Added Java support and bindings

Signed-off-by: Andrei Vasiliu <andrei.vasiliu@intel.com>
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>

CMakeLists.txt

@@ -58,6 +58,7 @@ option (BUILDSWIG "Build swig modules." ON)
 option (BUILDSWIGPYTHON "Build swig python modules." ON)
 option (BUILDSWIGNODE "Build swig node modules." ON)
 option (BUILDEXAMPLES "Build C++ example binaries" OFF)
+option (BUILDSWIGJAVA "Build swig java modules" OFF)
 option (IPK "Generate IPK using CPack" OFF)
 option (RPM "Generate RPM using CPack" OFF)
 

cmake/Toolchains/oe-sdk_cross.cmake

@@ -0,0 +1,25 @@
+# this toolchain file comes from gnuradio project
+
+set( CMAKE_SYSTEM_NAME Linux )
+#set( CMAKE_C_COMPILER  $ENV{CC} )
+#set( CMAKE_CXX_COMPILER  $ENV{CXX} )
+string(REGEX MATCH "sysroots/([a-zA-Z0-9]+)" CMAKE_SYSTEM_PROCESSOR $ENV{SDKTARGETSYSROOT})
+string(REGEX REPLACE "sysroots/" "" CMAKE_SYSTEM_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR})
+set( CMAKE_CXX_FLAGS $ENV{CXXFLAGS}  CACHE STRING "" FORCE )
+set( CMAKE_C_FLAGS $ENV{CFLAGS} CACHE STRING "" FORCE ) #same flags for C sources
+set( CMAKE_LDFLAGS_FLAGS ${CMAKE_CXX_FLAGS} CACHE STRING "" FORCE ) #same flags for C sources
+set( CMAKE_LIBRARY_PATH ${OECORE_TARGET_SYSROOT}/usr/lib )
+set( CMAKE_FIND_ROOT_PATH $ENV{OECORE_TARGET_SYSROOT} $ENV{OECORE_NATIVE_SYSROOT} )
+set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER )
+set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY )
+set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY )
+set( CMAKE_INSTALL_PREFIX $ENV{OECORE_TARGET_SYSROOT}/usr CACHE STRING "" FORCE)
+set( ORC_INCLUDE_DIRS $ENV{OECORE_TARGET_SYSROOT}/usr/include/orc-0.4 )
+set( ORC_LIBRARY_DIRS $ENV{OECORE_TARGET_SYSROOT}/usr/lib )
+
+# for java
+set( JAVA_AWT_INCLUDE_PATH $ENV{JAVA_HOME}/include CACHE PATH "" FORCE)
+set( JAVA_AWT_LIBRARY $ENV{JAVA_HOME}/jre/lib/amd64/libjawt.so CACHE FILEPATH "" FORCE)
+set( JAVA_INCLUDE_PATH $ENV{JAVA_HOME}/include CACHE PATH "" FORCE)
+set( JAVA_INCLUDE_PATH2 $ENV{JAVA_HOME}/include/linux CACHE PATH "" FORCE)
+set( JAVA_JVM_LIBRARY $ENV{JAVA_HOME}/jre/lib/amd64/libjvm.so CACHE FILEPATH "" FORCE)

src/CMakeLists.txt

@@ -53,6 +53,51 @@ macro(upm_SWIG_NODE)
   endif()
 endmacro()
 
+macro(upm_SWIG_JAVA)
+  if (BUILDSWIGJAVA AND BUILDSWIG)
+
+    FIND_PACKAGE (JNI REQUIRED)
+
+    include_directories (
+      ${JAVA_INCLUDE_PATH}
+      ${JAVA_INCLUDE_PATH2}
+      ${CMAKE_CURRENT_SOURCE_DIR}/..
+    )
+
+    set_source_files_properties (javaupm_${libname}.i PROPERTIES CPLUSPLUS ON)
+    set_source_files_properties (javaupm_${libname}.i PROPERTIES SWIG_FLAGS ";-package;upm_${libname};-I${CMAKE_BINARY_DIR}/src")
+    swig_add_module (javaupm_${libname} java javaupm_${libname}.i ${module_src})
+    swig_link_libraries (javaupm_${libname} ${MRAA_LIBRARIES} ${JAVA_LIBRARIES})
+    target_include_directories ( ${SWIG_MODULE_javaupm_${libname}_REAL_NAME}
+      PUBLIC
+      "${JAVA_INCLUDE_DIRS}"
+      "${JAVA_INCLUDE_PATH}"
+     )
+    set_target_properties (javaupm_${libname} PROPERTIES
+      COMPILE_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive"
+      PREFIX ""
+      SUFFIX ".so"
+    )
+    install (FILES ${CMAKE_CURRENT_BINARY_DIR}/javaupm_${libname}.jar
+	${CMAKE_CURRENT_BINARY_DIR}/javaupm_${libname}.so
+	DESTINATION lib
+    )
+
+    set (JAVAC $ENV{JAVA_HOME}/bin/javac)
+    set (JAR $ENV{JAVA_HOME}/bin/jar)
+
+    add_custom_command (TARGET javaupm_${libname}
+        POST_BUILD
+        COMMAND cmake -E echo "Compiling java.."
+        COMMAND cmake -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/upm_${libname}
+        COMMAND ${JAVAC} *.java -d ${CMAKE_CURRENT_BINARY_DIR}
+        COMMAND cmake -E echo "Creating jar"
+        COMMAND ${JAR} cvf upm_${libname}.jar upm_${libname}
+    )
+
+  endif()
+endmacro()
+
 macro(upm_doxygen)
   if (DOXYGEN_FOUND)
     if(NOT DEFINED classname)
