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

java: Use Runnables instead of IsrCallbacks in Java

Browse Source 
Signed-off-by: Petre Eftime <petre.p.eftime@intel.com>
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
This commit is contained in:
Petre Eftime
2015-12-23 17:47:26 +02:00
committed by Mihai Tudor Panu
parent e1c66c351a
commit 2cd043c2a1
35 changed files with 96 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/ttp223/javaupm_ttp223.i
View File

@ -1,12 +1,7 @@
%module (directors=1, docstring="TTP223 Touch Sensor") javaupm_ttp223
%module (docstring="TTP223 Touch Sensor") javaupm_ttp223
%include "../upm.i"
%feature("director") IsrCallback;
SWIG_DIRECTOR_OWNED(IsrCallback)
%ignore generic_callback_isr;
%include "../IsrCallback.h"
%apply int {mraa::Edge}
@ -25,4 +20,4 @@ SWIG_DIRECTOR_OWNED(IsrCallback)
System.exit(1);
}
}
%}
%}

4
src/ttp223/ttp223.cxx
View File

@ -60,9 +60,9 @@ bool TTP223::isPressed() {
}
#ifdef JAVACALLBACK
void TTP223::installISR(mraa::Edge level, IsrCallback *cb)
void TTP223::installISR(mraa::Edge level, jobject runnable)
{
installISR(level, generic_callback_isr, cb);
installISR(level, mraa_java_isr_callback, runnable);
}
#endif

6
src/ttp223/ttp223.h
View File

@ -26,10 +26,6 @@
#include <string>
#include <mraa/gpio.hpp>
#if defined(SWIGJAVA) || defined(JAVACALLBACK)
#include "../IsrCallback.h"
#endif
namespace upm {
/**
* @brief TTP223 Touch Detector Sensor library
@ -100,7 +96,7 @@ class TTP223 {
* argument to the ISR.
*/
#if defined(SWIGJAVA) || defined(JAVACALLBACK)
void installISR(mraa::Edge level, IsrCallback *cb);
void installISR(mraa::Edge level, jobject runnable);
#else
void installISR(mraa::Edge level, void (*isr)(void *), void *arg);
#endif