2jciebu01: remove attribute specifier from common header and update swig interfaces

Signed-off-by: Mihai Tudor Panu <[email protected]>

Author: Propanu

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 */

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

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 */