@@ -104,6 +149,10 @@ if (SWIG_FOUND)
     endmacro()
 
   endif(BUILDSWIGNODE)
+#  if(BUILDSWIGJAVA)
+#    add_subdirectory (java)
+#  endif(BUILDSWIGJAVA)
+    
 endif()
 
 macro(upm_module_init)
@@ -123,6 +172,7 @@ macro(upm_module_init)
   if (SWIG_FOUND)
     upm_swig_python()
     upm_swig_node()
+    upm_swig_java()
   endif()
   if (BUILDDOC)
     upm_doxygen()

src/a110x/javaupm_a110x.i

@@ -0,0 +1,19 @@
+%module javaupm_a110x
+%include "../upm.i"
+%include "stdint.i"
+%include "typemaps.i"
+/*
+%feature("director") ISRHelper;
+%feature("nodirector") A110x;
+*/
+%apply jobject { void * };
+/*
+%{
+    #include "isrhelper.h"
+%}
+%include "isrhelper.h"
+*/
+%{
+    #include "a110x.h"
+%}
+%include "a110x.h"

src/ad8232/javaupm_ad8232.i

@@ -0,0 +1,8 @@
+%module javaupm_ad8232
+%include "../upm.i"
+
+%{
+    #include "ad8232.h"
+%}
+
+%include "ad8232.h"

src/adafruitms1438/javaupm_adafruitms1438.i

@@ -0,0 +1,8 @@
+%module javaupm_adafruitms1438
+%include "../upm.i"
+
+%{
+    #include "adafruitms1438.h"
+%}
+
+%include "adafruitms1438.h"

src/adafruitss/javaupm_adafruitss.i

@@ -0,0 +1,7 @@
+%module javaupm_adafruitss
+%include "../upm.i"
+
+%include "adafruitss.h"
+%{
+    #include "adafruitss.h"
+%}

src/adc121c021/javaupm_adc121c021.i

@@ -0,0 +1,9 @@
+%module javaupm_adc121c021
+%include "../upm.i"
+%include "../carrays_uint16_t.i"
+
+%{
+    #include "adc121c021.h"
+%}
+
+%include "adc121c021.h"

src/adis16448/javaupm_adis16448.i

@@ -0,0 +1,8 @@
+%module javaupm_adis16448
+%include "../upm.i"
+
+%{
+    #include "adis16448.h"
+%}
+
+%include "adis16448.h"

src/adxl335/javaupm_adxl335.i

@@ -0,0 +1,12 @@
+%module javaupm_adxl335
+%include "../upm.i"
+%include "cpointer.i"
+
+%pointer_functions(int, intPointer);
+%pointer_functions(float, floatPointer);
+
+%{
+    #include "adxl335.h"
+%}
+
+%include "adxl335.h"

src/adxl345/javaupm_adxl345.i

@@ -0,0 +1,36 @@
+%module javaupm_adxl345
+%include "../upm.i"
+
+%{
+    #include "adxl345.h"
+%}
+
+%typemap(jni) float* "jfloatArray"
+%typemap(jstype) float* "float[]"
+%typemap(jtype) float* "float[]"
+
+%typemap(javaout) float* {
+    return $jnicall;
+}
+
+%typemap(out) float *getAcceleration {
+    $result = JCALL1(NewFloatArray, jenv, 3);
+    JCALL4(SetFloatArrayRegion, jenv, $result, 0, 3, $1);
+}
+
+
+%typemap(jni) int16_t* "jintArray"
+%typemap(jstype) int16_t* "int[]"
+%typemap(jtype) int16_t* "int[]"
+
+%typemap(javaout) int16_t* {
+    return $jnicall;
+}
+
+%typemap(out) int16_t *getRawValues {
+    $result = JCALL1(NewIntArray, jenv, 3);
+    JCALL4(SetIntArrayRegion, jenv, $result, 0, 3, (const signed int*)$1);
+    //delete [] $1;
+}
+
+%include "adxl345.h"

