From ef74a7b137f06c3dc305e33e5bc04169f80e760a Mon Sep 17 00:00:00 2001 From: Stefan Andritoiu Date: Mon, 14 Sep 2015 18:10:12 +0300 Subject: [PATCH] java: Eliminated double definition of SWIGJAVA and the need for "#undefine SWIGJAVA" Signed-off-by: Stefan Andritoiu Signed-off-by: Mihai Tudor Panu Conflicts: src/CMakeLists.txt --- src/CMakeLists.txt | 2 +- src/IsrCallback.h | 2 +- src/a110x/a110x.cxx | 2 +- src/a110x/a110x.h | 6 +++--- src/ad8232/ad8232.h | 6 ------ src/grovecircularled/grovecircularled.h | 7 ------- src/hcsr04/hcsr04.cxx | 2 +- src/hcsr04/hcsr04.h | 8 ++++---- src/lcd/eboled.h | 6 ------ src/lcd/lcm1602.h | 7 ------- src/lpd8806/lpd8806.h | 7 ------- src/lsm9ds0/lsm9ds0.cxx | 2 +- src/lsm9ds0/lsm9ds0.h | 15 ++++----------- src/max31723/max31723.h | 7 ------- src/max5487/max5487.h | 8 -------- src/mma7660/mma7660.cxx | 6 +++--- src/mma7660/mma7660.h | 10 +++++----- src/mpu9150/mpu60x0.cxx | 2 +- src/mpu9150/mpu60x0.h | 14 ++++---------- src/my9221/my9221.h | 7 ------- src/nrf24l01/nrf24l01.h | 7 ------- src/pn532/pn532.h | 7 ------- src/rgbringcoder/rgbringcoder.h | 6 ------ src/rpr220/rpr220.cxx | 5 ++--- src/rpr220/rpr220.h | 6 +++--- src/st7735/gfx.h | 7 ------- src/st7735/st7735.h | 7 ------- src/stepmotor/stepmotor.h | 7 ------- 28 files changed, 34 insertions(+), 144 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 02564c18..5390af32 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -74,7 +74,7 @@ macro(upm_SWIG_JAVA) "${JAVA_INCLUDE_PATH}" ) set_target_properties (javaupm_${libname} PROPERTIES - COMPILE_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive" + COMPILE_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -DJAVACALLBACK" PREFIX "lib" SUFFIX ".so" ) diff --git a/src/IsrCallback.h b/src/IsrCallback.h index 34a85a32..2f1a38d5 100644 --- a/src/IsrCallback.h +++ b/src/IsrCallback.h @@ -1,6 +1,6 @@ #pragma once -#ifdef SWIGJAVA +#if defined(SWIGJAVA) || defined(JAVACALLBACK) class IsrCallback { public: diff --git a/src/a110x/a110x.cxx b/src/a110x/a110x.cxx index 8061b17f..421198f6 100644 --- a/src/a110x/a110x.cxx +++ b/src/a110x/a110x.cxx @@ -54,7 +54,7 @@ bool A110X::magnetDetected() return (!mraa_gpio_read(m_gpio) ? true : false); } -#ifdef SWIGJAVA +#ifdef JAVACALLBACK void A110X::installISR( IsrCallback *cb) { installISR(generic_callback_isr, cb); diff --git a/src/a110x/a110x.h b/src/a110x/a110x.h index 38c4fdb5..030acbda 100644 --- a/src/a110x/a110x.h +++ b/src/a110x/a110x.h @@ -26,7 +26,7 @@ #include #include -#ifdef SWIGJAVA +#if defined(SWIGJAVA) || defined(JAVACALLBACK) #include "../IsrCallback.h" #endif @@ -89,7 +89,7 @@ namespace upm { * @param arg Pointer to an object to be supplied as an * argument to the ISR. */ -#ifdef SWIGJAVA +#if defined(SWIGJAVA) || defined(JAVACALLBACK) void installISR(IsrCallback *cb); #else void installISR(void (*isr)(void *), void *arg); @@ -101,7 +101,7 @@ namespace upm { void uninstallISR(); private: -#ifdef SWIGJAVA +#if defined(SWIGJAVA) || defined(JAVACALLBACK) void installISR(void (*isr)(void *), void *arg); #endif diff --git a/src/ad8232/ad8232.h b/src/ad8232/ad8232.h index 8cbfe03c..f4eaf7e0 100644 --- a/src/ad8232/ad8232.h +++ b/src/ad8232/ad8232.h @@ -26,13 +26,7 @@ #include #include -#ifdef SWIGJAVA -#undef SWIGJAVA #include -#define SWIGJAVA -#else -#include -#endif #include diff --git a/src/grovecircularled/grovecircularled.h b/src/grovecircularled/grovecircularled.h index 35b301cf..627f3838 100644 --- a/src/grovecircularled/grovecircularled.h +++ b/src/grovecircularled/grovecircularled.h @@ -30,14 +30,7 @@ #include #include -#ifdef SWIGJAVA -#undef SWIGJAVA #include -#define SWIGJAVA - -#else -#include -#endif #define MAX_BIT_PER_BLOCK 16 #define CMDMODE 0x0000 diff --git a/src/hcsr04/hcsr04.cxx b/src/hcsr04/hcsr04.cxx index 5c762822..6393a6a0 100644 --- a/src/hcsr04/hcsr04.cxx +++ b/src/hcsr04/hcsr04.cxx @@ -31,7 +31,7 @@ using namespace upm; -#ifdef SWIGJAVA +#ifdef JAVACALLBACK HCSR04::HCSR04 (uint8_t triggerPin, uint8_t echoPin, IsrCallback *cb) { HCSR04 (triggerPin, echoPin, generic_callback_isr); diff --git a/src/hcsr04/hcsr04.h b/src/hcsr04/hcsr04.h index cf54999d..a89b61e4 100644 --- a/src/hcsr04/hcsr04.h +++ b/src/hcsr04/hcsr04.h @@ -29,7 +29,7 @@ #include #include -#ifdef SWIGJAVA +#if defined(SWIGJAVA) || defined(JAVACALLBACK) #include "../IsrCallback.h" #endif @@ -62,8 +62,8 @@ namespace upm { */ class HCSR04 { public: -#ifdef SWIGJAVA - HCSR04 (uint8_t triggerPin, uint8_t echoPin, IsrCallback *cb); +#if defined(SWIGJAVA) || defined(JAVACALLBACK) + HCSR04 (uint8_t triggerPin, uint8_t echoPin, IsrCallback *cb); #else /** * Instantiates an HCSR04 object @@ -103,7 +103,7 @@ class HCSR04 { } private: -#ifdef SWIGJAVA +#if defined(SWIGJAVA) || defined(JAVACALLBACK) HCSR04 (uint8_t triggerPin, uint8_t echoPin, void (*fptr)(void *)); #endif mraa_pwm_context m_pwmTriggerCtx; diff --git a/src/lcd/eboled.h b/src/lcd/eboled.h index 03f98be3..e8d87365 100644 --- a/src/lcd/eboled.h +++ b/src/lcd/eboled.h @@ -26,13 +26,7 @@ #include #include -#ifdef SWIGJAVA -#undef SWIGJAVA #include -#define SWIGJAVA -#else -#include -#endif #include "lcd.h" #include "ssd.h" diff --git a/src/lcd/lcm1602.h b/src/lcd/lcm1602.h index 42d09e26..bee9d15d 100644 --- a/src/lcd/lcm1602.h +++ b/src/lcd/lcm1602.h @@ -35,14 +35,7 @@ #include #include -#ifdef SWIGJAVA -#undef SWIGJAVA #include -#define SWIGJAVA -#else -#include -#endif - #include "lcd.h" diff --git a/src/lpd8806/lpd8806.h b/src/lpd8806/lpd8806.h index 8afdb192..cc8f7e4c 100644 --- a/src/lpd8806/lpd8806.h +++ b/src/lpd8806/lpd8806.h @@ -26,14 +26,7 @@ #include #include -#ifdef SWIGJAVA -#undef SWIGJAVA #include -#define SWIGJAVA - -#else -#include -#endif #include diff --git a/src/lsm9ds0/lsm9ds0.cxx b/src/lsm9ds0/lsm9ds0.cxx index 045dc633..3b8d83d4 100644 --- a/src/lsm9ds0/lsm9ds0.cxx +++ b/src/lsm9ds0/lsm9ds0.cxx @@ -602,7 +602,7 @@ void LSM9DS0::getMagnetometer(float *x, float *y, float *z) *z = (m_magZ * m_magScale) / 1000.0; } -#ifdef SWIGJAVA +#ifdef JAVACALLBACK float *LSM9DS0::getAccelerometer() { float *v = new float[3]; diff --git a/src/lsm9ds0/lsm9ds0.h b/src/lsm9ds0/lsm9ds0.h index 7b47fbbd..b9101a83 100644 --- a/src/lsm9ds0/lsm9ds0.h +++ b/src/lsm9ds0/lsm9ds0.h @@ -27,19 +27,12 @@ #include #include -#ifdef SWIGJAVA -#undef SWIGJAVA #include -#define SWIGJAVA -#else -#include -#endif -#ifdef SWIGJAVA +#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 @@ -1268,7 +1261,7 @@ namespace upm { */ void getMagnetometer(float *x, float *y, float *z); -#ifdef SWIGJAVA +#if defined(SWIGJAVA) || defined(JAVACALLBACK) /** * get the accelerometer values in gravities * @@ -1418,7 +1411,7 @@ namespace upm { */ uint8_t getInterruptGen2Src(); -#ifdef SWIGJAVA +#if defined(SWIGJAVA) || defined(JAVACALLBACK) void installISR(INTERRUPT_PINS_T intr, int gpio, mraa::Edge level, IsrCallback *cb); #else @@ -1471,7 +1464,7 @@ namespace upm { private: // OR'd with a register, this enables register autoincrement mode, // which we need. -#ifdef SWIGJAVA +#if defined(SWIGJAVA) || defined(JAVACALLBACK) void installISR(INTERRUPT_PINS_T intr, int gpio, mraa::Edge level, void (*isr)(void *), void *arg); #endif diff --git a/src/max31723/max31723.h b/src/max31723/max31723.h index 12a487c2..9aaaca23 100644 --- a/src/max31723/max31723.h +++ b/src/max31723/max31723.h @@ -26,14 +26,7 @@ #include #include -#ifdef SWIGJAVA -#undef SWIGJAVA #include -#define SWIGJAVA - -#else -#include -#endif #include diff --git a/src/max5487/max5487.h b/src/max5487/max5487.h index 5514aa22..287d30a4 100644 --- a/src/max5487/max5487.h +++ b/src/max5487/max5487.h @@ -26,15 +26,7 @@ #include #include -#ifdef SWIGJAVA -#undef SWIGJAVA #include -#define SWIGJAVA - -#else -#include -#endif - #include #define HIGH 1 diff --git a/src/mma7660/mma7660.cxx b/src/mma7660/mma7660.cxx index cf7801a3..5928a463 100644 --- a/src/mma7660/mma7660.cxx +++ b/src/mma7660/mma7660.cxx @@ -88,7 +88,7 @@ void MMA7660::getRawValues(int *x, int *y, int *z) *z = getVerifiedAxis(REG_ZOUT); } -#ifdef SWIGJAVA +#ifdef JAVACALLBACK int *MMA7660::getRawValues() { int *values = new int[3]; @@ -204,7 +204,7 @@ bool MMA7660::tiltShake() return false; } -#ifdef SWIGJAVA +#ifdef JAVACALLBACK void MMA7660::installISR(int pin, IsrCallback *cb) { installISR(pin, generic_callback_isr, cb); @@ -263,7 +263,7 @@ void MMA7660::getAcceleration(float *ax, float *ay, float *az) *az = z/21.33; } -#ifdef SWIGJAVA +#ifdef JAVACALLBACK float *MMA7660::getAcceleration() { float *values = new float[3]; diff --git a/src/mma7660/mma7660.h b/src/mma7660/mma7660.h index 1ca4e4e2..c6a39889 100644 --- a/src/mma7660/mma7660.h +++ b/src/mma7660/mma7660.h @@ -27,7 +27,7 @@ #include #include -#ifdef SWIGJAVA +#if defined(SWIGJAVA) || defined(JAVACALLBACK) #include "../IsrCallback.h" #endif @@ -169,7 +169,7 @@ namespace upm { */ void getRawValues(int *x, int *y, int *z); -#ifdef SWIGJAVA +#if defined(SWIGJAVA) || defined(JAVACALLBACK) /** * Reads the current value of conversion * @@ -187,7 +187,7 @@ namespace upm { */ void getAcceleration(float *ax, float *ay, float *az); -#ifdef SWIGJAVA +#if defined(SWIGJAVA) || defined(JAVACALLBACK) /** * Gets the computed acceleration * @@ -270,7 +270,7 @@ namespace upm { * @param arg Pointer to an object to be supplied as an * argument to the ISR. */ -#ifdef SWIGJAVA +#if defined(SWIGJAVA) || defined(JAVACALLBACK) void installISR(int pin, IsrCallback *cb); #else void installISR(int pin, void (*isr)(void *), void *arg); @@ -301,7 +301,7 @@ namespace upm { bool setSampleRate(MMA7660_AUTOSLEEP_T sr); private: -#ifdef SWIGJAVA +#if defined(SWIGJAVA) || defined(JAVACALLBACK) void installISR(int pin, void (*isr)(void *), void *arg); #endif diff --git a/src/mpu9150/mpu60x0.cxx b/src/mpu9150/mpu60x0.cxx index b03489cf..2bff5984 100644 --- a/src/mpu9150/mpu60x0.cxx +++ b/src/mpu9150/mpu60x0.cxx @@ -380,7 +380,7 @@ uint8_t MPU60X0::getInterruptPinConfig() return readReg(REG_INT_PIN_CFG); } -#ifdef SWIGJAVA +#ifdef JAVACALLBACK void MPU60X0::installISR(int gpio, mraa::Edge level, IsrCallback *cb) { diff --git a/src/mpu9150/mpu60x0.h b/src/mpu9150/mpu60x0.h index 1ab96d19..18b63198 100644 --- a/src/mpu9150/mpu60x0.h +++ b/src/mpu9150/mpu60x0.h @@ -27,15 +27,9 @@ #include #include -#ifdef SWIGJAVA -#undef SWIGJAVA #include -#define SWIGJAVA -#else -#include -#endif -#ifdef SWIGJAVA +#if defined(SWIGJAVA) || defined(JAVACALLBACK) #include "../IsrCallback.h" #endif @@ -809,7 +803,7 @@ namespace upm { */ void getGyroscope(float *x, float *y, float *z); -#ifdef SWIGJAVA +#if defined(SWIGJAVA) || defined(JAVACALLBACK) /** * get the accelerometer values * @@ -926,7 +920,7 @@ namespace upm { * @param isr the interrupt handler, accepting a void * argument * @param arg the argument to pass the the interrupt handler */ -#ifdef SWIGJAVA +#if defined(SWIGJAVA) || defined(JAVACALLBACK) void installISR(int gpio, mraa::Edge level, IsrCallback *cb); #else void installISR(int gpio, mraa::Edge level, void (*isr)(void *), void *arg); @@ -957,7 +951,7 @@ namespace upm { float m_gyroScale; private: -#ifdef SWIGJAVA +#if defined(SWIGJAVA) || defined(JAVACALLBACK) void installISR(int gpio, mraa::Edge level, void (*isr)(void *), void *arg); #endif diff --git a/src/my9221/my9221.h b/src/my9221/my9221.h index 911dcd55..ec18a49b 100644 --- a/src/my9221/my9221.h +++ b/src/my9221/my9221.h @@ -27,14 +27,7 @@ #include #include -#ifdef SWIGJAVA -#undef SWIGJAVA #include -#define SWIGJAVA - -#else -#include -#endif #define MAX_BIT_PER_BLOCK 16 #define CMDMODE 0x0000 diff --git a/src/nrf24l01/nrf24l01.h b/src/nrf24l01/nrf24l01.h index 1f83788b..8ca9aad8 100644 --- a/src/nrf24l01/nrf24l01.h +++ b/src/nrf24l01/nrf24l01.h @@ -28,14 +28,7 @@ #include #include -#ifdef SWIGJAVA -#undef SWIGJAVA #include -#define SWIGJAVA - -#else -#include -#endif #include #include diff --git a/src/pn532/pn532.h b/src/pn532/pn532.h index 2a00dad2..c0d67dde 100644 --- a/src/pn532/pn532.h +++ b/src/pn532/pn532.h @@ -34,14 +34,7 @@ #include #include -#ifdef SWIGJAVA -#undef SWIGJAVA #include -#define SWIGJAVA -#else -#include -#endif - #define PN532_I2C_BUS 0 #define PN532_DEFAULT_I2C_ADDR (0x48 >> 1) diff --git a/src/rgbringcoder/rgbringcoder.h b/src/rgbringcoder/rgbringcoder.h index e3305924..5675c4fc 100644 --- a/src/rgbringcoder/rgbringcoder.h +++ b/src/rgbringcoder/rgbringcoder.h @@ -28,13 +28,7 @@ #include #include -#ifdef SWIGJAVA -#undef SWIGJAVA #include -#define SWIGJAVA -#else -#include -#endif #include diff --git a/src/rpr220/rpr220.cxx b/src/rpr220/rpr220.cxx index 3b4bde14..f2e8b0ca 100644 --- a/src/rpr220/rpr220.cxx +++ b/src/rpr220/rpr220.cxx @@ -26,7 +26,6 @@ #include "rpr220.h" - using namespace upm; using namespace std; @@ -56,10 +55,10 @@ bool RPR220::blackDetected() return (mraa_gpio_read(m_gpio) ? true : false); } -#ifdef SWIGJAVA +#ifdef JAVACALLBACK void RPR220::installISR(IsrCallback *cb) { - installISR(generic_callback_isr, cb); + installISR(generic_callback_isr, cb); } #endif diff --git a/src/rpr220/rpr220.h b/src/rpr220/rpr220.h index ad36ae09..af34f870 100644 --- a/src/rpr220/rpr220.h +++ b/src/rpr220/rpr220.h @@ -26,7 +26,7 @@ #include #include -#ifdef SWIGJAVA +#if defined(SWIGJAVA) || defined(JAVACALLBACK) #include "../IsrCallback.h" #endif @@ -87,7 +87,7 @@ namespace upm { */ bool blackDetected(); -#ifdef SWIGJAVA +#if defined(SWIGJAVA) || defined(JAVACALLBACK) void installISR(IsrCallback *cb); #else /** @@ -108,7 +108,7 @@ namespace upm { void uninstallISR(); private: -#ifdef SWIGJAVA +#if defined(SWIGJAVA) || defined(JAVACALLBACK) void installISR(void (*isr)(void *), void *arg); #endif bool m_isrInstalled; diff --git a/src/st7735/gfx.h b/src/st7735/gfx.h index 9f9a5b18..94cb4eff 100644 --- a/src/st7735/gfx.h +++ b/src/st7735/gfx.h @@ -28,14 +28,7 @@ #include #include -#ifdef SWIGJAVA -#undef SWIGJAVA #include -#define SWIGJAVA - -#else -#include -#endif #define swap(a, b) { int16_t t = a; a = b; b = t; } diff --git a/src/st7735/st7735.h b/src/st7735/st7735.h index 1fa1f15b..eebb4d06 100644 --- a/src/st7735/st7735.h +++ b/src/st7735/st7735.h @@ -30,14 +30,7 @@ #include #include -#ifdef SWIGJAVA -#undef SWIGJAVA #include -#define SWIGJAVA - -#else -#include -#endif #include #include diff --git a/src/stepmotor/stepmotor.h b/src/stepmotor/stepmotor.h index 0d1e75bd..611cee60 100644 --- a/src/stepmotor/stepmotor.h +++ b/src/stepmotor/stepmotor.h @@ -32,14 +32,7 @@ #include #include -#ifdef SWIGJAVA -#undef SWIGJAVA #include -#define SWIGJAVA - -#else -#include -#endif #define MIN_PERIOD 500 #define MAX_PERIOD 1000