alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-07-02 01:41:12 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Moved SWIG code from C++ files (hpp and cxx) to SWIG interface files (.i). Added getter/setter methods for classes with protected or private vars.

Browse Source
This commit is contained in:
Serban Waltter
2018-01-17 14:20:32 +02:00
committed by Noel Eck
parent 2551596309
commit 63b2b33df7
39 changed files with 351 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/button/button.cxx
View File

@ -59,12 +59,12 @@ int Button::value()
return mraa_gpio_read(m_gpio);
}
#ifdef JAVACALLBACK
/*#ifdef JAVACALLBACK
void Button::installISR(mraa::Edge level, jobject runnable)
{
installISR(level, mraa_java_isr_callback, runnable);
}
#endif
#endif*/
void Button::installISR(mraa::Edge level, void (*isr)(void *), void *arg)
{

9
src/button/button.hpp
View File

@ -87,11 +87,11 @@ class Button{
* @param arg Pointer to an object to be supplied as an
* argument to the ISR.
*/
#if defined(SWIGJAVA) || defined(JAVACALLBACK)
/*#if defined(SWIGJAVA) || defined(JAVACALLBACK)
void installISR(mraa::Edge level, jobject runnable);
#else
#else*/
void installISR(mraa::Edge level, void (*isr)(void *), void *arg);
#endif
//#endif
/**
* Uninstalls the previously installed ISR
*
@ -99,9 +99,6 @@ class Button{
void uninstallISR();
private:
#if defined(SWIGJAVA) || defined(JAVACALLBACK)
void installISR(mraa::Edge level, void (*isr)(void *), void *arg);
#endif
bool m_isrInstalled;
std::string m_name;
mraa_gpio_context m_gpio;

9
src/button/javaupm_button.i
View File

@ -9,4 +9,13 @@
%include "button.hpp"
#%ignore
%extend upm::Button {
void installISR(mraa::Edge level, jobject runnable)
{
$self->installISR(level, mraa_java_isr_callback, runnable);
}
}
JAVA_JNI_LOADLIBRARY(javaupm_button)