src/am2315/javaupm_am2315.i

@@ -0,0 +1,8 @@
+%module javaupm_am2315
+%include "../upm.i"
+
+%{
+    #include "am2315.h"
+%}
+
+%include "am2315.h"

src/apds9002/javaupm_apds9002.i

@@ -0,0 +1,8 @@
+%module javaupm_apds9002
+%include "../upm.i"
+
+%{
+    #include "apds9002.h"
+%}
+
+%include "apds9002.h"

src/at42qt1070/javaupm_at42qt1070.i

@@ -0,0 +1,8 @@
+%module javaupm_at42qt1070
+%include "../upm.i"
+
+%{
+    #include "at42qt1070.h"
+%}
+
+%include "at42qt1070.h"

src/biss0001/javaupm_biss0001.i

@@ -0,0 +1,8 @@
+%module javaupm_biss0001
+%include "../upm.i"
+
+%{
+    #include "biss0001.h"
+%}
+
+%include "biss0001.h"

src/bmpx8x/javaupm_bmpx8x.i

@@ -0,0 +1,8 @@
+%module javaupm_bmpx8x
+%include "../upm.i"
+
+%{
+    #include "bmpx8x.h"
+%}
+
+%include "bmpx8x.h"

src/buzzer/javaupm_buzzer.i

@@ -0,0 +1,8 @@
+%module javaupm_buzzer
+%include "../upm.i"
+
+%{
+    #include "buzzer.h"
+%}
+
+%include "buzzer.h"

src/cjq4435/javaupm_cjq4435.i

@@ -0,0 +1,8 @@
+%module javaupm_cjq4435
+%include "../upm.i"
+
+%{
+    #include "cjq4435.h"
+%}
+
+%include "cjq4435.h"

src/ds1307/javaupm_ds1307.i

@@ -0,0 +1,8 @@
+%module javaupm_ds1307
+%include "../upm.i"
+
+%{
+    #include "ds1307.h"
+%}
+
+%include "ds1307.h"

src/ecs1030/javaupm_ecs1030.i

@@ -0,0 +1,8 @@
+%module javaupm_ecs1030
+%include "../upm.i"
+
+%{
+    #include "ecs1030.h"
+%}
+
+%include "ecs1030.h"

src/enc03r/javaupm_enc03r.i

@@ -0,0 +1,8 @@
+%module javaupm_enc03r
+%include "../upm.i"
+
+%{
+    #include "enc03r.h"
+%}
+
+%include "enc03r.h"

src/flex/javaupm_flex.i

@@ -0,0 +1,8 @@
+%module javaupm_flex
+%include "../upm.i"
+
+%{
+    #include "flex.h"
+%}
+
+%include "flex.h"

src/gas/javaupm_gas.i

@@ -0,0 +1,35 @@
+%module javaupm_gas
+%include "../upm.i"
+%include "typemaps.i"
+
+%apply uint16_t *OUTPUT {uint16_t *buffer };
+
+%include "gas.h"
+%{
+    #include "gas.h"
+%}
+
+%include "mq2.h"
+%{
+    #include "mq2.h"
+%}
+
+%include "mq3.h"
+%{
+    #include "mq3.h"
+%}
+
+%include "mq5.h"
+%{
+    #include "mq5.h"
+%}
+
+%include "mq9.h"
+%{
+    #include "mq9.h"
+%}
+
+%include "tp401.h"
+%{
+    #include "tp401.h"
+%}

src/gp2y0a/javaupm_gp2y0a.i

@@ -0,0 +1,8 @@
+%module javaupm_gp2y0a
+%include "../upm.i"
+
+%{
+    #include "gp2y0a.h"
+%}
+
+%include "gp2y0a.h"

src/grove/javaupm_grove.i

@@ -0,0 +1,8 @@
+%module javaupm_grove
+%include "../upm.i"
+
+%{
+    #include "grove.h"
+%}
+
+%include "grove.h"

src/grovecollision/javaupm_grovecollision.i

@@ -0,0 +1,8 @@
+%module javaupm_grovecollision
+%include "../upm.i"
+
+%{
+    #include "grovecollision.h"
+%}
+
+%include "grovecollision.h"

