java: Use Runnables instead of IsrCallbacks in Java

Signed-off-by: Petre Eftime <petre.p.eftime@intel.com>
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>

src/CMakeLists.txt

@@ -67,6 +67,7 @@ macro(upm_SWIG_JAVA)
   if (BUILDSWIGJAVA AND BUILDSWIG)
 
     FIND_PACKAGE (JNI REQUIRED)
+    pkg_check_modules (MRAAJAVA REQUIRED mraajava>=0.8.0)
 
     include_directories (
       ${JAVA_INCLUDE_PATH}
@@ -77,7 +78,7 @@ macro(upm_SWIG_JAVA)
     set_source_files_properties (javaupm_${libname}.i PROPERTIES CPLUSPLUS ON)
     set_source_files_properties (javaupm_${libname}.i PROPERTIES SWIG_FLAGS ";-package;upm_${libname};-I${CMAKE_BINARY_DIR}/src")
     swig_add_module (javaupm_${libname} java javaupm_${libname}.i ${module_src})
-    swig_link_libraries (javaupm_${libname} ${MRAA_LIBRARIES} ${JAVA_LIBRARIES})
+    swig_link_libraries (javaupm_${libname} ${MRAAJAVA_LDFLAGS} ${JAVA_LDFLAGS})
     target_include_directories ( ${SWIG_MODULE_javaupm_${libname}_REAL_NAME}
       PUBLIC
       "${JAVA_INCLUDE_DIRS}"

src/IsrCallback.h

@@ -1,25 +0,0 @@
-#pragma once
-
-#if defined(SWIGJAVA) || defined(JAVACALLBACK)
-class IsrCallback
-{
-  public:
-    virtual ~IsrCallback()
-    {
-    }
-    virtual void run()
-    { /* empty, overloaded in Java*/
-    }
-
-  private:
-};
-
-
-static void generic_callback_isr (void* data)
-{
-    IsrCallback* callback = (IsrCallback*) data;
-    if (callback == NULL)
-        return;
-    callback->run();
-}
-#endif

src/a110x/a110x.cxx

@@ -58,9 +58,9 @@ bool A110X::magnetDetected()
 }
 
 #ifdef JAVACALLBACK
-void A110X::installISR( IsrCallback *cb)
+void A110X::installISR(jobject runnable)
 {
-installISR(generic_callback_isr, cb);
+installISR(mraa_java_isr_callback, runnable);
 }
 #endif
 

src/a110x/a110x.h

@@ -26,10 +26,6 @@
 #include <string>
 #include <mraa/gpio.h>
 
-#if defined(SWIGJAVA) || defined(JAVACALLBACK)
-#include "../IsrCallback.h"
-#endif
-
 namespace upm {
   /**
    * @brief A110X Hall Effect library
@@ -90,7 +86,7 @@ namespace upm {
      * argument to the ISR.
      */
 #if defined(SWIGJAVA) || defined(JAVACALLBACK)
-    void installISR(IsrCallback *cb);
+    void installISR(jobject runnable);
 #else
     void installISR(void (*isr)(void *), void *arg);
 #endif

src/a110x/javaupm_a110x.i

@@ -1,13 +1,8 @@
-%module(directors="1") javaupm_a110x
+%module javaupm_a110x
 %include "../upm.i"
 %include "stdint.i"
 %include "typemaps.i"
 
-%feature("director") IsrCallback;
-SWIG_DIRECTOR_OWNED(IsrCallback)
-%ignore generic_callback_isr;
-%include "../IsrCallback.h"
-
 %{
     #include "a110x.h"
 %}

src/bma220/bma220.cxx

@@ -489,14 +489,21 @@ bool BMA220::resetInterrupts()
   return writeReg(REG_ENABLE_CONFIG2, reg);
 }
 
-#ifdef SWIGJAVA
+#if defined(SWIGJAVA) || (JAVACALLBACK)
 void BMA220::installISR(int gpio, mraa::Edge level,
-                        IsrCallback *cb)
+                        jobject runnable)
 {
-  installISR(gpio, level, generic_callback_isr, cb);
+  // delete any existing ISR and GPIO context
-}
+  uninstallISR();
-#endif
 
