diff --git a/src/ads1x15/javaupm_ads1x15.i b/src/ads1x15/javaupm_ads1x15.i index 08b9694a..fe409bb0 100644 --- a/src/ads1x15/javaupm_ads1x15.i +++ b/src/ads1x15/javaupm_ads1x15.i @@ -1,9 +1,7 @@ %module javaupm_ads1x15 %include "../upm.i" -#if SWIG_VERSION >= 0x030009 %include "../interfaces/javaupm_iADC.i" -#endif %include "typemaps.i" diff --git a/src/bmp280/javaupm_bmp280.i b/src/bmp280/javaupm_bmp280.i index 484967c4..ca71a0d7 100644 --- a/src/bmp280/javaupm_bmp280.i +++ b/src/bmp280/javaupm_bmp280.i @@ -1,16 +1,9 @@ %module javaupm_bmp280 %include "../upm.i" -#if SWIG_VERSION >= 0x030009 %include "../interfaces/javaupm_iTemperatureSensor.i" %include "../interfaces/javaupm_iHumiditySensor.i" %include "../interfaces/javaupm_iPressureSensor.i" -#else -%include "iModuleStatus.hpp" -%include "iTemperatureSensor.hpp" -%include "iPressureSensor.hpp" -%include "iHumiditySensor.hpp" -#endif %include "cpointer.i" %include "typemaps.i" diff --git a/src/bmpx8x/javaupm_bmpx8x.i b/src/bmpx8x/javaupm_bmpx8x.i index 691ac6c5..bada4d5b 100644 --- a/src/bmpx8x/javaupm_bmpx8x.i +++ b/src/bmpx8x/javaupm_bmpx8x.i @@ -1,10 +1,8 @@ %module javaupm_bmpx8x %include "../upm.i" -#if SWIG_VERSION >= 0x030009 %include "../interfaces/javaupm_iTemperatureSensor.i" %include "../interfaces/javaupm_iPressureSensor.i" -#endif %{ #include "bmpx8x.hpp" diff --git a/src/ds1808lc/javaupm_ds1808lc.i b/src/ds1808lc/javaupm_ds1808lc.i index 612de3fa..2031bc37 100644 --- a/src/ds1808lc/javaupm_ds1808lc.i +++ b/src/ds1808lc/javaupm_ds1808lc.i @@ -1,9 +1,7 @@ %module javaupm_ds1808lc %include "../upm.i" -#if SWIG_VERSION >= 0x030009 %include "../interfaces/javaupm_iLightController.i" -#endif %include "arrays_java.i"; %include "../java_buffer.i" diff --git a/src/hlg150h/javaupm_hlg150h.i b/src/hlg150h/javaupm_hlg150h.i index 5d2f8ade..0abbfaa4 100644 --- a/src/hlg150h/javaupm_hlg150h.i +++ b/src/hlg150h/javaupm_hlg150h.i @@ -1,9 +1,7 @@ %module javaupm_hlg150h %include "../upm.i" -#if SWIG_VERSION >= 0x030009 %include "../interfaces/javaupm_iLightController.i" -#endif %include "arrays_java.i"; %include "../java_buffer.i" diff --git a/src/interfaces/javaupm_iADC.i b/src/interfaces/javaupm_iADC.i index ef398c33..d48b8913 100644 --- a/src/interfaces/javaupm_iADC.i +++ b/src/interfaces/javaupm_iADC.i @@ -1,6 +1,9 @@ -%include +#if SWIG_VERSION >= 0x030009 + %include + %interface_impl(upm::IADC); +#endif + %include "javaupm_interfaces.i" %include "javaupm_iModuleStatus.i" -%interface_impl(upm::IADC); %include "iADC.hpp" diff --git a/src/interfaces/javaupm_iCO2Sensor.i b/src/interfaces/javaupm_iCO2Sensor.i index f5efafe6..d6e56212 100644 --- a/src/interfaces/javaupm_iCO2Sensor.i +++ b/src/interfaces/javaupm_iCO2Sensor.i @@ -1,6 +1,9 @@ -%include +#if SWIG_VERSION >= 0x030009 + %include + %interface_impl(upm::ICO2Sensor); +#endif + %include "javaupm_interfaces.i" %include "javaupm_iModuleStatus.i" -%interface_impl(upm::ICO2Sensor); %include "iCO2Sensor.hpp" diff --git a/src/interfaces/javaupm_iHumiditySensor.i b/src/interfaces/javaupm_iHumiditySensor.i index 5d5a18e4..3c73c68b 100644 --- a/src/interfaces/javaupm_iHumiditySensor.i +++ b/src/interfaces/javaupm_iHumiditySensor.i @@ -1,6 +1,9 @@ -%include +#if SWIG_VERSION >= 0x030009 + %include + %interface_impl(upm::IHumiditySensor); +#endif + %include "javaupm_interfaces.i" %include "javaupm_iModuleStatus.i" -%interface_impl(upm::IHumiditySensor); %include "iHumiditySensor.hpp" diff --git a/src/interfaces/javaupm_iLightController.i b/src/interfaces/javaupm_iLightController.i index 7c8fc821..12cdae75 100644 --- a/src/interfaces/javaupm_iLightController.i +++ b/src/interfaces/javaupm_iLightController.i @@ -1,6 +1,9 @@ -%include +#if SWIG_VERSION >= 0x030009 + %include + %interface_impl(upm::ILightController); +#endif + %include "javaupm_interfaces.i" %include "javaupm_iModuleStatus.i" -%interface_impl(upm::ILightController); %include "iLightController.hpp" diff --git a/src/interfaces/javaupm_iLightSensor.i b/src/interfaces/javaupm_iLightSensor.i index 37454706..3bae25fe 100644 --- a/src/interfaces/javaupm_iLightSensor.i +++ b/src/interfaces/javaupm_iLightSensor.i @@ -1,6 +1,9 @@ -%include +#if SWIG_VERSION >= 0x030009 + %include + %interface_impl(upm::ILightSensor); +#endif + %include "javaupm_interfaces.i" %include "javaupm_iModuleStatus.i" -%interface_impl(upm::ILightSensor); %include "iLightSensor.hpp" diff --git a/src/interfaces/javaupm_iModuleStatus.i b/src/interfaces/javaupm_iModuleStatus.i index 901ce49d..f56f152a 100644 --- a/src/interfaces/javaupm_iModuleStatus.i +++ b/src/interfaces/javaupm_iModuleStatus.i @@ -1,5 +1,6 @@ -%include - -%interface_impl(upm::IModuleStatus); +#if SWIG_VERSION >= 0x030009 + %include + %interface_impl(upm::IModuleStatus); +#endif %include "iModuleStatus.hpp" diff --git a/src/interfaces/javaupm_iPressureSensor.i b/src/interfaces/javaupm_iPressureSensor.i index ab898f66..00cde052 100644 --- a/src/interfaces/javaupm_iPressureSensor.i +++ b/src/interfaces/javaupm_iPressureSensor.i @@ -1,6 +1,9 @@ -%include +#if SWIG_VERSION >= 0x030009 + %include + %interface_impl(upm::IPressureSensor); +#endif + %include "javaupm_interfaces.i" %include "javaupm_iModuleStatus.i" -%interface_impl(upm::IPressureSensor); %include "iPressureSensor.hpp" diff --git a/src/interfaces/javaupm_iTemperatureSensor.i b/src/interfaces/javaupm_iTemperatureSensor.i index 2e35be3d..3d2442df 100644 --- a/src/interfaces/javaupm_iTemperatureSensor.i +++ b/src/interfaces/javaupm_iTemperatureSensor.i @@ -1,6 +1,9 @@ -%include +#if SWIG_VERSION >= 0x030009 + %include + %interface_impl(upm::ITemperatureSensor); +#endif + %include "javaupm_interfaces.i" %include "javaupm_iModuleStatus.i" -%interface_impl(upm::ITemperatureSensor); %include "iTemperatureSensor.hpp" diff --git a/src/lp8860/javaupm_lp8860.i b/src/lp8860/javaupm_lp8860.i index 3da88b79..32e1f654 100644 --- a/src/lp8860/javaupm_lp8860.i +++ b/src/lp8860/javaupm_lp8860.i @@ -1,8 +1,6 @@ %module javaupm_lp8860 -#if SWIG_VERSION >= 0x030009 %include "../interfaces/javaupm_iLightController.i" -#endif %include "../upm.i" diff --git a/src/max44009/javaupm_max44009.i b/src/max44009/javaupm_max44009.i index af194413..08275933 100644 --- a/src/max44009/javaupm_max44009.i +++ b/src/max44009/javaupm_max44009.i @@ -1,9 +1,7 @@ %module javaupm_max44009 %include "../upm.i" -#if SWIG_VERSION >= 0x030009 %include "../interfaces/javaupm_iLightSensor.i" -#endif %include "arrays_java.i"; %include "../java_buffer.i" diff --git a/src/ms5611/javaupm_ms5611.i b/src/ms5611/javaupm_ms5611.i index 2650fd59..b2878d6b 100644 --- a/src/ms5611/javaupm_ms5611.i +++ b/src/ms5611/javaupm_ms5611.i @@ -1,10 +1,8 @@ %module javaupm_ms5611 %include "../upm.i" -#if SWIG_VERSION >= 0x030009 %include "../interfaces/javaupm_iTemperatureSensor.i" %include "../interfaces/javaupm_iPressureSensor.i" -#endif %{ #include "ms5611.hpp" diff --git a/src/si1132/javaupm_si1132.i b/src/si1132/javaupm_si1132.i index e05d0dae..ae9f14b3 100644 --- a/src/si1132/javaupm_si1132.i +++ b/src/si1132/javaupm_si1132.i @@ -1,9 +1,7 @@ %module(directors="1") javaupm_si1132 %include "../upm.i" -#if SWIG_VERSION >= 0x030009 %include "../interfaces/javaupm_iLightSensor.i" -#endif %pragma(java) jniclasscode=%{ static { diff --git a/src/si7005/javaupm_si7005.i b/src/si7005/javaupm_si7005.i index 84e43769..eec60aa2 100644 --- a/src/si7005/javaupm_si7005.i +++ b/src/si7005/javaupm_si7005.i @@ -1,10 +1,8 @@ %module javaupm_si7005 %include "../upm.i" -#if SWIG_VERSION >= 0x030009 %include "../interfaces/javaupm_iTemperatureSensor.i" %include "../interfaces/javaupm_iHumiditySensor.i" -#endif %include "arrays_java.i"; %include "../java_buffer.i" diff --git a/src/t6713/javaupm_t6713.i b/src/t6713/javaupm_t6713.i index 4a69c4ce..7c2844d8 100644 --- a/src/t6713/javaupm_t6713.i +++ b/src/t6713/javaupm_t6713.i @@ -1,9 +1,7 @@ %module javaupm_t6713 %include "../upm.i" -#if SWIG_VERSION >= 0x030009 %include "../interfaces/javaupm_iCO2Sensor.i" -#endif %include "arrays_java.i"; %include "../java_buffer.i"