src/groveehr/javaupm_groveehr.i

@@ -0,0 +1,8 @@
+%module javaupm_groveehr
+%include "../upm.i"
+
+%{
+    #include "groveehr.h"
+%}
+
+%include "groveehr.h"

src/groveeldriver/javaupm_groveeldriver.i

@@ -0,0 +1,8 @@
+%module javaupm_groveeldriver
+%include "../upm.i"
+
+%{
+    #include "groveeldriver.h"
+%}
+
+%include "groveeldriver.h"

src/groveelectromagnet/javaupm_groveelectromagnet.i

@@ -0,0 +1,8 @@
+%module javaupm_groveelectromagnet
+%include "../upm.i"
+
+%{
+    #include "groveelectromagnet.h"
+%}
+
+%include "groveelectromagnet.h"

src/groveemg/javaupm_groveemg.i

@@ -0,0 +1,8 @@
+%module javaupm_groveemg
+%include "../upm.i"
+
+%{
+    #include "groveemg.h"
+%}
+
+%include "groveemg.h"

src/grovegsr/javaupm_grovegsr.i

@@ -0,0 +1,8 @@
+%module javaupm_grovegsr
+%include "../upm.i"
+
+%{
+    #include "grovegsr.h"
+%}
+
+%include "grovegsr.h"

src/grovelinefinder/javaupm_grovelinefinder.i

@@ -0,0 +1,8 @@
+%module javaupm_grovelinefinder
+%include "../upm.i"
+
+%{
+    #include "grovelinefinder.h"
+%}
+
+%include "grovelinefinder.h"

src/groveloudness/javaupm_groveloudness.i

@@ -0,0 +1,8 @@
+%module javaupm_groveloudness
+%include "../upm.i"
+
+%{
+    #include "groveloudness.h"
+%}
+
+%include "groveloudness.h"

src/grovemd/javaupm_grovemd.i

@@ -0,0 +1,8 @@
+%module javaupm_grovemd
+%include "../upm.i"
+
+%{
+    #include "grovemd.h"
+%}
+
+%include "grovemd.h"

src/grovemoisture/javaupm_grovemoisture.i

@@ -0,0 +1,8 @@
+%module javaupm_grovemoisture
+%include "../upm.i"
+
+%{
+    #include "grovemoisture.h"
+%}
+
+%include "grovemoisture.h"

src/groveo2/javaupm_groveo2.i

@@ -0,0 +1,8 @@
+%module javaupm_groveo2
+%include "../upm.i"
+
+%{
+    #include "groveo2.h"
+%}
+
+%include "groveo2.h"

src/grovescam/javaupm_grovescam.i

@@ -0,0 +1,8 @@
+%module javaupm_grovescam
+%include "../upm.i"
+
+%{
+    #include "grovescam.h"
+%}
+
+%include "grovescam.h"

src/grovespeaker/javaupm_grovespeaker.i

@@ -0,0 +1,8 @@
+%module javaupm_grovespeaker
+%include "../upm.i"
+
+%{
+    #include "grovespeaker.h"
+%}
+
+%include "grovespeaker.h"

src/grovevdiv/javaupm_grovevdiv.i

@@ -0,0 +1,8 @@
+%module javaupm_grovevdiv
+%include "../upm.i"
+
+%{
+    #include "grovevdiv.h"
+%}
+
+%include "grovevdiv.h"

src/grovewater/javaupm_grovewater.i

@@ -0,0 +1,8 @@
+%module javaupm_grovewater
+%include "../upm.i"
+
+%{
+    #include "grovewater.h"
+%}
+
+%include "grovewater.h"

src/grovewfs/javaupm_grovewfs.i

@@ -0,0 +1,8 @@
+%module javaupm_grovewfs
+%include "../upm.i"
+
+%{
+    #include "grovewfs.h"
+%}
+
+%include "grovewfs.h"

src/guvas12d/javaupm_guvas12d.i

@@ -0,0 +1,8 @@
+%module javaupm_guvas12d
+%include "../upm.i"
+
+%{
+    #include "guvas12d.h"
+%}
+
+%include "guvas12d.h"

src/h3lis331dl/javaupm_h3lis331dl.i

@@ -0,0 +1,13 @@
+%module javaupm_h3lis331dl
+%include "../upm.i"
+%include "cpointer.i"
+
+/* Send "int *" and "float *" to JavaScript as intp and floatp */
+%pointer_functions(int, intp);
+%pointer_functions(float, floatp);
+
+%{
+    #include "h3lis331dl.h"
+%}
+
+%include "h3lis331dl.h"

src/hcsr04/javaupm_hcsr04.i

