From d256a225bfa5c6b17e4ea16489a03f7827321f78 Mon Sep 17 00:00:00 2001 From: Mihai Tudor Panu Date: Tue, 9 Apr 2019 20:50:45 -0700 Subject: [PATCH] 2jciebu01: remove attribute specifier from common header and update swig interfaces Signed-off-by: Mihai Tudor Panu --- src/2jciebu01-ble/2jciebu01_ble.i | 14 ++++++++++++++ src/2jciebu01-usb/2jciebu01.hpp | 2 +- src/2jciebu01-usb/2jciebu01_usb.i | 14 ++++++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/src/2jciebu01-ble/2jciebu01_ble.i b/src/2jciebu01-ble/2jciebu01_ble.i index 0ec43caa..70b183e3 100644 --- a/src/2jciebu01-ble/2jciebu01_ble.i +++ b/src/2jciebu01-ble/2jciebu01_ble.i @@ -1,8 +1,22 @@ +#ifdef SWIGPYTHON +%module (package="upm") 2jciebu01_ble +#endif + %include "../common_top.i" +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_2jciebu01_ble) +#endif +/* END Java syntax */ + /* BEGIN Common SWIG syntax ------------------------------------------------- */ %{ #include "2jciebu01_ble.hpp" +#include "2jciebu01.hpp" %} + %include "2jciebu01_ble.hpp" +%include "2jciebu01.hpp" + /* END Common SWIG syntax */ diff --git a/src/2jciebu01-usb/2jciebu01.hpp b/src/2jciebu01-usb/2jciebu01.hpp index 6bd12cf2..100640be 100644 --- a/src/2jciebu01-usb/2jciebu01.hpp +++ b/src/2jciebu01-usb/2jciebu01.hpp @@ -137,7 +137,7 @@ public : int16_t eCO2; int16_t discomfort_index; int16_t heat_stroke; - } __attribute__((packed))om2jciebuData_t; + } om2jciebuData_t; /** * OM2JCIEBU destructor diff --git a/src/2jciebu01-usb/2jciebu01_usb.i b/src/2jciebu01-usb/2jciebu01_usb.i index 408473f9..13c6ff24 100644 --- a/src/2jciebu01-usb/2jciebu01_usb.i +++ b/src/2jciebu01-usb/2jciebu01_usb.i @@ -1,8 +1,22 @@ +#ifdef SWIGPYTHON +%module (package="upm") 2jciebu01_usb +#endif + %include "../common_top.i" +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_2jciebu01_usb) +#endif +/* END Java syntax */ + /* BEGIN Common SWIG syntax ------------------------------------------------- */ %{ #include "2jciebu01_usb.hpp" +#include "2jciebu01.hpp" %} + %include "2jciebu01_usb.hpp" +%include "2jciebu01.hpp" + /* END Common SWIG syntax */