mirror of
https://github.com/eclipse/upm.git
synced 2025-03-14 20:47:30 +03:00
java_interfaces: Moved ifdefs for swig version
Moved the SWIG version check from each sensor library .i file to the base SWIG .i file (per interface). This cleans up the number of #if SWIG_VERSION's across the code base, and will make cleanup of these easier at a later date. Signed-off-by: Noel Eck <noel.eck@intel.com>
This commit is contained in:
parent
cfb4105dd8
commit
51a181a14f
@ -1,9 +1,7 @@
|
||||
%module javaupm_ads1x15
|
||||
%include "../upm.i"
|
||||
|
||||
#if SWIG_VERSION >= 0x030009
|
||||
%include "../interfaces/javaupm_iADC.i"
|
||||
#endif
|
||||
|
||||
%include "typemaps.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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -1,6 +1,9 @@
|
||||
%include <swiginterface.i>
|
||||
#if SWIG_VERSION >= 0x030009
|
||||
%include <swiginterface.i>
|
||||
%interface_impl(upm::IADC);
|
||||
#endif
|
||||
|
||||
%include "javaupm_interfaces.i"
|
||||
%include "javaupm_iModuleStatus.i"
|
||||
%interface_impl(upm::IADC);
|
||||
|
||||
%include "iADC.hpp"
|
||||
|
@ -1,6 +1,9 @@
|
||||
%include <swiginterface.i>
|
||||
#if SWIG_VERSION >= 0x030009
|
||||
%include <swiginterface.i>
|
||||
%interface_impl(upm::ICO2Sensor);
|
||||
#endif
|
||||
|
||||
%include "javaupm_interfaces.i"
|
||||
%include "javaupm_iModuleStatus.i"
|
||||
%interface_impl(upm::ICO2Sensor);
|
||||
|
||||
%include "iCO2Sensor.hpp"
|
||||
|
@ -1,6 +1,9 @@
|
||||
%include <swiginterface.i>
|
||||
#if SWIG_VERSION >= 0x030009
|
||||
%include <swiginterface.i>
|
||||
%interface_impl(upm::IHumiditySensor);
|
||||
#endif
|
||||
|
||||
%include "javaupm_interfaces.i"
|
||||
%include "javaupm_iModuleStatus.i"
|
||||
%interface_impl(upm::IHumiditySensor);
|
||||
|
||||
%include "iHumiditySensor.hpp"
|
||||
|
@ -1,6 +1,9 @@
|
||||
%include <swiginterface.i>
|
||||
#if SWIG_VERSION >= 0x030009
|
||||
%include <swiginterface.i>
|
||||
%interface_impl(upm::ILightController);
|
||||
#endif
|
||||
|
||||
%include "javaupm_interfaces.i"
|
||||
%include "javaupm_iModuleStatus.i"
|
||||
%interface_impl(upm::ILightController);
|
||||
|
||||
%include "iLightController.hpp"
|
||||
|
@ -1,6 +1,9 @@
|
||||
%include <swiginterface.i>
|
||||
#if SWIG_VERSION >= 0x030009
|
||||
%include <swiginterface.i>
|
||||
%interface_impl(upm::ILightSensor);
|
||||
#endif
|
||||
|
||||
%include "javaupm_interfaces.i"
|
||||
%include "javaupm_iModuleStatus.i"
|
||||
%interface_impl(upm::ILightSensor);
|
||||
|
||||
%include "iLightSensor.hpp"
|
||||
|
@ -1,5 +1,6 @@
|
||||
%include <swiginterface.i>
|
||||
|
||||
%interface_impl(upm::IModuleStatus);
|
||||
#if SWIG_VERSION >= 0x030009
|
||||
%include <swiginterface.i>
|
||||
%interface_impl(upm::IModuleStatus);
|
||||
#endif
|
||||
|
||||
%include "iModuleStatus.hpp"
|
||||
|
@ -1,6 +1,9 @@
|
||||
%include <swiginterface.i>
|
||||
#if SWIG_VERSION >= 0x030009
|
||||
%include <swiginterface.i>
|
||||
%interface_impl(upm::IPressureSensor);
|
||||
#endif
|
||||
|
||||
%include "javaupm_interfaces.i"
|
||||
%include "javaupm_iModuleStatus.i"
|
||||
%interface_impl(upm::IPressureSensor);
|
||||
|
||||
%include "iPressureSensor.hpp"
|
||||
|
@ -1,6 +1,9 @@
|
||||
%include <swiginterface.i>
|
||||
#if SWIG_VERSION >= 0x030009
|
||||
%include <swiginterface.i>
|
||||
%interface_impl(upm::ITemperatureSensor);
|
||||
#endif
|
||||
|
||||
%include "javaupm_interfaces.i"
|
||||
%include "javaupm_iModuleStatus.i"
|
||||
%interface_impl(upm::ITemperatureSensor);
|
||||
|
||||
%include "iTemperatureSensor.hpp"
|
||||
|
@ -1,8 +1,6 @@
|
||||
%module javaupm_lp8860
|
||||
|
||||
#if SWIG_VERSION >= 0x030009
|
||||
%include "../interfaces/javaupm_iLightController.i"
|
||||
#endif
|
||||
|
||||
%include "../upm.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"
|
||||
|
@ -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"
|
||||
|
@ -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 {
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
Loading…
x
Reference in New Issue
Block a user