@@ -0,0 +1,8 @@
+%module javaupm_hcsr04
+%include "../upm.i"
+
+%{
+    #include "hcsr04.h"
+%}
+
+%include "hcsr04.h"

src/hm11/javaupm_hm11.i

@@ -0,0 +1,12 @@
+%module javaupm_hm11
+%include "../upm.i"
+%include "carrays.i"
+
+%{
+    #include "hm11.h"
+    speed_t int_B9600 = B9600;
+%}
+
+%include "hm11.h"
+speed_t int_B9600 = B9600;
+%array_class(char, charArray);

src/hmc5883l/javaupm_hmc5883l.i

@@ -0,0 +1,22 @@
+%module javaupm_hmc5883l
+%include "../upm.i"
+
+%{
+    #include "hmc5883l.h"
+%}
+
+%typemap(jni) int16_t* "jintArray"
+%typemap(jstype) int16_t* "int[]"
+%typemap(jtype) int16_t* "int[]"
+
+%typemap(javaout) int16_t* {
+    return $jnicall;
+}
+
+%typemap(out) int16_t *coordinates {
+    $result = JCALL1(NewIntArray, jenv, 3);
+    JCALL4(SetIntArrayRegion, jenv, $result, 0, 3, (const signed int*)$1);
+    //delete [] $1;
+}
+
+%include "hmc5883l.h"

src/hmtrp/javaupm_hmtrp.i

@@ -0,0 +1,18 @@
+%module javaupm_hmtrp
+%include "../upm.i"
+%include "stdint.i"
+%include "typemaps.i"
+
+%apply uint32_t *OUTPUT { uint32_t *freq, uint32_t *dataRate };
+%apply uint16_t *OUTPUT { uint16_t *rxBandwidth };
+%apply uint8_t *OUTPUT { uint8_t *modulation, uint8_t *txPower };
+%apply uint32_t *OUTPUT { uint32_t *uartBaud };
+%apply uint8_t *OUTPUT { uint8_t *strength };
+
+%{
+    #include "hmtrp.h"
+    speed_t int_B9600 = B9600;
+%}
+
+%include "hmtrp.h"
+speed_t int_B9600 = B9600;

src/ht9170/javaupm_ht9170.i

@@ -0,0 +1,8 @@
+%module javaupm_ht9170
+%include "../upm.i"
+
+%{
+    #include "ht9170.h"
+%}
+
+%include "ht9170.h"

src/htu21d/javaupm_htu21d.i

@@ -0,0 +1,8 @@
+%module javaupm_htu21d
+%include "../upm.i"
+
+%{
+    #include "htu21d.h"
+%}
+
+%include "htu21d.h"

src/hx711/javaupm_hx711.i

@@ -0,0 +1,8 @@
+%module javaupm_hx711
+%include "../upm.i"
+
+%{
+    #include "hx711.h"
+%}
+
+%include "hx711.h"

src/ina132/javaupm_ina132.i

@@ -0,0 +1,8 @@
+%module javaupm_ina132
+%include "../upm.i"
+
+%{
+    #include "ina132.h"
+%}
+
+%include "ina132.h"

src/isd1820/javaupm_isd1820.i

@@ -0,0 +1,9 @@
+%module javaupm_isd1820
+%include "../upm.i"
+
+%{
+    #include "isd1820.h"
+%}
+
+%include "isd1820.h"
+

src/itg3200/javaupm_itg3200.i

@@ -0,0 +1,36 @@
+%module javaupm_itg3200
+%include "../upm.i"
+
+%{
+    #include "itg3200.h"
+%}
+
+%typemap(jni) float* "jfloatArray"
+%typemap(jstype) float* "float[]"
+%typemap(jtype) float* "float[]"
+
+%typemap(javaout) float* {
+    return $jnicall;
+}
+
+%typemap(out) float *getRotation {
+    $result = JCALL1(NewFloatArray, jenv, 3);
+    JCALL4(SetFloatArrayRegion, jenv, $result, 0, 3, $1);
+}
+
+
+%typemap(jni) int16_t* "jintArray"
+%typemap(jstype) int16_t* "int[]"
+%typemap(jtype) int16_t* "int[]"
+
+%typemap(javaout) int16_t* {
+    return $jnicall;
+}
+
+%typemap(out) int16_t *getRawValues {
+    $result = JCALL1(NewIntArray, jenv, 3);
+    JCALL4(SetIntArrayRegion, jenv, $result, 0, 3, (const signed int*)$1);
+    //delete [] $1;
+}
+
+%include "itg3200.h"

src/joystick12/javaupm_joystick12.i