+  // create gpio context
+  m_gpioIntr = new mraa::Gpio(gpio);
+
+  m_gpioIntr->dir(mraa::DIR_IN);
+  m_gpioIntr->isr(level, runnable);
+
+}
+#else
 void BMA220::installISR(int gpio, mraa::Edge level, 
                         void (*isr)(void *), void *arg)
 {
@@ -509,6 +516,7 @@ void BMA220::installISR(int gpio, mraa::Edge level,
   m_gpioIntr->dir(mraa::DIR_IN);
   m_gpioIntr->isr(level, isr, arg);
 }
+#endif
 
 void BMA220::uninstallISR()
 {

src/bma220/bma220.h

@@ -28,10 +28,6 @@
 #include <mraa/i2c.hpp>
 #include <mraa/gpio.hpp>
 
-#if defined(SWIGJAVA) || defined(JAVACALLBACK)
-#include "../IsrCallback.h"
-#endif
-
 #define BMA220_I2C_BUS 0
 #define BMA220_DEFAULT_ADDR 0x0a
 
@@ -782,7 +778,7 @@ namespace upm {
     bool resetInterrupts();
 
 #if defined(SWIGJAVA) || defined(JAVACALLBACK)
-    void installISR(int gpio, mraa::Edge level, IsrCallback *cb);
+    void installISR(int gpio, mraa::Edge level, jobject runnable);
 #else
     /**
      * install an interrupt handler.

src/bma220/javaupm_bma220.i

@@ -1,15 +1,10 @@
-%module(directors="1") javaupm_bma220
+%module javaupm_bma220
 %include "../upm.i"
 %include "cpointer.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};
 %apply float *INOUT { float *x, float *y, float *z };
 

src/grove/grove.cxx

@@ -279,9 +279,9 @@ int GroveButton::value()
 }
 
 #ifdef JAVACALLBACK
-void GroveButton::installISR(mraa::Edge level, IsrCallback *cb)
+void GroveButton::installISR(mraa::Edge level, jobject runnable)
 {
-  installISR(level, generic_callback_isr, cb);
+  installISR(level, mraa_java_isr_callback, runnable);
 }
 #endif
 

src/grove/grove.h

@@ -29,10 +29,6 @@
 #include <mraa/aio.hpp>
 #include <mraa/gpio.hpp>
 
-#ifdef JAVACALLBACK
-#include "../IsrCallback.h"
-#endif
-
 namespace upm {
 
 /**
@@ -392,7 +388,7 @@ class GroveButton: public Grove {
          * 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

src/grove/javaupm_grove.i

@@ -1,12 +1,7 @@
-%module (directors="1", docstring="Basic Grove sensors") javaupm_grove
+%module (docstring="Basic Grove sensors") javaupm_grove
 
 %include "../upm.i"
 
-%feature("director") IsrCallback;
-SWIG_DIRECTOR_OWNED(IsrCallback)
-%ignore generic_callback_isr;
-%include "../IsrCallback.h"
-
 %apply int {mraa::Edge}
 
 %{

src/hcsr04/hcsr04.cxx

@@ -30,6 +30,10 @@
 #include <stdlib.h>
 #include <functional>
 
+#ifdef JAVACALLBACK
+#undef JAVACALLBACK
+#endif
+
 #include "hcsr04.h"
 
 using namespace upm;

src/hcsr04/hcsr04.h

@@ -30,10 +30,6 @@
 #include <mraa/pwm.h>
 #include <sys/time.h>
 
-#if defined(SWIGJAVA) || defined(JAVACALLBACK)
-#include "../IsrCallback.h"
-#endif
-
 #define CM 1
 #define INC 0
 

src/hcsr04/javaupm_hcsr04.i

@@ -1,4 +1,4 @@
-%module(directors="1") javaupm_hcsr04
+%module javaupm_hcsr04
 %include "../upm.i"
 
 %{

src/lsm9ds0/javaupm_lsm9ds0.i

@@ -1,15 +1,10 @@
-%module(directors="1") javaupm_lsm9ds0
+%module javaupm_lsm9ds0
 %include "../upm.i"
 %include "cpointer.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};
 %apply float *INOUT { float *x, float *y, float *z };
 

src/lsm9ds0/lsm9ds0.cxx

@@ -741,14 +741,21 @@ uint8_t LSM9DS0::getInterruptGen2Src()
   return readReg(DEV_XM, REG_INT_GEN_2_SRC);
 }
 
-#ifdef SWIGJAVA
+#if defined(SWIGJAVA) || defined (JAVACALLBACK)
 void LSM9DS0::installISR(INTERRUPT_PINS_T intr, int gpio, mraa::Edge level,
-			 IsrCallback *cb)
+			 jobject runnable)
 {
-        installISR(intr, gpio, level, generic_callback_isr, cb);
+  // delete any existing ISR and GPIO context
-}
+  uninstallISR(intr);
-#endif
 
+  // greate gpio context
+  getPin(intr) = new mraa::Gpio(gpio);
+
+  getPin(intr)->dir(mraa::DIR_IN);
+  getPin(intr)->isr(level, runnable);
+
+}
+#else
 void LSM9DS0::installISR(INTERRUPT_PINS_T intr, int gpio, mraa::Edge level, 
                          void (*isr)(void *), void *arg)
 {
@@ -761,6 +768,7 @@ void LSM9DS0::installISR(INTERRUPT_PINS_T intr, int gpio, mraa::Edge level,
   getPin(intr)->dir(mraa::DIR_IN);
   getPin(intr)->isr(level, isr, arg);
 }
+#endif
 
 void LSM9DS0::uninstallISR(INTERRUPT_PINS_T intr)
 {

src/lsm9ds0/lsm9ds0.h

@@ -29,10 +29,6 @@
 
 #include <mraa/gpio.hpp>
 
-#if defined(SWIGJAVA) || defined(JAVACALLBACK)
-#include "../IsrCallback.h"
-#endif
-
 #define LSM9DS0_I2C_BUS 1
 #define LSM9DS0_DEFAULT_XM_ADDR 0x1d
 #define LSM9DS0_DEFAULT_GYRO_ADDR 0x6b
@@ -1413,7 +1409,7 @@ namespace upm {
 
 #if defined(SWIGJAVA) || defined(JAVACALLBACK)
     void installISR(INTERRUPT_PINS_T intr, int gpio, mraa::Edge level,
-		    IsrCallback *cb);
+		    jobject runnable);
 #else
     /**
      * install an interrupt handler.
@@ -1464,11 +1460,6 @@ namespace upm {
   private:
     // OR'd with a register, this enables register autoincrement mode,
     // which we need.
-#if defined(SWIGJAVA) || defined(JAVACALLBACK)
-    void installISR(INTERRUPT_PINS_T intr, int gpio, mraa::Edge level,
-                    void (*isr)(void *), void *arg);
-#endif
-
     static const uint8_t m_autoIncrementMode = 0x80;
 
     mraa::I2c m_i2cG;

src/mma7660/javaupm_mma7660.i

@@ -1,13 +1,8 @@
-%module(directors="1") javaupm_mma7660
+%module javaupm_mma7660
 %include "../upm.i"
 %include "cpointer.i"
 %include "typemaps.i"
 
-%feature("director") IsrCallback;
-SWIG_DIRECTOR_OWNED(IsrCallback)
-%ignore generic_callback_isr;
-%include "../IsrCallback.h"
-
 %apply int *OUTPUT { int *x, int *y, int *z };
 %apply float *OUTPUT { float *ax, float *ay, float *az  };
 

src/mma7660/mma7660.cxx

@@ -207,9 +207,9 @@ bool MMA7660::tiltShake()
 }
 
 #ifdef JAVACALLBACK
-void MMA7660::installISR(int pin, IsrCallback *cb)
+void MMA7660::installISR(int pin, jobject runnable)
 {
-        installISR(pin, generic_callback_isr, cb);
+        installISR(pin, mraa_java_isr_callback, runnable);
 }
 #endif
 

src/mma7660/mma7660.h

@@ -27,10 +27,6 @@
 #include <mraa/i2c.h>
 #include <mraa/gpio.h>
 
-#if defined(SWIGJAVA) || defined(JAVACALLBACK)
-#include "../IsrCallback.h"
-#endif
-
 #define MMA7660_I2C_BUS 0
 #define MMA7660_DEFAULT_I2C_ADDR 0x4c
 
@@ -271,7 +267,7 @@ namespace upm {
      * argument to the ISR.
      */
 #if defined(SWIGJAVA) || defined(JAVACALLBACK)
-    void installISR(int pin, IsrCallback *cb);
+    void installISR(int pin, jobject runnable);
 #else
     void installISR(int pin, void (*isr)(void *), void *arg);
 #endif

src/mpu9150/javaupm_mpu9150.i

@@ -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};
 
 %{

src/mpu9150/mpu60x0.cxx

@@ -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);
+  // delete any existing ISR and GPIO context
-}
+  uninstallISR();
-#endif
 
+  // 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()
 {

src/mpu9150/mpu60x0.h

@@ -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;
 

src/pn532/pn532.cxx

@@ -32,6 +32,10 @@
 #include <string>
 #include <stdexcept>
 
+#ifdef JAVACALLBACK
+#undef JAVACALLBACK
+#endif
+
 #include "pn532.h"
 
 using namespace upm;

src/rgbringcoder/rgbringcoder.cxx

@@ -24,6 +24,9 @@
 
 #include <iostream>
 
+#ifdef JAVACALLBACK
+#undef JAVACALLBACK
+#endif
 #include "rgbringcoder.h"
 
 using namespace std;

src/rpr220/javaupm_rpr220.i

@@ -1,12 +1,7 @@
-%module(directors="1") javaupm_rpr220
+%module javaupm_rpr220
 %include "../upm.i"
 
 
-%feature("director") IsrCallback;
-SWIG_DIRECTOR_OWNED(IsrCallback)
-%ignore generic_callback_isr;
-%include "../IsrCallback.h"
-
 %{
     #include "rpr220.h"
 %}

src/rpr220/rpr220.cxx

@@ -59,9 +59,9 @@ bool RPR220::blackDetected()
 }
 
 #ifdef JAVACALLBACK
-void RPR220::installISR(IsrCallback *cb)
+void RPR220::installISR(jobject runnable)
 {
-  installISR(generic_callback_isr, cb);
+  installISR(mraa_java_isr_callback, runnable);
 }
 #endif
 

src/rpr220/rpr220.h

@@ -26,10 +26,6 @@
 #include <string>
 #include <mraa/gpio.h>
 
-#if defined(SWIGJAVA) || defined(JAVACALLBACK)
-#include "../IsrCallback.h"
-#endif
-
 namespace upm {
 
 /**
@@ -88,7 +84,7 @@ namespace upm {
     bool blackDetected();
 
 #if defined(SWIGJAVA) || defined(JAVACALLBACK)
-    void installISR(IsrCallback *cb);
+    void installISR(jobject runnable);
 #else
     /**
      * Installs an ISR to be called when

src/sx1276/javaupm_sx1276.i

@@ -1,4 +1,4 @@
-%module(directors="1") javaupm_sx1276
+%module javaupm_sx1276
 %include "../upm.i"
 %include "cpointer.i"
 %include "typemaps.i"

src/sx1276/sx1276.cxx

@@ -29,6 +29,10 @@
 #include <string>
 #include <string.h>
 
+#ifdef JAVACALLBACK
+#undef JAVACALLBACK
+#endif
+
 #include "sx1276.h"
 
 using namespace upm;

src/ttp223/javaupm_ttp223.i

@@ -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}
 
 

src/ttp223/ttp223.cxx

@@ -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
 

src/ttp223/ttp223.h

@@ -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

src/upm.i

@@ -26,4 +26,6 @@ void cleanUp();
 #endif
 
 #if (SWIGJAVA)
+%typemap(jtype) jobject runnable "java.lang.Runnable"
+%typemap(jstype) jobject runnable "java.lang.Runnable"
 #endif

src/wheelencoder/wheelencoder.cxx

@@ -24,6 +24,9 @@
 
 #include <iostream>
 
+#ifdef JAVACALLBACK
+#undef JAVACALLBACK
+#endif
 #include "wheelencoder.h"
 
 using namespace upm;