alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-07-05 11:21:12 +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/mpu9150/javaupm_mpu9150.i
View File

@ -1,14 +1,9 @@
%module(directors="1") javaupm_mpu9150
%module javaupm_mpu9150
%include "../upm.i"
%include "typemaps.i"
%include "arrays_java.i"
%include "../java_buffer.i"
%feature("director") IsrCallback;
SWIG_DIRECTOR_OWNED(IsrCallback)
%ignore generic_callback_isr;
%include "../IsrCallback.h"
%apply int {mraa::Edge};
%{
@ -47,4 +42,4 @@ SWIG_DIRECTOR_OWNED(IsrCallback)
System.exit(1);
}
}
%}
%}

17
src/mpu9150/mpu60x0.cxx
View File

@ -384,14 +384,20 @@ uint8_t MPU60X0::getInterruptPinConfig()
return readReg(REG_INT_PIN_CFG);
}
#ifdef JAVACALLBACK
#if defined(SWIGJAVA) || defined(JAVACALLBACK)
void MPU60X0::installISR(int gpio, mraa::Edge level,
IsrCallback *cb)
jobject runnable)
{
installISR(gpio, level, generic_callback_isr, cb);
}
#endif
// delete any existing ISR and GPIO context
uninstallISR();
// greate gpio context
m_gpioIRQ = new mraa::Gpio(gpio);
m_gpioIRQ->dir(mraa::DIR_IN);
m_gpioIRQ->isr(level, runnable);
}
#else
void MPU60X0::installISR(int gpio, mraa::Edge level,
void (*isr)(void *), void *arg)
{
@ -404,6 +410,7 @@ void MPU60X0::installISR(int gpio, mraa::Edge level,
m_gpioIRQ->dir(mraa::DIR_IN);
m_gpioIRQ->isr(level, isr, arg);
}
#endif
void MPU60X0::uninstallISR()
{

10
src/mpu9150/mpu60x0.h
View File

@ -29,10 +29,6 @@
#include <mraa/gpio.hpp>
#if defined(SWIGJAVA) || defined(JAVACALLBACK)
#include "../IsrCallback.h"
#endif
#define MPU60X0_I2C_BUS 0
#define MPU60X0_DEFAULT_I2C_ADDR 0x68
@ -921,7 +917,7 @@ namespace upm {
* @param arg the argument to pass the the interrupt handler
*/
#if defined(SWIGJAVA) || defined(JAVACALLBACK)
void installISR(int gpio, mraa::Edge level, IsrCallback *cb);
void installISR(int gpio, mraa::Edge level, jobject runnable);
#else
void installISR(int gpio, mraa::Edge level, void (*isr)(void *), void *arg);
#endif
@ -951,10 +947,6 @@ namespace upm {
float m_gyroScale;
private:
#if defined(SWIGJAVA) || defined(JAVACALLBACK)
void installISR(int gpio, mraa::Edge level, void (*isr)(void *), void *arg);
#endif
mraa::I2c m_i2c;
uint8_t m_addr;