@@ -0,0 +1,8 @@
+%module javaupm_joystick12
+%include "../upm.i"
+
+%{
+    #include "joystick12.h"
+%}
+
+%include "joystick12.h"

src/l298/javaupm_l298.i

@@ -0,0 +1,8 @@
+%module javaupm_l298
+%include "../upm.i"
+
+%{
+    #include "l298.h"
+%}
+
+%include "l298.h"

src/lcd/javaupm_i2clcd.i

@@ -0,0 +1,36 @@
+%module javaupm_i2clcd
+%include "../upm.i"
+%include "stdint.i"
+%include "typemaps.i"
+
+%apply uint8_t *OUTPUT { uint8_t *data };
+
+%include "ssd.h"
+%{
+    #include "ssd.h"
+%}
+
+%include "i2clcd.h"
+%{
+    #include "i2clcd.h"
+%}
+
+%include "jhd1313m1.h"
+%{
+    #include "jhd1313m1.h"
+%}
+
+%include "lcm1602.h"
+%{
+    #include "lcm1602.h"
+%}
+
+%include "ssd1327.h"
+%{
+    #include "ssd1327.h"
+%}
+
+%include "ssd1308.h"
+%{
+    #include "ssd1308.h"
+%}

src/ldt0028/javaupm_ldt0028.i

@@ -0,0 +1,8 @@
+%module javaupm_ldt0028
+%include "../upm.i"
+
+%{
+    #include "ldt0028.h"
+%}
+
+%include "ldt0028.h"

src/lol/javaupm_lol.i

@@ -0,0 +1,8 @@
+%module javaupm_lol
+%include "../upm.i"
+
+%{
+    #include "lol.h"
+%}
+
+%include "lol.h"

src/lpd8806/javaupm_lpd8806.i

@@ -0,0 +1,8 @@
+%module javaupm_lpd8806
+%include "../upm.i"
+
+%{
+    #include "lpd8806.h"
+%}
+
+%include "lpd8806.h"

src/lsm303/javaupm_lsm303.i

@@ -0,0 +1,22 @@
+%module javaupm_lsm303
+%include "../upm.i"
+
+%{
+    #include "lsm303.h"
+%}
+
+%typemap(jni) int16_t* "jintArray"
+%typemap(jstype) int16_t* "int[]"
+%typemap(jtype) int16_t* "int[]"
+
+%typemap(javaout) int16_t* {
+    return $jnicall;
+}
+
+%typemap(out) int16_t *getRawAccelData {
+    $result = JCALL1(NewIntArray, jenv, 3);
+    JCALL4(SetIntArrayRegion, jenv, $result, 0, 3, (const signed int*)$1);
+    //delete [] $1;
+}
+
+%include "lsm303.h"

src/m24lr64e/javaupm_m24lr64e.i

@@ -0,0 +1,10 @@
+%module javaupm_m24lr64e
+%include "../upm.i"
+
+%include "stdint.i"
+
+%{
+    #include "m24lr64e.h"
+%}
+
+%include "m24lr64e.h"

src/max31723/javaupm_max31723.i

@@ -0,0 +1,8 @@
+%module javaupm_max31723
+%include "../upm.i"
+
+%{
+    #include "max31723.h"
+%}
+
+%include "max31723.h"

src/max31855/javaupm_max31855.i

@@ -0,0 +1,10 @@
+//! [Interesting]
+%module javaupm_max31855
+%include "../upm.i"
+
+%{
+    #include "max31855.h"
+%}
+
+%include "max31855.h"
+//! [Interesting]

src/max44000/javaupm_max44000.i

@@ -0,0 +1,8 @@
+%module javaupm_max44000
+%include "../upm.i"
+
+%{
+    #include "max44000.h"
+%}
+
+%include "max44000.h"

src/max5487/javaupm_max5487.i

@@ -0,0 +1,8 @@
+%module javaupm_max5487
+%include "../upm.i"
+
+%{
+    #include "max5487.h"
+%}
+
+%include "max5487.h"

src/maxds3231m/javaupm_maxds3231m.i

@@ -0,0 +1,8 @@
+%module javaupm_maxds3231m
+%include "../upm.i"
+
+%{
+    #include "maxds3231m.h"
+%}
+
+%include "maxds3231m.h"

src/maxsonarez/javaupm_maxsonarez.i

@@ -0,0 +1,8 @@
+%module javaupm_maxsonarez
+%include "../upm.i"
+
+%{
+    #include "maxsonarez.h"
+%}
+
+%include "maxsonarez.h"

src/mhz16/javaupm_mhz16.i

@@ -0,0 +1,13 @@
+%module javaupm_mhz16
+%include "../upm.i"
+%include "cpointer.i"
+
+/* Send "int *" to JavaScript as intp */
+%pointer_functions(int, intp);
+%{
+    #include "mhz16.h"
+    speed_t int_B9600 = B9600;
+%}
+
+%include "mhz16.h"
+speed_t int_B9600 = B9600;

src/mic/javaupm_mic.i

@@ -0,0 +1,12 @@
+%module javaupm_mic
+%include "../upm.i"
+%include "stdint.i"
+%include "typemaps.i"
+
+%apply uint16_t *OUTPUT { uint16_t *buffer };
+
+%{
+    #include "mic.h"
+%}
+
+%include "mic.h"

src/mlx90614/javaupm_mlx90614.i

@@ -0,0 +1,8 @@
+%module javaupm_mlx90614
+%include "../upm.i"
+
+%{
+    #include "mlx90614.h"
+%}
+
+%include "mlx90614.h"

src/mma7455/javaupm_mma7455.i

@@ -0,0 +1,8 @@
+%module javaupm_mma7455
+%include "../upm.i"
+
+%{
+    #include "mma7455.h"
+%}
+
+%include "mma7455.h"

src/mma7660/javaupm_mma7660.i

@@ -0,0 +1,13 @@
+%module javaupm_mma7660
+%include "../upm.i"
+%include "cpointer.i"
+
+/* Send "int *" and "float *" to JavaScript as intp and floatp */
+%pointer_functions(int, intp);
+%pointer_functions(float, floatp);
+
+%{
+    #include "mma7660.h"
+%}
+
+%include "mma7660.h"

src/mpl3115a2/javaupm_mpl3115a2.i

@@ -0,0 +1,8 @@
+%module javaupm_mpl3115a2
+%include "../upm.i"
+
+%{
+    #include "mpl3115a2.h"
+%}
+
+%include "mpl3115a2.h"

src/mpr121/javaupm_mpr121.i

@@ -0,0 +1,8 @@
+%module javaupm_mpr121
+%include "../upm.i"
+
+%{
+    #include "mpr121.h"
+%}
+
+%include "mpr121.h"

src/mpu9150/javaupm_mpu9150.i

@@ -0,0 +1,8 @@
+%module javaupm_mpu9150
+%include "../upm.i"
+
+%{
+    #include "mpu9150.h"
+%}
+
+%include "mpu9150.h"

src/mq303a/javaupm_mq303a.i

@@ -0,0 +1,8 @@
+%module javaupm_mq303a
+%include "../upm.i"
+
+%{
+    #include "mq303a.h"
+%}
+
+%include "mq303a.h"

src/my9221/javaupm_my9221.i

@@ -0,0 +1,8 @@
+%module javaupm_my9221
+%include "../upm.i"
+
+%{
+    #include "my9221.h"
+%}
+
+%include "my9221.h"

src/nrf24l01/javaupm_nrf24l01.i

@@ -0,0 +1,8 @@
+%module javaupm_nrf24l01
+%include "../upm.i"
+
+%{
+    #include "nrf24l01.h"
+%}
+
+%include "nrf24l01.h"

src/nrf8001/javaupm_nrf8001.i

@@ -0,0 +1,8 @@
+%module javaupm_nrf8001
+%include "../upm.i"
+
+%{
+    #include "nrf8001.h"
+%}
+
+%include "nrf8001.h"

src/nunchuck/javaupm_nunchuck.i

@@ -0,0 +1,8 @@
+%module javaupm_nunchuck
+%include "../upm.i"
+
+%{
+    #include "nunchuck.h"
+%}
+
+%include "nunchuck.h"

src/otp538u/javaupm_otp538u.i

@@ -0,0 +1,8 @@
+%module javaupm_otp538u
+%include "../upm.i"
+
+%{
+    #include "otp538u.h"
+%}
+
+%include "otp538u.h"

src/pca9685/javaupm_pca9685.i

@@ -0,0 +1,9 @@
+%module javaupm_pca9685
+%include "../upm.i"
+%include "cpointer.i"
+
+%{
+    #include "pca9685.h"
+%}
+
+%include "pca9685.h"

src/ppd42ns/javaupm_ppd42ns.i

@@ -0,0 +1,8 @@
+%module javaupm_ppd42ns
+%include "../upm.i"
+
+%{
+    #include "ppd42ns.h"
+%}
+
+%include "ppd42ns.h"

src/pulsensor/javaupm_pulsensor.i

@@ -0,0 +1,8 @@
+%module javaupm_pulsensor
+%include "../upm.i"
+
+%{
+    #include "pulsensor.h"
+%}
+
+%include "pulsensor.h"

src/rfr359f/javaupm_rfr359f.i

@@ -0,0 +1,8 @@
+%module javaupm_rfr359f
+%include "../upm.i"
+
+%{
+    #include "rfr359f.h"
+%}
+
+%include "rfr359f.h"

src/rotaryencoder/javaupm_rotaryencoder.i

@@ -0,0 +1,8 @@
+%module javaupm_rotaryencoder
+%include "../upm.i"
+
+%{
+    #include "rotaryencoder.h"
+%}
+
+%include "rotaryencoder.h"

src/rpr220/javaupm_rpr220.i

@@ -0,0 +1,8 @@
+%module javaupm_rpr220
+%include "../upm.i"
+
+%{
+    #include "rpr220.h"
+%}
+
+%include "rpr220.h"

src/servo/javaupm_servo.i

@@ -0,0 +1,12 @@
+%module javaupm_servo
+%include "../upm.i"
+
+%include "servo.h"
+%{
+    #include "servo.h"
+%}
+
+%include "es08a.h"
+%{
+    #include "es08a.h"
+%}

src/si114x/javaupm_si114x.i

@@ -0,0 +1,9 @@
+%module javaupm_si114x
+%include "../upm.i"
+%include "cpointer.i"
+
+%{
+    #include "si114x.h"
+%}
+
+%include "si114x.h"

src/sm130/javaupm_sm130.i

@@ -0,0 +1,8 @@
+%module javaupm_sm130
+%include "../upm.i"
+
+%{
+    #include "sm130.h"
+%}
+
+%include "sm130.h"

src/st7735/javaupm_st7735.i

@@ -0,0 +1,12 @@
+%module javaupm_st7735
+%include "../upm.i"
+
+%include "gfx.h"
+%{
+    #include "gfx.h"
+%}
+
+%include "st7735.h"
+%{
+    #include "st7735.h"
+%}

src/stepmotor/javaupm_stepmotor.i

@@ -0,0 +1,8 @@
+%module javaupm_stepmotor
+%include "../upm.i"
+
+%{
+    #include "stepmotor.h"
+%}
+
+%include "stepmotor.h"

src/sx6119/javaupm_sx6119.i

@@ -0,0 +1,9 @@
+%module javaupm_sx6119
+%include "../upm.i"
+
+%{
+    #include "sx6119.h"
+%}
+
+%include "sx6119.h"
+

src/ta12200/javaupm_ta12200.i

@@ -0,0 +1,8 @@
+%module javaupm_ta12200
+%include "../upm.i"
+
+%{
+    #include "ta12200.h"
+%}
+
+%include "ta12200.h"

src/tcs3414cs/javaupm_tcs3414cs.i

@@ -0,0 +1,8 @@
+%module javaupm_tcs3414cs
+%include "../upm.i"
+
+%{
+    #include "tcs3414cs.h"
+%}
+
+%include "tcs3414cs.h"

src/th02/javaupm_th02.i

@@ -0,0 +1,8 @@
+%module javaupm_th02
+%include "../upm.i"
+
+%{
+    #include "th02.h"
+%}
+
+%include "th02.h"

src/tm1637/javaupm_tm1637.i

@@ -0,0 +1,18 @@
+%module javaupm_tm1637
+%include "../upm.i"
+%include "stdint.i"
+%include "typemaps.i"
+
+%varargs(4, int digit = 0) write;
+
+%rename("writeArray")  write(uint8_t *digits);
+%rename("writeString") write(std::string digits);
+
+%apply uint8_t *INPUT { uint8_t *digits }
+
+%{
+    #include "tm1637.h"
+%}
+
+%include "tm1637.h"
+

src/tsl2561/javaupm_tsl2561.i

@@ -0,0 +1,8 @@
+%module javaupm_tsl2561
+%include "../upm.i"
+
+%{
+    #include "tsl2561.h"
+%}
+
+%include "tsl2561.h"

src/ttp223/javaupm_ttp223.i

@@ -0,0 +1,8 @@
+%module javaupm_ttp223
+%include "../upm.i"
+
+%{
+    #include "ttp223.h"
+%}
+
+%include "ttp223.h"

src/ublox6/javaupm_ublox6.i

@@ -0,0 +1,13 @@
+%module javaupm_ublox6
+%include "../upm.i"
+%include "stdint.i"
+%include "carrays.i"
+
+%{
+    #include "ublox6.h"
+    speed_t int_B9600 = B9600;
+%}
+
+%include "ublox6.h"
+speed_t int_B9600 = B9600;
+%array_class(char, charArray);