diff --git a/docs/creating_java_bindings.md b/docs/creating_java_bindings.md index 515ab76b..efc55b5c 100644 --- a/docs/creating_java_bindings.md +++ b/docs/creating_java_bindings.md @@ -259,7 +259,7 @@ We extend the sensor class with another method, _installISR\(jobject runnable\)_ Java callbacks are added at the SWIG interface level. For ease-of-use, a collection of macros are available in src/_upm.i. -src/a110x/javaupm_a110x.i: +src/a110x/a110x.i: ```c++ JAVA_ADD_INSTALLISR(upm::A110X) ``` diff --git a/docs/max31855.md b/docs/max31855.md index 7a6a22b4..e28e4659 100644 --- a/docs/max31855.md +++ b/docs/max31855.md @@ -14,8 +14,7 @@ First thing to do is to create a tree structure like this in upm/src/max31855: * max31855.cxx * max31855.hpp -* jsupm_max31855.i -* pyupm_max31855.i +* max31855.i * CMakeLists.txt And then an example file to use & test our lib with in upm/examples/max31855.cxx. diff --git a/scripts/build-android.sh b/scripts/build-android.sh index d1f69f71..04d9f610 100755 --- a/scripts/build-android.sh +++ b/scripts/build-android.sh @@ -66,7 +66,7 @@ cmake \ make -j8 -Cbuild # Anotate the .java src from doxygen -find src/ -name "javaupm_*.i" > build/upm.i.list +find src/ -name "*.i" > build/upm.i.list #../doxy/doxyport build/upm.i.list \ # -s src/interfaces/,src/bacnetmstp,src/bmg160,src/bma250e,src/bmm150 \ # -m doxy/samples.mapping.txt \ diff --git a/scripts/build-doc.sh b/scripts/build-doc.sh index cae39d36..26ad679b 100755 --- a/scripts/build-doc.sh +++ b/scripts/build-doc.sh @@ -22,10 +22,10 @@ mkdir -p ${BUILD_LOGS_DIR} cd ${ROOT_DIR} && make -j8 -Cbuild 2> ${BUILD_LOGS_DIR}/build-doc.log # Make Java Documentation -cd ${BUILD_DIR} && find ../src/ -name "javaupm_*.i" > upm.i.list && \ +cd ${BUILD_DIR} && find ../src/ -name "*.i" > upm.i.list && \ ../doxy/doxyport/doxyport upm.i.list \ --cmake ./compile_commands.json \ - --source ../src/interfaces/,../src/bacnetmstp \ + --source ../src/interfaces/,../src/bacnetmstp,src \ --destination src/ \ --convert-protected-to-private \ --output upm-java-files.txt \ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 858e005a..0d28d5c2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -228,18 +228,63 @@ function (_get_target_dependency_interface_include_dirs target varIncludeDirs) set(${varIncludeDirs} "${${varIncludeDirs}}" PARENT_SCOPE) endfunction (_get_target_dependency_interface_include_dirs target varIncludeDirs) +# This function decides which swig interface file to use for the +# CMAKE_CURRENT_SOURCE_DIR. If no .i file exists, create one. +# +# if ${filePrefix}_${libname}.i exists +# return its full path +# elif ${libname}.i exists +# return its full path +# else +# create ${libname}.i via template and return its full path +# +function (_get_current_dot_i_file filePrefix varDotIFile) + set(${varDotIFile} "${CMAKE_CURRENT_SOURCE_DIR}/${libname}.i") + if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${filePrefix}_${libname}.i") + set(${varDotIFile} "${CMAKE_CURRENT_SOURCE_DIR}/${filePrefix}_${libname}.i") + endif() + # If a SWIG .i file DOES NOT exist, make a simple one from the template + if (NOT EXISTS "${${varDotIFile}}") + # This file will exist OUTSIDE the source tree + set(${varDotIFile} "${CMAKE_CURRENT_BINARY_DIR}/${libname}.i") + + # First, create the include variables + set(SWIG_HASH_INCLUDES) + foreach (_hpp ${module_hpp}) + set(SWIG_HASH_INCLUDES "#include \"${_hpp}\"") + endforeach() + string(REPLACE "#" "%" SWIG_PERCENT_INCLUDES "${SWIG_HASH_INCLUDES}") + + # Write the interface file + configure_file (${PROJECT_SOURCE_DIR}/src/swigme.i.in "${${varDotIFile}}" @ONLY) + endif() + + set(${varDotIFile} "${${varDotIFile}}" PARENT_SCOPE) +endfunction() + # Create a single swig target for python +# This is a macro since the function which calls it (upm_swig_python) depends +# on values set inside this macro macro(_upm_swig_python) # Transitive headers don't appear to get picked up by swig_add_module call for # wrapper generation. Get them manually and add them here. _get_target_dependency_interface_include_dirs(${libname} DEPEND_DIRS) - include_directories (${CMAKE_CURRENT_SOURCE_DIR}/.. + include_directories (${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/.. ${DEPEND_DIRS}) - set_source_files_properties (pyupm_${libname}.i PROPERTIES CPLUSPLUS ON) - set_source_files_properties (pyupm_${libname}.i PROPERTIES SWIG_FLAGS "-I${CMAKE_CURRENT_BINARY_DIR}/..") + # Decide between ${libname}.i or a language-specific .i + _get_current_dot_i_file(pyupm SWIG_CURRENT_DOT_I_FILE) + # If this module is using ${libname}.i, provide a module name for UseSWIG AND SWIG_FLAGS + if (${SWIG_CURRENT_DOT_I_FILE} MATCHES ${libname}.i) + set_source_files_properties(${SWIG_CURRENT_DOT_I_FILE} PROPERTIES + SWIG_MODULE_NAME pyupm_${libname} + SWIG_FLAGS ";-module;pyupm_${libname};") + endif() + + # Tell UseSWIG that this is CXX + set_property(SOURCE ${SWIG_CURRENT_DOT_I_FILE} PROPERTY CPLUSPLUS ON) # Set current python binary dir set (CMAKE_CURRENT_PYTHON_BINARY_DIR @@ -255,9 +300,9 @@ macro(_upm_swig_python) # Swig module name (example: pyupm_a110x-python2) set (python_wrapper_name pyupm_${libname}-python${PYTHON_VERSION_MAJOR}) if (CMAKE_VERSION VERSION_LESS "3.8") - swig_add_module (${python_wrapper_name} python pyupm_${libname}.i) + swig_add_module (${python_wrapper_name} python ${SWIG_CURRENT_DOT_I_FILE}) else () - swig_add_library (${python_wrapper_name} LANGUAGE python SOURCES pyupm_${libname}.i) + swig_add_library (${python_wrapper_name} LANGUAGE python SOURCES ${SWIG_CURRENT_DOT_I_FILE}) endif () # Get target library name (example _pyupm_a110x-python2) set (python_wrapper_target ${SWIG_MODULE_${python_wrapper_name}_REAL_NAME}) @@ -361,16 +406,29 @@ function(upm_swig_node) # wrapper generation. Get them manually and add them here. _get_target_dependency_interface_include_dirs(${libname} DEPEND_DIRS) - include_directories (${CMAKE_CURRENT_SOURCE_DIR}/.. + include_directories (${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/.. ${DEPEND_DIRS}) - set_property (SOURCE jsupm_${libname}.i PROPERTY SWIG_FLAGS "-node" "-DV8_VERSION=${V8_VERSION_HEX}") - set_source_files_properties (jsupm_${libname}.i PROPERTIES CPLUSPLUS ON) + # Decide between ${libname}.i or a language-specific .i + _get_current_dot_i_file(jsupm SWIG_CURRENT_DOT_I_FILE) + # If this module is using ${libname}.i, provide a module name for UseSWIG AND SWIG_FLAGS + if (${SWIG_CURRENT_DOT_I_FILE} MATCHES ${libname}.i) + set_source_files_properties(${SWIG_CURRENT_DOT_I_FILE} PROPERTIES + SWIG_MODULE_NAME jsupm_${libname} + SWIG_FLAGS ";-module;jsupm_${libname};") + endif() + + # Tell UseSWIG that this is CXX + set_property(SOURCE ${SWIG_CURRENT_DOT_I_FILE} PROPERTY CPLUSPLUS ON) + # Append additional flags for NodeJS + set_property(SOURCE ${SWIG_CURRENT_DOT_I_FILE} APPEND PROPERTY + SWIG_FLAGS ";-node;-DV8_VERSION=${V8_VERSION_HEX}") + if (CMAKE_VERSION VERSION_LESS "3.8") - swig_add_module (jsupm_${libname} javascript jsupm_${libname}.i) + swig_add_module (jsupm_${libname} javascript ${SWIG_CURRENT_DOT_I_FILE}) else () - swig_add_library (jsupm_${libname} LANGUAGE javascript SOURCES jsupm_${libname}.i) + swig_add_library (jsupm_${libname} LANGUAGE javascript SOURCES ${SWIG_CURRENT_DOT_I_FILE}) endif () add_dependencies(jsupm_${libname} ${libname}) swig_link_libraries (jsupm_${libname} ${NODE_LIBRARIES} ${libname}) @@ -427,20 +485,33 @@ function(upm_swig_java) # wrapper generation. Get them manually and add them here. _get_target_dependency_interface_include_dirs(${libname} DEPEND_DIRS) - include_directories ( - ${JAVA_INCLUDE_PATH} - ${JAVA_INCLUDE_PATH2} - ${CMAKE_CURRENT_BINARY_DIR}/.. - ${CMAKE_CURRENT_BINARY_DIR}/.. - ${DEPEND_DIRS} - ) + include_directories (${JAVA_INCLUDE_PATH} + ${JAVA_INCLUDE_PATH2} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR}/.. + ${DEPEND_DIRS}) + + # Decide between ${libname}.i or a language-specific .i + _get_current_dot_i_file(javaupm SWIG_CURRENT_DOT_I_FILE) + # If this module is using ${libname}.i, provide a module name for UseSWIG AND SWIG_FLAGS + if (${SWIG_CURRENT_DOT_I_FILE} MATCHES ${libname}.i) + set_source_files_properties(${SWIG_CURRENT_DOT_I_FILE} PROPERTIES + SWIG_MODULE_NAME javaupm_${libname} + SWIG_FLAGS ";-module;javaupm_${libname};") + endif() + + # Tell UseSWIG that this is CXX + set_property(SOURCE ${SWIG_CURRENT_DOT_I_FILE} PROPERTY CPLUSPLUS ON) + + # Set a -package as well (which is slightly different than the module name, + # module: javaupm_a110x vs package: upm_a110x + set_property(SOURCE ${SWIG_CURRENT_DOT_I_FILE} APPEND PROPERTY + SWIG_FLAGS ";-package;upm_${libname}") - 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") if (CMAKE_VERSION VERSION_LESS "3.8") - swig_add_module (javaupm_${libname} java javaupm_${libname}.i) + swig_add_module (javaupm_${libname} java ${SWIG_CURRENT_DOT_I_FILE}) else () - swig_add_library (javaupm_${libname} LANGUAGE java SOURCES javaupm_${libname}.i) + swig_add_library (javaupm_${libname} LANGUAGE java SOURCES ${SWIG_CURRENT_DOT_I_FILE}) endif () # If the C++ target depends on C++ interfaces, make the JAVA target diff --git a/src/_upm.i b/src/_upm.i index 02a7b032..bae882ec 100644 --- a/src/_upm.i +++ b/src/_upm.i @@ -1,7 +1,7 @@ /* * This file provides additional non-wrapper code functionality for use * throughout the UPM repository. This file is intended to be %imported - * from the top-level upm.i (not directly by UPM libraries). + * from the top-level common_top.i (not directly by UPM libraries). * * No wrapper code will be generated from importing this .i file. */ diff --git a/src/a110x/a110x.i b/src/a110x/a110x.i new file mode 100644 index 00000000..cc29262a --- /dev/null +++ b/src/a110x/a110x.i @@ -0,0 +1,18 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +/* Macro for loading javaupm_a110x */ +JAVA_JNI_LOADLIBRARY(javaupm_a110x) + +/* Macro adding an installisr call w/JAVA runnable to A110X */ +JAVA_ADD_INSTALLISR(upm::A110X) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "a110x.hpp" +%} +%include "a110x.hpp" +/* END Common SWIG syntax */ diff --git a/src/a110x/common.i b/src/a110x/common.i deleted file mode 100644 index 0c8257a3..00000000 --- a/src/a110x/common.i +++ /dev/null @@ -1,6 +0,0 @@ -%include "../upm.i" - -%{ -#include "a110x.hpp" -%} -%include "a110x.hpp" diff --git a/src/a110x/javaupm_a110x.i b/src/a110x/javaupm_a110x.i deleted file mode 100644 index 7443506e..00000000 --- a/src/a110x/javaupm_a110x.i +++ /dev/null @@ -1,11 +0,0 @@ -%module javaupm_a110x -%include "stdint.i" -%include "typemaps.i" - -%include "common.i" - -/* Macro for loading javaupm_a110x */ -JAVA_JNI_LOADLIBRARY(javaupm_a110x) - -/* Macro adding an installisr call w/JAVA runnable to A110X */ -JAVA_ADD_INSTALLISR(upm::A110X) diff --git a/src/a110x/jsupm_a110x.i b/src/a110x/jsupm_a110x.i deleted file mode 100644 index 27befc34..00000000 --- a/src/a110x/jsupm_a110x.i +++ /dev/null @@ -1,3 +0,0 @@ -%module jsupm_a110x - -%include "common.i" diff --git a/src/a110x/pyupm_a110x.i b/src/a110x/pyupm_a110x.i deleted file mode 100644 index c82bf319..00000000 --- a/src/a110x/pyupm_a110x.i +++ /dev/null @@ -1,4 +0,0 @@ -%include "pyupm_doxy2swig.i" -%module pyupm_a110x - -%include "common.i" diff --git a/src/abp/abp.i b/src/abp/abp.i new file mode 100644 index 00000000..cc094b2c --- /dev/null +++ b/src/abp/abp.i @@ -0,0 +1,14 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_abp) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "abp.hpp" +%} +%include "abp.hpp" +/* END Common SWIG syntax */ diff --git a/src/abp/javaupm_abp.i b/src/abp/javaupm_abp.i deleted file mode 100644 index f69f4b00..00000000 --- a/src/abp/javaupm_abp.i +++ /dev/null @@ -1,11 +0,0 @@ -%module javaupm_abp -%include "../upm.i" -%include "stdint.i" -%include "typemaps.i" - -%{ - #include "abp.hpp" -%} -%include "abp.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_abp) diff --git a/src/abp/jsupm_abp.i b/src/abp/jsupm_abp.i deleted file mode 100644 index ccf73fff..00000000 --- a/src/abp/jsupm_abp.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_abp -%include "../upm.i" - -%{ - #include "abp.hpp" -%} - -%include "abp.hpp" diff --git a/src/abp/pyupm_abp.i b/src/abp/pyupm_abp.i deleted file mode 100644 index 50ffdad5..00000000 --- a/src/abp/pyupm_abp.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_abp -%include "../upm.i" - -%include "abp.hpp" -%{ - #include "abp.hpp" -%} diff --git a/src/ad8232/javaupm_ad8232.i b/src/ad8232/javaupm_ad8232.i deleted file mode 100644 index 31a21f47..00000000 --- a/src/ad8232/javaupm_ad8232.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_ad8232 -%include "../upm.i" - -%{ - #include "ad8232.hpp" -%} - -%include "ad8232.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_ad8232) \ No newline at end of file diff --git a/src/ad8232/jsupm_ad8232.i b/src/ad8232/jsupm_ad8232.i deleted file mode 100644 index 63490dac..00000000 --- a/src/ad8232/jsupm_ad8232.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_ad8232 -%include "../upm.i" - -%{ - #include "ad8232.hpp" -%} - -%include "ad8232.hpp" diff --git a/src/ad8232/pyupm_ad8232.i b/src/ad8232/pyupm_ad8232.i deleted file mode 100644 index 70cfb1d3..00000000 --- a/src/ad8232/pyupm_ad8232.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_ad8232 -%include "../upm.i" - -%include "ad8232.hpp" -%{ - #include "ad8232.hpp" -%} diff --git a/src/adafruitms1438/javaupm_adafruitms1438.i b/src/adafruitms1438/javaupm_adafruitms1438.i deleted file mode 100644 index 0633c7b9..00000000 --- a/src/adafruitms1438/javaupm_adafruitms1438.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_adafruitms1438 -%include "../upm.i" - -%{ - #include "adafruitms1438.hpp" -%} - -%include "adafruitms1438.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_adafruitms1438) \ No newline at end of file diff --git a/src/adafruitms1438/jsupm_adafruitms1438.i b/src/adafruitms1438/jsupm_adafruitms1438.i deleted file mode 100644 index f06f2b5e..00000000 --- a/src/adafruitms1438/jsupm_adafruitms1438.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_adafruitms1438 -%include "../upm.i" - -%{ - #include "adafruitms1438.hpp" -%} - -%include "adafruitms1438.hpp" diff --git a/src/adafruitms1438/pyupm_adafruitms1438.i b/src/adafruitms1438/pyupm_adafruitms1438.i deleted file mode 100644 index ae63f81e..00000000 --- a/src/adafruitms1438/pyupm_adafruitms1438.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_adafruitms1438 -%include "../upm.i" - -%include "adafruitms1438.hpp" -%{ - #include "adafruitms1438.hpp" -%} diff --git a/src/adafruitss/javaupm_adafruitss.i b/src/adafruitss/javaupm_adafruitss.i deleted file mode 100644 index ad778277..00000000 --- a/src/adafruitss/javaupm_adafruitss.i +++ /dev/null @@ -1,9 +0,0 @@ -%module javaupm_adafruitss -%include "../upm.i" - -%include "adafruitss.hpp" -%{ - #include "adafruitss.hpp" -%} - -JAVA_JNI_LOADLIBRARY(javaupm_adafruitss) \ No newline at end of file diff --git a/src/adafruitss/jsupm_adafruitss.i b/src/adafruitss/jsupm_adafruitss.i deleted file mode 100644 index 41175439..00000000 --- a/src/adafruitss/jsupm_adafruitss.i +++ /dev/null @@ -1,7 +0,0 @@ -%module jsupm_adafruitss -%include "../upm.i" - -%include "adafruitss.hpp" -%{ - #include "adafruitss.hpp" -%} diff --git a/src/adafruitss/pyupm_adafruitss.i b/src/adafruitss/pyupm_adafruitss.i deleted file mode 100644 index ce11ad5f..00000000 --- a/src/adafruitss/pyupm_adafruitss.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_adafruitss -%include "../upm.i" - -%include "adafruitss.hpp" -%{ - #include "adafruitss.hpp" -%} diff --git a/src/adc121c021/adc121c021.i b/src/adc121c021/adc121c021.i new file mode 100644 index 00000000..cdf83d86 --- /dev/null +++ b/src/adc121c021/adc121c021.i @@ -0,0 +1,20 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_adc121c021) +#endif +/* END Java syntax */ + +/* BEGIN Javascript syntax ------------------------------------------------- */ +#ifdef SWIGJAVASCRIPT +%include "../carrays_uint16_t.i" +#endif +/* END Javascript syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "adc121c021.hpp" +%} +%include "adc121c021.hpp" +/* END Common SWIG syntax */ diff --git a/src/adc121c021/javaupm_adc121c021.i b/src/adc121c021/javaupm_adc121c021.i deleted file mode 100644 index 5fa996e2..00000000 --- a/src/adc121c021/javaupm_adc121c021.i +++ /dev/null @@ -1,11 +0,0 @@ -%module javaupm_adc121c021 -%include "../upm.i" -/*%include "../carrays_uint16_t.i" -*/ -%{ - #include "adc121c021.hpp" -%} - -%include "adc121c021.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_adc121c021) \ No newline at end of file diff --git a/src/adc121c021/jsupm_adc121c021.i b/src/adc121c021/jsupm_adc121c021.i deleted file mode 100644 index 2a81ccb9..00000000 --- a/src/adc121c021/jsupm_adc121c021.i +++ /dev/null @@ -1,9 +0,0 @@ -%module jsupm_adc121c021 -%include "../upm.i" -%include "../carrays_uint16_t.i" - -%{ - #include "adc121c021.hpp" -%} - -%include "adc121c021.hpp" diff --git a/src/adc121c021/pyupm_adc121c021.i b/src/adc121c021/pyupm_adc121c021.i deleted file mode 100644 index 3dbfaab5..00000000 --- a/src/adc121c021/pyupm_adc121c021.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_adc121c021 -%include "../upm.i" - -%include "adc121c021.hpp" -%{ - #include "adc121c021.hpp" -%} diff --git a/src/adis16448/javaupm_adis16448.i b/src/adis16448/javaupm_adis16448.i deleted file mode 100644 index 8fe04cc0..00000000 --- a/src/adis16448/javaupm_adis16448.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_adis16448 -%include "../upm.i" - -%{ - #include "adis16448.hpp" -%} - -%include "adis16448.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_adis16448) \ No newline at end of file diff --git a/src/adis16448/jsupm_adis16448.i b/src/adis16448/jsupm_adis16448.i deleted file mode 100644 index 95b88f6b..00000000 --- a/src/adis16448/jsupm_adis16448.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_adis16448 -%include "../upm.i" - -%{ - #include "adis16448.hpp" -%} - -%include "adis16448.hpp" diff --git a/src/adis16448/pyupm_adis16448.i b/src/adis16448/pyupm_adis16448.i deleted file mode 100644 index 5edec486..00000000 --- a/src/adis16448/pyupm_adis16448.i +++ /dev/null @@ -1,10 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_adis16448 -%include "../upm.i" - -%{ - #include "adis16448.hpp" -%} - -%include "adis16448.hpp" diff --git a/src/ads1x15/ads1x15.i b/src/ads1x15/ads1x15.i new file mode 100644 index 00000000..e3252da9 --- /dev/null +++ b/src/ads1x15/ads1x15.i @@ -0,0 +1,35 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%import "../interfaces/javaupm_iADC.i" +%typemap(javaimports) SWIGTYPE %{import upm_interfaces.*;%} + +JAVA_JNI_LOADLIBRARY(javaupm_ads1x15) +#endif +/* END Java syntax */ + +/* BEGIN Javascript syntax ------------------------------------------------- */ +#ifdef SWIGJAVASCRIPT +%include "iModuleStatus.hpp" +%include "iADC.hpp" +#endif +/* END Javascript syntax */ + +/* BEGIN Python syntax ----------------------------------------------------- */ +#ifdef SWIGPYTHON +%include "iModuleStatus.hpp" +%include "iADC.hpp" +#endif +/* END Python syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "ads1x15.hpp" +#include "ads1015.hpp" +#include "ads1115.hpp" +%} +%include "ads1x15.hpp" +%include "ads1115.hpp" +%include "ads1015.hpp" +/* END Common SWIG syntax */ diff --git a/src/ads1x15/javaupm_ads1x15.i b/src/ads1x15/javaupm_ads1x15.i deleted file mode 100644 index 78279501..00000000 --- a/src/ads1x15/javaupm_ads1x15.i +++ /dev/null @@ -1,21 +0,0 @@ -%module javaupm_ads1x15 -%include "../upm.i" -%include "typemaps.i" - -%import "../interfaces/javaupm_iADC.i" - -%typemap(javaimports) SWIGTYPE %{ -import upm_interfaces.*; -%} - -%{ - #include "ads1x15.hpp" - #include "ads1015.hpp" - #include "ads1115.hpp" -%} - -%include "ads1x15.hpp" -%include "ads1015.hpp" -%include "ads1115.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_ads1x15) diff --git a/src/ads1x15/jsupm_ads1x15.i b/src/ads1x15/jsupm_ads1x15.i deleted file mode 100644 index 9bdc2e0f..00000000 --- a/src/ads1x15/jsupm_ads1x15.i +++ /dev/null @@ -1,20 +0,0 @@ -%module jsupm_ads1x15 -%include "../upm.i" - -%include "iModuleStatus.hpp" -%include "iADC.hpp" - -%include "ads1x15.hpp" -%{ - #include "ads1x15.hpp" -%} - -%include "ads1015.hpp" -%{ - #include "ads1015.hpp" -%} - -%include "ads1115.hpp" -%{ - #include "ads1115.hpp" -%} diff --git a/src/ads1x15/pyupm_ads1x15.i b/src/ads1x15/pyupm_ads1x15.i deleted file mode 100644 index dd90f8a0..00000000 --- a/src/ads1x15/pyupm_ads1x15.i +++ /dev/null @@ -1,22 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_ads1x15 -%include "../upm.i" - -%include "iModuleStatus.hpp" -%include "iADC.hpp" - -%include "ads1x15.hpp" -%{ - #include "ads1x15.hpp" -%} - -%include "ads1015.hpp" -%{ - #include "ads1015.hpp" -%} - -%include "ads1115.hpp" -%{ - #include "ads1115.hpp" -%} diff --git a/src/adxl335/javaupm_adxl335.i b/src/adxl335/adxl335.i similarity index 54% rename from src/adxl335/javaupm_adxl335.i rename to src/adxl335/adxl335.i index 000745b5..6aa280bc 100644 --- a/src/adxl335/javaupm_adxl335.i +++ b/src/adxl335/adxl335.i @@ -1,15 +1,10 @@ -%module javaupm_adxl335 -%include "../upm.i" -%include "cpointer.i" -%include "typemaps.i" +%include "../common_top.i" +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA %apply int *OUTPUT { int *xVal, int *yVal, int *zVal }; %apply float *OUTPUT { float *xAccel, float *yAccel, float *zAccel }; -%{ - #include "adxl335.hpp" -%} - %typemap(jni) float* "jfloatArray" %typemap(jstype) float* "float[]" %typemap(jtype) float* "float[]" @@ -40,6 +35,27 @@ %ignore values(int *, int *, int *); %ignore acceleration(float *, float *, float *); -%include "adxl335.hpp" +JAVA_JNI_LOADLIBRARY(javaupm_adxl335) +#endif +/* END Java syntax */ -JAVA_JNI_LOADLIBRARY(javaupm_adxl335) \ No newline at end of file +/* BEGIN Javascript syntax ------------------------------------------------- */ +#ifdef SWIGJAVASCRIPT +%pointer_functions(int, intp); +%pointer_functions(float, floatp); +#endif +/* END Javascript syntax */ + +/* BEGIN Python syntax ----------------------------------------------------- */ +#ifdef SWIGPYTHON +%pointer_functions(int, intp); +%pointer_functions(float, floatp); +#endif +/* END Python syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "adxl335.hpp" +%} +%include "adxl335.hpp" +/* END Common SWIG syntax */ diff --git a/src/adxl335/jsupm_adxl335.i b/src/adxl335/jsupm_adxl335.i deleted file mode 100644 index 4c48eedb..00000000 --- a/src/adxl335/jsupm_adxl335.i +++ /dev/null @@ -1,12 +0,0 @@ -%module jsupm_adxl335 -%include "../upm.i" -%include "cpointer.i" - -%pointer_functions(int, intPointer); -%pointer_functions(float, floatPointer); - -%{ - #include "adxl335.hpp" -%} - -%include "adxl335.hpp" diff --git a/src/adxl335/pyupm_adxl335.i b/src/adxl335/pyupm_adxl335.i deleted file mode 100644 index c403b9ff..00000000 --- a/src/adxl335/pyupm_adxl335.i +++ /dev/null @@ -1,13 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_adxl335 -%include "../upm.i" -%include "cpointer.i" - -%pointer_functions(int, intPointer); -%pointer_functions(float, floatPointer); - -%include "adxl335.hpp" -%{ - #include "adxl335.hpp" -%} diff --git a/src/adxl345/adxl345.i b/src/adxl345/adxl345.i new file mode 100644 index 00000000..596ad213 --- /dev/null +++ b/src/adxl345/adxl345.i @@ -0,0 +1,73 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%typemap(jni) float* "jfloatArray" +%typemap(jstype) float* "float[]" +%typemap(jtype) float* "float[]" + +%typemap(javaout) float* { + return $jnicall; +} + +%typemap(out) float * { + $result = JCALL1(NewFloatArray, jenv, 3); + JCALL4(SetFloatArrayRegion, jenv, $result, 0, 3, $1); +} + +%typemap(jni) int16_t* "jshortArray" +%typemap(jstype) int16_t* "short[]" +%typemap(jtype) int16_t* "short[]" + +%typemap(javaout) int16_t* { + return $jnicall; +} + +%typemap(out) int16_t *getRawValues { + $result = JCALL1(NewShortArray, jenv, 3); + JCALL4(SetShortArrayRegion, jenv, $result, 0, 3, (jshort*)$1); + delete [] $1; +} + +JAVA_JNI_LOADLIBRARY(javaupm_adxl345) +#endif +/* END Java syntax */ + +/* BEGIN Javascript syntax ------------------------------------------------- */ +#ifdef SWIGJAVASCRIPT +%include "../carrays_int16_t.i" +%include "../carrays_float.i" + +%typemap(out) int16_t * { + $result = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_int16Array, 0 | 0 ); +} + +%typemap(out) float * { + $result = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_floatArray, 0 | 0 ); +} + +%include +#endif +/* END Javascript syntax */ + +/* BEGIN Python syntax ----------------------------------------------------- */ +#ifdef SWIGPYTHON +%include "../carrays_int16_t.i" +%include "../carrays_float.i" + +%typemap(out) int16_t * { + $result = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_int16Array, 0 | 0 ); +} + +%typemap(out) float * { + $result = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_floatArray, 0 | 0 ); +} +#endif +/* END Python syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "adxl345.hpp" +%} +%include "adxl345.hpp" +/* END Common SWIG syntax */ diff --git a/src/adxl345/javaupm_adxl345.i b/src/adxl345/javaupm_adxl345.i deleted file mode 100644 index bc4ce1e0..00000000 --- a/src/adxl345/javaupm_adxl345.i +++ /dev/null @@ -1,38 +0,0 @@ -%module javaupm_adxl345 -%include "../upm.i" - -%{ - #include "adxl345.hpp" -%} - -%typemap(jni) float* "jfloatArray" -%typemap(jstype) float* "float[]" -%typemap(jtype) float* "float[]" - -%typemap(javaout) float* { - return $jnicall; -} - -%typemap(out) float * { - $result = JCALL1(NewFloatArray, jenv, 3); - JCALL4(SetFloatArrayRegion, jenv, $result, 0, 3, $1); -} - - -%typemap(jni) int16_t* "jshortArray" -%typemap(jstype) int16_t* "short[]" -%typemap(jtype) int16_t* "short[]" - -%typemap(javaout) int16_t* { - return $jnicall; -} - -%typemap(out) int16_t *getRawValues { - $result = JCALL1(NewShortArray, jenv, 3); - JCALL4(SetShortArrayRegion, jenv, $result, 0, 3, (jshort*)$1); - delete [] $1; -} - -%include "adxl345.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_adxl345) \ No newline at end of file diff --git a/src/adxl345/jsupm_adxl345.i b/src/adxl345/jsupm_adxl345.i deleted file mode 100644 index 99578875..00000000 --- a/src/adxl345/jsupm_adxl345.i +++ /dev/null @@ -1,20 +0,0 @@ -%module jsupm_adxl345 -%include "../upm.i" -%include "../carrays_int16_t.i" -%include "../carrays_float.i" - -%{ - #include "adxl345.hpp" -%} - -%typemap(out) int16_t * { - $result = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_int16Array, 0 | 0 ); -} - -%typemap(out) float * { - $result = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_floatArray, 0 | 0 ); -} - -%include "adxl345.hpp" - -%include diff --git a/src/adxl345/pyupm_adxl345.i b/src/adxl345/pyupm_adxl345.i deleted file mode 100644 index 9c4e2cf3..00000000 --- a/src/adxl345/pyupm_adxl345.i +++ /dev/null @@ -1,19 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_adxl345 -%include "../upm.i" -%include "../carrays_int16_t.i" -%include "../carrays_float.i" - -%typemap(out) int16_t * { - $result = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_int16Array, 0 | 0 ); -} - -%typemap(out) float * { - $result = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_floatArray, 0 | 0 ); -} - -%include "adxl345.hpp" -%{ - #include "adxl345.hpp" -%} diff --git a/src/adxrs610/javaupm_adxrs610.i b/src/adxrs610/javaupm_adxrs610.i deleted file mode 100644 index 6c0cdd87..00000000 --- a/src/adxrs610/javaupm_adxrs610.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_adxrs610 -%include "../upm.i" - -%{ - #include "adxrs610.hpp" -%} - -%include "adxrs610.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_adxrs610) \ No newline at end of file diff --git a/src/adxrs610/jsupm_adxrs610.i b/src/adxrs610/jsupm_adxrs610.i deleted file mode 100644 index 35ce5595..00000000 --- a/src/adxrs610/jsupm_adxrs610.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_adxrs610 -%include "../upm.i" - -%{ - #include "adxrs610.hpp" -%} - -%include "adxrs610.hpp" diff --git a/src/adxrs610/pyupm_adxrs610.i b/src/adxrs610/pyupm_adxrs610.i deleted file mode 100644 index 181a3d29..00000000 --- a/src/adxrs610/pyupm_adxrs610.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_adxrs610 -%include "../upm.i" - -%include "adxrs610.hpp" -%{ - #include "adxrs610.hpp" -%} diff --git a/src/am2315/javaupm_am2315.i b/src/am2315/javaupm_am2315.i deleted file mode 100644 index 579324e6..00000000 --- a/src/am2315/javaupm_am2315.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_am2315 -%include "../upm.i" - -%{ - #include "am2315.hpp" -%} - -%include "am2315.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_am2315) \ No newline at end of file diff --git a/src/am2315/jsupm_am2315.i b/src/am2315/jsupm_am2315.i deleted file mode 100644 index ddf4cac6..00000000 --- a/src/am2315/jsupm_am2315.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_am2315 -%include "../upm.i" - -%{ - #include "am2315.hpp" -%} - -%include "am2315.hpp" diff --git a/src/am2315/pyupm_am2315.i b/src/am2315/pyupm_am2315.i deleted file mode 100644 index e190d530..00000000 --- a/src/am2315/pyupm_am2315.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_am2315 -%include "../upm.i" - -%include "am2315.hpp" -%{ - #include "am2315.hpp" -%} diff --git a/src/apa102/apa102.i b/src/apa102/apa102.i new file mode 100644 index 00000000..8b8ae710 --- /dev/null +++ b/src/apa102/apa102.i @@ -0,0 +1,52 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%typemap(jtype) (uint8_t *colors) "byte[]" +%typemap(jstype) (uint8_t *colors) "byte[]" +%typemap(jni) (uint8_t *colors) "jbyteArray" +%typemap(javain) (uint8_t *colors) "$javainput" + +%typemap(in) (uint8_t *colors) { + $1 = (uint8_t*)JCALL2(GetByteArrayElements, jenv, $input, NULL); +} + +JAVA_JNI_LOADLIBRARY(javaupm_apa102) +#endif +/* END Java syntax */ + +/* BEGIN Javascript syntax ------------------------------------------------- */ +#ifdef SWIGJAVASCRIPT +%inline %{ + #include +%} + +%typemap(in) (uint8_t *colors) { + if (!node::Buffer::HasInstance($input)) { + SWIG_exception_fail(SWIG_ERROR, "Expected a node Buffer"); + } + $1 = (uint8_t*) node::Buffer::Data($input); +} +#endif +/* END Javascript syntax */ + +/* BEGIN Python syntax ----------------------------------------------------- */ +#ifdef SWIGPYTHON +// setLeds +%typemap(in) (uint8_t *colors) { + if (PyByteArray_Check($input)) { + $1 = (uint8_t*) PyByteArray_AsString($input); + } else { + PyErr_SetString(PyExc_ValueError, "bytearray expected"); + return NULL; + } +} +#endif +/* END Python syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "apa102.hpp" +%} +%include "apa102.hpp" +/* END Common SWIG syntax */ diff --git a/src/apa102/javaupm_apa102.i b/src/apa102/javaupm_apa102.i deleted file mode 100644 index 70ed738f..00000000 --- a/src/apa102/javaupm_apa102.i +++ /dev/null @@ -1,21 +0,0 @@ -%module javaupm_apa102 - -%include "../upm.i" -%include "typemaps.i" - -%typemap(jtype) (uint8_t *colors) "byte[]" -%typemap(jstype) (uint8_t *colors) "byte[]" -%typemap(jni) (uint8_t *colors) "jbyteArray" -%typemap(javain) (uint8_t *colors) "$javainput" - -%typemap(in) (uint8_t *colors) { - $1 = (uint8_t*)JCALL2(GetByteArrayElements, jenv, $input, NULL); -} - -%{ - #include "apa102.hpp" -%} - -%include "apa102.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_apa102) diff --git a/src/apa102/jsupm_apa102.i b/src/apa102/jsupm_apa102.i deleted file mode 100644 index ae40e2fe..00000000 --- a/src/apa102/jsupm_apa102.i +++ /dev/null @@ -1,19 +0,0 @@ -%module jsupm_apa102 - -%include "../upm.i" -%inline %{ - #include -%} - -%typemap(in) (uint8_t *colors) { - if (!node::Buffer::HasInstance($input)) { - SWIG_exception_fail(SWIG_ERROR, "Expected a node Buffer"); - } - $1 = (uint8_t*) node::Buffer::Data($input); -} - -%include "apa102.hpp" - -%{ - #include "apa102.hpp" -%} diff --git a/src/apa102/pyupm_apa102.i b/src/apa102/pyupm_apa102.i deleted file mode 100644 index 53c3ba70..00000000 --- a/src/apa102/pyupm_apa102.i +++ /dev/null @@ -1,23 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" - -%module pyupm_apa102 - -%include "../upm.i" - -// setLeds -%typemap(in) (uint8_t *colors) { - if (PyByteArray_Check($input)) { - $1 = (uint8_t*) PyByteArray_AsString($input); - } else { - PyErr_SetString(PyExc_ValueError, "bytearray expected"); - return NULL; - } -} - -%include "apa102.hpp" - -%{ - - #include "apa102.hpp" -%} diff --git a/src/apds9002/javaupm_apds9002.i b/src/apds9002/javaupm_apds9002.i deleted file mode 100644 index 0a4f381e..00000000 --- a/src/apds9002/javaupm_apds9002.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_apds9002 -%include "../upm.i" - -%{ - #include "apds9002.hpp" -%} - -%include "apds9002.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_apds9002) \ No newline at end of file diff --git a/src/apds9002/jsupm_apds9002.i b/src/apds9002/jsupm_apds9002.i deleted file mode 100644 index 0968abaa..00000000 --- a/src/apds9002/jsupm_apds9002.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_apds9002 -%include "../upm.i" - -%{ - #include "apds9002.hpp" -%} - -%include "apds9002.hpp" diff --git a/src/apds9002/pyupm_apds9002.i b/src/apds9002/pyupm_apds9002.i deleted file mode 100644 index cabcb265..00000000 --- a/src/apds9002/pyupm_apds9002.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_apds9002 -%include "../upm.i" - -%include "apds9002.hpp" -%{ - #include "apds9002.hpp" -%} diff --git a/src/apds9930/javaupm_apds9930.i b/src/apds9930/javaupm_apds9930.i deleted file mode 100644 index 3059d356..00000000 --- a/src/apds9930/javaupm_apds9930.i +++ /dev/null @@ -1,9 +0,0 @@ -%module javaupm_apds9930 -%include "../upm.i" - -%{ - #include "apds9930.hpp" -%} -%include "apds9930.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_apds9930) diff --git a/src/apds9930/jsupm_apds9930.i b/src/apds9930/jsupm_apds9930.i deleted file mode 100644 index 8a22c0dc..00000000 --- a/src/apds9930/jsupm_apds9930.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_apds9930 -%include "../upm.i" - -%{ - #include "apds9930.hpp" -%} - -%include "apds9930.hpp" diff --git a/src/apds9930/pyupm_apds9930.i b/src/apds9930/pyupm_apds9930.i deleted file mode 100644 index 2db8f90f..00000000 --- a/src/apds9930/pyupm_apds9930.i +++ /dev/null @@ -1,9 +0,0 @@ -%module pyupm_apds9930 -%include "../upm.i" -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" - -%include "apds9930.hpp" -%{ - #include "apds9930.hpp" -%} diff --git a/src/at42qt1070/javaupm_at42qt1070.i b/src/at42qt1070/javaupm_at42qt1070.i deleted file mode 100644 index 233d44a8..00000000 --- a/src/at42qt1070/javaupm_at42qt1070.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_at42qt1070 -%include "../upm.i" - -%{ - #include "at42qt1070.hpp" -%} - -%include "at42qt1070.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_at42qt1070) \ No newline at end of file diff --git a/src/at42qt1070/jsupm_at42qt1070.i b/src/at42qt1070/jsupm_at42qt1070.i deleted file mode 100644 index ac72d2d4..00000000 --- a/src/at42qt1070/jsupm_at42qt1070.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_at42qt1070 -%include "../upm.i" - -%{ - #include "at42qt1070.hpp" -%} - -%include "at42qt1070.hpp" diff --git a/src/at42qt1070/pyupm_at42qt1070.i b/src/at42qt1070/pyupm_at42qt1070.i deleted file mode 100644 index 13cc3708..00000000 --- a/src/at42qt1070/pyupm_at42qt1070.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_at42qt1070 -%include "../upm.i" - -%include "at42qt1070.hpp" -%{ - #include "at42qt1070.hpp" -%} diff --git a/src/bacnetmstp/bacnetmstp.i b/src/bacnetmstp/bacnetmstp.i new file mode 100644 index 00000000..e05cc998 --- /dev/null +++ b/src/bacnetmstp/bacnetmstp.i @@ -0,0 +1,16 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%include "../carrays_uint32_t.i" +JAVA_JNI_LOADLIBRARY(javaupm_bacnetmstp) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%pointer_functions(float, floatp); +%{ +#include "bacnetmstp.hpp" +%} +%include "bacnetmstp.hpp" +/* END Common SWIG syntax */ diff --git a/src/bacnetmstp/javaupm_bacnetmstp.i b/src/bacnetmstp/javaupm_bacnetmstp.i deleted file mode 100644 index 933734e9..00000000 --- a/src/bacnetmstp/javaupm_bacnetmstp.i +++ /dev/null @@ -1,14 +0,0 @@ -%module javaupm_bacnetmstp -%include "../upm.i" -%include "typemaps.i" -%include "../carrays_uint32_t.i" - -%{ - #include "bacnetmstp.hpp" - #include "bacnetutil.hpp" -%} - -%include "bacnetmstp.hpp" -%include "bacnetutil.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_bacnetmstp) diff --git a/src/bacnetmstp/jsupm_bacnetmstp.i b/src/bacnetmstp/jsupm_bacnetmstp.i deleted file mode 100644 index 1ee6deeb..00000000 --- a/src/bacnetmstp/jsupm_bacnetmstp.i +++ /dev/null @@ -1,11 +0,0 @@ -%module jsupm_bacnetmstp -%include "../upm.i" -%include "stdint.i" -%include "cpointer.i" - -%pointer_functions(float, floatp); - -%include "bacnetmstp.hpp" -%{ - #include "bacnetmstp.hpp" -%} diff --git a/src/bacnetmstp/pyupm_bacnetmstp.i b/src/bacnetmstp/pyupm_bacnetmstp.i deleted file mode 100644 index 10bd7a72..00000000 --- a/src/bacnetmstp/pyupm_bacnetmstp.i +++ /dev/null @@ -1,13 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_bacnetmstp -%include "../upm.i" -%include "stdint.i" -%include "cpointer.i" - -%pointer_functions(float, floatp); - -%include "bacnetmstp.hpp" -%{ - #include "bacnetmstp.hpp" -%} diff --git a/src/bh1750/bh1750.i b/src/bh1750/bh1750.i new file mode 100644 index 00000000..e5778e87 --- /dev/null +++ b/src/bh1750/bh1750.i @@ -0,0 +1,16 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_bh1750) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "bh1750_defs.h" +#include "bh1750.hpp" +%} +%include "bh1750_defs.h" +%include "bh1750.hpp" +/* END Common SWIG syntax */ diff --git a/src/bh1750/javaupm_bh1750.i b/src/bh1750/javaupm_bh1750.i deleted file mode 100644 index 7630633a..00000000 --- a/src/bh1750/javaupm_bh1750.i +++ /dev/null @@ -1,13 +0,0 @@ -%module javaupm_bh1750 -%include "../upm.i" -%include "std_string.i" - - -%include "bh1750_defs.h" -%include "bh1750.hpp" -%{ - #include "bh1750.hpp" -%} - - -JAVA_JNI_LOADLIBRARY(javaupm_bh1750) diff --git a/src/bh1750/jsupm_bh1750.i b/src/bh1750/jsupm_bh1750.i deleted file mode 100644 index 5692f76b..00000000 --- a/src/bh1750/jsupm_bh1750.i +++ /dev/null @@ -1,10 +0,0 @@ -%module jsupm_bh1750 -%include "../upm.i" -%include "std_string.i" - -%include "bh1750_defs.h" -%include "bh1750.hpp" -%{ - #include "bh1750.hpp" -%} - diff --git a/src/bh1750/pyupm_bh1750.i b/src/bh1750/pyupm_bh1750.i deleted file mode 100644 index b93be215..00000000 --- a/src/bh1750/pyupm_bh1750.i +++ /dev/null @@ -1,12 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_bh1750 -%include "../upm.i" -%include "std_string.i" - -%include "bh1750_defs.h" -%include "bh1750.hpp" -%{ - #include "bh1750.hpp" -%} - diff --git a/src/biss0001/javaupm_biss0001.i b/src/biss0001/javaupm_biss0001.i deleted file mode 100644 index b4abf480..00000000 --- a/src/biss0001/javaupm_biss0001.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_biss0001 -%include "../upm.i" - -%{ - #include "biss0001.hpp" -%} - -%include "biss0001.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_biss0001) \ No newline at end of file diff --git a/src/biss0001/jsupm_biss0001.i b/src/biss0001/jsupm_biss0001.i deleted file mode 100644 index ce8fac67..00000000 --- a/src/biss0001/jsupm_biss0001.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_biss0001 -%include "../upm.i" - -%{ - #include "biss0001.hpp" -%} - -%include "biss0001.hpp" diff --git a/src/biss0001/pyupm_biss0001.i b/src/biss0001/pyupm_biss0001.i deleted file mode 100644 index 7ccd01ae..00000000 --- a/src/biss0001/pyupm_biss0001.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_biss0001 -%include "../upm.i" - -%include "biss0001.hpp" -%{ - #include "biss0001.hpp" -%} diff --git a/src/bma220/javaupm_bma220.i b/src/bma220/bma220.i similarity index 53% rename from src/bma220/javaupm_bma220.i rename to src/bma220/bma220.i index 24bcd47f..189842e0 100644 --- a/src/bma220/javaupm_bma220.i +++ b/src/bma220/bma220.i @@ -1,7 +1,7 @@ -%module javaupm_bma220 -%include "../upm.i" -%include "cpointer.i" -%include "typemaps.i" +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA %include "arrays_java.i"; %include "../java_buffer.i" @@ -23,17 +23,30 @@ } %ignore getAccelerometer(float *, float *, float *); - -%{ - #include "bma220.hpp" -%} - -%include "bma220.hpp" +%ignore installISR(int, mraa::Edge, void *, void *); %define GETTER get_gpioIntr(); %enddef + JAVA_ADD_INSTALLISR_GPIO(upm::BMA220) - -%ignore installISR(int, mraa::Edge, void *, void *); - JAVA_JNI_LOADLIBRARY(javaupm_bma220) +#endif +/* END Java syntax */ + +/* BEGIN Javascript syntax ------------------------------------------------- */ +#ifdef SWIGJAVASCRIPT +%pointer_functions(float, floatp); +#endif +/* END Javascript syntax */ + +/* BEGIN Python syntax ----------------------------------------------------- */ +#ifdef SWIGPYTHON +%pointer_functions(float, floatp); +#endif +/* END Python syntax */ +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "bma220.hpp" +%} +%include "bma220.hpp" +/* END Common SWIG syntax */ diff --git a/src/bma220/jsupm_bma220.i b/src/bma220/jsupm_bma220.i deleted file mode 100644 index 2816e085..00000000 --- a/src/bma220/jsupm_bma220.i +++ /dev/null @@ -1,11 +0,0 @@ -%module jsupm_bma220 -%include "../upm.i" -%include "cpointer.i" - -%pointer_functions(float, floatp); - -%include "bma220.hpp" -%{ - #include "bma220.hpp" -%} - diff --git a/src/bma220/pyupm_bma220.i b/src/bma220/pyupm_bma220.i deleted file mode 100644 index ad146af9..00000000 --- a/src/bma220/pyupm_bma220.i +++ /dev/null @@ -1,15 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_bma220 -%include "../upm.i" -%include "cpointer.i" - -%include "stdint.i" - -%pointer_functions(float, floatp); - -%include "bma220.hpp" -%{ - #include "bma220.hpp" -%} - diff --git a/src/bma250e/bma250e.i b/src/bma250e/bma250e.i new file mode 100644 index 00000000..523ecde0 --- /dev/null +++ b/src/bma250e/bma250e.i @@ -0,0 +1,56 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%include "../upm_javastdvector.i" + +%ignore getAccelerometer(float *, float *, float *); +%ignore installISR (BMA250E_INTERRUPT_PINS_T, int, mraa::Edge , void *, void *); + +%typemap(javaimports) SWIGTYPE %{ +import java.util.AbstractList; +import java.lang.Float; +%} + +%typemap(javaout) upm::BMA250E { + return new $&javaclassname($jnicall, true); +} +%typemap(javaout) std::vector { + return (AbstractList)(new $&javaclassname($jnicall, true)); +} +%typemap(jstype) std::vector "AbstractList" + +%template(floatVector) std::vector; + +%define INTERRUPT BMA250E_INTERRUPT_PINS_T +%enddef + +JAVA_ADD_INSTALLISR_INTERRUPT(upm::BMA250E) +JAVA_JNI_LOADLIBRARY(javaupm_bma250e) +#endif +/* END Java syntax */ + +/* BEGIN Javascript syntax ------------------------------------------------- */ +#ifdef SWIGJAVASCRIPT +%include "../upm_vectortypes.i" +%pointer_functions(int, intp); +%pointer_functions(float, floatp); +#endif +/* END Javascript syntax */ + +/* BEGIN Python syntax ----------------------------------------------------- */ +#ifdef SWIGPYTHON +%include "../upm_vectortypes.i" +%pointer_functions(int, intp); +%pointer_functions(float, floatp); +#endif +/* END Python syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "bma250e_defs.h" +#include "bma250e.hpp" +%} +%include "bma250e_defs.h" +%include "bma250e.hpp" +/* END Common SWIG syntax */ diff --git a/src/bma250e/javaupm_bma250e.i b/src/bma250e/javaupm_bma250e.i deleted file mode 100644 index d31bc803..00000000 --- a/src/bma250e/javaupm_bma250e.i +++ /dev/null @@ -1,38 +0,0 @@ -%module javaupm_bma250e -%include "../upm.i" -%include "typemaps.i" -%include "../upm_javastdvector.i" - -%ignore getAccelerometer(float *, float *, float *); - -%typemap(javaimports) SWIGTYPE %{ -import java.util.AbstractList; -import java.lang.Float; -%} - -%typemap(javaout) upm::BMA250E { - return new $&javaclassname($jnicall, true); -} -%typemap(javaout) std::vector { - return (AbstractList)(new $&javaclassname($jnicall, true)); -} -%typemap(jstype) std::vector "AbstractList" - -%template(floatVector) std::vector; - -%{ - #include "bma250e.hpp" - #include "bma250e_defs.h" -%} -%include "bma250e_defs.h" -%include "bma250e.hpp" - - -%ignore installISR (BMA250E_INTERRUPT_PINS_T, int, mraa::Edge , void *, void *); - -%define INTERRUPT BMA250E_INTERRUPT_PINS_T -%enddef -JAVA_ADD_INSTALLISR_INTERRUPT(upm::BMA250E) - - -JAVA_JNI_LOADLIBRARY(javaupm_bma250e) diff --git a/src/bma250e/jsupm_bma250e.i b/src/bma250e/jsupm_bma250e.i deleted file mode 100644 index 306c89e1..00000000 --- a/src/bma250e/jsupm_bma250e.i +++ /dev/null @@ -1,14 +0,0 @@ -%module jsupm_bma250e -%include "../upm.i" -%include "cpointer.i" -%include "../upm_vectortypes.i" - -/* Send "int *" and "float *" to JavaScript as intp and floatp */ -%pointer_functions(int, intp); -%pointer_functions(float, floatp); - -%include "bma250e_defs.h" -%include "bma250e.hpp" -%{ - #include "bma250e.hpp" -%} diff --git a/src/bma250e/pyupm_bma250e.i b/src/bma250e/pyupm_bma250e.i deleted file mode 100644 index 50a7cba0..00000000 --- a/src/bma250e/pyupm_bma250e.i +++ /dev/null @@ -1,16 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_bma250e -%include "../upm.i" -%include "cpointer.i" -%include "../upm_vectortypes.i" - -/* Send "int *" and "float *" to python as intp and floatp */ -%pointer_functions(int, intp); -%pointer_functions(float, floatp); - -%include "bma250e_defs.h" -%include "bma250e.hpp" -%{ - #include "bma250e.hpp" -%} diff --git a/src/bmg160/bmg160.i b/src/bmg160/bmg160.i new file mode 100644 index 00000000..5b7c1a9c --- /dev/null +++ b/src/bmg160/bmg160.i @@ -0,0 +1,56 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%include "../upm_javastdvector.i" + +%ignore installISR (BMG160_INTERRUPT_PINS_T , int mraa::Edge , void *, void *); +%ignore getGyroscope(float *, float *, float *); + +%typemap(javaimports) SWIGTYPE %{ +import java.util.AbstractList; +import java.lang.Float; +%} + +%typemap(javaout) SWIGTYPE { + return new $&javaclassname($jnicall, true); +} +%typemap(javaout) std::vector { + return (AbstractList)(new $&javaclassname($jnicall, true)); +} +%typemap(jstype) std::vector "AbstractList" + +%template(floatVector) std::vector; + +%define INTERRUPT BMG160_INTERRUPT_PINS_T +%enddef + +JAVA_ADD_INSTALLISR_INTERRUPT(upm::BMG160) +JAVA_JNI_LOADLIBRARY(javaupm_bmg160) +#endif +/* END Java syntax */ + +/* BEGIN Javascript syntax ------------------------------------------------- */ +#ifdef SWIGJAVASCRIPT +%include "../upm_vectortypes.i" +%pointer_functions(int, intp); +%pointer_functions(float, floatp); +#endif +/* END Javascript syntax */ + +/* BEGIN Python syntax ----------------------------------------------------- */ +#ifdef SWIGPYTHON +%include "../upm_vectortypes.i" +%pointer_functions(int, intp); +%pointer_functions(float, floatp); +#endif +/* END Python syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "bmg160_defs.h" +#include "bmg160.hpp" +%} +%include "bmg160_defs.h" +%include "bmg160.hpp" +/* END Common SWIG syntax */ diff --git a/src/bmg160/javaupm_bmg160.i b/src/bmg160/javaupm_bmg160.i deleted file mode 100644 index f1d49274..00000000 --- a/src/bmg160/javaupm_bmg160.i +++ /dev/null @@ -1,37 +0,0 @@ -%module javaupm_bmg160 -%include "../upm.i" -%include "typemaps.i" -%include "../upm_javastdvector.i" - -%ignore getGyroscope(float *, float *, float *); - -%typemap(javaimports) SWIGTYPE %{ -import java.util.AbstractList; -import java.lang.Float; -%} - -%typemap(javaout) SWIGTYPE { - return new $&javaclassname($jnicall, true); -} -%typemap(javaout) std::vector { - return (AbstractList)(new $&javaclassname($jnicall, true)); -} -%typemap(jstype) std::vector "AbstractList" - -%template(floatVector) std::vector; - -%{ - #include "bmg160.hpp" - #include "bmg160_defs.h" -%} -%include "bmg160_defs.h" -%include "bmg160.hpp" - - -%ignore installISR (BMG160_INTERRUPT_PINS_T , int mraa::Edge , void *, void *); - -%define INTERRUPT BMG160_INTERRUPT_PINS_T -%enddef -JAVA_ADD_INSTALLISR_INTERRUPT(upm::BMG160) - -JAVA_JNI_LOADLIBRARY(javaupm_bmg160) diff --git a/src/bmg160/jsupm_bmg160.i b/src/bmg160/jsupm_bmg160.i deleted file mode 100644 index ae050f3e..00000000 --- a/src/bmg160/jsupm_bmg160.i +++ /dev/null @@ -1,14 +0,0 @@ -%module jsupm_bmg160 -%include "../upm.i" -%include "cpointer.i" -%include "../upm_vectortypes.i" - -/* Send "int *" and "float *" to JavaScript as intp and floatp */ -%pointer_functions(int, intp); -%pointer_functions(float, floatp); - -%include "bmg160_defs.h" -%include "bmg160.hpp" -%{ - #include "bmg160.hpp" -%} diff --git a/src/bmg160/pyupm_bmg160.i b/src/bmg160/pyupm_bmg160.i deleted file mode 100644 index db630587..00000000 --- a/src/bmg160/pyupm_bmg160.i +++ /dev/null @@ -1,16 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_bmg160 -%include "../upm.i" -%include "cpointer.i" -%include "../upm_vectortypes.i" - -/* Send "int *" and "float *" to python as intp and floatp */ -%pointer_functions(int, intp); -%pointer_functions(float, floatp); - -%include "bmg160_defs.h" -%include "bmg160.hpp" -%{ - #include "bmg160.hpp" -%} diff --git a/src/bmi160/bmi160.i b/src/bmi160/bmi160.i new file mode 100644 index 00000000..80f747c3 --- /dev/null +++ b/src/bmi160/bmi160.i @@ -0,0 +1,48 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%include "arrays_java.i" +%include "../java_buffer.i" + +%typemap(jni) float * "jfloatArray" +%typemap(jstype) float * "float[]" +%typemap(jtype) float * "float[]" + +%typemap(javaout) float * { + return $jnicall; +} + +%typemap(out) float * { + $result = JCALL1(NewFloatArray, jenv, 3); + JCALL4(SetFloatArrayRegion, jenv, $result, 0, 3, $1); +} + +%ignore getAccelerometer(float *, float *, float *); +%ignore getGyroscope(float *, float *, float *); +%ignore getMagnetometer(float *, float *, float *); + +JAVA_JNI_LOADLIBRARY(javaupm_bmi160) +#endif +/* END Java syntax */ + +/* BEGIN Javascript syntax ------------------------------------------------- */ +#ifdef SWIGJAVASCRIPT +%pointer_functions(float, floatp); +#endif +/* END Javascript syntax */ + +/* BEGIN Python syntax ----------------------------------------------------- */ +#ifdef SWIGPYTHON +%pointer_functions(float, floatp); +#endif +/* END Python syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "bmi160_defs.h" +#include "bmi160.hpp" +%} +%include "bmi160_defs.h" +%include "bmi160.hpp" +/* END Common SWIG syntax */ diff --git a/src/bmi160/javaupm_bmi160.i b/src/bmi160/javaupm_bmi160.i deleted file mode 100644 index 02914254..00000000 --- a/src/bmi160/javaupm_bmi160.i +++ /dev/null @@ -1,33 +0,0 @@ -%module javaupm_bmi160 -%include "../upm.i" -%include "typemaps.i" -%include "arrays_java.i" -%include "../java_buffer.i" -%include "std_string.i" - -%include "bmi160_defs.h" -%{ - #include "bmi160.hpp" -%} - - -%typemap(jni) float * "jfloatArray" -%typemap(jstype) float * "float[]" -%typemap(jtype) float * "float[]" - -%typemap(javaout) float * { - return $jnicall; -} - -%typemap(out) float * { - $result = JCALL1(NewFloatArray, jenv, 3); - JCALL4(SetFloatArrayRegion, jenv, $result, 0, 3, $1); -} - -%ignore getAccelerometer(float *, float *, float *); -%ignore getGyroscope(float *, float *, float *); -%ignore getMagnetometer(float *, float *, float *); - -%include "bmi160.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_bmi160) diff --git a/src/bmi160/jsupm_bmi160.i b/src/bmi160/jsupm_bmi160.i deleted file mode 100644 index 88f2fe1b..00000000 --- a/src/bmi160/jsupm_bmi160.i +++ /dev/null @@ -1,12 +0,0 @@ -%module jsupm_bmi160 -%include "../upm.i" -%include "cpointer.i" -%include "std_string.i" - -%pointer_functions(float, floatp); - -%include "bmi160_defs.h" -%include "bmi160.hpp" -%{ - #include "bmi160.hpp" -%} diff --git a/src/bmi160/pyupm_bmi160.i b/src/bmi160/pyupm_bmi160.i deleted file mode 100644 index 48949041..00000000 --- a/src/bmi160/pyupm_bmi160.i +++ /dev/null @@ -1,16 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_bmi160 -%include "../upm.i" -%include "cpointer.i" -%include "std_string.i" - -%include "stdint.i" - -%pointer_functions(float, floatp); - -%include "bmi160_defs.h" -%include "bmi160.hpp" -%{ - #include "bmi160.hpp" -%} diff --git a/src/bmm150/bmm150.i b/src/bmm150/bmm150.i new file mode 100644 index 00000000..ef364d90 --- /dev/null +++ b/src/bmm150/bmm150.i @@ -0,0 +1,57 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%include "../upm_javastdvector.i" + +%ignore getMagnetometer(float *, float *, float *); + +%typemap(javaimports) SWIGTYPE %{ +import java.util.AbstractList; +import java.lang.Float; +%} + +%typemap(javaout) SWIGTYPE { + return new $&javaclassname($jnicall, true); +} +%typemap(javaout) std::vector { + return (AbstractList)(new $&javaclassname($jnicall, true)); +} +%typemap(jstype) std::vector "AbstractList" + +%template(floatVector) std::vector; + +%ignore installISR (BMM150_INTERRUPT_PINS_T , int , mraa::Edge , void *, void *); + +%define INTERRUPT BMM150_INTERRUPT_PINS_T +%enddef +JAVA_ADD_INSTALLISR_INTERRUPT(upm::BMM150) + +JAVA_JNI_LOADLIBRARY(javaupm_bmm150) +#endif +/* END Java syntax */ + +/* BEGIN Javascript syntax ------------------------------------------------- */ +#ifdef SWIGJAVASCRIPT +%include "../upm_vectortypes.i" +%pointer_functions(int, intp); +%pointer_functions(float, floatp); +#endif +/* END Javascript syntax */ + +/* BEGIN Python syntax ----------------------------------------------------- */ +#ifdef SWIGPYTHON +%include "../upm_vectortypes.i" +%pointer_functions(int, intp); +%pointer_functions(float, floatp); +#endif +/* END Python syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "bmm150_defs.h" +#include "bmm150.hpp" +%} +%include "bmm150_defs.h" +%include "bmm150.hpp" +/* END Common SWIG syntax */ diff --git a/src/bmm150/javaupm_bmm150.i b/src/bmm150/javaupm_bmm150.i deleted file mode 100644 index 14ec636a..00000000 --- a/src/bmm150/javaupm_bmm150.i +++ /dev/null @@ -1,36 +0,0 @@ -%module javaupm_bmm150 -%include "../upm.i" -%include "typemaps.i" -%include "../upm_javastdvector.i" - -%ignore getMagnetometer(float *, float *, float *); - -%typemap(javaimports) SWIGTYPE %{ -import java.util.AbstractList; -import java.lang.Float; -%} - -%typemap(javaout) SWIGTYPE { - return new $&javaclassname($jnicall, true); -} -%typemap(javaout) std::vector { - return (AbstractList)(new $&javaclassname($jnicall, true)); -} -%typemap(jstype) std::vector "AbstractList" - -%template(floatVector) std::vector; - -%{ - #include "bmm150.hpp" - #include "bmm150_defs.h" -%} -%include "bmm150_defs.h" -%include "bmm150.hpp" - -%ignore installISR (BMM150_INTERRUPT_PINS_T , int , mraa::Edge , void *, void *); - -%define INTERRUPT BMM150_INTERRUPT_PINS_T -%enddef -JAVA_ADD_INSTALLISR_INTERRUPT(upm::BMM150) - -JAVA_JNI_LOADLIBRARY(javaupm_bmm150) diff --git a/src/bmm150/jsupm_bmm150.i b/src/bmm150/jsupm_bmm150.i deleted file mode 100644 index 234e07df..00000000 --- a/src/bmm150/jsupm_bmm150.i +++ /dev/null @@ -1,14 +0,0 @@ -%module jsupm_bmm150 -%include "../upm.i" -%include "cpointer.i" -%include "../upm_vectortypes.i" - -/* Send "int *" and "float *" to JavaScript as intp and floatp */ -%pointer_functions(int, intp); -%pointer_functions(float, floatp); - -%include "bmm150_defs.h" -%include "bmm150.hpp" -%{ - #include "bmm150.hpp" -%} diff --git a/src/bmm150/pyupm_bmm150.i b/src/bmm150/pyupm_bmm150.i deleted file mode 100644 index d56d8ced..00000000 --- a/src/bmm150/pyupm_bmm150.i +++ /dev/null @@ -1,16 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_bmm150 -%include "../upm.i" -%include "cpointer.i" -%include "../upm_vectortypes.i" - -/* Send "int *" and "float *" to python as intp and floatp */ -%pointer_functions(int, intp); -%pointer_functions(float, floatp); - -%include "bmm150_defs.h" -%include "bmm150.hpp" -%{ - #include "bmm150.hpp" -%} diff --git a/src/bmp280/bmp280.i b/src/bmp280/bmp280.i new file mode 100644 index 00000000..ebd316ab --- /dev/null +++ b/src/bmp280/bmp280.i @@ -0,0 +1,47 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%import "../interfaces/javaupm_iTemperatureSensor.i" +%import "../interfaces/javaupm_iHumiditySensor.i" +%import "../interfaces/javaupm_iPressureSensor.i" + +%include "arrays_java.i"; +%include "../java_buffer.i" + +%typemap(javaimports) SWIGTYPE %{ + import upm_interfaces.*; +%} + +JAVA_JNI_LOADLIBRARY(javaupm_bmp280) +#endif +/* END Java syntax */ + +/* BEGIN Javascript syntax ------------------------------------------------- */ +#ifdef SWIGJAVASCRIPT +%include "iModuleStatus.hpp" +%include "iTemperatureSensor.hpp" +%include "iPressureSensor.hpp" +%include "iHumiditySensor.hpp" +#endif +/* END Javascript syntax */ + +/* BEGIN Python syntax ----------------------------------------------------- */ +#ifdef SWIGPYTHON +%include "iModuleStatus.hpp" +%include "iTemperatureSensor.hpp" +%include "iPressureSensor.hpp" +%include "iHumiditySensor.hpp" +#endif +/* END Python syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "bmp280_regs.h" +#include "bmp280.hpp" +#include "bme280.hpp" +%} +%include "bmp280_regs.h" +%include "bmp280.hpp" +%include "bme280.hpp" +/* END Common SWIG syntax */ diff --git a/src/bmp280/javaupm_bmp280.i b/src/bmp280/javaupm_bmp280.i deleted file mode 100644 index 90cedea2..00000000 --- a/src/bmp280/javaupm_bmp280.i +++ /dev/null @@ -1,29 +0,0 @@ -%module javaupm_bmp280 - -%import "../interfaces/javaupm_iTemperatureSensor.i" -%import "../interfaces/javaupm_iHumiditySensor.i" -%import "../interfaces/javaupm_iPressureSensor.i" - - -%include "../upm.i" -%include "cpointer.i" -%include "typemaps.i" -%include "arrays_java.i"; -%include "../java_buffer.i" - -%typemap(javaimports) SWIGTYPE %{ - import upm_interfaces.*; -%} - -%include "bmp280_regs.h" -%include "bmp280.hpp" -%{ - #include "bmp280.hpp" -%} - -%include "bme280.hpp" -%{ - #include "bme280.hpp" -%} - -JAVA_JNI_LOADLIBRARY(javaupm_bmp280) diff --git a/src/bmp280/jsupm_bmp280.i b/src/bmp280/jsupm_bmp280.i deleted file mode 100644 index b6a08c30..00000000 --- a/src/bmp280/jsupm_bmp280.i +++ /dev/null @@ -1,19 +0,0 @@ -%module jsupm_bmp280 -%include "../upm.i" -%include "cpointer.i" - -%include "iModuleStatus.hpp" -%include "iHumiditySensor.hpp" -%include "iPressureSensor.hpp" -%include "iTemperatureSensor.hpp" - -%include "bmp280_regs.h" -%include "bmp280.hpp" -%{ - #include "bmp280.hpp" -%} - -%include "bme280.hpp" -%{ - #include "bme280.hpp" -%} diff --git a/src/bmp280/pyupm_bmp280.i b/src/bmp280/pyupm_bmp280.i deleted file mode 100644 index 81f39998..00000000 --- a/src/bmp280/pyupm_bmp280.i +++ /dev/null @@ -1,23 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_bmp280 -%include "../upm.i" -%include "cpointer.i" - -%include "stdint.i" - -%include "iModuleStatus.hpp" -%include "iHumiditySensor.hpp" -%include "iPressureSensor.hpp" -%include "iTemperatureSensor.hpp" - -%include "bmp280_regs.h" -%include "bmp280.hpp" -%{ - #include "bmp280.hpp" -%} - -%include "bme280.hpp" -%{ - #include "bme280.hpp" -%} diff --git a/src/bmpx8x/bmpx8x.i b/src/bmpx8x/bmpx8x.i new file mode 100644 index 00000000..08465a5d --- /dev/null +++ b/src/bmpx8x/bmpx8x.i @@ -0,0 +1,28 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%import "../interfaces/javaupm_iPressureSensor.i" +%typemap(javaimports) SWIGTYPE %{import upm_interfaces.*;%} +%import "../interfaces/javaupm_iTemperatureSensor.i" + +JAVA_JNI_LOADLIBRARY(javaupm_bmpx8x) +#endif +/* END Java syntax */ + +/* BEGIN Python syntax ----------------------------------------------------- */ +#ifdef SWIGPYTHON +%include "iModuleStatus.hpp" +%include "iTemperatureSensor.hpp" +%include "iPressureSensor.hpp" +#endif +/* END Python syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "bmpx8x_defs.h" +#include "bmpx8x.hpp" +%} +%include "bmpx8x_defs.h" +%include "bmpx8x.hpp" +/* END Common SWIG syntax */ diff --git a/src/bmpx8x/javaupm_bmpx8x.i b/src/bmpx8x/javaupm_bmpx8x.i deleted file mode 100644 index 6f511c42..00000000 --- a/src/bmpx8x/javaupm_bmpx8x.i +++ /dev/null @@ -1,18 +0,0 @@ -%module javaupm_bmpx8x -%include "../upm.i" - -%import "../interfaces/javaupm_iTemperatureSensor.i" -%import "../interfaces/javaupm_iPressureSensor.i" - -%typemap(javaimports) SWIGTYPE %{ -import upm_interfaces.*; -%} - -%{ - #include "bmpx8x.hpp" -%} - -%include "bmpx8x_defs.h" -%include "bmpx8x.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_bmpx8x) diff --git a/src/bmpx8x/jsupm_bmpx8x.i b/src/bmpx8x/jsupm_bmpx8x.i deleted file mode 100644 index cf8b82d8..00000000 --- a/src/bmpx8x/jsupm_bmpx8x.i +++ /dev/null @@ -1,9 +0,0 @@ -%module jsupm_bmpx8x -%include "../upm.i" - -%{ - #include "bmpx8x.hpp" -%} - -%include "bmpx8x_defs.h" -%include "bmpx8x.hpp" diff --git a/src/bmpx8x/pyupm_bmpx8x.i b/src/bmpx8x/pyupm_bmpx8x.i deleted file mode 100644 index a69f1b0f..00000000 --- a/src/bmpx8x/pyupm_bmpx8x.i +++ /dev/null @@ -1,13 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_bmpx8x -%include "../upm.i" - -%include "stdint.i" - -%include "bmpx8x_defs.h" -%include "bmpx8x.hpp" -%{ - #include "bmpx8x.hpp" -%} - diff --git a/src/bmx055/bmx055.i b/src/bmx055/bmx055.i new file mode 100644 index 00000000..c71695f9 --- /dev/null +++ b/src/bmx055/bmx055.i @@ -0,0 +1,65 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%include "../upm_javastdvector.i" + +%apply int {mraa::Edge}; + +%ignore getAccelerometer(float *, float *, float *); +%ignore getMagnetometer(float *, float *, float *); +%ignore getGyroscope(float *, float *, float *); + +%typemap(javaimports) SWIGTYPE %{ +import java.util.AbstractList; +import java.lang.Float; +%} + +%typemap(javaout) SWIGTYPE { + return new $&javaclassname($jnicall, true); +} +%typemap(javaout) std::vector { + return (AbstractList)(new $&javaclassname($jnicall, true)); +} +%typemap(jstype) std::vector "AbstractList" + +%template(floatVector) std::vector; + +JAVA_JNI_LOADLIBRARY(javaupm_bmx055) +#endif +/* END Java syntax */ + +/* BEGIN Javascript syntax ------------------------------------------------- */ +#ifdef SWIGJAVASCRIPT +%include "../upm_vectortypes.i" +%pointer_functions(int, intp); +%pointer_functions(float, floatp); +#endif +/* END Javascript syntax */ + +/* BEGIN Python syntax ----------------------------------------------------- */ +#ifdef SWIGPYTHON +%include "../upm_vectortypes.i" +%pointer_functions(int, intp); +%pointer_functions(float, floatp); +#endif +/* END Python syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "bmm150_defs.h" +#include "bmg160_defs.h" +#include "bma250e_defs.h" +#include "bmm150.hpp" +#include "bmc150.hpp" +#include "bmx055.hpp" +#include "bmi055.hpp" +%} +%include "bmm150_defs.h" +%include "bmg160_defs.h" +%include "bma250e_defs.h" +%include "bmm150.hpp" +%include "bmx055.hpp" +%include "bmi055.hpp" +%include "bmc150.hpp" +/* END Common SWIG syntax */ diff --git a/src/bmx055/javaupm_bmx055.i b/src/bmx055/javaupm_bmx055.i deleted file mode 100644 index 194617e8..00000000 --- a/src/bmx055/javaupm_bmx055.i +++ /dev/null @@ -1,47 +0,0 @@ -%module javaupm_bmx055 -%include "../upm.i" -%include "cpointer.i" -%include "typemaps.i" -%include "../upm_javastdvector.i" - -%apply int {mraa::Edge}; - -%ignore getAccelerometer(float *, float *, float *); -%ignore getMagnetometer(float *, float *, float *); -%ignore getGyroscope(float *, float *, float *); - -%typemap(javaimports) SWIGTYPE %{ -import java.util.AbstractList; -import java.lang.Float; -%} - -%typemap(javaout) SWIGTYPE { - return new $&javaclassname($jnicall, true); -} -%typemap(javaout) std::vector { - return (AbstractList)(new $&javaclassname($jnicall, true)); -} -%typemap(jstype) std::vector "AbstractList" - -%template(floatVector) std::vector; - -%include "bmg160_defs.h" -%include "bma250e_defs.h" -%include "bmm150_defs.h" - -%include "bmx055.hpp" -%{ - #include "bmx055.hpp" -%} - -%include "bmc150.hpp" -%{ - #include "bmc150.hpp" -%} - -%include "bmi055.hpp" -%{ - #include "bmi055.hpp" -%} - -JAVA_JNI_LOADLIBRARY(javaupm_bmx055) diff --git a/src/bmx055/jsupm_bmx055.i b/src/bmx055/jsupm_bmx055.i deleted file mode 100644 index d838b94a..00000000 --- a/src/bmx055/jsupm_bmx055.i +++ /dev/null @@ -1,27 +0,0 @@ -%module jsupm_bmx055 -%include "../upm.i" -%include "cpointer.i" -%include "../upm_vectortypes.i" - -/* Send "int *" and "float *" to JavaScript as intp and floatp */ -%pointer_functions(int, intp); -%pointer_functions(float, floatp); - -%include "bmg160_defs.h" -%include "bma250e_defs.h" -%include "bmm150_defs.h" - -%include "bmx055.hpp" -%{ - #include "bmx055.hpp" -%} - -%include "bmc150.hpp" -%{ - #include "bmc150.hpp" -%} - -%include "bmi055.hpp" -%{ - #include "bmi055.hpp" -%} diff --git a/src/bmx055/pyupm_bmx055.i b/src/bmx055/pyupm_bmx055.i deleted file mode 100644 index edd252e9..00000000 --- a/src/bmx055/pyupm_bmx055.i +++ /dev/null @@ -1,34 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_bmx055 -%include "../upm.i" -%include "cpointer.i" -%include "../upm_vectortypes.i" - -/* Send "int *" and "float *" to python as intp and floatp */ -%pointer_functions(int, intp); -%pointer_functions(float, floatp); - -%include "bmg160_defs.h" -%include "bma250e_defs.h" -%include "bmm150_defs.h" - -%include "bmm150.hpp" -%{ - #include "bmm150.hpp" -%} - -%include "bmx055.hpp" -%{ - #include "bmx055.hpp" -%} - -%include "bmc150.hpp" -%{ - #include "bmc150.hpp" -%} - -%include "bmi055.hpp" -%{ - #include "bmi055.hpp" -%} diff --git a/src/bno055/javaupm_bno055.i b/src/bno055/bno055.i similarity index 55% rename from src/bno055/javaupm_bno055.i rename to src/bno055/bno055.i index 76d985e9..0007cc28 100644 --- a/src/bno055/javaupm_bno055.i +++ b/src/bno055/bno055.i @@ -1,10 +1,8 @@ -%module javaupm_bno055 -%include "../upm.i" -%include "cpointer.i" -%include "typemaps.i" -%include "std_vector.i" -%include "stdint.i" +%include "../common_top.i" +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%include "std_vector.i" %ignore getCalibrationStatus(int *, int *, int *, int *); %ignore getAccelerometer(float *, float *, float *); %ignore getMagnetometer(float *, float *, float *); @@ -13,20 +11,12 @@ %ignore getQuaternions(float *, float *, float *, float *); %ignore getLinearAcceleration(float *, float *, float *); %ignore getGravityVectors(float *, float *, float *); +%ignore installISR(int , mraa::Edge , void *, void *); %template(floatVector) std::vector; %template(byteVector) std::vector; %template(intVector) std::vector; -%{ - #include "bno055.hpp" - #include "bno055_regs.h" -%} -%include "bno055_regs.h" -%include "bno055.hpp" - -%ignore installISR(int , mraa::Edge , void *, void *); - %extend upm::BNO055 { void installISR(int gpio, mraa_gpio_edge_t level, jobject runnable) { @@ -35,3 +25,29 @@ } JAVA_JNI_LOADLIBRARY(javaupm_bno055) +#endif +/* END Java syntax */ + +/* BEGIN Javascript syntax ------------------------------------------------- */ +#ifdef SWIGJAVASCRIPT +%include "../upm_vectortypes.i" +%pointer_functions(int, intp); +%pointer_functions(float, floatp); +#endif +/* END Javascript syntax */ + +/* BEGIN Python syntax ----------------------------------------------------- */ +#ifdef SWIGPYTHON +%include "../upm_vectortypes.i" +%pointer_functions(int, intp); +%pointer_functions(float, floatp); +#endif +/* END Python syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "bno055.hpp" +%} +%include "bno055_regs.h" +%include "bno055.hpp" +/* END Common SWIG syntax */ diff --git a/src/bno055/jsupm_bno055.i b/src/bno055/jsupm_bno055.i deleted file mode 100644 index 8b863a0d..00000000 --- a/src/bno055/jsupm_bno055.i +++ /dev/null @@ -1,17 +0,0 @@ -%module jsupm_bno055 -%include "../upm.i" -%include "cpointer.i" -%include "../upm_vectortypes.i" - -/* Send "int *" and "float *" to JS as intp and floatp, though - * using the vector return (upm_vectortypes.i) functions instead of - * the pointer argument functions is preferable. - */ -%pointer_functions(int, intp); -%pointer_functions(float, floatp); - -%include "bno055_regs.h" -%include "bno055.hpp" -%{ - #include "bno055.hpp" -%} diff --git a/src/bno055/pyupm_bno055.i b/src/bno055/pyupm_bno055.i deleted file mode 100644 index b6c25971..00000000 --- a/src/bno055/pyupm_bno055.i +++ /dev/null @@ -1,20 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_bno055 -%include "../upm.i" -%include "cpointer.i" -%include "../upm_vectortypes.i" - -/* Send "int *" and "float *" to python as intp and floatp, though - * using the vector return (upm_vectortypes.i) functions instead of - * the pointer argument functions is preferable. - */ -%pointer_functions(int, intp); -%pointer_functions(float, floatp); - - -%include "bno055_regs.h" -%include "bno055.hpp" -%{ - #include "bno055.hpp" -%} diff --git a/src/button/button.i b/src/button/button.i new file mode 100644 index 00000000..ac34e356 --- /dev/null +++ b/src/button/button.i @@ -0,0 +1,18 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%apply int {mraa::Edge} + +JAVA_ADD_INSTALLISR_EDGE(upm::Button) + +JAVA_JNI_LOADLIBRARY(javaupm_button) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "button.hpp" +%} +%include "button.hpp" +/* END Common SWIG syntax */ diff --git a/src/button/javaupm_button.i b/src/button/javaupm_button.i deleted file mode 100644 index 1812e2cf..00000000 --- a/src/button/javaupm_button.i +++ /dev/null @@ -1,16 +0,0 @@ -%module javaupm_button -%include "../upm.i" - -%apply int {mraa::Edge} - -%{ - #include "button.hpp" -%} - -%include "button.hpp" - -#%ignore - -JAVA_ADD_INSTALLISR_EDGE(upm::Button) - -JAVA_JNI_LOADLIBRARY(javaupm_button) diff --git a/src/button/jsupm_button.i b/src/button/jsupm_button.i deleted file mode 100644 index bc1c4b3c..00000000 --- a/src/button/jsupm_button.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_button -%include "../upm.i" - -%{ - #include "button.hpp" -%} - -%include "button.hpp" diff --git a/src/button/pyupm_button.i b/src/button/pyupm_button.i deleted file mode 100644 index f1f18946..00000000 --- a/src/button/pyupm_button.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_button -%include "../upm.i" - -%include "button.hpp" -%{ - #include "button.hpp" -%} diff --git a/src/buzzer/buzzer.i b/src/buzzer/buzzer.i new file mode 100644 index 00000000..b2191d67 --- /dev/null +++ b/src/buzzer/buzzer.i @@ -0,0 +1,15 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_buzzer) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "buzzer.hpp" +%} +%include "buzzer_tones.h" +%include "buzzer.hpp" +/* END Common SWIG syntax */ diff --git a/src/buzzer/javaupm_buzzer.i b/src/buzzer/javaupm_buzzer.i deleted file mode 100644 index ec515f81..00000000 --- a/src/buzzer/javaupm_buzzer.i +++ /dev/null @@ -1,11 +0,0 @@ -%module javaupm_buzzer -%include "../upm.i" - - -%include "buzzer_tones.h" -%include "buzzer.hpp" -%{ - #include "buzzer.hpp" -%} - -JAVA_JNI_LOADLIBRARY(javaupm_buzzer) diff --git a/src/buzzer/jsupm_buzzer.i b/src/buzzer/jsupm_buzzer.i deleted file mode 100644 index 93768b29..00000000 --- a/src/buzzer/jsupm_buzzer.i +++ /dev/null @@ -1,9 +0,0 @@ -%module jsupm_buzzer -%include "../upm.i" - -%include "buzzer_tones.h" -%include "buzzer.hpp" -%{ - #include "buzzer.hpp" -%} - diff --git a/src/buzzer/pyupm_buzzer.i b/src/buzzer/pyupm_buzzer.i deleted file mode 100644 index 2b3838c7..00000000 --- a/src/buzzer/pyupm_buzzer.i +++ /dev/null @@ -1,10 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_buzzer -%include "../upm.i" - -%include "buzzer_tones.h" -%include "buzzer.hpp" -%{ - #include "buzzer.hpp" -%} diff --git a/src/cjq4435/javaupm_cjq4435.i b/src/cjq4435/javaupm_cjq4435.i deleted file mode 100644 index b0b206db..00000000 --- a/src/cjq4435/javaupm_cjq4435.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_cjq4435 -%include "../upm.i" - -%{ - #include "cjq4435.hpp" -%} - -%include "cjq4435.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_cjq4435) \ No newline at end of file diff --git a/src/cjq4435/jsupm_cjq4435.i b/src/cjq4435/jsupm_cjq4435.i deleted file mode 100644 index fa7be735..00000000 --- a/src/cjq4435/jsupm_cjq4435.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_cjq4435 -%include "../upm.i" - -%{ - #include "cjq4435.hpp" -%} - -%include "cjq4435.hpp" diff --git a/src/cjq4435/pyupm_cjq4435.i b/src/cjq4435/pyupm_cjq4435.i deleted file mode 100644 index c1466e00..00000000 --- a/src/cjq4435/pyupm_cjq4435.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_cjq4435 -%include "../upm.i" - -%include "cjq4435.hpp" -%{ - #include "cjq4435.hpp" -%} diff --git a/src/collision/javaupm_collision.i b/src/collision/javaupm_collision.i deleted file mode 100644 index c61cd48c..00000000 --- a/src/collision/javaupm_collision.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_collision -%include "../upm.i" - -%{ - #include "collision.hpp" -%} - -%include "collision.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_collision) \ No newline at end of file diff --git a/src/collision/jsupm_collision.i b/src/collision/jsupm_collision.i deleted file mode 100644 index db6a3da0..00000000 --- a/src/collision/jsupm_collision.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_collision -%include "../upm.i" - -%{ - #include "collision.hpp" -%} - -%include "collision.hpp" diff --git a/src/collision/pyupm_collision.i b/src/collision/pyupm_collision.i deleted file mode 100644 index 70fe5c56..00000000 --- a/src/collision/pyupm_collision.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_collision -%include "../upm.i" - -%include "collision.hpp" -%{ - #include "collision.hpp" -%} diff --git a/src/upm.i b/src/common_top.i similarity index 78% rename from src/upm.i rename to src/common_top.i index 0718904b..41d5991f 100644 --- a/src/upm.i +++ b/src/common_top.i @@ -1,5 +1,7 @@ %include "std_string.i" +%include "cpointer.i" %include "stdint.i" +%include "typemaps.i" %include "upm_exception.i" /* Import additional SWIG helps (not exposed in wrapper) */ @@ -43,3 +45,11 @@ void cleanUp(); // Disable nested struct warnings #pragma SWIG nowarn=312,325 + +/* The pyupm_doxy2swig.i file is created via doxy2swig.py from doxygen xml + * output during doc build. This file is used by swig to provide native + * python module documentation. + */ +#if SWIGPYTHON +%include "pyupm_doxy2swig.i" +#endif diff --git a/src/curieimu/curieimu.i b/src/curieimu/curieimu.i new file mode 100644 index 00000000..fb92fe66 --- /dev/null +++ b/src/curieimu/curieimu.i @@ -0,0 +1,58 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%typemap(jni) int16_t* "jshortArray" +%typemap(jstype) int16_t* "short[]" +%typemap(jtype) int16_t* "short[]" + +%typemap(javaout) int16_t* { + return $jnicall; +} + +%typemap(out) int16_t *getAccel { + $result = JCALL1(NewShortArray, jenv, 3); + JCALL4(SetShortArrayRegion, jenv, $result, 0, 3, (jshort*)$1); +} + +%typemap(out) int16_t *getGyro { + $result = JCALL1(NewShortArray, jenv, 3); + JCALL4(SetShortArrayRegion, jenv, $result, 0, 3, (jshort*)$1); +} + +%typemap(out) int16_t *getMotion { + $result = JCALL1(NewShortArray, jenv, 6); + JCALL4(SetShortArrayRegion, jenv, $result, 0, 6, (jshort*)$1); +} + +JAVA_JNI_LOADLIBRARY(javaupm_curieimu) +#endif +/* END Java syntax */ + +/* BEGIN Javascript syntax ------------------------------------------------- */ +#ifdef SWIGJAVASCRIPT +%include "../carrays_int16_t.i" + +// Adding this typemap because SWIG is converting int16 into a short by default +// This forces SWIG to convert it correctly +%typemap(out) int16_t* { + jsresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_int16Array, 0 | 0 ); +} +#endif +/* END Javascript syntax */ + +/* BEGIN Python syntax ----------------------------------------------------- */ +#ifdef SWIGPYTHON +%include "../carrays_int16_t.i" +%typemap(out) int16_t* { + $result = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_int16Array, 0 | 0 ); +} +#endif +/* END Python syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "curieimu.hpp" +%} +%include "curieimu.hpp" +/* END Common SWIG syntax */ diff --git a/src/curieimu/javaupm_curieimu.i b/src/curieimu/javaupm_curieimu.i deleted file mode 100644 index 24ebc1d1..00000000 --- a/src/curieimu/javaupm_curieimu.i +++ /dev/null @@ -1,33 +0,0 @@ -%module javaupm_curieimu -%include "../upm.i" - -%{ - #include "curieimu.hpp" -%} - -%typemap(jni) int16_t* "jshortArray" -%typemap(jstype) int16_t* "short[]" -%typemap(jtype) int16_t* "short[]" - -%typemap(javaout) int16_t* { - return $jnicall; -} - -%typemap(out) int16_t *getAccel { - $result = JCALL1(NewShortArray, jenv, 3); - JCALL4(SetShortArrayRegion, jenv, $result, 0, 3, (jshort*)$1); -} - -%typemap(out) int16_t *getGyro { - $result = JCALL1(NewShortArray, jenv, 3); - JCALL4(SetShortArrayRegion, jenv, $result, 0, 3, (jshort*)$1); -} - -%typemap(out) int16_t *getMotion { - $result = JCALL1(NewShortArray, jenv, 6); - JCALL4(SetShortArrayRegion, jenv, $result, 0, 6, (jshort*)$1); -} - -%include "curieimu.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_curieimu) diff --git a/src/curieimu/jsupm_curieimu.i b/src/curieimu/jsupm_curieimu.i deleted file mode 100644 index cf2955a2..00000000 --- a/src/curieimu/jsupm_curieimu.i +++ /dev/null @@ -1,15 +0,0 @@ -%module jsupm_curieimu -%include "../upm.i" -%include "../carrays_int16_t.i" - -// Adding this typemap because SWIG is converting int16 into a short by default -// This forces SWIG to convert it correctly -%typemap(out) int16_t* { - jsresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_int16Array, 0 | 0 ); -} - -%{ - #include "curieimu.hpp" -%} - -%include "curieimu.hpp" diff --git a/src/curieimu/pyupm_curieimu.i b/src/curieimu/pyupm_curieimu.i deleted file mode 100644 index 19a46c20..00000000 --- a/src/curieimu/pyupm_curieimu.i +++ /dev/null @@ -1,15 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_curieimu -%include "../upm.i" -%include "../carrays_int16_t.i" -%include "stdint.i" - -%typemap(out) int16_t* { - $result = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_int16Array, 0 | 0 ); -} - -%include "curieimu.hpp" -%{ - #include "curieimu.hpp" -%} diff --git a/src/cwlsxxa/cwlsxxa.i b/src/cwlsxxa/cwlsxxa.i new file mode 100644 index 00000000..f233e3c4 --- /dev/null +++ b/src/cwlsxxa/cwlsxxa.i @@ -0,0 +1,14 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_cwlsxxa) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "cwlsxxa.hpp" +%} +%include "cwlsxxa.hpp" +/* END Common SWIG syntax */ diff --git a/src/cwlsxxa/javaupm_cwlsxxa.i b/src/cwlsxxa/javaupm_cwlsxxa.i deleted file mode 100644 index 54e1b250..00000000 --- a/src/cwlsxxa/javaupm_cwlsxxa.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_cwlsxxa -%include "../upm.i" -%include "std_string.i" - -%include "cwlsxxa.hpp" -%{ - #include "cwlsxxa.hpp" -%} - -JAVA_JNI_LOADLIBRARY(javaupm_cwlsxxa) diff --git a/src/cwlsxxa/jsupm_cwlsxxa.i b/src/cwlsxxa/jsupm_cwlsxxa.i deleted file mode 100644 index cae0224f..00000000 --- a/src/cwlsxxa/jsupm_cwlsxxa.i +++ /dev/null @@ -1,10 +0,0 @@ -%module jsupm_cwlsxxa -%include "../upm.i" -%include "std_string.i" - -%{ - #include "cwlsxxa.hpp" -%} - -%include "cwlsxxa.hpp" - diff --git a/src/cwlsxxa/pyupm_cwlsxxa.i b/src/cwlsxxa/pyupm_cwlsxxa.i deleted file mode 100644 index 086180b7..00000000 --- a/src/cwlsxxa/pyupm_cwlsxxa.i +++ /dev/null @@ -1,11 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_cwlsxxa -%include "../upm.i" -%include "std_string.i" - -%{ - #include "cwlsxxa.hpp" -%} -%include "cwlsxxa.hpp" - diff --git a/src/dfrec/dfrec.i b/src/dfrec/dfrec.i new file mode 100644 index 00000000..0af3b504 --- /dev/null +++ b/src/dfrec/dfrec.i @@ -0,0 +1,17 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_dfrec) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%pointer_functions(int, intp); +%pointer_functions(float, floatp); + +%{ +#include "dfrec.hpp" +%} +%include "dfrec.hpp" +/* END Common SWIG syntax */ diff --git a/src/dfrec/javaupm_dfrec.i b/src/dfrec/javaupm_dfrec.i deleted file mode 100644 index 868860d9..00000000 --- a/src/dfrec/javaupm_dfrec.i +++ /dev/null @@ -1,12 +0,0 @@ -%module javaupm_dfrec -%include "../upm.i" -%include "std_string.i" -%include "cpointer.i" -%include "typemaps.i" - -%include "dfrec.hpp" -%{ - #include "dfrec.hpp" -%} - -JAVA_JNI_LOADLIBRARY(javaupm_dfrec) diff --git a/src/dfrec/jsupm_dfrec.i b/src/dfrec/jsupm_dfrec.i deleted file mode 100644 index 4d4b27be..00000000 --- a/src/dfrec/jsupm_dfrec.i +++ /dev/null @@ -1,13 +0,0 @@ -%module jsupm_dfrec -%include "../upm.i" -%include "std_string.i" -%include "cpointer.i" - -/* Send "int *" and "float *" to JavaScript as intp and floatp */ -%pointer_functions(int, intp); -%pointer_functions(float, floatp); - -%include "dfrec.hpp" -%{ - #include "dfrec.hpp" -%} diff --git a/src/dfrec/pyupm_dfrec.i b/src/dfrec/pyupm_dfrec.i deleted file mode 100644 index eac453c5..00000000 --- a/src/dfrec/pyupm_dfrec.i +++ /dev/null @@ -1,15 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_dfrec -%include "../upm.i" -%include "std_string.i" -%include "cpointer.i" - -/* Send "int *" and "float *" to python as intp and floatp */ -%pointer_functions(int, intp); -%pointer_functions(float, floatp); - -%include "dfrec.hpp" -%{ - #include "dfrec.hpp" -%} diff --git a/src/dfrorp/dfrorp.i b/src/dfrorp/dfrorp.i new file mode 100644 index 00000000..04000a34 --- /dev/null +++ b/src/dfrorp/dfrorp.i @@ -0,0 +1,17 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_dfrorp) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%pointer_functions(int, intp); +%pointer_functions(float, floatp); + +%{ +#include "dfrorp.hpp" +%} +%include "dfrorp.hpp" +/* END Common SWIG syntax */ diff --git a/src/dfrorp/javaupm_dfrorp.i b/src/dfrorp/javaupm_dfrorp.i deleted file mode 100644 index da465c48..00000000 --- a/src/dfrorp/javaupm_dfrorp.i +++ /dev/null @@ -1,12 +0,0 @@ -%module javaupm_dfrorp -%include "../upm.i" -%include "std_string.i" -%include "cpointer.i" -%include "typemaps.i" - -%include "dfrorp.hpp" -%{ - #include "dfrorp.hpp" -%} - -JAVA_JNI_LOADLIBRARY(javaupm_dfrorp) diff --git a/src/dfrorp/jsupm_dfrorp.i b/src/dfrorp/jsupm_dfrorp.i deleted file mode 100644 index ae3448b0..00000000 --- a/src/dfrorp/jsupm_dfrorp.i +++ /dev/null @@ -1,13 +0,0 @@ -%module jsupm_dfrorp -%include "../upm.i" -%include "std_string.i" -%include "cpointer.i" - -/* Send "int *" and "float *" to JavaScript as intp and floatp */ -%pointer_functions(int, intp); -%pointer_functions(float, floatp); - -%include "dfrorp.hpp" -%{ - #include "dfrorp.hpp" -%} diff --git a/src/dfrorp/pyupm_dfrorp.i b/src/dfrorp/pyupm_dfrorp.i deleted file mode 100644 index c2ca5378..00000000 --- a/src/dfrorp/pyupm_dfrorp.i +++ /dev/null @@ -1,15 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_dfrorp -%include "../upm.i" -%include "std_string.i" -%include "cpointer.i" - -/* Send "int *" and "float *" to python as intp and floatp */ -%pointer_functions(int, intp); -%pointer_functions(float, floatp); - -%include "dfrorp.hpp" -%{ - #include "dfrorp.hpp" -%} diff --git a/src/dfrph/javaupm_dfrph.i b/src/dfrph/javaupm_dfrph.i deleted file mode 100644 index 83570bb3..00000000 --- a/src/dfrph/javaupm_dfrph.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_dfrph -%include "../upm.i" - -%{ - #include "dfrph.hpp" -%} - -%include "dfrph.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_dfrph) \ No newline at end of file diff --git a/src/dfrph/jsupm_dfrph.i b/src/dfrph/jsupm_dfrph.i deleted file mode 100644 index 764fc77c..00000000 --- a/src/dfrph/jsupm_dfrph.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_dfrph -%include "../upm.i" - -%{ - #include "dfrph.hpp" -%} - -%include "dfrph.hpp" diff --git a/src/dfrph/pyupm_dfrph.i b/src/dfrph/pyupm_dfrph.i deleted file mode 100644 index 69c80a23..00000000 --- a/src/dfrph/pyupm_dfrph.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_dfrph -%include "../upm.i" - -%include "dfrph.hpp" -%{ - #include "dfrph.hpp" -%} diff --git a/src/ds1307/ds1307.i b/src/ds1307/ds1307.i new file mode 100644 index 00000000..914dfa4d --- /dev/null +++ b/src/ds1307/ds1307.i @@ -0,0 +1,17 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%include "arrays_java.i"; +%include "../java_buffer.i" + +JAVA_JNI_LOADLIBRARY(javaupm_ds1307) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "ds1307.hpp" +%} +%include "ds1307.hpp" +/* END Common SWIG syntax */ diff --git a/src/ds1307/javaupm_ds1307.i b/src/ds1307/javaupm_ds1307.i deleted file mode 100644 index 1ef78215..00000000 --- a/src/ds1307/javaupm_ds1307.i +++ /dev/null @@ -1,12 +0,0 @@ -%module javaupm_ds1307 -%include "../upm.i" -%include "arrays_java.i"; -%include "../java_buffer.i" - -%{ - #include "ds1307.hpp" -%} - -%include "ds1307.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_ds1307) \ No newline at end of file diff --git a/src/ds1307/jsupm_ds1307.i b/src/ds1307/jsupm_ds1307.i deleted file mode 100644 index f2e689c2..00000000 --- a/src/ds1307/jsupm_ds1307.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_ds1307 -%include "../upm.i" - -%{ - #include "ds1307.hpp" -%} - -%include "ds1307.hpp" diff --git a/src/ds1307/pyupm_ds1307.i b/src/ds1307/pyupm_ds1307.i deleted file mode 100644 index d1976844..00000000 --- a/src/ds1307/pyupm_ds1307.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_ds1307 -%include "../upm.i" - -%include "ds1307.hpp" -%{ - #include "ds1307.hpp" -%} diff --git a/src/ds1808lc/ds1808lc.i b/src/ds1808lc/ds1808lc.i new file mode 100644 index 00000000..e68e58b4 --- /dev/null +++ b/src/ds1808lc/ds1808lc.i @@ -0,0 +1,33 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%include "arrays_java.i"; +%include "../java_buffer.i" +%typemap(javaimports) SWIGTYPE %{import upm_interfaces.*;%} +%import "../interfaces/javaupm_iLightController.i" + +JAVA_JNI_LOADLIBRARY(javaupm_ds1808lc) +#endif +/* END Java syntax */ + +/* BEGIN Javascript syntax ------------------------------------------------- */ +#ifdef SWIGJAVASCRIPT +%include "iModuleStatus.hpp" +%include "iLightController.hpp" +#endif +/* END Javascript syntax */ + +/* BEGIN Python syntax ----------------------------------------------------- */ +#ifdef SWIGPYTHON +%include "iModuleStatus.hpp" +%include "iLightController.hpp" +#endif +/* END Python syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "ds1808lc.hpp" +%} +%include "ds1808lc.hpp" +/* END Common SWIG syntax */ diff --git a/src/ds1808lc/javaupm_ds1808lc.i b/src/ds1808lc/javaupm_ds1808lc.i deleted file mode 100644 index f8e8f3d4..00000000 --- a/src/ds1808lc/javaupm_ds1808lc.i +++ /dev/null @@ -1,21 +0,0 @@ -%module javaupm_ds1808lc -%include "../upm.i" - -%import "../interfaces/javaupm_iLightController.i" - -%typemap(javaimports) SWIGTYPE %{ -import upm_interfaces.*; -%} - -%include "arrays_java.i"; -%include "../java_buffer.i" -%include "cpointer.i" -%include "typemaps.i" - -%{ - #include "ds1808lc.hpp" -%} - -%include "ds1808lc.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_ds1808lc) diff --git a/src/ds1808lc/jsupm_ds1808lc.i b/src/ds1808lc/jsupm_ds1808lc.i deleted file mode 100644 index 970c2e29..00000000 --- a/src/ds1808lc/jsupm_ds1808lc.i +++ /dev/null @@ -1,10 +0,0 @@ -%module jsupm_ds1808lc -%include "../upm.i" - -%{ - #include "ds1808lc.hpp" -%} - -%include "iModuleStatus.hpp" -%include "iLightController.hpp" -%include "ds1808lc.hpp" diff --git a/src/ds1808lc/pyupm_ds1808lc.i b/src/ds1808lc/pyupm_ds1808lc.i deleted file mode 100644 index c6e4d637..00000000 --- a/src/ds1808lc/pyupm_ds1808lc.i +++ /dev/null @@ -1,12 +0,0 @@ -%module pyupm_ds1808lc -%include "../upm.i" -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" - - -%include "iModuleStatus.hpp" -%include "iLightController.hpp" -%include "ds1808lc.hpp" -%{ - #include "ds1808lc.hpp" -%} diff --git a/src/ds18b20/ds18b20.i b/src/ds18b20/ds18b20.i new file mode 100644 index 00000000..195623f8 --- /dev/null +++ b/src/ds18b20/ds18b20.i @@ -0,0 +1,18 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_ds18b20) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%include "carrays.i" +%{ +#include "ds18b20_defs.h" +#include "ds18b20.hpp" +%} +%include "ds18b20_defs.h" +%include "ds18b20.hpp" +%array_class(char, charArray); +/* END Common SWIG syntax */ diff --git a/src/ds18b20/javaupm_ds18b20.i b/src/ds18b20/javaupm_ds18b20.i deleted file mode 100644 index b46df9cb..00000000 --- a/src/ds18b20/javaupm_ds18b20.i +++ /dev/null @@ -1,14 +0,0 @@ -%module javaupm_ds18b20 -%include "../upm.i" -%include "carrays.i" -%include "std_string.i" - -%include "ds18b20_defs.h" -%include "ds18b20.hpp" -%{ - #include "ds18b20.hpp" -%} - -%array_class(char, charArray); - -JAVA_JNI_LOADLIBRARY(javaupm_ds18b20) diff --git a/src/ds18b20/jsupm_ds18b20.i b/src/ds18b20/jsupm_ds18b20.i deleted file mode 100644 index 64d57345..00000000 --- a/src/ds18b20/jsupm_ds18b20.i +++ /dev/null @@ -1,12 +0,0 @@ -%module jsupm_ds18b20 -%include "../upm.i" -%include "carrays.i" -%include "std_string.i" - -%include "ds18b20_defs.h" -%include "ds18b20.hpp" -%{ - #include "ds18b20.hpp" -%} - -%array_class(char, charArray); diff --git a/src/ds18b20/pyupm_ds18b20.i b/src/ds18b20/pyupm_ds18b20.i deleted file mode 100644 index a72595fc..00000000 --- a/src/ds18b20/pyupm_ds18b20.i +++ /dev/null @@ -1,15 +0,0 @@ -%module pyupm_ds18b20 -%include "../upm.i" -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" - -%include "carrays.i" -%include "std_string.i" - -%include "ds18b20_defs.h" -%include "ds18b20.hpp" -%{ - #include "ds18b20.hpp" -%} -%include "ds18b20.hpp" -%array_class(char, charArray); diff --git a/src/ds2413/ds2413.i b/src/ds2413/ds2413.i new file mode 100644 index 00000000..e29979a3 --- /dev/null +++ b/src/ds2413/ds2413.i @@ -0,0 +1,16 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_ds2413) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%include "carrays.i" +%{ +#include "ds2413.hpp" +%} +%include "ds2413.hpp" +%array_class(char, charArray); +/* END Common SWIG syntax */ diff --git a/src/ds2413/javaupm_ds2413.i b/src/ds2413/javaupm_ds2413.i deleted file mode 100644 index 51118778..00000000 --- a/src/ds2413/javaupm_ds2413.i +++ /dev/null @@ -1,13 +0,0 @@ -%module javaupm_ds2413 -%include "../upm.i" -%include "carrays.i" -%include "std_string.i" - -%{ - #include "ds2413.hpp" -%} - -%include "ds2413.hpp" -%array_class(char, charArray); - -JAVA_JNI_LOADLIBRARY(javaupm_ds2413) diff --git a/src/ds2413/jsupm_ds2413.i b/src/ds2413/jsupm_ds2413.i deleted file mode 100644 index af9ffaf2..00000000 --- a/src/ds2413/jsupm_ds2413.i +++ /dev/null @@ -1,11 +0,0 @@ -%module jsupm_ds2413 -%include "../upm.i" -%include "carrays.i" -%include "std_string.i" - -%{ - #include "ds2413.hpp" -%} - -%include "ds2413.hpp" -%array_class(char, charArray); diff --git a/src/ds2413/pyupm_ds2413.i b/src/ds2413/pyupm_ds2413.i deleted file mode 100644 index c5dda62f..00000000 --- a/src/ds2413/pyupm_ds2413.i +++ /dev/null @@ -1,13 +0,0 @@ -%module pyupm_ds2413 -%include "../upm.i" -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" - -%include "carrays.i" -%include "std_string.i" - -%{ - #include "ds2413.hpp" -%} -%include "ds2413.hpp" -%array_class(char, charArray); diff --git a/src/e50hx/javaupm_e50hx.i b/src/e50hx/e50hx.i similarity index 64% rename from src/e50hx/javaupm_e50hx.i rename to src/e50hx/e50hx.i index e2cc8441..cdbb414c 100644 --- a/src/e50hx/javaupm_e50hx.i +++ b/src/e50hx/e50hx.i @@ -1,6 +1,7 @@ -%module javaupm_e50hx -%include "../upm.i" -%include "typemaps.i" +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA %include "../carrays_uint32_t.i" // We need to use this method for enum wrapping since the enum typedefs used @@ -13,13 +14,17 @@ %include "enumtypeunsafe.swg" %javaconst(1); +JAVA_JNI_LOADLIBRARY(javaupm_e50hx) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "bacnetmstp.hpp" +#include "bacnetutil.hpp" +#include "e50hx.hpp" +%} %include "bacnetmstp.hpp" %include "bacnetutil.hpp" %include "e50hx.hpp" -%{ - #include "bacnetutil.hpp" - #include "e50hx.hpp" -%} - - -JAVA_JNI_LOADLIBRARY(javaupm_e50hx) +/* END Common SWIG syntax */ diff --git a/src/e50hx/jsupm_e50hx.i b/src/e50hx/jsupm_e50hx.i deleted file mode 100644 index a8d91702..00000000 --- a/src/e50hx/jsupm_e50hx.i +++ /dev/null @@ -1,10 +0,0 @@ -%module jsupm_e50hx -%include "../upm.i" -%include "stdint.i" - -%include "bacnetmstp.hpp" -%include "bacnetutil.hpp" -%include "e50hx.hpp" -%{ - #include "e50hx.hpp" -%} diff --git a/src/e50hx/pyupm_e50hx.i b/src/e50hx/pyupm_e50hx.i deleted file mode 100644 index 72acec71..00000000 --- a/src/e50hx/pyupm_e50hx.i +++ /dev/null @@ -1,12 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_e50hx -%include "../upm.i" -%include "stdint.i" - -%include "bacnetmstp.hpp" -%include "bacnetutil.hpp" -%include "e50hx.hpp" -%{ - #include "e50hx.hpp" -%} diff --git a/src/ecezo/ecezo.i b/src/ecezo/ecezo.i new file mode 100644 index 00000000..aee7694f --- /dev/null +++ b/src/ecezo/ecezo.i @@ -0,0 +1,16 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_ecezo) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "ecezo_defs.h" +#include "ecezo.hpp" +%} +%include "ecezo_defs.h" +%include "ecezo.hpp" +/* END Common SWIG syntax */ diff --git a/src/ecezo/javaupm_ecezo.i b/src/ecezo/javaupm_ecezo.i deleted file mode 100644 index 64d34e99..00000000 --- a/src/ecezo/javaupm_ecezo.i +++ /dev/null @@ -1,13 +0,0 @@ -%module javaupm_ecezo -%include "../upm.i" -%include "std_string.i" -%include "stdint.i" -%include "typemaps.i" - -%include "ecezo_defs.h" -%include "ecezo.hpp" -%{ - #include "ecezo.hpp" -%} - -JAVA_JNI_LOADLIBRARY(javaupm_ecezo) diff --git a/src/ecezo/jsupm_ecezo.i b/src/ecezo/jsupm_ecezo.i deleted file mode 100644 index e7116ef0..00000000 --- a/src/ecezo/jsupm_ecezo.i +++ /dev/null @@ -1,9 +0,0 @@ -%module jsupm_ecezo -%include "../upm.i" -%include "std_string.i" - -%include "ecezo_defs.h" -%include "ecezo.hpp" -%{ - #include "ecezo.hpp" -%} diff --git a/src/ecezo/pyupm_ecezo.i b/src/ecezo/pyupm_ecezo.i deleted file mode 100644 index 6434c4b8..00000000 --- a/src/ecezo/pyupm_ecezo.i +++ /dev/null @@ -1,11 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_ecezo -%include "../upm.i" -%include "std_string.i" - -%include "ecezo_defs.h" -%include "ecezo.hpp" -%{ - #include "ecezo.hpp" -%} diff --git a/src/ecs1030/ecs1030.i b/src/ecs1030/ecs1030.i new file mode 100644 index 00000000..ca189fdf --- /dev/null +++ b/src/ecs1030/ecs1030.i @@ -0,0 +1,14 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_ecs1030) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "ecs1030.hpp" +%} +%include "ecs1030.hpp" +/* END Common SWIG syntax */ diff --git a/src/ecs1030/javaupm_ecs1030.i b/src/ecs1030/javaupm_ecs1030.i deleted file mode 100644 index 44153781..00000000 --- a/src/ecs1030/javaupm_ecs1030.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_ecs1030 -%include "../upm.i" - -%{ - #include "ecs1030.hpp" -%} - -%include "ecs1030.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_ecs1030) \ No newline at end of file diff --git a/src/ecs1030/jsupm_ecs1030.i b/src/ecs1030/jsupm_ecs1030.i deleted file mode 100644 index ce30b75c..00000000 --- a/src/ecs1030/jsupm_ecs1030.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_ecs1030 -%include "../upm.i" - -%{ - #include "ecs1030.hpp" -%} - -%include "ecs1030.hpp" diff --git a/src/ecs1030/pyupm_ecs1030.i b/src/ecs1030/pyupm_ecs1030.i deleted file mode 100644 index 3b891deb..00000000 --- a/src/ecs1030/pyupm_ecs1030.i +++ /dev/null @@ -1,11 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_ecs1030 -%include "../upm.i" - -%include "stdint.i" - -%include "ecs1030.hpp" -%{ - #include "ecs1030.hpp" -%} diff --git a/src/ehr/ehr.i b/src/ehr/ehr.i new file mode 100644 index 00000000..25c63496 --- /dev/null +++ b/src/ehr/ehr.i @@ -0,0 +1,16 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%ignore beatISR; + +JAVA_JNI_LOADLIBRARY(javaupm_ehr) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "ehr.hpp" +%} +%include "ehr.hpp" +/* END Common SWIG syntax */ diff --git a/src/ehr/javaupm_ehr.i b/src/ehr/javaupm_ehr.i deleted file mode 100644 index 829e50f7..00000000 --- a/src/ehr/javaupm_ehr.i +++ /dev/null @@ -1,12 +0,0 @@ -%module javaupm_ehr -%include "../upm.i" - -%ignore beatISR; - -%{ - #include "ehr.hpp" -%} - -%include "ehr.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_ehr) \ No newline at end of file diff --git a/src/ehr/jsupm_ehr.i b/src/ehr/jsupm_ehr.i deleted file mode 100644 index ef76d195..00000000 --- a/src/ehr/jsupm_ehr.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_ehr -%include "../upm.i" - -%{ - #include "ehr.hpp" -%} - -%include "ehr.hpp" diff --git a/src/ehr/pyupm_ehr.i b/src/ehr/pyupm_ehr.i deleted file mode 100644 index e39efcf4..00000000 --- a/src/ehr/pyupm_ehr.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_ehr -%include "../upm.i" - -%include "ehr.hpp" -%{ - #include "ehr.hpp" -%} diff --git a/src/eldriver/javaupm_eldriver.i b/src/eldriver/javaupm_eldriver.i deleted file mode 100644 index bef554ae..00000000 --- a/src/eldriver/javaupm_eldriver.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_eldriver -%include "../upm.i" - -%{ - #include "eldriver.hpp" -%} - -%include "eldriver.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_eldriver) \ No newline at end of file diff --git a/src/eldriver/jsupm_eldriver.i b/src/eldriver/jsupm_eldriver.i deleted file mode 100644 index 93ca498f..00000000 --- a/src/eldriver/jsupm_eldriver.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_eldriver -%include "../upm.i" - -%{ - #include "eldriver.hpp" -%} - -%include "eldriver.hpp" diff --git a/src/eldriver/pyupm_eldriver.i b/src/eldriver/pyupm_eldriver.i deleted file mode 100644 index b3155ba9..00000000 --- a/src/eldriver/pyupm_eldriver.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_eldriver -%include "../upm.i" - -%include "eldriver.hpp" -%{ - #include "eldriver.hpp" -%} diff --git a/src/electromagnet/javaupm_electromagnet.i b/src/electromagnet/javaupm_electromagnet.i deleted file mode 100644 index 99403700..00000000 --- a/src/electromagnet/javaupm_electromagnet.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_electromagnet -%include "../upm.i" - -%{ - #include "electromagnet.hpp" -%} - -%include "electromagnet.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_electromagnet) \ No newline at end of file diff --git a/src/electromagnet/jsupm_electromagnet.i b/src/electromagnet/jsupm_electromagnet.i deleted file mode 100644 index 268aa899..00000000 --- a/src/electromagnet/jsupm_electromagnet.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_electromagnet -%include "../upm.i" - -%{ - #include "electromagnet.hpp" -%} - -%include "electromagnet.hpp" diff --git a/src/electromagnet/pyupm_electromagnet.i b/src/electromagnet/pyupm_electromagnet.i deleted file mode 100644 index 5eeabe41..00000000 --- a/src/electromagnet/pyupm_electromagnet.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_electromagnet -%include "../upm.i" - -%include "electromagnet.hpp" -%{ - #include "electromagnet.hpp" -%} diff --git a/src/emg/javaupm_emg.i b/src/emg/javaupm_emg.i deleted file mode 100644 index 6f911c38..00000000 --- a/src/emg/javaupm_emg.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_emg -%include "../upm.i" - -%{ - #include "emg.hpp" -%} - -%include "emg.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_emg) \ No newline at end of file diff --git a/src/emg/jsupm_emg.i b/src/emg/jsupm_emg.i deleted file mode 100644 index 37ed79be..00000000 --- a/src/emg/jsupm_emg.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_emg -%include "../upm.i" - -%{ - #include "emg.hpp" -%} - -%include "emg.hpp" diff --git a/src/emg/pyupm_emg.i b/src/emg/pyupm_emg.i deleted file mode 100644 index 89e63788..00000000 --- a/src/emg/pyupm_emg.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_emg -%include "../upm.i" - -%include "emg.hpp" -%{ - #include "emg.hpp" -%} diff --git a/src/enc03r/javaupm_enc03r.i b/src/enc03r/javaupm_enc03r.i deleted file mode 100644 index e5e9f3e2..00000000 --- a/src/enc03r/javaupm_enc03r.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_enc03r -%include "../upm.i" - -%{ - #include "enc03r.hpp" -%} - -%include "enc03r.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_enc03r) \ No newline at end of file diff --git a/src/enc03r/jsupm_enc03r.i b/src/enc03r/jsupm_enc03r.i deleted file mode 100644 index 5e150606..00000000 --- a/src/enc03r/jsupm_enc03r.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_enc03r -%include "../upm.i" - -%{ - #include "enc03r.hpp" -%} - -%include "enc03r.hpp" diff --git a/src/enc03r/pyupm_enc03r.i b/src/enc03r/pyupm_enc03r.i deleted file mode 100644 index 8e8cfcfa..00000000 --- a/src/enc03r/pyupm_enc03r.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_enc03r -%include "../upm.i" - -%include "enc03r.hpp" -%{ - #include "enc03r.hpp" -%} diff --git a/src/flex/javaupm_flex.i b/src/flex/javaupm_flex.i deleted file mode 100644 index 14a07ed7..00000000 --- a/src/flex/javaupm_flex.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_flex -%include "../upm.i" - -%{ - #include "flex.hpp" -%} - -%include "flex.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_flex) \ No newline at end of file diff --git a/src/flex/jsupm_flex.i b/src/flex/jsupm_flex.i deleted file mode 100644 index eba2fd85..00000000 --- a/src/flex/jsupm_flex.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_flex -%include "../upm.i" - -%{ - #include "flex.hpp" -%} - -%include "flex.hpp" diff --git a/src/flex/pyupm_flex.i b/src/flex/pyupm_flex.i deleted file mode 100644 index 089ed105..00000000 --- a/src/flex/pyupm_flex.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_flex -%include "../upm.i" - -%include "flex.hpp" -%{ - #include "flex.hpp" -%} diff --git a/src/gas/javaupm_gas.i b/src/gas/gas.i similarity index 61% rename from src/gas/javaupm_gas.i rename to src/gas/gas.i index 9a259973..fb2effef 100644 --- a/src/gas/javaupm_gas.i +++ b/src/gas/gas.i @@ -1,20 +1,7 @@ -%module javaupm_gas -%include "../upm.i" -%include "typemaps.i" - -%{ - #include "gas.hpp" - #include "mq2.hpp" - #include "mq3.hpp" - #include "mq4.hpp" - #include "mq5.hpp" - #include "mq6.hpp" - #include "mq7.hpp" - #include "mq8.hpp" - #include "mq9.hpp" - #include "tp401.hpp" -%} +%include "../common_top.i" +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA %typemap(jni) (uint16_t *buffer, int len) "jshortArray"; %typemap(jtype) (uint16_t *buffer, int len) "short[]"; %typemap(jstype) (uint16_t *buffer, int len) "short[]"; @@ -45,6 +32,36 @@ JCALL3(ReleaseShortArrayElements, jenv, $input, (jshort *)$2, 0); } +JAVA_JNI_LOADLIBRARY(javaupm_gas) +#endif +/* END Java syntax */ + +/* BEGIN Javascript syntax ------------------------------------------------- */ +#ifdef SWIGJAVASCRIPT +%include "../carrays_uint16_t.i" +#endif +/* END Javascript syntax */ + +/* BEGIN Python syntax ----------------------------------------------------- */ +#ifdef SWIGPYTHON +%include "../carrays_uint16_t.i" +#endif +/* END Python syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "gas.hpp" +#include "mq2.hpp" +#include "mq3.hpp" +#include "mq4.hpp" +#include "mq5.hpp" +#include "mq6.hpp" +#include "mq7.hpp" +#include "mq8.hpp" +#include "mq9.hpp" +#include "tp401.hpp" +%} + %include "gas.hpp" %include "mq2.hpp" %include "mq3.hpp" @@ -55,5 +72,4 @@ %include "mq8.hpp" %include "mq9.hpp" %include "tp401.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_gas) \ No newline at end of file +/* END Common SWIG syntax */ diff --git a/src/gas/jsupm_gas.i b/src/gas/jsupm_gas.i deleted file mode 100644 index add44b1b..00000000 --- a/src/gas/jsupm_gas.i +++ /dev/null @@ -1,53 +0,0 @@ -%module jsupm_gas -%include "../upm.i" -%include "../carrays_uint16_t.i" - -%include "gas.hpp" -%{ - #include "gas.hpp" -%} - -%include "mq2.hpp" -%{ - #include "mq2.hpp" -%} - -%include "mq3.hpp" -%{ - #include "mq3.hpp" -%} - -%include "mq4.hpp" -%{ - #include "mq4.hpp" -%} - -%include "mq5.hpp" -%{ - #include "mq5.hpp" -%} - -%include "mq6.hpp" -%{ - #include "mq6.hpp" -%} - -%include "mq7.hpp" -%{ - #include "mq7.hpp" -%} - -%include "mq8.hpp" -%{ - #include "mq8.hpp" -%} - -%include "mq9.hpp" -%{ - #include "mq9.hpp" -%} - -%include "tp401.hpp" -%{ - #include "tp401.hpp" -%} diff --git a/src/gas/pyupm_gas.i b/src/gas/pyupm_gas.i deleted file mode 100644 index 8a2382fe..00000000 --- a/src/gas/pyupm_gas.i +++ /dev/null @@ -1,55 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_gas -%include "../upm.i" -%include "../carrays_uint16_t.i" - -%include "gas.hpp" -%{ - #include "gas.hpp" -%} - -%include "mq2.hpp" -%{ - #include "mq2.hpp" -%} - -%include "mq3.hpp" -%{ - #include "mq3.hpp" -%} - -%include "mq4.hpp" -%{ - #include "mq4.hpp" -%} - -%include "mq5.hpp" -%{ - #include "mq5.hpp" -%} - -%include "mq6.hpp" -%{ - #include "mq6.hpp" -%} - -%include "mq7.hpp" -%{ - #include "mq7.hpp" -%} - -%include "mq8.hpp" -%{ - #include "mq8.hpp" -%} - -%include "mq9.hpp" -%{ - #include "mq9.hpp" -%} - -%include "tp401.hpp" -%{ - #include "tp401.hpp" -%} diff --git a/src/gp2y0a/javaupm_gp2y0a.i b/src/gp2y0a/javaupm_gp2y0a.i deleted file mode 100644 index 3ea06750..00000000 --- a/src/gp2y0a/javaupm_gp2y0a.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_gp2y0a -%include "../upm.i" - -%{ - #include "gp2y0a.hpp" -%} - -%include "gp2y0a.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_gp2y0a) \ No newline at end of file diff --git a/src/gp2y0a/jsupm_gp2y0a.i b/src/gp2y0a/jsupm_gp2y0a.i deleted file mode 100644 index 81f731f2..00000000 --- a/src/gp2y0a/jsupm_gp2y0a.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_gp2y0a -%include "../upm.i" - -%{ - #include "gp2y0a.hpp" -%} - -%include "gp2y0a.hpp" diff --git a/src/gp2y0a/pyupm_gp2y0a.i b/src/gp2y0a/pyupm_gp2y0a.i deleted file mode 100644 index 76824eb8..00000000 --- a/src/gp2y0a/pyupm_gp2y0a.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_gp2y0a -%include "../upm.i" - -%include "gp2y0a.hpp" -%{ - #include "gp2y0a.hpp" -%} diff --git a/src/gprs/gprs.i b/src/gprs/gprs.i new file mode 100644 index 00000000..c9ac958b --- /dev/null +++ b/src/gprs/gprs.i @@ -0,0 +1,16 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_gprs) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%include "carrays.i" +%{ +#include "gprs.hpp" +%} +%include "gprs.hpp" +%array_class(char, charArray); +/* END Common SWIG syntax */ diff --git a/src/gprs/javaupm_gprs.i b/src/gprs/javaupm_gprs.i deleted file mode 100644 index 61a59cfc..00000000 --- a/src/gprs/javaupm_gprs.i +++ /dev/null @@ -1,13 +0,0 @@ -%module javaupm_gprs -%include "../upm.i" -%include "carrays.i" -%include "std_string.i" - -%{ - #include "gprs.hpp" -%} - -%include "gprs.hpp" -%array_class(char, charArray); - -JAVA_JNI_LOADLIBRARY(javaupm_gprs) \ No newline at end of file diff --git a/src/gprs/jsupm_gprs.i b/src/gprs/jsupm_gprs.i deleted file mode 100644 index 820dcef9..00000000 --- a/src/gprs/jsupm_gprs.i +++ /dev/null @@ -1,11 +0,0 @@ -%module jsupm_gprs -%include "../upm.i" -%include "carrays.i" -%include "std_string.i" - -%{ - #include "gprs.hpp" -%} - -%include "gprs.hpp" -%array_class(char, charArray); diff --git a/src/gprs/pyupm_gprs.i b/src/gprs/pyupm_gprs.i deleted file mode 100644 index 6e229d02..00000000 --- a/src/gprs/pyupm_gprs.i +++ /dev/null @@ -1,12 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_gprs -%include "../upm.i" -%include "carrays.i" -%include "std_string.i" - -%{ - #include "gprs.hpp" -%} -%include "gprs.hpp" -%array_class(char, charArray); diff --git a/src/grove/grove.i b/src/grove/grove.i new file mode 100644 index 00000000..cb9cc590 --- /dev/null +++ b/src/grove/grove.i @@ -0,0 +1,33 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%apply int {mraa::Edge} + +JAVA_ADD_INSTALLISR_EDGE(upm::GroveButton) +JAVA_JNI_LOADLIBRARY(javaupm_grove) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "grovebase.hpp" +#include "grove.hpp" +#include "grovebutton.hpp" +#include "groveled.hpp" +#include "grovelight.hpp" +#include "groverelay.hpp" +#include "groverotary.hpp" +#include "groveslide.hpp" +#include "grovetemp.hpp" +%} +%include "grovebase.hpp" +%include "grove.hpp" +%include "grovebutton.hpp" +%include "groveled.hpp" +%include "grovelight.hpp" +%include "groverelay.hpp" +%include "groverotary.hpp" +%include "groveslide.hpp" +%include "grovetemp.hpp" +/* END Common SWIG syntax */ diff --git a/src/grove/javaupm_grove.i b/src/grove/javaupm_grove.i deleted file mode 100644 index 724ccdb1..00000000 --- a/src/grove/javaupm_grove.i +++ /dev/null @@ -1,56 +0,0 @@ -%module (docstring="Basic Grove sensors") javaupm_grove - -%include "../upm.i" - -%apply int {mraa::Edge} - -%include "grove.hpp" -%{ - #include "grove.hpp" -%} - -%include "grovebase.hpp" -%{ - #include "grovebase.hpp" -%} - -%include "grovebutton.hpp" -%{ - #include "grovebutton.hpp" -%} - -%include "groveled.hpp" -%{ - #include "groveled.hpp" -%} - -%include "grovelight.hpp" -%{ - #include "grovelight.hpp" -%} - -%include "groverelay.hpp" -%{ - #include "groverelay.hpp" -%} - -%include "groverotary.hpp" -%{ - #include "groverotary.hpp" -%} - -%include "groveslide.hpp" -%{ - #include "groveslide.hpp" -%} - -%include "grovetemp.hpp" -%{ - #include "grovetemp.hpp" -%} - -JAVA_ADD_INSTALLISR_EDGE(upm::GroveButton) - - - -JAVA_JNI_LOADLIBRARY(javaupm_grove) diff --git a/src/grove/jsupm_grove.i b/src/grove/jsupm_grove.i deleted file mode 100644 index e3390235..00000000 --- a/src/grove/jsupm_grove.i +++ /dev/null @@ -1,47 +0,0 @@ -%module jsupm_grove -%include "../upm.i" - -%include "grove.hpp" -%{ - #include "grove.hpp" -%} - -%include "grovebase.hpp" -%{ - #include "grovebase.hpp" -%} - -%include "grovebutton.hpp" -%{ - #include "grovebutton.hpp" -%} - -%include "groveled.hpp" -%{ - #include "groveled.hpp" -%} - -%include "grovelight.hpp" -%{ - #include "grovelight.hpp" -%} - -%include "groverelay.hpp" -%{ - #include "groverelay.hpp" -%} - -%include "groverotary.hpp" -%{ - #include "groverotary.hpp" -%} - -%include "groveslide.hpp" -%{ - #include "groveslide.hpp" -%} - -%include "grovetemp.hpp" -%{ - #include "grovetemp.hpp" -%} diff --git a/src/grove/pyupm_grove.i b/src/grove/pyupm_grove.i deleted file mode 100644 index 140bcdce..00000000 --- a/src/grove/pyupm_grove.i +++ /dev/null @@ -1,49 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_grove -%include "../upm.i" - -%include "grove.hpp" -%{ - #include "grove.hpp" -%} - -%include "grovebase.hpp" -%{ - #include "grovebase.hpp" -%} - -%include "grovebutton.hpp" -%{ - #include "grovebutton.hpp" -%} - -%include "groveled.hpp" -%{ - #include "groveled.hpp" -%} - -%include "grovelight.hpp" -%{ - #include "grovelight.hpp" -%} - -%include "groverelay.hpp" -%{ - #include "groverelay.hpp" -%} - -%include "groverotary.hpp" -%{ - #include "groverotary.hpp" -%} - -%include "groveslide.hpp" -%{ - #include "groveslide.hpp" -%} - -%include "grovetemp.hpp" -%{ - #include "grovetemp.hpp" -%} diff --git a/src/grovecollision/javaupm_grovecollision.i b/src/grovecollision/javaupm_grovecollision.i deleted file mode 100644 index 2697c0e2..00000000 --- a/src/grovecollision/javaupm_grovecollision.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_grovecollision -%include "../upm.i" - -%{ - #include "grovecollision.hpp" -%} - -%include "grovecollision.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_grovecollision) \ No newline at end of file diff --git a/src/grovecollision/jsupm_grovecollision.i b/src/grovecollision/jsupm_grovecollision.i deleted file mode 100644 index 7cd1ca0b..00000000 --- a/src/grovecollision/jsupm_grovecollision.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_grovecollision -%include "../upm.i" - -%{ - #include "grovecollision.hpp" -%} - -%include "grovecollision.hpp" diff --git a/src/grovecollision/pyupm_grovecollision.i b/src/grovecollision/pyupm_grovecollision.i deleted file mode 100644 index b6b0de0d..00000000 --- a/src/grovecollision/pyupm_grovecollision.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_grovecollision -%include "../upm.i" - -%include "grovecollision.hpp" -%{ - #include "grovecollision.hpp" -%} diff --git a/src/groveehr/groveehr.i b/src/groveehr/groveehr.i new file mode 100644 index 00000000..b17c143f --- /dev/null +++ b/src/groveehr/groveehr.i @@ -0,0 +1,16 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%ignore beatISR; + +JAVA_JNI_LOADLIBRARY(javaupm_groveehr) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "groveehr.hpp" +%} +%include "groveehr.hpp" +/* END Common SWIG syntax */ diff --git a/src/groveehr/javaupm_groveehr.i b/src/groveehr/javaupm_groveehr.i deleted file mode 100644 index 55d0b6b6..00000000 --- a/src/groveehr/javaupm_groveehr.i +++ /dev/null @@ -1,12 +0,0 @@ -%module javaupm_groveehr -%include "../upm.i" - -%ignore beatISR; - -%{ - #include "groveehr.hpp" -%} - -%include "groveehr.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_groveehr) \ No newline at end of file diff --git a/src/groveehr/jsupm_groveehr.i b/src/groveehr/jsupm_groveehr.i deleted file mode 100644 index 3005cc9f..00000000 --- a/src/groveehr/jsupm_groveehr.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_groveehr -%include "../upm.i" - -%{ - #include "groveehr.hpp" -%} - -%include "groveehr.hpp" diff --git a/src/groveehr/pyupm_groveehr.i b/src/groveehr/pyupm_groveehr.i deleted file mode 100644 index fd14733f..00000000 --- a/src/groveehr/pyupm_groveehr.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_groveehr -%include "../upm.i" - -%include "groveehr.hpp" -%{ - #include "groveehr.hpp" -%} diff --git a/src/groveeldriver/javaupm_groveeldriver.i b/src/groveeldriver/javaupm_groveeldriver.i deleted file mode 100644 index 9647d777..00000000 --- a/src/groveeldriver/javaupm_groveeldriver.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_groveeldriver -%include "../upm.i" - -%{ - #include "groveeldriver.hpp" -%} - -%include "groveeldriver.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_groveeldriver) \ No newline at end of file diff --git a/src/groveeldriver/jsupm_groveeldriver.i b/src/groveeldriver/jsupm_groveeldriver.i deleted file mode 100644 index bfd05ac1..00000000 --- a/src/groveeldriver/jsupm_groveeldriver.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_groveeldriver -%include "../upm.i" - -%{ - #include "groveeldriver.hpp" -%} - -%include "groveeldriver.hpp" diff --git a/src/groveeldriver/pyupm_groveeldriver.i b/src/groveeldriver/pyupm_groveeldriver.i deleted file mode 100644 index 51a30b13..00000000 --- a/src/groveeldriver/pyupm_groveeldriver.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_groveeldriver -%include "../upm.i" - -%include "groveeldriver.hpp" -%{ - #include "groveeldriver.hpp" -%} diff --git a/src/groveelectromagnet/javaupm_groveelectromagnet.i b/src/groveelectromagnet/javaupm_groveelectromagnet.i deleted file mode 100644 index b3c80972..00000000 --- a/src/groveelectromagnet/javaupm_groveelectromagnet.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_groveelectromagnet -%include "../upm.i" - -%{ - #include "groveelectromagnet.hpp" -%} - -%include "groveelectromagnet.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_groveelectromagnet) \ No newline at end of file diff --git a/src/groveelectromagnet/jsupm_groveelectromagnet.i b/src/groveelectromagnet/jsupm_groveelectromagnet.i deleted file mode 100644 index 62d5ac9b..00000000 --- a/src/groveelectromagnet/jsupm_groveelectromagnet.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_groveelectromagnet -%include "../upm.i" - -%{ - #include "groveelectromagnet.hpp" -%} - -%include "groveelectromagnet.hpp" diff --git a/src/groveelectromagnet/pyupm_groveelectromagnet.i b/src/groveelectromagnet/pyupm_groveelectromagnet.i deleted file mode 100644 index 72aa7219..00000000 --- a/src/groveelectromagnet/pyupm_groveelectromagnet.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_groveelectromagnet -%include "../upm.i" - -%include "groveelectromagnet.hpp" -%{ - #include "groveelectromagnet.hpp" -%} diff --git a/src/groveemg/javaupm_groveemg.i b/src/groveemg/javaupm_groveemg.i deleted file mode 100644 index a8224642..00000000 --- a/src/groveemg/javaupm_groveemg.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_groveemg -%include "../upm.i" - -%{ - #include "groveemg.hpp" -%} - -%include "groveemg.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_groveemg) \ No newline at end of file diff --git a/src/groveemg/jsupm_groveemg.i b/src/groveemg/jsupm_groveemg.i deleted file mode 100644 index 99041721..00000000 --- a/src/groveemg/jsupm_groveemg.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_groveemg -%include "../upm.i" - -%{ - #include "groveemg.hpp" -%} - -%include "groveemg.hpp" diff --git a/src/groveemg/pyupm_groveemg.i b/src/groveemg/pyupm_groveemg.i deleted file mode 100644 index 514fd1c2..00000000 --- a/src/groveemg/pyupm_groveemg.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_groveemg -%include "../upm.i" - -%include "groveemg.hpp" -%{ - #include "groveemg.hpp" -%} diff --git a/src/grovegprs/grovegprs.i b/src/grovegprs/grovegprs.i new file mode 100644 index 00000000..dcedefeb --- /dev/null +++ b/src/grovegprs/grovegprs.i @@ -0,0 +1,16 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_grovegprs) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%include "carrays.i" +%{ +#include "grovegprs.hpp" +%} +%include "grovegprs.hpp" +%array_class(char, charArray); +/* END Common SWIG syntax */ diff --git a/src/grovegprs/javaupm_grovegprs.i b/src/grovegprs/javaupm_grovegprs.i deleted file mode 100644 index 3671fda5..00000000 --- a/src/grovegprs/javaupm_grovegprs.i +++ /dev/null @@ -1,13 +0,0 @@ -%module javaupm_grovegprs -%include "../upm.i" -%include "carrays.i" -%include "std_string.i" - -%{ - #include "grovegprs.hpp" -%} - -%include "grovegprs.hpp" -%array_class(char, charArray); - -JAVA_JNI_LOADLIBRARY(javaupm_grovegprs) \ No newline at end of file diff --git a/src/grovegprs/jsupm_grovegprs.i b/src/grovegprs/jsupm_grovegprs.i deleted file mode 100644 index bd14764f..00000000 --- a/src/grovegprs/jsupm_grovegprs.i +++ /dev/null @@ -1,11 +0,0 @@ -%module jsupm_grovegprs -%include "../upm.i" -%include "carrays.i" -%include "std_string.i" - -%{ - #include "grovegprs.hpp" -%} - -%include "grovegprs.hpp" -%array_class(char, charArray); diff --git a/src/grovegprs/pyupm_grovegprs.i b/src/grovegprs/pyupm_grovegprs.i deleted file mode 100644 index 29ae9a1f..00000000 --- a/src/grovegprs/pyupm_grovegprs.i +++ /dev/null @@ -1,12 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_grovegprs -%include "../upm.i" -%include "carrays.i" -%include "std_string.i" - -%{ - #include "grovegprs.hpp" -%} -%include "grovegprs.hpp" -%array_class(char, charArray); diff --git a/src/grovegsr/javaupm_grovegsr.i b/src/grovegsr/javaupm_grovegsr.i deleted file mode 100644 index 20ca2eda..00000000 --- a/src/grovegsr/javaupm_grovegsr.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_grovegsr -%include "../upm.i" - -%{ - #include "grovegsr.hpp" -%} - -%include "grovegsr.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_grovegsr) \ No newline at end of file diff --git a/src/grovegsr/jsupm_grovegsr.i b/src/grovegsr/jsupm_grovegsr.i deleted file mode 100644 index 5ee875bc..00000000 --- a/src/grovegsr/jsupm_grovegsr.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_grovegsr -%include "../upm.i" - -%{ - #include "grovegsr.hpp" -%} - -%include "grovegsr.hpp" diff --git a/src/grovegsr/pyupm_grovegsr.i b/src/grovegsr/pyupm_grovegsr.i deleted file mode 100644 index ab02837b..00000000 --- a/src/grovegsr/pyupm_grovegsr.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_grovegsr -%include "../upm.i" - -%include "grovegsr.hpp" -%{ - #include "grovegsr.hpp" -%} diff --git a/src/grovelinefinder/javaupm_grovelinefinder.i b/src/grovelinefinder/javaupm_grovelinefinder.i deleted file mode 100644 index 8c38f43f..00000000 --- a/src/grovelinefinder/javaupm_grovelinefinder.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_grovelinefinder -%include "../upm.i" - -%{ - #include "grovelinefinder.hpp" -%} - -%include "grovelinefinder.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_grovelinefinder) \ No newline at end of file diff --git a/src/grovelinefinder/jsupm_grovelinefinder.i b/src/grovelinefinder/jsupm_grovelinefinder.i deleted file mode 100644 index 174f4b42..00000000 --- a/src/grovelinefinder/jsupm_grovelinefinder.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_grovelinefinder -%include "../upm.i" - -%{ - #include "grovelinefinder.hpp" -%} - -%include "grovelinefinder.hpp" diff --git a/src/grovelinefinder/pyupm_grovelinefinder.i b/src/grovelinefinder/pyupm_grovelinefinder.i deleted file mode 100644 index b675c69b..00000000 --- a/src/grovelinefinder/pyupm_grovelinefinder.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_grovelinefinder -%include "../upm.i" - -%include "grovelinefinder.hpp" -%{ - #include "grovelinefinder.hpp" -%} diff --git a/src/grovemd/javaupm_grovemd.i b/src/grovemd/javaupm_grovemd.i deleted file mode 100644 index b1ef7661..00000000 --- a/src/grovemd/javaupm_grovemd.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_grovemd -%include "../upm.i" - -%{ - #include "grovemd.hpp" -%} - -%include "grovemd.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_grovemd) \ No newline at end of file diff --git a/src/grovemd/jsupm_grovemd.i b/src/grovemd/jsupm_grovemd.i deleted file mode 100644 index b15aa496..00000000 --- a/src/grovemd/jsupm_grovemd.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_grovemd -%include "../upm.i" - -%{ - #include "grovemd.hpp" -%} - -%include "grovemd.hpp" diff --git a/src/grovemd/pyupm_grovemd.i b/src/grovemd/pyupm_grovemd.i deleted file mode 100644 index e12b9c8f..00000000 --- a/src/grovemd/pyupm_grovemd.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_grovemd -%include "../upm.i" - -%include "grovemd.hpp" -%{ - #include "grovemd.hpp" -%} diff --git a/src/grovemoisture/javaupm_grovemoisture.i b/src/grovemoisture/javaupm_grovemoisture.i deleted file mode 100644 index 2ed6005a..00000000 --- a/src/grovemoisture/javaupm_grovemoisture.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_grovemoisture -%include "../upm.i" - -%{ - #include "grovemoisture.hpp" -%} - -%include "grovemoisture.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_grovemoisture) \ No newline at end of file diff --git a/src/grovemoisture/jsupm_grovemoisture.i b/src/grovemoisture/jsupm_grovemoisture.i deleted file mode 100644 index 40a877ee..00000000 --- a/src/grovemoisture/jsupm_grovemoisture.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_grovemoisture -%include "../upm.i" - -%{ - #include "grovemoisture.hpp" -%} - -%include "grovemoisture.hpp" diff --git a/src/grovemoisture/pyupm_grovemoisture.i b/src/grovemoisture/pyupm_grovemoisture.i deleted file mode 100644 index b17ed6cc..00000000 --- a/src/grovemoisture/pyupm_grovemoisture.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_grovemoisture -%include "../upm.i" - -%include "grovemoisture.hpp" -%{ - #include "grovemoisture.hpp" -%} diff --git a/src/groveo2/javaupm_groveo2.i b/src/groveo2/javaupm_groveo2.i deleted file mode 100644 index dc408563..00000000 --- a/src/groveo2/javaupm_groveo2.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_groveo2 -%include "../upm.i" - -%{ - #include "groveo2.hpp" -%} - -%include "groveo2.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_groveo2) \ No newline at end of file diff --git a/src/groveo2/jsupm_groveo2.i b/src/groveo2/jsupm_groveo2.i deleted file mode 100644 index 11d849e2..00000000 --- a/src/groveo2/jsupm_groveo2.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_groveo2 -%include "../upm.i" - -%{ - #include "groveo2.hpp" -%} - -%include "groveo2.hpp" diff --git a/src/groveo2/pyupm_groveo2.i b/src/groveo2/pyupm_groveo2.i deleted file mode 100644 index 0c3881bf..00000000 --- a/src/groveo2/pyupm_groveo2.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_groveo2 -%include "../upm.i" - -%include "groveo2.hpp" -%{ - #include "groveo2.hpp" -%} diff --git a/src/grovescam/grovescam.i b/src/grovescam/grovescam.i new file mode 100644 index 00000000..3bdf1511 --- /dev/null +++ b/src/grovescam/grovescam.i @@ -0,0 +1,16 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%include "../java_buffer.i" + +JAVA_JNI_LOADLIBRARY(javaupm_grovescam) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "grovescam.hpp" +%} +%include "grovescam.hpp" +/* END Common SWIG syntax */ diff --git a/src/grovescam/javaupm_grovescam.i b/src/grovescam/javaupm_grovescam.i deleted file mode 100644 index 0b0966db..00000000 --- a/src/grovescam/javaupm_grovescam.i +++ /dev/null @@ -1,11 +0,0 @@ -%module javaupm_grovescam -%include "../upm.i" -%include "../java_buffer.i" - -%{ - #include "grovescam.hpp" -%} - -%include "grovescam.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_grovescam) \ No newline at end of file diff --git a/src/grovescam/jsupm_grovescam.i b/src/grovescam/jsupm_grovescam.i deleted file mode 100644 index 18cf4744..00000000 --- a/src/grovescam/jsupm_grovescam.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_grovescam -%include "../upm.i" - -%{ - #include "grovescam.hpp" -%} - -%include "grovescam.hpp" diff --git a/src/grovescam/pyupm_grovescam.i b/src/grovescam/pyupm_grovescam.i deleted file mode 100644 index 25770904..00000000 --- a/src/grovescam/pyupm_grovescam.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_grovescam -%include "../upm.i" - -%{ - #include "grovescam.hpp" -%} -%include "grovescam.hpp" diff --git a/src/grovespeaker/javaupm_grovespeaker.i b/src/grovespeaker/javaupm_grovespeaker.i deleted file mode 100644 index 65934a5e..00000000 --- a/src/grovespeaker/javaupm_grovespeaker.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_grovespeaker -%include "../upm.i" - -%{ - #include "grovespeaker.hpp" -%} - -%include "grovespeaker.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_grovespeaker) \ No newline at end of file diff --git a/src/grovespeaker/jsupm_grovespeaker.i b/src/grovespeaker/jsupm_grovespeaker.i deleted file mode 100644 index ef71438f..00000000 --- a/src/grovespeaker/jsupm_grovespeaker.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_grovespeaker -%include "../upm.i" - -%{ - #include "grovespeaker.hpp" -%} - -%include "grovespeaker.hpp" diff --git a/src/grovespeaker/pyupm_grovespeaker.i b/src/grovespeaker/pyupm_grovespeaker.i deleted file mode 100644 index a017bfd5..00000000 --- a/src/grovespeaker/pyupm_grovespeaker.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_grovespeaker -%include "../upm.i" - -%include "grovespeaker.hpp" -%{ - #include "grovespeaker.hpp" -%} diff --git a/src/groveultrasonic/groveultrasonic.i b/src/groveultrasonic/groveultrasonic.i new file mode 100644 index 00000000..035c0657 --- /dev/null +++ b/src/groveultrasonic/groveultrasonic.i @@ -0,0 +1,16 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%ignore signalISR; + +JAVA_JNI_LOADLIBRARY(javaupm_groveultrasonic) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "groveultrasonic.hpp" +%} +%include "groveultrasonic.hpp" +/* END Common SWIG syntax */ diff --git a/src/groveultrasonic/javaupm_groveultrasonic.i b/src/groveultrasonic/javaupm_groveultrasonic.i deleted file mode 100644 index 7d906b2d..00000000 --- a/src/groveultrasonic/javaupm_groveultrasonic.i +++ /dev/null @@ -1,12 +0,0 @@ -%module javaupm_groveultrasonic -%include "../upm.i" - -%ignore signalISR; - -%{ - #include "groveultrasonic.hpp" -%} - -%include "groveultrasonic.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_groveultrasonic) diff --git a/src/groveultrasonic/jsupm_groveultrasonic.i b/src/groveultrasonic/jsupm_groveultrasonic.i deleted file mode 100644 index 6cfae0af..00000000 --- a/src/groveultrasonic/jsupm_groveultrasonic.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_groveultrasonic -%include "../upm.i" - -%{ - #include "groveultrasonic.hpp" -%} - -%include "groveultrasonic.hpp" diff --git a/src/groveultrasonic/pyupm_groveultrasonic.i b/src/groveultrasonic/pyupm_groveultrasonic.i deleted file mode 100644 index eee4b956..00000000 --- a/src/groveultrasonic/pyupm_groveultrasonic.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_groveultrasonic -%include "../upm.i" - -%include "groveultrasonic.hpp" -%{ - #include "groveultrasonic.hpp" -%} diff --git a/src/grovevdiv/javaupm_grovevdiv.i b/src/grovevdiv/javaupm_grovevdiv.i deleted file mode 100644 index 5dc15ef0..00000000 --- a/src/grovevdiv/javaupm_grovevdiv.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_grovevdiv -%include "../upm.i" - -%{ - #include "grovevdiv.hpp" -%} - -%include "grovevdiv.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_grovevdiv) \ No newline at end of file diff --git a/src/grovevdiv/jsupm_grovevdiv.i b/src/grovevdiv/jsupm_grovevdiv.i deleted file mode 100644 index ab9bedfe..00000000 --- a/src/grovevdiv/jsupm_grovevdiv.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_grovevdiv -%include "../upm.i" - -%{ - #include "grovevdiv.hpp" -%} - -%include "grovevdiv.hpp" diff --git a/src/grovevdiv/pyupm_grovevdiv.i b/src/grovevdiv/pyupm_grovevdiv.i deleted file mode 100644 index add483cf..00000000 --- a/src/grovevdiv/pyupm_grovevdiv.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_grovevdiv -%include "../upm.i" - -%include "grovevdiv.hpp" -%{ - #include "grovevdiv.hpp" -%} diff --git a/src/grovewater/javaupm_grovewater.i b/src/grovewater/javaupm_grovewater.i deleted file mode 100644 index 3d2eeabb..00000000 --- a/src/grovewater/javaupm_grovewater.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_grovewater -%include "../upm.i" - -%{ - #include "grovewater.hpp" -%} - -%include "grovewater.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_grovewater) \ No newline at end of file diff --git a/src/grovewater/jsupm_grovewater.i b/src/grovewater/jsupm_grovewater.i deleted file mode 100644 index 48c5deeb..00000000 --- a/src/grovewater/jsupm_grovewater.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_grovewater -%include "../upm.i" - -%{ - #include "grovewater.hpp" -%} - -%include "grovewater.hpp" diff --git a/src/grovewater/pyupm_grovewater.i b/src/grovewater/pyupm_grovewater.i deleted file mode 100644 index 12e4ce75..00000000 --- a/src/grovewater/pyupm_grovewater.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_grovewater -%include "../upm.i" - -%include "grovewater.hpp" -%{ - #include "grovewater.hpp" -%} diff --git a/src/grovewfs/grovewfs.i b/src/grovewfs/grovewfs.i new file mode 100644 index 00000000..62595e95 --- /dev/null +++ b/src/grovewfs/grovewfs.i @@ -0,0 +1,16 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%ignore flowISR; + +JAVA_JNI_LOADLIBRARY(javaupm_grovewfs) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "grovewfs.hpp" +%} +%include "grovewfs.hpp" +/* END Common SWIG syntax */ diff --git a/src/grovewfs/javaupm_grovewfs.i b/src/grovewfs/javaupm_grovewfs.i deleted file mode 100644 index 65cbf0f6..00000000 --- a/src/grovewfs/javaupm_grovewfs.i +++ /dev/null @@ -1,12 +0,0 @@ -%module javaupm_grovewfs -%include "../upm.i" - -%ignore flowISR; - -%{ - #include "grovewfs.hpp" -%} - -%include "grovewfs.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_grovewfs) \ No newline at end of file diff --git a/src/grovewfs/jsupm_grovewfs.i b/src/grovewfs/jsupm_grovewfs.i deleted file mode 100644 index 1b837c28..00000000 --- a/src/grovewfs/jsupm_grovewfs.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_grovewfs -%include "../upm.i" - -%{ - #include "grovewfs.hpp" -%} - -%include "grovewfs.hpp" diff --git a/src/grovewfs/pyupm_grovewfs.i b/src/grovewfs/pyupm_grovewfs.i deleted file mode 100644 index 5bded040..00000000 --- a/src/grovewfs/pyupm_grovewfs.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_grovewfs -%include "../upm.i" - -%include "grovewfs.hpp" -%{ - #include "grovewfs.hpp" -%} diff --git a/src/gsr/javaupm_gsr.i b/src/gsr/javaupm_gsr.i deleted file mode 100644 index de644725..00000000 --- a/src/gsr/javaupm_gsr.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_gsr -%include "../upm.i" - -%{ - #include "gsr.hpp" -%} - -%include "gsr.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_gsr) \ No newline at end of file diff --git a/src/gsr/jsupm_gsr.i b/src/gsr/jsupm_gsr.i deleted file mode 100644 index c7960dc2..00000000 --- a/src/gsr/jsupm_gsr.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_gsr -%include "../upm.i" - -%{ - #include "gsr.hpp" -%} - -%include "gsr.hpp" diff --git a/src/gsr/pyupm_gsr.i b/src/gsr/pyupm_gsr.i deleted file mode 100644 index ba590c45..00000000 --- a/src/gsr/pyupm_gsr.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_gsr -%include "../upm.i" - -%include "gsr.hpp" -%{ - #include "gsr.hpp" -%} diff --git a/src/guvas12d/javaupm_guvas12d.i b/src/guvas12d/javaupm_guvas12d.i deleted file mode 100644 index 3f0ab6ef..00000000 --- a/src/guvas12d/javaupm_guvas12d.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_guvas12d -%include "../upm.i" - -%{ - #include "guvas12d.hpp" -%} - -%include "guvas12d.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_guvas12d) \ No newline at end of file diff --git a/src/guvas12d/jsupm_guvas12d.i b/src/guvas12d/jsupm_guvas12d.i deleted file mode 100644 index db1e6c4f..00000000 --- a/src/guvas12d/jsupm_guvas12d.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_guvas12d -%include "../upm.i" - -%{ - #include "guvas12d.hpp" -%} - -%include "guvas12d.hpp" diff --git a/src/guvas12d/pyupm_guvas12d.i b/src/guvas12d/pyupm_guvas12d.i deleted file mode 100644 index 86cbd110..00000000 --- a/src/guvas12d/pyupm_guvas12d.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_guvas12d -%include "../upm.i" - -%include "guvas12d.hpp" -%{ - #include "guvas12d.hpp" -%} diff --git a/src/h3lis331dl/javaupm_h3lis331dl.i b/src/h3lis331dl/h3lis331dl.i similarity index 50% rename from src/h3lis331dl/javaupm_h3lis331dl.i rename to src/h3lis331dl/h3lis331dl.i index 2f85c510..d0140000 100644 --- a/src/h3lis331dl/javaupm_h3lis331dl.i +++ b/src/h3lis331dl/h3lis331dl.i @@ -1,20 +1,27 @@ -%module javaupm_h3lis331dl -%include "../upm.i" -%include "cpointer.i" -%include "typemaps.i" +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA %include "std_vector.i" +%apply float *OUTPUT { float *aX, float *aY, float *aZ }; +%apply int *OUTPUT { int *x, int *y, int*z }; + +%ignore i2cContext; + %template(IntVector) std::vector; %template(FloatVector) std::vector; -%apply int *OUTPUT { int *x, int *y, int*z }; -%apply float *OUTPUT { float *aX, float *aY, float *aZ }; +JAVA_JNI_LOADLIBRARY(javaupm_h3lis331dl) +#endif +/* END Java syntax */ -%ignore i2cContext; +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%pointer_functions(int, intp); +%pointer_functions(float, floatp); %{ #include "h3lis331dl.hpp" %} %include "h3lis331dl.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_h3lis331dl) +/* END Common SWIG syntax */ diff --git a/src/h3lis331dl/jsupm_h3lis331dl.i b/src/h3lis331dl/jsupm_h3lis331dl.i deleted file mode 100644 index 052cc5bf..00000000 --- a/src/h3lis331dl/jsupm_h3lis331dl.i +++ /dev/null @@ -1,13 +0,0 @@ -%module jsupm_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.hpp" -%} - -%include "h3lis331dl.hpp" diff --git a/src/h3lis331dl/pyupm_h3lis331dl.i b/src/h3lis331dl/pyupm_h3lis331dl.i deleted file mode 100644 index aa469053..00000000 --- a/src/h3lis331dl/pyupm_h3lis331dl.i +++ /dev/null @@ -1,14 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_h3lis331dl -%include "../upm.i" -%include "cpointer.i" - -/* Send "int *" and "float *" to python as intp and floatp */ -%pointer_functions(int, intp); -%pointer_functions(float, floatp); - -%include "h3lis331dl.hpp" -%{ - #include "h3lis331dl.hpp" -%} diff --git a/src/h803x/h803x.i b/src/h803x/h803x.i new file mode 100644 index 00000000..a2dc0053 --- /dev/null +++ b/src/h803x/h803x.i @@ -0,0 +1,14 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_h803x) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "h803x.hpp" +%} +%include "h803x.hpp" +/* END Common SWIG syntax */ diff --git a/src/h803x/javaupm_h803x.i b/src/h803x/javaupm_h803x.i deleted file mode 100644 index 691e127a..00000000 --- a/src/h803x/javaupm_h803x.i +++ /dev/null @@ -1,11 +0,0 @@ -%module javaupm_h803x -%include "../upm.i" -%include "typemaps.i" - -%{ - #include "h803x.hpp" -%} - -%include "h803x.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_h803x) diff --git a/src/h803x/jsupm_h803x.i b/src/h803x/jsupm_h803x.i deleted file mode 100644 index 4938fe67..00000000 --- a/src/h803x/jsupm_h803x.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_h803x -%include "../upm.i" -%include "stdint.i" - -%include "h803x.hpp" -%{ - #include "h803x.hpp" -%} diff --git a/src/h803x/pyupm_h803x.i b/src/h803x/pyupm_h803x.i deleted file mode 100644 index 6c28d81e..00000000 --- a/src/h803x/pyupm_h803x.i +++ /dev/null @@ -1,10 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_h803x -%include "../upm.i" -%include "stdint.i" - -%include "h803x.hpp" -%{ - #include "h803x.hpp" -%} diff --git a/src/hcsr04/hcsr04.i b/src/hcsr04/hcsr04.i new file mode 100644 index 00000000..62d2f344 --- /dev/null +++ b/src/hcsr04/hcsr04.i @@ -0,0 +1,15 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_hcsr04) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "hcsr04.hpp" +%} +%include "hcsr04.h" +%include "hcsr04.hpp" +/* END Common SWIG syntax */ diff --git a/src/hcsr04/javaupm_hcsr04.i b/src/hcsr04/javaupm_hcsr04.i deleted file mode 100644 index 4b5e8d9f..00000000 --- a/src/hcsr04/javaupm_hcsr04.i +++ /dev/null @@ -1,12 +0,0 @@ -%module javaupm_hcsr04 -%include "../upm.i" - -%{ - #include "hcsr04.hpp" -%} - -%include "hcsr04.h" -%include "hcsr04.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_hcsr04) - diff --git a/src/hcsr04/jsupm_hcsr04.i b/src/hcsr04/jsupm_hcsr04.i deleted file mode 100644 index 5bcd753a..00000000 --- a/src/hcsr04/jsupm_hcsr04.i +++ /dev/null @@ -1,9 +0,0 @@ -%module jsupm_hcsr04 -%include "../upm.i" - -%{ - #include "hcsr04.hpp" -%} - -%include "hcsr04.h" -%include "hcsr04.hpp" diff --git a/src/hcsr04/pyupm_hcsr04.i b/src/hcsr04/pyupm_hcsr04.i deleted file mode 100644 index 28163d3a..00000000 --- a/src/hcsr04/pyupm_hcsr04.i +++ /dev/null @@ -1,10 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_hcsr04 -%include "../upm.i" - -%include "hcsr04.h" -%include "hcsr04.hpp" -%{ - #include "hcsr04.hpp" -%} diff --git a/src/hdc1000/javaupm_hdc1000.i b/src/hdc1000/javaupm_hdc1000.i deleted file mode 100644 index c885e378..00000000 --- a/src/hdc1000/javaupm_hdc1000.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_hdc1000 -%include "../upm.i" - -%{ - #include "hdc1000.hpp" -%} - -%include "hdc1000.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_hdc1000) \ No newline at end of file diff --git a/src/hdc1000/jsupm_hdc1000.i b/src/hdc1000/jsupm_hdc1000.i deleted file mode 100644 index b9ed9f39..00000000 --- a/src/hdc1000/jsupm_hdc1000.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_hdc1000 -%include "../upm.i" - -%{ - #include "hdc1000.hpp" -%} - -%include "hdc1000.hpp" diff --git a/src/hdc1000/pyupm_hdc1000.i b/src/hdc1000/pyupm_hdc1000.i deleted file mode 100644 index 652e6044..00000000 --- a/src/hdc1000/pyupm_hdc1000.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_hdc1000 -%include "../upm.i" - -%include "hdc1000.hpp" -%{ - #include "hdc1000.hpp" -%} diff --git a/src/hdxxvxta/hdxxvxta.i b/src/hdxxvxta/hdxxvxta.i new file mode 100644 index 00000000..68ec2368 --- /dev/null +++ b/src/hdxxvxta/hdxxvxta.i @@ -0,0 +1,14 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_hdxxvxta) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "hdxxvxta.hpp" +%} +%include "hdxxvxta.hpp" +/* END Common SWIG syntax */ diff --git a/src/hdxxvxta/javaupm_hdxxvxta.i b/src/hdxxvxta/javaupm_hdxxvxta.i deleted file mode 100644 index 558e33c6..00000000 --- a/src/hdxxvxta/javaupm_hdxxvxta.i +++ /dev/null @@ -1,12 +0,0 @@ -%module javaupm_hdxxvxta -%include "../upm.i" -%include "std_string.i" - -%{ - #include "hdxxvxta.hpp" -%} - -%include "hdxxvxta.hpp" - - -JAVA_JNI_LOADLIBRARY(javaupm_hdxxvxta) diff --git a/src/hdxxvxta/jsupm_hdxxvxta.i b/src/hdxxvxta/jsupm_hdxxvxta.i deleted file mode 100644 index b3b25e32..00000000 --- a/src/hdxxvxta/jsupm_hdxxvxta.i +++ /dev/null @@ -1,10 +0,0 @@ -%module jsupm_hdxxvxta -%include "../upm.i" -%include "std_string.i" - -%{ - #include "hdxxvxta.hpp" -%} - -%include "hdxxvxta.hpp" - diff --git a/src/hdxxvxta/pyupm_hdxxvxta.i b/src/hdxxvxta/pyupm_hdxxvxta.i deleted file mode 100644 index cfaf4d87..00000000 --- a/src/hdxxvxta/pyupm_hdxxvxta.i +++ /dev/null @@ -1,11 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_hdxxvxta -%include "../upm.i" -%include "std_string.i" - -%{ - #include "hdxxvxta.hpp" -%} -%include "hdxxvxta.hpp" - diff --git a/src/hka5/hka5.i b/src/hka5/hka5.i new file mode 100644 index 00000000..82b03d65 --- /dev/null +++ b/src/hka5/hka5.i @@ -0,0 +1,14 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_hka5) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "hka5.hpp" +%} +%include "hka5.hpp" +/* END Common SWIG syntax */ diff --git a/src/hka5/javaupm_hka5.i b/src/hka5/javaupm_hka5.i deleted file mode 100644 index 2d88955c..00000000 --- a/src/hka5/javaupm_hka5.i +++ /dev/null @@ -1,12 +0,0 @@ -%module javaupm_hka5 -%include "../upm.i" -%include "std_string.i" -%include "stdint.i" -%include "typemaps.i" - -%include "hka5.hpp" -%{ - #include "hka5.hpp" -%} - -JAVA_JNI_LOADLIBRARY(javaupm_hka5) diff --git a/src/hka5/jsupm_hka5.i b/src/hka5/jsupm_hka5.i deleted file mode 100644 index bd37d2f4..00000000 --- a/src/hka5/jsupm_hka5.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_hka5 -%include "../upm.i" -%include "std_string.i" - -%include "hka5.hpp" -%{ - #include "hka5.hpp" -%} diff --git a/src/hka5/pyupm_hka5.i b/src/hka5/pyupm_hka5.i deleted file mode 100644 index 77e87d71..00000000 --- a/src/hka5/pyupm_hka5.i +++ /dev/null @@ -1,10 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_hka5 -%include "../upm.i" -%include "std_string.i" - -%include "hka5.hpp" -%{ - #include "hka5.hpp" -%} diff --git a/src/hlg150h/hlg150h.i b/src/hlg150h/hlg150h.i new file mode 100644 index 00000000..84b58cb6 --- /dev/null +++ b/src/hlg150h/hlg150h.i @@ -0,0 +1,19 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%include "arrays_java.i"; +%include "../java_buffer.i" +%typemap(javaimports) SWIGTYPE %{import upm_interfaces.*;%} +%import "../interfaces/javaupm_iLightController.i" + +JAVA_JNI_LOADLIBRARY(javaupm_hlg150h) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "hlg150h.hpp" +%} +%include "hlg150h.hpp" +/* END Common SWIG syntax */ diff --git a/src/hlg150h/javaupm_hlg150h.i b/src/hlg150h/javaupm_hlg150h.i deleted file mode 100644 index 26d62ccb..00000000 --- a/src/hlg150h/javaupm_hlg150h.i +++ /dev/null @@ -1,21 +0,0 @@ -%module javaupm_hlg150h - -%include "../upm.i" -%include "arrays_java.i"; -%include "../java_buffer.i" -%include "cpointer.i" -%include "typemaps.i" - -%import "../interfaces/javaupm_iLightController.i" - -%typemap(javaimports) SWIGTYPE %{ -import upm_interfaces.*; -%} - -%{ - #include "hlg150h.hpp" -%} - -%include "hlg150h.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_hlg150h) diff --git a/src/hlg150h/jsupm_hlg150h.i b/src/hlg150h/jsupm_hlg150h.i deleted file mode 100644 index 18cb2e0f..00000000 --- a/src/hlg150h/jsupm_hlg150h.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_hlg150h -%include "../upm.i" - -%{ - #include "hlg150h.hpp" -%} - -%include "hlg150h.hpp" diff --git a/src/hlg150h/pyupm_hlg150h.i b/src/hlg150h/pyupm_hlg150h.i deleted file mode 100644 index af585018..00000000 --- a/src/hlg150h/pyupm_hlg150h.i +++ /dev/null @@ -1,9 +0,0 @@ -%module pyupm_hlg150h -%include "../upm.i" -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" - -%include "hlg150h.hpp" -%{ - #include "hlg150h.hpp" -%} diff --git a/src/hm11/hm11.i b/src/hm11/hm11.i new file mode 100644 index 00000000..a6f6c166 --- /dev/null +++ b/src/hm11/hm11.i @@ -0,0 +1,23 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%include "../java_buffer.i" + +JAVA_JNI_LOADLIBRARY(javaupm_hm11) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%include "carrays.i" + +%{ +#include "hm11.hpp" +speed_t int_B9600 = B9600; +%} +%include "hm11.hpp" + +%array_class(char, charArray); + +speed_t int_B9600 = B9600; +/* END Common SWIG syntax */ diff --git a/src/hm11/javaupm_hm11.i b/src/hm11/javaupm_hm11.i deleted file mode 100644 index 3248e2ed..00000000 --- a/src/hm11/javaupm_hm11.i +++ /dev/null @@ -1,15 +0,0 @@ -%module javaupm_hm11 -%include "../upm.i" -%include "carrays.i" -%include "../java_buffer.i" - -%{ - #include "hm11.hpp" - speed_t int_B9600 = B9600; -%} - -%include "hm11.hpp" -speed_t int_B9600 = B9600; -%array_class(char, charArray); - -JAVA_JNI_LOADLIBRARY(javaupm_hm11) \ No newline at end of file diff --git a/src/hm11/jsupm_hm11.i b/src/hm11/jsupm_hm11.i deleted file mode 100644 index bf2f6050..00000000 --- a/src/hm11/jsupm_hm11.i +++ /dev/null @@ -1,12 +0,0 @@ -%module jsupm_hm11 -%include "../upm.i" -%include "carrays.i" - -%{ - #include "hm11.hpp" - speed_t int_B9600 = B9600; -%} - -%include "hm11.hpp" -speed_t int_B9600 = B9600; -%array_class(char, charArray); diff --git a/src/hm11/pyupm_hm11.i b/src/hm11/pyupm_hm11.i deleted file mode 100644 index 233817ba..00000000 --- a/src/hm11/pyupm_hm11.i +++ /dev/null @@ -1,13 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_hm11 -%include "../upm.i" -%include "carrays.i" - -%{ - #include "hm11.hpp" - speed_t int_B9600 = B9600; -%} -%include "hm11.hpp" -speed_t int_B9600 = B9600; -%array_class(char, charArray); diff --git a/src/hmc5883l/hmc5883l.i b/src/hmc5883l/hmc5883l.i new file mode 100644 index 00000000..7ded65a7 --- /dev/null +++ b/src/hmc5883l/hmc5883l.i @@ -0,0 +1,49 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%typemap(jni) int16_t* "jshortArray" +%typemap(jstype) int16_t* "short[]" +%typemap(jtype) int16_t* "short[]" + +%typemap(javaout) int16_t* { + return $jnicall; +} + +%typemap(out) int16_t *coordinates { + $result = JCALL1(NewShortArray, jenv, 3); + JCALL4(SetShortArrayRegion, jenv, $result, 0, 3, (jshort*)$1); +} + +JAVA_JNI_LOADLIBRARY(javaupm_hmc5883l) +#endif +/* END Java syntax */ + +/* BEGIN Javascript syntax ------------------------------------------------- */ +#ifdef SWIGJAVASCRIPT +%include "../carrays_int16_t.i" + +// Adding this typemap because SWIG is converting int16 into a short by default +// This forces SWIG to convert it correctly +%typemap(out) int16_t* { + $result = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_int16Array, 0 | 0 ); +} +#endif +/* END Javascript syntax */ + +/* BEGIN Python syntax ----------------------------------------------------- */ +#ifdef SWIGPYTHON +%include "../carrays_int16_t.i" + +%typemap(out) int16_t* { + $result = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_int16Array, 0 | 0 ); +} +#endif +/* END Python syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "hmc5883l.hpp" +%} +%include "hmc5883l.hpp" +/* END Common SWIG syntax */ diff --git a/src/hmc5883l/javaupm_hmc5883l.i b/src/hmc5883l/javaupm_hmc5883l.i deleted file mode 100644 index df5cc6ea..00000000 --- a/src/hmc5883l/javaupm_hmc5883l.i +++ /dev/null @@ -1,23 +0,0 @@ -%module javaupm_hmc5883l -%include "../upm.i" - -%{ - #include "hmc5883l.hpp" -%} - -%typemap(jni) int16_t* "jshortArray" -%typemap(jstype) int16_t* "short[]" -%typemap(jtype) int16_t* "short[]" - -%typemap(javaout) int16_t* { - return $jnicall; -} - -%typemap(out) int16_t *coordinates { - $result = JCALL1(NewShortArray, jenv, 3); - JCALL4(SetShortArrayRegion, jenv, $result, 0, 3, (jshort*)$1); -} - -%include "hmc5883l.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_hmc5883l) \ No newline at end of file diff --git a/src/hmc5883l/jsupm_hmc5883l.i b/src/hmc5883l/jsupm_hmc5883l.i deleted file mode 100644 index f5b71923..00000000 --- a/src/hmc5883l/jsupm_hmc5883l.i +++ /dev/null @@ -1,14 +0,0 @@ -%module jsupm_hmc5883l -%include "../upm.i" -%include "../carrays_int16_t.i" -%{ - #include "hmc5883l.hpp" -%} - -// Adding this typemap because SWIG is converting int16 into a short by default -// This forces SWIG to convert it correctly -%typemap(out) int16_t* { - $result = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_int16Array, 0 | 0 ); -} - -%include "hmc5883l.hpp" diff --git a/src/hmc5883l/pyupm_hmc5883l.i b/src/hmc5883l/pyupm_hmc5883l.i deleted file mode 100644 index c08e5766..00000000 --- a/src/hmc5883l/pyupm_hmc5883l.i +++ /dev/null @@ -1,14 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_hmc5883l -%include "../upm.i" -%include "../carrays_int16_t.i" - -%typemap(out) int16_t* { - $result = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_int16Array, 0 | 0 ); -} - -%include "hmc5883l.hpp" -%{ - #include "hmc5883l.hpp" -%} diff --git a/src/hmtrp/hmtrp.i b/src/hmtrp/hmtrp.i new file mode 100644 index 00000000..a9e778e8 --- /dev/null +++ b/src/hmtrp/hmtrp.i @@ -0,0 +1,55 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%include "../java_buffer.i" +%include "../java_exceptions.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 }; + +%ignore getRFSignalStrength(uint8_t *strength); +READDATA_EXCEPTION(getRFSignalStrength()) + +%ignore getModSignalStrength(uint8_t *strength); +READDATA_EXCEPTION(getModSignalStrength()) + +JAVA_JNI_LOADLIBRARY(javaupm_hmtrp) +#endif +/* END Java syntax */ + +/* BEGIN Javascript syntax ------------------------------------------------- */ +#ifdef SWIGJAVASCRIPT +%include "../carrays_uint8_t.i" +%include "../carrays_uint16_t.i" +%include "../carrays_uint32_t.i" + +%array_class(char, charArray); +#endif +/* END Javascript syntax */ + +/* BEGIN Python syntax ----------------------------------------------------- */ +#ifdef SWIGPYTHON +%include "../carrays_uint8_t.i" +%include "../carrays_uint16_t.i" +%include "../carrays_uint32_t.i" + +%rename("getModSignalStrengthNoParam") getModSignalStrength(); +%rename("getRFSignalStrengthNoParam") getRFSignalStrength(); + +%array_class(char, charArray); +#endif +/* END Python syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "hmtrp.hpp" +speed_t int_B9600 = B9600; +%} +%include "hmtrp.hpp" + +speed_t int_B9600 = B9600; +/* END Common SWIG syntax */ diff --git a/src/hmtrp/javaupm_hmtrp.i b/src/hmtrp/javaupm_hmtrp.i deleted file mode 100644 index 35333d26..00000000 --- a/src/hmtrp/javaupm_hmtrp.i +++ /dev/null @@ -1,28 +0,0 @@ -%module javaupm_hmtrp -%include "../upm.i" -%include "stdint.i" -%include "typemaps.i" -%include "../java_buffer.i" -%include "../java_exceptions.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.hpp" - speed_t int_B9600 = B9600; -%} - -%ignore getRFSignalStrength(uint8_t *strength); -READDATA_EXCEPTION(getRFSignalStrength()) - -%ignore getModSignalStrength(uint8_t *strength); -READDATA_EXCEPTION(getModSignalStrength()) - -%include "hmtrp.hpp" -speed_t int_B9600 = B9600; - -JAVA_JNI_LOADLIBRARY(javaupm_hmtrp) diff --git a/src/hmtrp/jsupm_hmtrp.i b/src/hmtrp/jsupm_hmtrp.i deleted file mode 100644 index 3c2bfbe0..00000000 --- a/src/hmtrp/jsupm_hmtrp.i +++ /dev/null @@ -1,14 +0,0 @@ -%module jsupm_hmtrp -%include "../upm.i" -%include "../carrays_uint8_t.i" -%include "../carrays_uint16_t.i" -%include "../carrays_uint32_t.i" - -%{ - #include "hmtrp.hpp" - speed_t int_B9600 = B9600; -%} - -%include "hmtrp.hpp" -speed_t int_B9600 = B9600; -%array_class(char, charArray); diff --git a/src/hmtrp/pyupm_hmtrp.i b/src/hmtrp/pyupm_hmtrp.i deleted file mode 100644 index 14af44f0..00000000 --- a/src/hmtrp/pyupm_hmtrp.i +++ /dev/null @@ -1,18 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_hmtrp -%include "../upm.i" -%include "../carrays_uint8_t.i" -%include "../carrays_uint16_t.i" -%include "../carrays_uint32_t.i" - -%rename("getModSignalStrengthNoParam") getModSignalStrength(); -%rename("getRFSignalStrengthNoParam") getRFSignalStrength(); - -%include "hmtrp.hpp" -%{ - #include "hmtrp.hpp" - speed_t int_B9600 = B9600; -%} -speed_t int_B9600 = B9600; -%array_class(char, charArray); diff --git a/src/hp20x/javaupm_hp20x.i b/src/hp20x/javaupm_hp20x.i deleted file mode 100644 index eb3a7061..00000000 --- a/src/hp20x/javaupm_hp20x.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_hp20x -%include "../upm.i" - -%{ - #include "hp20x.hpp" -%} - -%include "hp20x.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_hp20x) \ No newline at end of file diff --git a/src/hp20x/jsupm_hp20x.i b/src/hp20x/jsupm_hp20x.i deleted file mode 100644 index e83a6b24..00000000 --- a/src/hp20x/jsupm_hp20x.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_hp20x -%include "../upm.i" - -%{ - #include "hp20x.hpp" -%} - -%include "hp20x.hpp" diff --git a/src/hp20x/pyupm_hp20x.i b/src/hp20x/pyupm_hp20x.i deleted file mode 100644 index c52f30de..00000000 --- a/src/hp20x/pyupm_hp20x.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_hp20x -%include "../upm.i" - -%include "hp20x.hpp" -%{ - #include "hp20x.hpp" -%} diff --git a/src/ht9170/javaupm_ht9170.i b/src/ht9170/javaupm_ht9170.i deleted file mode 100644 index 518efc1b..00000000 --- a/src/ht9170/javaupm_ht9170.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_ht9170 -%include "../upm.i" - -%{ - #include "ht9170.hpp" -%} - -%include "ht9170.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_ht9170) \ No newline at end of file diff --git a/src/ht9170/jsupm_ht9170.i b/src/ht9170/jsupm_ht9170.i deleted file mode 100644 index 1c7c7898..00000000 --- a/src/ht9170/jsupm_ht9170.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_ht9170 -%include "../upm.i" - -%{ - #include "ht9170.hpp" -%} - -%include "ht9170.hpp" diff --git a/src/ht9170/pyupm_ht9170.i b/src/ht9170/pyupm_ht9170.i deleted file mode 100644 index fe895f8a..00000000 --- a/src/ht9170/pyupm_ht9170.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_ht9170 -%include "../upm.i" - -%include "ht9170.hpp" -%{ - #include "ht9170.hpp" -%} diff --git a/src/htu21d/htu21d.i b/src/htu21d/htu21d.i new file mode 100644 index 00000000..064cb239 --- /dev/null +++ b/src/htu21d/htu21d.i @@ -0,0 +1,16 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%ignore getHumidityData(float*, float*, float*); + +JAVA_JNI_LOADLIBRARY(javaupm_htu21d) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "htu21d.hpp" +%} +%include "htu21d.hpp" +/* END Common SWIG syntax */ diff --git a/src/htu21d/javaupm_htu21d.i b/src/htu21d/javaupm_htu21d.i deleted file mode 100644 index 36441026..00000000 --- a/src/htu21d/javaupm_htu21d.i +++ /dev/null @@ -1,12 +0,0 @@ -%module javaupm_htu21d -%include "../upm.i" -%include "typemaps.i" - -%ignore getHumidityData(float*, float*, float*); - -%{ - #include "htu21d.hpp" -%} -%include "htu21d.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_htu21d) diff --git a/src/htu21d/jsupm_htu21d.i b/src/htu21d/jsupm_htu21d.i deleted file mode 100644 index 66dcdb49..00000000 --- a/src/htu21d/jsupm_htu21d.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_htu21d -%include "../upm.i" - -%{ - #include "htu21d.hpp" -%} - -%include "htu21d.hpp" diff --git a/src/htu21d/pyupm_htu21d.i b/src/htu21d/pyupm_htu21d.i deleted file mode 100644 index 0d70bd6f..00000000 --- a/src/htu21d/pyupm_htu21d.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_htu21d -%include "../upm.i" - -%include "htu21d.hpp" -%{ - #include "htu21d.hpp" -%} diff --git a/src/hwxpxx/hwxpxx.i b/src/hwxpxx/hwxpxx.i new file mode 100644 index 00000000..c8eff427 --- /dev/null +++ b/src/hwxpxx/hwxpxx.i @@ -0,0 +1,14 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_hwxpxx) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "hwxpxx.hpp" +%} +%include "hwxpxx.hpp" +/* END Common SWIG syntax */ diff --git a/src/hwxpxx/javaupm_hwxpxx.i b/src/hwxpxx/javaupm_hwxpxx.i deleted file mode 100644 index 5e4fe95f..00000000 --- a/src/hwxpxx/javaupm_hwxpxx.i +++ /dev/null @@ -1,11 +0,0 @@ -%module javaupm_hwxpxx -%include "../upm.i" -%include "typemaps.i" - -%{ - #include "hwxpxx.hpp" -%} - -%include "hwxpxx.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_hwxpxx) diff --git a/src/hwxpxx/jsupm_hwxpxx.i b/src/hwxpxx/jsupm_hwxpxx.i deleted file mode 100644 index b58732ae..00000000 --- a/src/hwxpxx/jsupm_hwxpxx.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_hwxpxx -%include "../upm.i" -%include "stdint.i" - -%include "hwxpxx.hpp" -%{ - #include "hwxpxx.hpp" -%} diff --git a/src/hwxpxx/pyupm_hwxpxx.i b/src/hwxpxx/pyupm_hwxpxx.i deleted file mode 100644 index c1bbe743..00000000 --- a/src/hwxpxx/pyupm_hwxpxx.i +++ /dev/null @@ -1,10 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_hwxpxx -%include "../upm.i" -%include "stdint.i" - -%include "hwxpxx.hpp" -%{ - #include "hwxpxx.hpp" -%} diff --git a/src/hx711/hx711.i b/src/hx711/hx711.i new file mode 100644 index 00000000..8cefe4e3 --- /dev/null +++ b/src/hx711/hx711.i @@ -0,0 +1,14 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_hx711) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "hx711.hpp" +%} +%include "hx711.hpp" +/* END Common SWIG syntax */ diff --git a/src/hx711/javaupm_hx711.i b/src/hx711/javaupm_hx711.i deleted file mode 100644 index 38082e7f..00000000 --- a/src/hx711/javaupm_hx711.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_hx711 -%include "../upm.i" - -%{ - #include "hx711.hpp" -%} - -%include "hx711.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_hx711) \ No newline at end of file diff --git a/src/hx711/jsupm_hx711.i b/src/hx711/jsupm_hx711.i deleted file mode 100644 index a3a79f37..00000000 --- a/src/hx711/jsupm_hx711.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_hx711 -%include "../upm.i" - -%{ - #include "hx711.hpp" -%} - -%include "hx711.hpp" diff --git a/src/hx711/pyupm_hx711.i b/src/hx711/pyupm_hx711.i deleted file mode 100644 index f15ffbda..00000000 --- a/src/hx711/pyupm_hx711.i +++ /dev/null @@ -1,10 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_hx711 -%include "../upm.i" -%include "stdint.i" - -%include "hx711.hpp" -%{ - #include "hx711.hpp" -%} diff --git a/src/ili9341/ili9341.i b/src/ili9341/ili9341.i new file mode 100644 index 00000000..b258534c --- /dev/null +++ b/src/ili9341/ili9341.i @@ -0,0 +1,18 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%apply uint8_t *INPUT { uint8_t *addr } + +JAVA_JNI_LOADLIBRARY(javaupm_ili9341) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "ili9341_gfx.hpp" +#include "ili9341.hpp" +%} +%include "ili9341_gfx.hpp" +%include "ili9341.hpp" +/* END Common SWIG syntax */ diff --git a/src/ili9341/javaupm_ili9341.i b/src/ili9341/javaupm_ili9341.i deleted file mode 100644 index e628c1d3..00000000 --- a/src/ili9341/javaupm_ili9341.i +++ /dev/null @@ -1,19 +0,0 @@ -%module javaupm_ili9341 -%include "../upm.i" -%include "stdint.i" -%include "typemaps.i" - -%apply uint8_t *INPUT { uint8_t *addr } - -%include "ili9341_gfx.hpp" -%{ - #include "ili9341_gfx.hpp" -%} - -%{ - #include "ili9341.hpp" -%} - -%include "ili9341.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_ili9341) \ No newline at end of file diff --git a/src/ili9341/jsupm_ili9341.i b/src/ili9341/jsupm_ili9341.i deleted file mode 100644 index fd47fb67..00000000 --- a/src/ili9341/jsupm_ili9341.i +++ /dev/null @@ -1,12 +0,0 @@ -%module jsupm_ili9341 -%include "../upm.i" - -%include "ili9341_gfx.hpp" -%{ - #include "ili9341_gfx.hpp" -%} - -%include "ili9341.hpp" -%{ - #include "ili9341.hpp" -%} diff --git a/src/ili9341/pyupm_ili9341.i b/src/ili9341/pyupm_ili9341.i deleted file mode 100644 index c469280e..00000000 --- a/src/ili9341/pyupm_ili9341.i +++ /dev/null @@ -1,14 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_ili9341 -%include "../upm.i" - -%include "ili9341_gfx.hpp" -%{ - #include "ili9341_gfx.hpp" -%} - -%include "ili9341.hpp" -%{ - #include "ili9341.hpp" -%} diff --git a/src/ims/ims.i b/src/ims/ims.i new file mode 100644 index 00000000..2ccc2fa5 --- /dev/null +++ b/src/ims/ims.i @@ -0,0 +1,16 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_ims) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "ims_defs.h" +#include "ims.hpp" +%} +%include "ims_defs.h" +%include "ims.hpp" +/* END Common SWIG syntax */ diff --git a/src/ims/javaupm_ims.i b/src/ims/javaupm_ims.i deleted file mode 100644 index 6bff5154..00000000 --- a/src/ims/javaupm_ims.i +++ /dev/null @@ -1,11 +0,0 @@ -%module javaupm_ims -%include "../upm.i" - -%{ - #include "ims.hpp" -%} - -%include "ims_defs.h" -%include "ims.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_ims) diff --git a/src/ims/jsupm_ims.i b/src/ims/jsupm_ims.i deleted file mode 100644 index 962e96b1..00000000 --- a/src/ims/jsupm_ims.i +++ /dev/null @@ -1,9 +0,0 @@ -%module jsupm_ims -%include "../upm.i" - -%{ - #include "ims.hpp" -%} - -%include "ims_defs.h" -%include "ims.hpp" diff --git a/src/ims/pyupm_ims.i b/src/ims/pyupm_ims.i deleted file mode 100644 index d2504f89..00000000 --- a/src/ims/pyupm_ims.i +++ /dev/null @@ -1,11 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_ims -%include "../upm.i" - -%{ - #include "ims.hpp" -%} - -%include "ims_defs.h" -%include "ims.hpp" diff --git a/src/ina132/javaupm_ina132.i b/src/ina132/javaupm_ina132.i deleted file mode 100644 index cf4d0c5e..00000000 --- a/src/ina132/javaupm_ina132.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_ina132 -%include "../upm.i" - -%{ - #include "ina132.hpp" -%} - -%include "ina132.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_ina132) \ No newline at end of file diff --git a/src/ina132/jsupm_ina132.i b/src/ina132/jsupm_ina132.i deleted file mode 100644 index 2780b89d..00000000 --- a/src/ina132/jsupm_ina132.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_ina132 -%include "../upm.i" - -%{ - #include "ina132.hpp" -%} - -%include "ina132.hpp" diff --git a/src/ina132/pyupm_ina132.i b/src/ina132/pyupm_ina132.i deleted file mode 100644 index e92001d3..00000000 --- a/src/ina132/pyupm_ina132.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_ina132 -%include "../upm.i" - -%include "ina132.hpp" -%{ - #include "ina132.hpp" -%} diff --git a/src/interfaces/javaupm_interfaces.i b/src/interfaces/interfaces.i similarity index 68% rename from src/interfaces/javaupm_interfaces.i rename to src/interfaces/interfaces.i index f247dd74..3f77d902 100644 --- a/src/interfaces/javaupm_interfaces.i +++ b/src/interfaces/interfaces.i @@ -1,5 +1,7 @@ -%module javaupm_interfaces +%include "../common_top.i" +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA %import "../_upm.i" %include javaupm_iModuleStatus.i @@ -12,3 +14,5 @@ %include javaupm_iTemperatureSensor.i JAVA_JNI_LOADLIBRARY(javaupm_interfaces) +#endif +/* END Java syntax */ diff --git a/src/interfaces/javaupm_iADC.i b/src/interfaces/javaupm_iADC.i index 843f7f83..e50806b7 100644 --- a/src/interfaces/javaupm_iADC.i +++ b/src/interfaces/javaupm_iADC.i @@ -2,11 +2,10 @@ %include %interface_impl(upm::IADC); #endif - -%include "javaupm_interfaces.i" +%include "interfaces.i" %include "javaupm_iModuleStatus.i" %include "iADC.hpp" %{ #include "iADC.hpp" -%} \ No newline at end of file +%} diff --git a/src/interfaces/javaupm_iCO2Sensor.i b/src/interfaces/javaupm_iCO2Sensor.i index 61e95968..237690ff 100644 --- a/src/interfaces/javaupm_iCO2Sensor.i +++ b/src/interfaces/javaupm_iCO2Sensor.i @@ -2,12 +2,11 @@ %include %interface_impl(upm::ICO2Sensor); #endif - %include "stdint.i" -%include "javaupm_interfaces.i" +%include "interfaces.i" %include "javaupm_iModuleStatus.i" %include "iCO2Sensor.hpp" %{ #include "iCO2Sensor.hpp" -%} \ No newline at end of file +%} diff --git a/src/interfaces/javaupm_iHumiditySensor.i b/src/interfaces/javaupm_iHumiditySensor.i index 4514ae6f..1b680ded 100644 --- a/src/interfaces/javaupm_iHumiditySensor.i +++ b/src/interfaces/javaupm_iHumiditySensor.i @@ -2,11 +2,10 @@ %include %interface_impl(upm::IHumiditySensor); #endif - -%include "javaupm_interfaces.i" +%include "interfaces.i" %include "javaupm_iModuleStatus.i" %include "iHumiditySensor.hpp" %{ #include "iHumiditySensor.hpp" -%} \ No newline at end of file +%} diff --git a/src/interfaces/javaupm_iLightController.i b/src/interfaces/javaupm_iLightController.i index fe3206c8..3c47d1db 100644 --- a/src/interfaces/javaupm_iLightController.i +++ b/src/interfaces/javaupm_iLightController.i @@ -2,11 +2,10 @@ %include %interface_impl(upm::ILightController); #endif - -%include "javaupm_interfaces.i" +%include "interfaces.i" %include "javaupm_iModuleStatus.i" -%include "iLightController.hpp" %{ - #include "iLightController.hpp" -%} \ No newline at end of file +#include "iLightController.hpp" +%} +%include "iLightController.hpp" diff --git a/src/interfaces/javaupm_iLightSensor.i b/src/interfaces/javaupm_iLightSensor.i index 72456a3a..429e18a8 100644 --- a/src/interfaces/javaupm_iLightSensor.i +++ b/src/interfaces/javaupm_iLightSensor.i @@ -2,11 +2,10 @@ %include %interface_impl(upm::ILightSensor); #endif - -%include "javaupm_interfaces.i" +%include "interfaces.i" %include "javaupm_iModuleStatus.i" %include "iLightSensor.hpp" %{ #include "iLightSensor.hpp" -%} \ No newline at end of file +%} diff --git a/src/interfaces/javaupm_iModuleStatus.i b/src/interfaces/javaupm_iModuleStatus.i index 133c7aac..f8286767 100644 --- a/src/interfaces/javaupm_iModuleStatus.i +++ b/src/interfaces/javaupm_iModuleStatus.i @@ -2,7 +2,6 @@ %include %interface_impl(upm::IModuleStatus); #endif - %include "iModuleStatus.hpp" %{ #include "iModuleStatus.hpp" diff --git a/src/interfaces/javaupm_iPressureSensor.i b/src/interfaces/javaupm_iPressureSensor.i index acb37b23..67ef7f66 100644 --- a/src/interfaces/javaupm_iPressureSensor.i +++ b/src/interfaces/javaupm_iPressureSensor.i @@ -2,11 +2,10 @@ %include %interface_impl(upm::IPressureSensor); #endif - -%include "javaupm_interfaces.i" +%include "interfaces.i" %include "javaupm_iModuleStatus.i" %include "iPressureSensor.hpp" %{ #include "iPressureSensor.hpp" -%} \ No newline at end of file +%} diff --git a/src/interfaces/javaupm_iTemperatureSensor.i b/src/interfaces/javaupm_iTemperatureSensor.i index 699df32b..6da971af 100644 --- a/src/interfaces/javaupm_iTemperatureSensor.i +++ b/src/interfaces/javaupm_iTemperatureSensor.i @@ -2,11 +2,10 @@ %include %interface_impl(upm::ITemperatureSensor); #endif - -%include "javaupm_interfaces.i" +%include "interfaces.i" %include "javaupm_iModuleStatus.i" %include "iTemperatureSensor.hpp" %{ #include "iTemperatureSensor.hpp" -%} \ No newline at end of file +%} diff --git a/src/interfaces/jsupm_interfaces.i b/src/interfaces/jsupm_interfaces.i deleted file mode 100644 index 3cd3c00c..00000000 --- a/src/interfaces/jsupm_interfaces.i +++ /dev/null @@ -1,13 +0,0 @@ -%module jsupm_interfaces -/* -%include "../upm.i" - -%{ - #include "iLightSensor.hpp" - #include "iLightController.hpp" -%} - -%include "iModuleStatus.hpp" -%include "iLightSensor.hpp" -%include "iLightController.hpp" -*/ diff --git a/src/interfaces/pyupm_interfaces.i b/src/interfaces/pyupm_interfaces.i deleted file mode 100644 index 19dd1450..00000000 --- a/src/interfaces/pyupm_interfaces.i +++ /dev/null @@ -1,15 +0,0 @@ -%module pyupm_interfaces -/* -%include "../upm.i" -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" - -%{ - #include "iLightSensor.hpp" - #include "iLightController.hpp" -%} - -%include "iModuleStatus.hpp" -%include "iLightSensor.hpp" -%include "iLightController.hpp" -*/ diff --git a/src/isd1820/javaupm_isd1820.i b/src/isd1820/javaupm_isd1820.i deleted file mode 100644 index 492b80f9..00000000 --- a/src/isd1820/javaupm_isd1820.i +++ /dev/null @@ -1,11 +0,0 @@ -%module javaupm_isd1820 -%include "../upm.i" - -%{ - #include "isd1820.hpp" -%} - -%include "isd1820.hpp" - - -JAVA_JNI_LOADLIBRARY(javaupm_isd1820) \ No newline at end of file diff --git a/src/isd1820/jsupm_isd1820.i b/src/isd1820/jsupm_isd1820.i deleted file mode 100644 index 00be649d..00000000 --- a/src/isd1820/jsupm_isd1820.i +++ /dev/null @@ -1,9 +0,0 @@ -%module jsupm_isd1820 -%include "../upm.i" - -%{ - #include "isd1820.hpp" -%} - -%include "isd1820.hpp" - diff --git a/src/isd1820/pyupm_isd1820.i b/src/isd1820/pyupm_isd1820.i deleted file mode 100644 index 6917ce21..00000000 --- a/src/isd1820/pyupm_isd1820.i +++ /dev/null @@ -1,11 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_isd1820 -%include "../upm.i" - -%{ - #include "isd1820.hpp" -%} - -%include "isd1820.hpp" - diff --git a/src/itg3200/itg3200.i b/src/itg3200/itg3200.i new file mode 100644 index 00000000..1e5d7d14 --- /dev/null +++ b/src/itg3200/itg3200.i @@ -0,0 +1,72 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%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* "jshortArray" +%typemap(jstype) int16_t* "short[]" +%typemap(jtype) int16_t* "short[]" + +%typemap(javaout) int16_t* { + return $jnicall; +} + +%typemap(out) int16_t *getRawValues { + $result = JCALL1(NewShortArray, jenv, 3); + JCALL4(SetShortArrayRegion, jenv, $result, 0, 3, (jshort*)$1); +} + +JAVA_JNI_LOADLIBRARY(javaupm_itg3200) +#endif +/* END Java syntax */ + +/* BEGIN Javascript syntax ------------------------------------------------- */ +#ifdef SWIGJAVASCRIPT +%include "../carrays_int16_t.i" +%include "../carrays_float.i" + +%typemap(out) int16_t * { + $result = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_int16Array, 0 | 0 ); +} + +%typemap(out) float * { + $result = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_floatArray, 0 | 0 ); +} + +%include +#endif +/* END Javascript syntax */ + +/* BEGIN Python syntax ----------------------------------------------------- */ +#ifdef SWIGPYTHON +%include "../carrays_int16_t.i" +%include "../carrays_float.i" + +%typemap(out) int16_t * { + $result = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_int16Array, 0 | 0 ); +} + +%typemap(out) float * { + $result = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_floatArray, 0 | 0 ); +} +#endif +/* END Python syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "itg3200.hpp" +%} +%include "itg3200.hpp" +/* END Common SWIG syntax */ diff --git a/src/itg3200/javaupm_itg3200.i b/src/itg3200/javaupm_itg3200.i deleted file mode 100644 index d60f8c6b..00000000 --- a/src/itg3200/javaupm_itg3200.i +++ /dev/null @@ -1,37 +0,0 @@ -%module javaupm_itg3200 -%include "../upm.i" - -%{ - #include "itg3200.hpp" -%} - -%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* "jshortArray" -%typemap(jstype) int16_t* "short[]" -%typemap(jtype) int16_t* "short[]" - -%typemap(javaout) int16_t* { - return $jnicall; -} - -%typemap(out) int16_t *getRawValues { - $result = JCALL1(NewShortArray, jenv, 3); - JCALL4(SetShortArrayRegion, jenv, $result, 0, 3, (jshort*)$1); -} - -%include "itg3200.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_itg3200) \ No newline at end of file diff --git a/src/itg3200/jsupm_itg3200.i b/src/itg3200/jsupm_itg3200.i deleted file mode 100644 index 0dda5ce7..00000000 --- a/src/itg3200/jsupm_itg3200.i +++ /dev/null @@ -1,20 +0,0 @@ -%module jsupm_itg3200 -%include "../upm.i" -%include "../carrays_int16_t.i" -%include "../carrays_float.i" - -%{ - #include "itg3200.hpp" -%} - -%typemap(out) int16_t * { - $result = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_int16Array, 0 | 0 ); -} - -%typemap(out) float * { - $result = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_floatArray, 0 | 0 ); -} - -%include "itg3200.hpp" - -%include diff --git a/src/itg3200/pyupm_itg3200.i b/src/itg3200/pyupm_itg3200.i deleted file mode 100644 index 76969863..00000000 --- a/src/itg3200/pyupm_itg3200.i +++ /dev/null @@ -1,19 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_itg3200 -%include "../upm.i" -%include "../carrays_int16_t.i" -%include "../carrays_float.i" - -%typemap(out) int16_t * { - $result = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_int16Array, 0 | 0 ); -} - -%typemap(out) float * { - $result = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_floatArray, 0 | 0 ); -} - -%include "itg3200.hpp" -%{ - #include "itg3200.hpp" -%} diff --git a/src/jhd1313m1/javaupm_jhd1313m1.i b/src/jhd1313m1/javaupm_jhd1313m1.i deleted file mode 100644 index 175e9947..00000000 --- a/src/jhd1313m1/javaupm_jhd1313m1.i +++ /dev/null @@ -1,14 +0,0 @@ -%module javaupm_jhd1313m1 -%include "../upm.i" -%include "typemaps.i" -%include "std_vector.i" -%include "stdint.i" - -%template(byteVector) std::vector; - -%include "jhd1313m1.hpp" -%{ - #include "jhd1313m1.hpp" -%} - -JAVA_JNI_LOADLIBRARY(javaupm_jhd1313m1) diff --git a/src/jhd1313m1/jhd1313m1.i b/src/jhd1313m1/jhd1313m1.i new file mode 100644 index 00000000..75c4f395 --- /dev/null +++ b/src/jhd1313m1/jhd1313m1.i @@ -0,0 +1,29 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%include "std_vector.i" +%template(byteVector) std::vector; + +JAVA_JNI_LOADLIBRARY(javaupm_jhd1313m1) +#endif +/* END Java syntax */ + +/* BEGIN Javascript syntax ------------------------------------------------- */ +#ifdef SWIGJAVASCRIPT +%include "../upm_vectortypes.i" +#endif +/* END Javascript syntax */ + +/* BEGIN Python syntax ----------------------------------------------------- */ +#ifdef SWIGPYTHON +%include "../upm_vectortypes.i" +#endif +/* END Python syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "jhd1313m1.hpp" +%} +%include "jhd1313m1.hpp" +/* END Common SWIG syntax */ diff --git a/src/jhd1313m1/jsupm_jhd1313m1.i b/src/jhd1313m1/jsupm_jhd1313m1.i deleted file mode 100644 index af0767d3..00000000 --- a/src/jhd1313m1/jsupm_jhd1313m1.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_jhd1313m1 -%include "../upm.i" -%include "../upm_vectortypes.i" - -%include "jhd1313m1.hpp" -%{ - #include "jhd1313m1.hpp" -%} diff --git a/src/jhd1313m1/pyupm_jhd1313m1.i b/src/jhd1313m1/pyupm_jhd1313m1.i deleted file mode 100644 index daa4d05d..00000000 --- a/src/jhd1313m1/pyupm_jhd1313m1.i +++ /dev/null @@ -1,10 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_jhd1313m1 -%include "../upm.i" -%include "../upm_vectortypes.i" - -%include "jhd1313m1.hpp" -%{ - #include "jhd1313m1.hpp" -%} diff --git a/src/joystick12/javaupm_joystick12.i b/src/joystick12/javaupm_joystick12.i deleted file mode 100644 index b75cf1fc..00000000 --- a/src/joystick12/javaupm_joystick12.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_joystick12 -%include "../upm.i" - -%{ - #include "joystick12.hpp" -%} - -%include "joystick12.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_joystick12) \ No newline at end of file diff --git a/src/joystick12/joystick12.i b/src/joystick12/joystick12.i new file mode 100644 index 00000000..27127052 --- /dev/null +++ b/src/joystick12/joystick12.i @@ -0,0 +1,14 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_joystick12) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "joystick12.hpp" +%} +%include "joystick12.hpp" +/* END Common SWIG syntax */ diff --git a/src/joystick12/jsupm_joystick12.i b/src/joystick12/jsupm_joystick12.i deleted file mode 100644 index 29459182..00000000 --- a/src/joystick12/jsupm_joystick12.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_joystick12 -%include "../upm.i" - -%{ - #include "joystick12.hpp" -%} - -%include "joystick12.hpp" diff --git a/src/joystick12/pyupm_joystick12.i b/src/joystick12/pyupm_joystick12.i deleted file mode 100644 index 574e0253..00000000 --- a/src/joystick12/pyupm_joystick12.i +++ /dev/null @@ -1,11 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_joystick12 -%include "../upm.i" - -%include "stdint.i" - -%include "joystick12.hpp" -%{ - #include "joystick12.hpp" -%} diff --git a/src/kxcjk1013/javaupm_kxcjk1013.i b/src/kxcjk1013/javaupm_kxcjk1013.i deleted file mode 100644 index c2878ba5..00000000 --- a/src/kxcjk1013/javaupm_kxcjk1013.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_kxcjk1013 -%include "../upm.i" - -%{ - #include "kxcjk1013.hpp" -%} - -%include "kxcjk1013.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_kxcjk1013) diff --git a/src/kxcjk1013/jsupm_kxcjk1013.i b/src/kxcjk1013/jsupm_kxcjk1013.i deleted file mode 100644 index 7671462b..00000000 --- a/src/kxcjk1013/jsupm_kxcjk1013.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_kxcjk1013 -%include "../upm.i" - -%{ - #include "kxcjk1013.hpp" -%} - -%include "kxcjk1013.hpp" diff --git a/src/kxcjk1013/pyupm_kxcjk1013.i b/src/kxcjk1013/pyupm_kxcjk1013.i deleted file mode 100644 index 30f4c72c..00000000 --- a/src/kxcjk1013/pyupm_kxcjk1013.i +++ /dev/null @@ -1,10 +0,0 @@ -%module pyupm_kxcjk1013 -%include "../upm.i" -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" - - -%include "kxcjk1013.hpp" -%{ - #include "kxcjk1013.hpp" -%} diff --git a/src/l298/javaupm_l298.i b/src/l298/javaupm_l298.i deleted file mode 100644 index 94911073..00000000 --- a/src/l298/javaupm_l298.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_l298 -%include "../upm.i" - -%{ - #include "l298.hpp" -%} - -%include "l298.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_l298) \ No newline at end of file diff --git a/src/l298/jsupm_l298.i b/src/l298/jsupm_l298.i deleted file mode 100644 index 0d779c2d..00000000 --- a/src/l298/jsupm_l298.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_l298 -%include "../upm.i" - -%{ - #include "l298.hpp" -%} - -%include "l298.hpp" diff --git a/src/l298/pyupm_l298.i b/src/l298/pyupm_l298.i deleted file mode 100644 index a297b3fb..00000000 --- a/src/l298/pyupm_l298.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_l298 -%include "../upm.i" - -%include "l298.hpp" -%{ - #include "l298.hpp" -%} diff --git a/src/l3gd20/javaupm_l3gd20.i b/src/l3gd20/javaupm_l3gd20.i deleted file mode 100644 index 8cd4af4e..00000000 --- a/src/l3gd20/javaupm_l3gd20.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_l3gd20 -%include "../upm.i" - -%{ - #include "l3gd20.hpp" -%} - -%include "l3gd20.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_l3gd20) diff --git a/src/l3gd20/jsupm_l3gd20.i b/src/l3gd20/jsupm_l3gd20.i deleted file mode 100644 index 49ff312c..00000000 --- a/src/l3gd20/jsupm_l3gd20.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_l3gd20 -%include "../upm.i" - -%{ - #include "l3gd20.hpp" -%} - -%include "l3gd20.hpp" diff --git a/src/l3gd20/pyupm_l3gd20.i b/src/l3gd20/pyupm_l3gd20.i deleted file mode 100644 index 1387e634..00000000 --- a/src/l3gd20/pyupm_l3gd20.i +++ /dev/null @@ -1,10 +0,0 @@ -%module pyupm_l3gd20 -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" - -%include "../upm.i" - -%include "l3gd20.hpp" -%{ - #include "l3gd20.hpp" -%} diff --git a/src/lcd/jsupm_lcd.i b/src/lcd/jsupm_lcd.i deleted file mode 100644 index 36f3ccad..00000000 --- a/src/lcd/jsupm_lcd.i +++ /dev/null @@ -1,29 +0,0 @@ -%module jsupm_lcd -%include "../upm.i" -%include "../carrays_uint8_t.i" - -%include "ssd.hpp" -%include "lcd.hpp" -%{ - #include "lcd.hpp" -%} - -%include "ssd1327.hpp" -%{ - #include "ssd1327.hpp" -%} - -%include "ssd1308.hpp" -%{ - #include "ssd1308.hpp" -%} - -%include "eboled.hpp" -%{ - #include "eboled.hpp" -%} - -%include "ssd1306.hpp" -%{ - #include "ssd1306.hpp" -%} diff --git a/src/lcd/javaupm_lcd.i b/src/lcd/lcd.i similarity index 52% rename from src/lcd/javaupm_lcd.i rename to src/lcd/lcd.i index b9d31c91..bac9e71d 100644 --- a/src/lcd/javaupm_lcd.i +++ b/src/lcd/lcd.i @@ -1,7 +1,7 @@ -%module javaupm_lcd -%include "../upm.i" -%include "stdint.i" -%include "typemaps.i" +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA %include "arrays_java.i"; %apply signed char[] {uint8_t []}; @@ -22,20 +22,35 @@ JCALL3(ReleaseByteArrayElements, jenv, $input, (jbyte *)$1, 0); } +JAVA_JNI_LOADLIBRARY(javaupm_i2clcd) +#endif +/* END Java syntax */ + +/* BEGIN Javascript syntax ------------------------------------------------- */ +#ifdef SWIGJAVASCRIPT +%include "../carrays_uint8_t.i" +#endif +/* END Javascript syntax */ + +/* BEGIN Python syntax ----------------------------------------------------- */ +#ifdef SWIGPYTHON +%include "../carrays_uint8_t.i" +#endif +/* END Python syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ %{ - #include "lcd.hpp" - #include "ssd.hpp" - #include "ssd1327.hpp" - #include "ssd1308.hpp" - #include "ssd1306.hpp" - #include "eboled.hpp" +#include "lcd.hpp" +#include "eboled.hpp" +#include "ssd1306.hpp" +#include "ssd1308.hpp" +#include "ssd1327.hpp" %} %include "lcd.hpp" -%include "ssd.hpp" -%include "ssd1327.hpp" -%include "ssd1308.hpp" -%include "ssd1306.hpp" %include "eboled.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_i2clcd) +%include "ssd1306.hpp" +%include "ssd1308.hpp" +%include "ssd1327.hpp" +%include "ssd.hpp" +/* END Common SWIG syntax */ diff --git a/src/lcd/pyupm_lcd.i b/src/lcd/pyupm_lcd.i deleted file mode 100644 index cfb348f4..00000000 --- a/src/lcd/pyupm_lcd.i +++ /dev/null @@ -1,31 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_lcd -%include "../upm.i" -%include "../carrays_uint8_t.i" - -%include "ssd.hpp" -%include "lcd.hpp" -%{ - #include "lcd.hpp" -%} - -%include "ssd1327.hpp" -%{ - #include "ssd1327.hpp" -%} - -%include "ssd1308.hpp" -%{ - #include "ssd1308.hpp" -%} - -%include "eboled.hpp" -%{ - #include "eboled.hpp" -%} - -%include "ssd1306.hpp" -%{ - #include "ssd1306.hpp" -%} diff --git a/src/lcdks/javaupm_lcdks.i b/src/lcdks/javaupm_lcdks.i deleted file mode 100644 index dcc9a9eb..00000000 --- a/src/lcdks/javaupm_lcdks.i +++ /dev/null @@ -1,14 +0,0 @@ -%module javaupm_lcdks -%include "../upm.i" -%include "typemaps.i" -%include "std_vector.i" -%include "stdint.i" - -%template(byteVector) std::vector; - -%include "lcdks.hpp" -%{ - #include "lcdks.hpp" -%} - -JAVA_JNI_LOADLIBRARY(javaupm_lcdks) diff --git a/src/lcdks/jsupm_lcdks.i b/src/lcdks/jsupm_lcdks.i deleted file mode 100644 index 5fc3de24..00000000 --- a/src/lcdks/jsupm_lcdks.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_lcdks -%include "../upm.i" -%include "../upm_vectortypes.i" - -%include "lcdks.hpp" -%{ - #include "lcdks.hpp" -%} diff --git a/src/lcdks/lcdks.i b/src/lcdks/lcdks.i new file mode 100644 index 00000000..19ea3cec --- /dev/null +++ b/src/lcdks/lcdks.i @@ -0,0 +1,29 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%include "std_vector.i" +%template(byteVector) std::vector; + +JAVA_JNI_LOADLIBRARY(javaupm_lcdks) +#endif +/* END Java syntax */ + +/* BEGIN Javascript syntax ------------------------------------------------- */ +#ifdef SWIGJAVASCRIPT +%include "../upm_vectortypes.i" +#endif +/* END Javascript syntax */ + +/* BEGIN Python syntax ----------------------------------------------------- */ +#ifdef SWIGPYTHON +%include "../upm_vectortypes.i" +#endif +/* END Python syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "lcdks.hpp" +%} +%include "lcdks.hpp" +/* END Common SWIG syntax */ diff --git a/src/lcdks/pyupm_lcdks.i b/src/lcdks/pyupm_lcdks.i deleted file mode 100644 index 6e0cb3be..00000000 --- a/src/lcdks/pyupm_lcdks.i +++ /dev/null @@ -1,10 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_lcdks -%include "../upm.i" -%include "../upm_vectortypes.i" - -%include "lcdks.hpp" -%{ - #include "lcdks.hpp" -%} diff --git a/src/lcm1602/javaupm_lcm1602.i b/src/lcm1602/javaupm_lcm1602.i deleted file mode 100644 index 6e599fad..00000000 --- a/src/lcm1602/javaupm_lcm1602.i +++ /dev/null @@ -1,14 +0,0 @@ -%module javaupm_lcm1602 -%include "../upm.i" -%include "typemaps.i" -%include "std_vector.i" -%include "stdint.i" - -%template(byteVector) std::vector; - -%include "lcm1602.hpp" -%{ - #include "lcm1602.hpp" -%} - -JAVA_JNI_LOADLIBRARY(javaupm_lcm1602) diff --git a/src/lcm1602/jsupm_lcm1602.i b/src/lcm1602/jsupm_lcm1602.i deleted file mode 100644 index 63f01d8f..00000000 --- a/src/lcm1602/jsupm_lcm1602.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_lcm1602 -%include "../upm.i" -%include "../upm_vectortypes.i" - -%include "lcm1602.hpp" -%{ - #include "lcm1602.hpp" -%} diff --git a/src/lcm1602/lcm1602.i b/src/lcm1602/lcm1602.i new file mode 100644 index 00000000..43124909 --- /dev/null +++ b/src/lcm1602/lcm1602.i @@ -0,0 +1,29 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%include "std_vector.i" +%template(byteVector) std::vector; + +JAVA_JNI_LOADLIBRARY(javaupm_lcm1602) +#endif +/* END Java syntax */ + +/* BEGIN Javascript syntax ------------------------------------------------- */ +#ifdef SWIGJAVASCRIPT +%include "../upm_vectortypes.i" +#endif +/* END Javascript syntax */ + +/* BEGIN Python syntax ----------------------------------------------------- */ +#ifdef SWIGPYTHON +%include "../upm_vectortypes.i" +#endif +/* END Python syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "lcm1602.hpp" +%} +%include "lcm1602.hpp" +/* END Common SWIG syntax */ diff --git a/src/lcm1602/pyupm_lcm1602.i b/src/lcm1602/pyupm_lcm1602.i deleted file mode 100644 index 2358853a..00000000 --- a/src/lcm1602/pyupm_lcm1602.i +++ /dev/null @@ -1,10 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_lcm1602 -%include "../upm.i" -%include "../upm_vectortypes.i" - -%include "lcm1602.hpp" -%{ - #include "lcm1602.hpp" -%} diff --git a/src/ldt0028/javaupm_ldt0028.i b/src/ldt0028/javaupm_ldt0028.i deleted file mode 100644 index 47244737..00000000 --- a/src/ldt0028/javaupm_ldt0028.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_ldt0028 -%include "../upm.i" - -%{ - #include "ldt0028.hpp" -%} - -%include "ldt0028.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_ldt0028) \ No newline at end of file diff --git a/src/ldt0028/jsupm_ldt0028.i b/src/ldt0028/jsupm_ldt0028.i deleted file mode 100644 index 3c22594e..00000000 --- a/src/ldt0028/jsupm_ldt0028.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_ldt0028 -%include "../upm.i" - -%{ - #include "ldt0028.hpp" -%} - -%include "ldt0028.hpp" diff --git a/src/ldt0028/pyupm_ldt0028.i b/src/ldt0028/pyupm_ldt0028.i deleted file mode 100644 index 0614c2b4..00000000 --- a/src/ldt0028/pyupm_ldt0028.i +++ /dev/null @@ -1,10 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_ldt0028 -%include "../upm.i" - -%include "ldt0028.hpp" -%{ - #include "ldt0028.hpp" -%} - diff --git a/src/led/javaupm_led.i b/src/led/javaupm_led.i deleted file mode 100644 index 2be8ff7b..00000000 --- a/src/led/javaupm_led.i +++ /dev/null @@ -1,11 +0,0 @@ -%module javaupm_led -%include "../upm.i" - -%apply int {mraa::Edge} - -%include "led.hpp" -%{ - #include "led.hpp" -%} - -JAVA_JNI_LOADLIBRARY(javaupm_led) diff --git a/src/led/jsupm_led.i b/src/led/jsupm_led.i deleted file mode 100644 index ea991177..00000000 --- a/src/led/jsupm_led.i +++ /dev/null @@ -1,7 +0,0 @@ -%module jsupm_led -%include "../upm.i" - -%include "led.hpp" -%{ - #include "led.hpp" -%} diff --git a/src/led/led.i b/src/led/led.i new file mode 100644 index 00000000..bed31ac4 --- /dev/null +++ b/src/led/led.i @@ -0,0 +1,16 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%apply int {mraa::Edge} + +JAVA_JNI_LOADLIBRARY(javaupm_led) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "led.hpp" +%} +%include "led.hpp" +/* END Common SWIG syntax */ diff --git a/src/led/pyupm_led.i b/src/led/pyupm_led.i deleted file mode 100644 index 5c228c22..00000000 --- a/src/led/pyupm_led.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_led -%include "../upm.i" - -%include "led.hpp" -%{ - #include "led.hpp" -%} diff --git a/src/lidarlitev3/javaupm_lidarlitev3.i b/src/lidarlitev3/javaupm_lidarlitev3.i deleted file mode 100644 index 3609d297..00000000 --- a/src/lidarlitev3/javaupm_lidarlitev3.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_lidarlitev3 -%include "../upm.i" - -%{ - #include "lidarlitev3.hpp" -%} - -%include "lidarlitev3.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_lidarlitev3) diff --git a/src/lidarlitev3/jsupm_lidarlitev3.i b/src/lidarlitev3/jsupm_lidarlitev3.i deleted file mode 100644 index f68e1c06..00000000 --- a/src/lidarlitev3/jsupm_lidarlitev3.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_lidarlitev3 -%include "../upm.i" - -%{ - #include "lidarlitev3.hpp" -%} - -%include "lidarlitev3.hpp" diff --git a/src/lidarlitev3/lidarlitev3.i b/src/lidarlitev3/lidarlitev3.i new file mode 100644 index 00000000..176f0bcf --- /dev/null +++ b/src/lidarlitev3/lidarlitev3.i @@ -0,0 +1,14 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_lidarlitev3) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "lidarlitev3.hpp" +%} +%include "lidarlitev3.hpp" +/* END Common SWIG syntax */ diff --git a/src/lidarlitev3/pyupm_lidarlitev3.i b/src/lidarlitev3/pyupm_lidarlitev3.i deleted file mode 100644 index 96ec61a8..00000000 --- a/src/lidarlitev3/pyupm_lidarlitev3.i +++ /dev/null @@ -1,11 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_lidarlitev3 -%include "../upm.i" - -%include "stdint.i" - -%include "lidarlitev3.hpp" -%{ - #include "lidarlitev3.hpp" -%} diff --git a/src/light/javaupm_light.i b/src/light/javaupm_light.i deleted file mode 100644 index a93fb664..00000000 --- a/src/light/javaupm_light.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_light -%include "../upm.i" - -%{ - #include "light.hpp" -%} - -%include "light.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_light) \ No newline at end of file diff --git a/src/light/jsupm_light.i b/src/light/jsupm_light.i deleted file mode 100644 index 32b7103a..00000000 --- a/src/light/jsupm_light.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_light -%include "../upm.i" - -%{ - #include "light.hpp" -%} - -%include "light.hpp" diff --git a/src/light/pyupm_light.i b/src/light/pyupm_light.i deleted file mode 100644 index cf1cfec2..00000000 --- a/src/light/pyupm_light.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_light -%include "../upm.i" - -%include "light.hpp" -%{ - #include "light.hpp" -%} diff --git a/src/linefinder/javaupm_linefinder.i b/src/linefinder/javaupm_linefinder.i deleted file mode 100644 index 957dcd9b..00000000 --- a/src/linefinder/javaupm_linefinder.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_linefinder -%include "../upm.i" - -%{ - #include "linefinder.hpp" -%} - -%include "linefinder.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_linefinder) \ No newline at end of file diff --git a/src/linefinder/jsupm_linefinder.i b/src/linefinder/jsupm_linefinder.i deleted file mode 100644 index 6e51f359..00000000 --- a/src/linefinder/jsupm_linefinder.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_linefinder -%include "../upm.i" - -%{ - #include "linefinder.hpp" -%} - -%include "linefinder.hpp" diff --git a/src/linefinder/pyupm_linefinder.i b/src/linefinder/pyupm_linefinder.i deleted file mode 100644 index 1c5c4ba8..00000000 --- a/src/linefinder/pyupm_linefinder.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_linefinder -%include "../upm.i" - -%include "linefinder.hpp" -%{ - #include "linefinder.hpp" -%} diff --git a/src/lis2ds12/jsupm_lis2ds12.i b/src/lis2ds12/jsupm_lis2ds12.i deleted file mode 100644 index 5804336e..00000000 --- a/src/lis2ds12/jsupm_lis2ds12.i +++ /dev/null @@ -1,10 +0,0 @@ -%module jsupm_lis2ds12 -%include "../upm.i" -%include "../upm_vectortypes.i" - - -%include "lis2ds12_defs.h" -%include "lis2ds12.hpp" -%{ - #include "lis2ds12.hpp" -%} diff --git a/src/lis2ds12/javaupm_lis2ds12.i b/src/lis2ds12/lis2ds12.i similarity index 56% rename from src/lis2ds12/javaupm_lis2ds12.i rename to src/lis2ds12/lis2ds12.i index be636f0e..0693f942 100644 --- a/src/lis2ds12/javaupm_lis2ds12.i +++ b/src/lis2ds12/lis2ds12.i @@ -1,18 +1,8 @@ -%module javaupm_lis2ds12 -%include "../upm.i" -%include "typemaps.i" -%include "../upm_vectortypes.i" +%include "../common_top.i" +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA %ignore getAccelerometer(float *, float *, float *); - -%{ - #include "lis2ds12.hpp" - #include "lis2ds12_defs.h" -%} -%include "lis2ds12_defs.h" -%include "lis2ds12.hpp" - - #%ignore installISR(LIS2DS12_INTERRUPT_PINS_T , int , mraa::Edge, void *, void *); %define INTERRUPT LIS2DS12_INTERRUPT_PINS_T @@ -20,3 +10,14 @@ JAVA_ADD_INSTALLISR_INTERRUPT(upm::LIS2DS12) JAVA_JNI_LOADLIBRARY(javaupm_lis2ds12) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%include "../upm_vectortypes.i" +%{ +#include "lis2ds12.hpp" +%} +%include "lis2ds12_defs.h" +%include "lis2ds12.hpp" +/* END Common SWIG syntax */ diff --git a/src/lis2ds12/pyupm_lis2ds12.i b/src/lis2ds12/pyupm_lis2ds12.i deleted file mode 100644 index 28d19e08..00000000 --- a/src/lis2ds12/pyupm_lis2ds12.i +++ /dev/null @@ -1,11 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_lis2ds12 -%include "../upm.i" -%include "../upm_vectortypes.i" - -%include "lis2ds12_defs.h" -%include "lis2ds12.hpp" -%{ - #include "lis2ds12.hpp" -%} diff --git a/src/lis3dh/jsupm_lis3dh.i b/src/lis3dh/jsupm_lis3dh.i deleted file mode 100644 index ff9efd77..00000000 --- a/src/lis3dh/jsupm_lis3dh.i +++ /dev/null @@ -1,10 +0,0 @@ -%module jsupm_lis3dh -%include "../upm.i" -%include "../upm_vectortypes.i" - - -%include "lis3dh_defs.h" -%include "lis3dh.hpp" -%{ - #include "lis3dh.hpp" -%} diff --git a/src/lis3dh/javaupm_lis3dh.i b/src/lis3dh/lis3dh.i similarity index 50% rename from src/lis3dh/javaupm_lis3dh.i rename to src/lis3dh/lis3dh.i index e40987ab..f1daea89 100644 --- a/src/lis3dh/javaupm_lis3dh.i +++ b/src/lis3dh/lis3dh.i @@ -1,22 +1,26 @@ -%module javaupm_lis3dh -%include "../upm.i" -%include "typemaps.i" +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA %include "../upm_vectortypes.i" %ignore getAccelerometer(float *, float *, float *); - -%{ - #include "lis3dh.hpp" - #include "lis3dh_defs.h" -%} -%include "lis3dh_defs.h" -%include "lis3dh.hpp" - - %ignore installISR(LIS3DH_INTERRUPT_PINS_T , int , mraa::Edge , void *, void* ); %define INTERRUPT LIS3DH_INTERRUPT_PINS_T %enddef -JAVA_ADD_INSTALLISR_INTERRUPT(upm::LIS3DH) +JAVA_ADD_INSTALLISR_INTERRUPT(upm::LIS3DH) JAVA_JNI_LOADLIBRARY(javaupm_lis3dh) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%include "../upm_vectortypes.i" +%{ +#include "lis3dh_defs.h" +#include "lis3dh.hpp" +%} +%include "lis3dh_defs.h" +%include "lis3dh.hpp" +/* END Common SWIG syntax */ diff --git a/src/lis3dh/pyupm_lis3dh.i b/src/lis3dh/pyupm_lis3dh.i deleted file mode 100644 index 6a8cff01..00000000 --- a/src/lis3dh/pyupm_lis3dh.i +++ /dev/null @@ -1,11 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_lis3dh -%include "../upm.i" -%include "../upm_vectortypes.i" - -%include "lis3dh_defs.h" -%include "lis3dh.hpp" -%{ - #include "lis3dh.hpp" -%} diff --git a/src/lm35/javaupm_lm35.i b/src/lm35/javaupm_lm35.i deleted file mode 100644 index 7f85e8c8..00000000 --- a/src/lm35/javaupm_lm35.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_lm35 -%include "../upm.i" - -%{ - #include "lm35.hpp" -%} - -%include "lm35.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_lm35) \ No newline at end of file diff --git a/src/lm35/jsupm_lm35.i b/src/lm35/jsupm_lm35.i deleted file mode 100644 index 73a7af2b..00000000 --- a/src/lm35/jsupm_lm35.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_lm35 -%include "../upm.i" - -%{ - #include "lm35.hpp" -%} - -%include "lm35.hpp" diff --git a/src/lm35/pyupm_lm35.i b/src/lm35/pyupm_lm35.i deleted file mode 100644 index 31d8ff57..00000000 --- a/src/lm35/pyupm_lm35.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_lm35 -%include "../upm.i" - -%include "lm35.hpp" -%{ - #include "lm35.hpp" -%} diff --git a/src/lol/jsupm_lol.i b/src/lol/jsupm_lol.i deleted file mode 100644 index 3280ecbe..00000000 --- a/src/lol/jsupm_lol.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_lol -%include "../upm.i" - -%{ - #include "lol.hpp" -%} - -%include "lol.hpp" diff --git a/src/lol/javaupm_lol.i b/src/lol/lol.i similarity index 58% rename from src/lol/javaupm_lol.i rename to src/lol/lol.i index 6ac316be..419b2cbb 100644 --- a/src/lol/javaupm_lol.i +++ b/src/lol/lol.i @@ -1,9 +1,8 @@ -%module javaupm_lol -%include "../upm.i" -%include "stdint.i" -%include "arrays_java.i"; -%include "typemaps.i" +%include "../common_top.i" +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%include "arrays_java.i"; %typemap(jni) unsigned char* "jbyteArray"; %typemap(jtype) unsigned char* "byte[]"; %typemap(jstype) unsigned char* "byte[]"; @@ -18,10 +17,13 @@ delete [] $1; } +JAVA_JNI_LOADLIBRARY(javaupm_lol) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ %{ - #include "lol.hpp" +#include "lol.hpp" %} - %include "lol.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_lol) \ No newline at end of file +/* END Common SWIG syntax */ diff --git a/src/lol/pyupm_lol.i b/src/lol/pyupm_lol.i deleted file mode 100644 index 2cef85cc..00000000 --- a/src/lol/pyupm_lol.i +++ /dev/null @@ -1,11 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_lol -%include "../upm.i" - -%include "stdint.i" - -%include "lol.hpp" -%{ - #include "lol.hpp" -%} diff --git a/src/loudness/javaupm_loudness.i b/src/loudness/javaupm_loudness.i deleted file mode 100644 index d053e626..00000000 --- a/src/loudness/javaupm_loudness.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_loudness -%include "../upm.i" - -%{ - #include "loudness.hpp" -%} - -%include "loudness.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_loudness) \ No newline at end of file diff --git a/src/loudness/jsupm_loudness.i b/src/loudness/jsupm_loudness.i deleted file mode 100644 index d6e8533e..00000000 --- a/src/loudness/jsupm_loudness.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_loudness -%include "../upm.i" - -%{ - #include "loudness.hpp" -%} - -%include "loudness.hpp" diff --git a/src/loudness/pyupm_loudness.i b/src/loudness/pyupm_loudness.i deleted file mode 100644 index d93f2f6a..00000000 --- a/src/loudness/pyupm_loudness.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_loudness -%include "../upm.i" - -%include "loudness.hpp" -%{ - #include "loudness.hpp" -%} diff --git a/src/lp8860/javaupm_lp8860.i b/src/lp8860/javaupm_lp8860.i deleted file mode 100644 index a324a5a6..00000000 --- a/src/lp8860/javaupm_lp8860.i +++ /dev/null @@ -1,17 +0,0 @@ -%module javaupm_lp8860 - -%import "../interfaces/javaupm_iLightController.i" - -%include "../upm.i" - -%typemap(javaimports) SWIGTYPE %{ -import upm_interfaces.*; -%} - -%{ - #include "lp8860.hpp" -%} - -%include "lp8860.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_lp8860) diff --git a/src/lp8860/jsupm_lp8860.i b/src/lp8860/jsupm_lp8860.i deleted file mode 100644 index d7c0fbcc..00000000 --- a/src/lp8860/jsupm_lp8860.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_lp8860 -%include "../upm.i" - -%{ - #include "lp8860.hpp" -%} - -%include "lp8860.hpp" diff --git a/src/lp8860/lp8860.i b/src/lp8860/lp8860.i new file mode 100644 index 00000000..6b638ffe --- /dev/null +++ b/src/lp8860/lp8860.i @@ -0,0 +1,17 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%typemap(javaimports) SWIGTYPE %{import upm_interfaces.*;%} +%import "../interfaces/javaupm_iLightController.i" + +JAVA_JNI_LOADLIBRARY(javaupm_lp8860) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "lp8860.hpp" +%} +%include "lp8860.hpp" +/* END Common SWIG syntax */ diff --git a/src/lp8860/pyupm_lp8860.i b/src/lp8860/pyupm_lp8860.i deleted file mode 100644 index 1ffab2ea..00000000 --- a/src/lp8860/pyupm_lp8860.i +++ /dev/null @@ -1,9 +0,0 @@ -%module pyupm_lp8860 -%include "../upm.i" -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" - -%include "lp8860.hpp" -%{ - #include "lp8860.hpp" -%} diff --git a/src/lpd8806/javaupm_lpd8806.i b/src/lpd8806/javaupm_lpd8806.i deleted file mode 100644 index dd47e540..00000000 --- a/src/lpd8806/javaupm_lpd8806.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_lpd8806 -%include "../upm.i" - -%{ - #include "lpd8806.hpp" -%} - -%include "lpd8806.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_lpd8806) \ No newline at end of file diff --git a/src/lpd8806/jsupm_lpd8806.i b/src/lpd8806/jsupm_lpd8806.i deleted file mode 100644 index bafc2b4d..00000000 --- a/src/lpd8806/jsupm_lpd8806.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_lpd8806 -%include "../upm.i" - -%{ - #include "lpd8806.hpp" -%} - -%include "lpd8806.hpp" diff --git a/src/lpd8806/pyupm_lpd8806.i b/src/lpd8806/pyupm_lpd8806.i deleted file mode 100644 index 05e1c0e2..00000000 --- a/src/lpd8806/pyupm_lpd8806.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_lpd8806 -%include "../upm.i" - -%include "lpd8806.hpp" -%{ - #include "lpd8806.hpp" -%} diff --git a/src/lsm303agr/jsupm_lsm303agr.i b/src/lsm303agr/jsupm_lsm303agr.i deleted file mode 100644 index 2802da1a..00000000 --- a/src/lsm303agr/jsupm_lsm303agr.i +++ /dev/null @@ -1,9 +0,0 @@ -%module jsupm_lsm303agr -%include "../upm.i" -%include "../upm_vectortypes.i" - -%include "lsm303agr_defs.h" -%include "lsm303agr.hpp" -%{ - #include "lsm303agr.hpp" -%} diff --git a/src/lsm303agr/javaupm_lsm303agr.i b/src/lsm303agr/lsm303agr.i similarity index 55% rename from src/lsm303agr/javaupm_lsm303agr.i rename to src/lsm303agr/lsm303agr.i index ad8962d0..b685bb58 100644 --- a/src/lsm303agr/javaupm_lsm303agr.i +++ b/src/lsm303agr/lsm303agr.i @@ -1,10 +1,12 @@ -%module javaupm_lsm303agr -%include "../upm.i" -%include "typemaps.i" +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA %include "../upm_javastdvector.i" %ignore getMagnetometer(float *, float *, float *); %ignore getAccelerometer(float *, float *, float *); +%ignore installISR(LSM303AGR_INTERRUPT_PINS_T , int , mraa::Edge , void *, void *); %typemap(javaimports) SWIGTYPE %{ import java.util.AbstractList; @@ -21,18 +23,31 @@ import java.lang.Float; %template(floatVector) std::vector; +%define INTERRUPT LSM303AGR_INTERRUPT_PINS_T +%enddef + +JAVA_ADD_INSTALLISR_INTERRUPT(upm::LSM303AGR) +JAVA_JNI_LOADLIBRARY(javaupm_lsm303agr) +#endif +/* END Java syntax */ + +/* BEGIN Javascript syntax ------------------------------------------------- */ +#ifdef SWIGJAVASCRIPT +%include "../upm_vectortypes.i" +#endif +/* END Javascript syntax */ + +/* BEGIN Python syntax ----------------------------------------------------- */ +#ifdef SWIGPYTHON +%include "../upm_vectortypes.i" +#endif +/* END Python syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ %{ - #include "lsm303agr.hpp" - #include "lsm303agr_defs.h" +#include "lsm303agr_defs.h" +#include "lsm303agr.hpp" %} %include "lsm303agr_defs.h" %include "lsm303agr.hpp" - - -%ignore installISR(LSM303AGR_INTERRUPT_PINS_T , int , mraa::Edge , void *, void *); - -%define INTERRUPT LSM303AGR_INTERRUPT_PINS_T -%enddef -JAVA_ADD_INSTALLISR_INTERRUPT(upm::LSM303AGR) - -JAVA_JNI_LOADLIBRARY(javaupm_lsm303agr) +/* END Common SWIG syntax */ diff --git a/src/lsm303agr/pyupm_lsm303agr.i b/src/lsm303agr/pyupm_lsm303agr.i deleted file mode 100644 index 4659044b..00000000 --- a/src/lsm303agr/pyupm_lsm303agr.i +++ /dev/null @@ -1,11 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_lsm303agr -%include "../upm.i" -%include "../upm_vectortypes.i" - -%include "lsm303agr_defs.h" -%include "lsm303agr.hpp" -%{ - #include "lsm303agr.hpp" -%} diff --git a/src/lsm303d/javaupm_lsm303d.i b/src/lsm303d/javaupm_lsm303d.i deleted file mode 100644 index 8592d615..00000000 --- a/src/lsm303d/javaupm_lsm303d.i +++ /dev/null @@ -1,30 +0,0 @@ -%module javaupm_lsm303d -%include "../upm.i" -%include "typemaps.i" -%include "../upm_javastdvector.i" - -%ignore getMagnetometer(float *, float *, float *); -%ignore getAccelerometer(float *, float *, float *); - -%typemap(javaimports) SWIGTYPE %{ -import java.util.AbstractList; -import java.lang.Float; -%} - -%typemap(javaout) SWIGTYPE { - return new $&javaclassname($jnicall, true); -} -%typemap(javaout) std::vector { - return (AbstractList)(new $&javaclassname($jnicall, true)); -} -%typemap(jstype) std::vector "AbstractList" - -%template(floatVector) std::vector; - -%include "lsm303d_defs.h" -%include "lsm303d.hpp" -%{ - #include "lsm303d.hpp" -%} - -JAVA_JNI_LOADLIBRARY(javaupm_lsm303d) diff --git a/src/lsm303d/jsupm_lsm303d.i b/src/lsm303d/jsupm_lsm303d.i deleted file mode 100644 index 755ca61d..00000000 --- a/src/lsm303d/jsupm_lsm303d.i +++ /dev/null @@ -1,9 +0,0 @@ -%module jsupm_lsm303d -%include "../upm.i" -%include "../upm_vectortypes.i" - -%include "lsm303d_defs.h" -%include "lsm303d.hpp" -%{ - #include "lsm303d.hpp" -%} diff --git a/src/lsm303d/lsm303d.i b/src/lsm303d/lsm303d.i new file mode 100644 index 00000000..ba5c4659 --- /dev/null +++ b/src/lsm303d/lsm303d.i @@ -0,0 +1,48 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%include "../upm_javastdvector.i" + +%ignore getMagnetometer(float *, float *, float *); +%ignore getAccelerometer(float *, float *, float *); + +%typemap(javaimports) SWIGTYPE %{ +import java.util.AbstractList; +import java.lang.Float; +%} + +%typemap(javaout) SWIGTYPE { + return new $&javaclassname($jnicall, true); +} +%typemap(javaout) std::vector { + return (AbstractList)(new $&javaclassname($jnicall, true)); +} +%typemap(jstype) std::vector "AbstractList" + +%template(floatVector) std::vector; + +JAVA_JNI_LOADLIBRARY(javaupm_lsm303d) +#endif +/* END Java syntax */ + +/* BEGIN Javascript syntax ------------------------------------------------- */ +#ifdef SWIGJAVASCRIPT +%include "../upm_vectortypes.i" +#endif +/* END Javascript syntax */ + +/* BEGIN Python syntax ----------------------------------------------------- */ +#ifdef SWIGPYTHON +%include "../upm_vectortypes.i" +#endif +/* END Python syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "lsm303d_defs.h" +#include "lsm303d.hpp" +%} +%include "lsm303d_defs.h" +%include "lsm303d.hpp" +/* END Common SWIG syntax */ diff --git a/src/lsm303d/pyupm_lsm303d.i b/src/lsm303d/pyupm_lsm303d.i deleted file mode 100644 index dc1304ee..00000000 --- a/src/lsm303d/pyupm_lsm303d.i +++ /dev/null @@ -1,11 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_lsm303d -%include "../upm.i" -%include "../upm_vectortypes.i" - -%include "lsm303d_defs.h" -%include "lsm303d.hpp" -%{ - #include "lsm303d.hpp" -%} diff --git a/src/lsm303dlh/javaupm_lsm303dlh.i b/src/lsm303dlh/javaupm_lsm303dlh.i deleted file mode 100644 index a7f8066d..00000000 --- a/src/lsm303dlh/javaupm_lsm303dlh.i +++ /dev/null @@ -1,23 +0,0 @@ -%module javaupm_lsm303dlh -%include "../upm.i" - -%{ - #include "lsm303dlh.hpp" -%} - -%typemap(jni) int16_t* "jshortArray" -%typemap(jstype) int16_t* "short[]" -%typemap(jtype) int16_t* "short[]" - -%typemap(javaout) int16_t* { - return $jnicall; -} - -%typemap(out) int16_t *getRawAccelData { - $result = JCALL1(NewShortArray, jenv, 3); - JCALL4(SetShortArrayRegion, jenv, $result, 0, 3, (jshort*)$1); -} - -%include "lsm303dlh.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_lsm303dlh) diff --git a/src/lsm303dlh/jsupm_lsm303dlh.i b/src/lsm303dlh/jsupm_lsm303dlh.i deleted file mode 100644 index 7370e200..00000000 --- a/src/lsm303dlh/jsupm_lsm303dlh.i +++ /dev/null @@ -1,15 +0,0 @@ -%module jsupm_lsm303dlh -%include "../upm.i" -%include "../carrays_int16_t.i" - -// Adding this typemap because SWIG is converting int16 into a short by default -// This forces SWIG to convert it correctly -%typemap(out) int16_t* { - jsresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_int16Array, 0 | 0 ); -} - -%{ - #include "lsm303dlh.hpp" -%} - -%include "lsm303dlh.hpp" diff --git a/src/lsm303dlh/lsm303dlh.i b/src/lsm303dlh/lsm303dlh.i new file mode 100644 index 00000000..b56cff40 --- /dev/null +++ b/src/lsm303dlh/lsm303dlh.i @@ -0,0 +1,51 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%typemap(jni) int16_t* "jshortArray" +%typemap(jstype) int16_t* "short[]" +%typemap(jtype) int16_t* "short[]" + +%typemap(javaout) int16_t* { + return $jnicall; +} + +%typemap(out) int16_t *getRawAccelData { + $result = JCALL1(NewShortArray, jenv, 3); + JCALL4(SetShortArrayRegion, jenv, $result, 0, 3, (jshort*)$1); +} + +JAVA_JNI_LOADLIBRARY(javaupm_lsm303dlh) +#endif +/* END Java syntax */ + +/* BEGIN Javascript syntax ------------------------------------------------- */ +#ifdef SWIGJAVASCRIPT +%include "../carrays_int16_t.i" + +// Adding this typemap because SWIG is converting int16 into a short by default +// This forces SWIG to convert it correctly +%typemap(out) int16_t* { + jsresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_int16Array, 0 | 0 ); +} +#endif +/* END Javascript syntax */ + +/* BEGIN Python syntax ----------------------------------------------------- */ +#ifdef SWIGPYTHON +%include "../carrays_int16_t.i" + +// Adding this typemap because SWIG is converting int16 into a short by default +// This forces SWIG to convert it correctly +%typemap(out) int16_t* { + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_int16Array, 0 | 0 ); +} +#endif +/* END Python syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "lsm303dlh.hpp" +%} +%include "lsm303dlh.hpp" +/* END Common SWIG syntax */ diff --git a/src/lsm303dlh/pyupm_lsm303dlh.i b/src/lsm303dlh/pyupm_lsm303dlh.i deleted file mode 100644 index dbbf6647..00000000 --- a/src/lsm303dlh/pyupm_lsm303dlh.i +++ /dev/null @@ -1,16 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_lsm303dlh -%include "../upm.i" -%include "../carrays_int16_t.i" - -// Adding this typemap because SWIG is converting int16 into a short by default -// This forces SWIG to convert it correctly -%typemap(out) int16_t* { - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_int16Array, 0 | 0 ); -} - -%include "lsm303dlh.hpp" -%{ - #include "lsm303dlh.hpp" -%} diff --git a/src/lsm6ds3h/jsupm_lsm6ds3h.i b/src/lsm6ds3h/jsupm_lsm6ds3h.i deleted file mode 100644 index e57b820f..00000000 --- a/src/lsm6ds3h/jsupm_lsm6ds3h.i +++ /dev/null @@ -1,10 +0,0 @@ -%module jsupm_lsm6ds3h -%include "../upm.i" -%include "../upm_vectortypes.i" - - -%include "lsm6ds3h_defs.h" -%include "lsm6ds3h.hpp" -%{ - #include "lsm6ds3h.hpp" -%} diff --git a/src/lsm6ds3h/javaupm_lsm6ds3h.i b/src/lsm6ds3h/lsm6ds3h.i similarity index 54% rename from src/lsm6ds3h/javaupm_lsm6ds3h.i rename to src/lsm6ds3h/lsm6ds3h.i index f3c7e617..263b4a46 100644 --- a/src/lsm6ds3h/javaupm_lsm6ds3h.i +++ b/src/lsm6ds3h/lsm6ds3h.i @@ -1,22 +1,28 @@ -%module javaupm_lsm6ds3h -%include "../upm.i" -%include "typemaps.i" +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA %include "../upm_vectortypes.i" %ignore getAccelerometer(float *, float *, float *); %ignore getGyroscope(float *, float *, float *); -%{ - #include "lsm6ds3h.hpp" - #include "lsm6ds3h_defs.h" -%} -%include "lsm6ds3h_defs.h" -%include "lsm6ds3h.hpp" - %ignore installISR(LSM6DS3H_INTERRUPT_PINS_T , int , mraa::Edge , void *, void *); %define INTERRUPT LSM6DS3H_INTERRUPT_PINS_T %enddef -JAVA_ADD_INSTALLISR_INTERRUPT(upm::LSM6DS3H) +JAVA_ADD_INSTALLISR_INTERRUPT(upm::LSM6DS3H) JAVA_JNI_LOADLIBRARY(javaupm_lsm6ds3h) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%include "../upm_vectortypes.i" +%{ +#include "lsm6ds3h_defs.h" +#include "lsm6ds3h.hpp" +%} +%include "lsm6ds3h_defs.h" +%include "lsm6ds3h.hpp" +/* END Common SWIG syntax */ diff --git a/src/lsm6ds3h/pyupm_lsm6ds3h.i b/src/lsm6ds3h/pyupm_lsm6ds3h.i deleted file mode 100644 index 17f03c01..00000000 --- a/src/lsm6ds3h/pyupm_lsm6ds3h.i +++ /dev/null @@ -1,11 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_lsm6ds3h -%include "../upm.i" -%include "../upm_vectortypes.i" - -%include "lsm6ds3h_defs.h" -%include "lsm6ds3h.hpp" -%{ - #include "lsm6ds3h.hpp" -%} diff --git a/src/lsm6dsl/jsupm_lsm6dsl.i b/src/lsm6dsl/jsupm_lsm6dsl.i deleted file mode 100644 index b63b966f..00000000 --- a/src/lsm6dsl/jsupm_lsm6dsl.i +++ /dev/null @@ -1,10 +0,0 @@ -%module jsupm_lsm6dsl -%include "../upm.i" -%include "../upm_vectortypes.i" - - -%include "lsm6dsl_defs.h" -%include "lsm6dsl.hpp" -%{ - #include "lsm6dsl.hpp" -%} diff --git a/src/lsm6dsl/javaupm_lsm6dsl.i b/src/lsm6dsl/lsm6dsl.i similarity index 54% rename from src/lsm6dsl/javaupm_lsm6dsl.i rename to src/lsm6dsl/lsm6dsl.i index 98d96115..77c22a93 100644 --- a/src/lsm6dsl/javaupm_lsm6dsl.i +++ b/src/lsm6dsl/lsm6dsl.i @@ -1,22 +1,28 @@ -%module javaupm_lsm6dsl -%include "../upm.i" -%include "typemaps.i" +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA %include "../upm_vectortypes.i" %ignore getAccelerometer(float *, float *, float *); %ignore getGyroscope(float *, float *, float *); -%{ - #include "lsm6dsl.hpp" - #include "lsm6dsl_defs.h" -%} -%include "lsm6dsl_defs.h" -%include "lsm6dsl.hpp" - - %ignore installISR(LSM6DSL_INTERRUPT_PINS_T , int , mraa::Edge , void *, void *); %define INTERRUPT LSM6DSL_INTERRUPT_PINS_T %enddef + JAVA_ADD_INSTALLISR_INTERRUPT(upm::LSM6DSL) JAVA_JNI_LOADLIBRARY(javaupm_lsm6dsl) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%include "../upm_vectortypes.i" +%{ +#include "lsm6dsl_defs.h" +#include "lsm6dsl.hpp" +%} +%include "lsm6dsl_defs.h" +%include "lsm6dsl.hpp" +/* END Common SWIG syntax */ diff --git a/src/lsm6dsl/pyupm_lsm6dsl.i b/src/lsm6dsl/pyupm_lsm6dsl.i deleted file mode 100644 index f9273646..00000000 --- a/src/lsm6dsl/pyupm_lsm6dsl.i +++ /dev/null @@ -1,11 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_lsm6dsl -%include "../upm.i" -%include "../upm_vectortypes.i" - -%include "lsm6dsl_defs.h" -%include "lsm6dsl.hpp" -%{ - #include "lsm6dsl.hpp" -%} diff --git a/src/lsm9ds0/jsupm_lsm9ds0.i b/src/lsm9ds0/jsupm_lsm9ds0.i deleted file mode 100644 index 982d652c..00000000 --- a/src/lsm9ds0/jsupm_lsm9ds0.i +++ /dev/null @@ -1,11 +0,0 @@ -%module jsupm_lsm9ds0 -%include "../upm.i" -%include "cpointer.i" - -%pointer_functions(float, floatp); - -%include "lsm9ds0.hpp" -%{ - #include "lsm9ds0.hpp" -%} - diff --git a/src/lsm9ds0/javaupm_lsm9ds0.i b/src/lsm9ds0/lsm9ds0.i similarity index 56% rename from src/lsm9ds0/javaupm_lsm9ds0.i rename to src/lsm9ds0/lsm9ds0.i index 4e2c584e..a6aeaf66 100644 --- a/src/lsm9ds0/javaupm_lsm9ds0.i +++ b/src/lsm9ds0/lsm9ds0.i @@ -1,7 +1,7 @@ -%module javaupm_lsm9ds0 -%include "../upm.i" -%include "cpointer.i" -%include "typemaps.i" +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA %include "arrays_java.i"; %include "../java_buffer.i" @@ -38,28 +38,32 @@ %ignore getGyroscope(float *, float *, float *); %ignore getMagnetometer(float *, float *, float *); -%{ - #include "lsm9ds0.hpp" -%} +%ignore installISR(INTERRUPT_PINS_T, int, mraa::Edge, void *, void *); -%ignore installISR(LSM6DSL_INTERRUPT_PINS_T , int , mraa::Edge , void *, void *); +%define INTERRUPT INTERRUPT_PINS_T +%enddef -%extend upm::LSM9DS0 { - installISR(INTERRUPT_PINS_T intr, int gpio, mraa::Edge level, - jobject runnable) - { - // delete any existing ISR and GPIO context - $self->uninstallISR(intr); - - // greate gpio context - getPin(intr) = new mraa::Gpio(gpio); - - getPin(intr)->dir(mraa::DIR_IN); - getPin(intr)->isr(level, runnable); - - } -} - -%include "lsm9ds0.hpp" +JAVA_ADD_INSTALLISR_INTERRUPT(upm::LSM9DS0) JAVA_JNI_LOADLIBRARY(javaupm_lsm9ds0) +#endif +/* END Java syntax */ + +/* BEGIN Javascript syntax ------------------------------------------------- */ +#ifdef SWIGJAVASCRIPT +%pointer_functions(float, floatp); +#endif +/* END Javascript syntax */ + +/* BEGIN Python syntax ----------------------------------------------------- */ +#ifdef SWIGPYTHON +%pointer_functions(float, floatp); +#endif +/* END Python syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "lsm9ds0.hpp" +%} +%include "lsm9ds0.hpp" +/* END Common SWIG syntax */ diff --git a/src/lsm9ds0/pyupm_lsm9ds0.i b/src/lsm9ds0/pyupm_lsm9ds0.i deleted file mode 100644 index be133c71..00000000 --- a/src/lsm9ds0/pyupm_lsm9ds0.i +++ /dev/null @@ -1,15 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_lsm9ds0 -%include "../upm.i" -%include "cpointer.i" - -%include "stdint.i" - -%pointer_functions(float, floatp); - -%include "lsm9ds0.hpp" -%{ - #include "lsm9ds0.hpp" -%} - diff --git a/src/m24lr64e/jsupm_m24lr64e.i b/src/m24lr64e/jsupm_m24lr64e.i deleted file mode 100644 index 104efae9..00000000 --- a/src/m24lr64e/jsupm_m24lr64e.i +++ /dev/null @@ -1,10 +0,0 @@ -%module jsupm_m24lr64e -%include "../upm.i" - -%include "stdint.i" - -%{ - #include "m24lr64e.hpp" -%} - -%include "m24lr64e.hpp" diff --git a/src/m24lr64e/javaupm_m24lr64e.i b/src/m24lr64e/m24lr64e.i similarity index 59% rename from src/m24lr64e/javaupm_m24lr64e.i rename to src/m24lr64e/m24lr64e.i index 09fc1e7f..3cd8904f 100644 --- a/src/m24lr64e/javaupm_m24lr64e.i +++ b/src/m24lr64e/m24lr64e.i @@ -1,6 +1,7 @@ -%module javaupm_m24lr64e -%include "../upm.i" -%include "stdint.i" +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA %include "arrays_java.i"; %include "../java_buffer.i" @@ -19,10 +20,13 @@ delete [] $1; } +JAVA_JNI_LOADLIBRARY(javaupm_m24lr64e) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ %{ - #include "m24lr64e.hpp" +#include "m24lr64e.hpp" %} - %include "m24lr64e.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_m24lr64e) \ No newline at end of file +/* END Common SWIG syntax */ diff --git a/src/m24lr64e/pyupm_m24lr64e.i b/src/m24lr64e/pyupm_m24lr64e.i deleted file mode 100644 index ca473470..00000000 --- a/src/m24lr64e/pyupm_m24lr64e.i +++ /dev/null @@ -1,11 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_m24lr64e -%include "../upm.i" - -%include "stdint.i" - -%include "m24lr64e.hpp" -%{ - #include "m24lr64e.hpp" -%} diff --git a/src/mag3110/javaupm_mag3110.i b/src/mag3110/javaupm_mag3110.i deleted file mode 100644 index cdc25c23..00000000 --- a/src/mag3110/javaupm_mag3110.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_mag3110 -%include "../upm.i" - -%{ - #include "mag3110.hpp" -%} - -%include "mag3110.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_mag3110) \ No newline at end of file diff --git a/src/mag3110/jsupm_mag3110.i b/src/mag3110/jsupm_mag3110.i deleted file mode 100644 index 2f74981e..00000000 --- a/src/mag3110/jsupm_mag3110.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_mag3110 -%include "../upm.i" - -%{ - #include "mag3110.hpp" -%} - -%include "mag3110.hpp" diff --git a/src/mag3110/pyupm_mag3110.i b/src/mag3110/pyupm_mag3110.i deleted file mode 100644 index 7d80eef3..00000000 --- a/src/mag3110/pyupm_mag3110.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_mag3110 -%include "../upm.i" - -%include "mag3110.hpp" -%{ - #include "mag3110.hpp" -%} diff --git a/src/max30100/javaupm_max30100.i b/src/max30100/javaupm_max30100.i deleted file mode 100644 index ecf83532..00000000 --- a/src/max30100/javaupm_max30100.i +++ /dev/null @@ -1,20 +0,0 @@ -#ifdef ANDROID - %module javaupm_max30100 -#else - %module(directors="1", threads="1") javaupm_max30100 -#endif - -%include "../upm.i" - -%{ - #include "max30100.hpp" -%} - -#ifndef ANDROID - %feature("director") upm::Callback; -#endif - -%include "max30100_regs.h" -%include "max30100.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_max30100) diff --git a/src/max30100/jsupm_max30100.i b/src/max30100/jsupm_max30100.i deleted file mode 100644 index edb35335..00000000 --- a/src/max30100/jsupm_max30100.i +++ /dev/null @@ -1,9 +0,0 @@ -%module jsupm_max30100 -%include "../upm.i" - -%{ - #include "max30100.hpp" -%} - -%include "max30100_regs.h" -%include "max30100.hpp" diff --git a/src/max30100/max30100.i b/src/max30100/max30100.i new file mode 100644 index 00000000..e188e32f --- /dev/null +++ b/src/max30100/max30100.i @@ -0,0 +1,28 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +#ifndef ANDROID +%module(directors="1", threads="1") javaupm_max30100 +%feature("director") upm::Callback; +#endif +JAVA_JNI_LOADLIBRARY(javaupm_max30100) +#endif +/* END Java syntax */ + +/* BEGIN Python syntax ----------------------------------------------------- */ +#ifdef SWIGPYTHON +%module(directors="1", threads="1") pyupm_max30100 + +%feature("director") upm::Callback; +#endif +/* END Python syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "max30100_regs.h" +#include "max30100.hpp" +%} +%include "max30100_regs.h" +%include "max30100.hpp" +/* END Common SWIG syntax */ diff --git a/src/max30100/pyupm_max30100.i b/src/max30100/pyupm_max30100.i deleted file mode 100644 index a0d28df8..00000000 --- a/src/max30100/pyupm_max30100.i +++ /dev/null @@ -1,12 +0,0 @@ -// Include doxygen-generated documentation -%module(directors="1", threads="1") pyupm_max30100 -%include "pyupm_doxy2swig.i" -%include "../upm.i" - -%{ - #include "max30100.hpp" -%} - -%feature("director") upm::Callback; -%include "max30100_regs.h" -%include "max30100.hpp" diff --git a/src/max31723/javaupm_max31723.i b/src/max31723/javaupm_max31723.i deleted file mode 100644 index 57d23547..00000000 --- a/src/max31723/javaupm_max31723.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_max31723 -%include "../upm.i" - -%{ - #include "max31723.hpp" -%} - -%include "max31723.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_max31723) \ No newline at end of file diff --git a/src/max31723/jsupm_max31723.i b/src/max31723/jsupm_max31723.i deleted file mode 100644 index cfb8a7e0..00000000 --- a/src/max31723/jsupm_max31723.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_max31723 -%include "../upm.i" - -%{ - #include "max31723.hpp" -%} - -%include "max31723.hpp" diff --git a/src/max31723/pyupm_max31723.i b/src/max31723/pyupm_max31723.i deleted file mode 100644 index 2e4a8464..00000000 --- a/src/max31723/pyupm_max31723.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_max31723 -%include "../upm.i" - -%include "max31723.hpp" -%{ - #include "max31723.hpp" -%} diff --git a/src/max31855/javaupm_max31855.i b/src/max31855/javaupm_max31855.i deleted file mode 100644 index 8561629d..00000000 --- a/src/max31855/javaupm_max31855.i +++ /dev/null @@ -1,12 +0,0 @@ -//! [Interesting] -%module javaupm_max31855 -%include "../upm.i" - -%{ - #include "max31855.hpp" -%} - -%include "max31855.hpp" -//! [Interesting] - -JAVA_JNI_LOADLIBRARY(javaupm_max31855) \ No newline at end of file diff --git a/src/max31855/jsupm_max31855.i b/src/max31855/jsupm_max31855.i deleted file mode 100644 index d3c28972..00000000 --- a/src/max31855/jsupm_max31855.i +++ /dev/null @@ -1,10 +0,0 @@ -//! [Interesting] -%module jsupm_max31855 -%include "../upm.i" - -%{ - #include "max31855.hpp" -%} - -%include "max31855.hpp" -//! [Interesting] diff --git a/src/max31855/max31855.i b/src/max31855/max31855.i new file mode 100644 index 00000000..d63b39b8 --- /dev/null +++ b/src/max31855/max31855.i @@ -0,0 +1,17 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +//! [Interesting] + +JAVA_JNI_LOADLIBRARY(javaupm_max31855) +//! [Interesting] +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "max31855.hpp" +%} +%include "max31855.hpp" +/* END Common SWIG syntax */ diff --git a/src/max31855/pyupm_max31855.i b/src/max31855/pyupm_max31855.i deleted file mode 100644 index d81b2fe6..00000000 --- a/src/max31855/pyupm_max31855.i +++ /dev/null @@ -1,11 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_max31855 -%include "../upm.i" - -%include "stdint.i" - -%include "max31855.hpp" -%{ - #include "max31855.hpp" -%} diff --git a/src/max44000/javaupm_max44000.i b/src/max44000/javaupm_max44000.i deleted file mode 100644 index afe29a11..00000000 --- a/src/max44000/javaupm_max44000.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_max44000 -%include "../upm.i" - -%{ - #include "max44000.hpp" -%} - -%include "max44000.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_max44000) \ No newline at end of file diff --git a/src/max44000/jsupm_max44000.i b/src/max44000/jsupm_max44000.i deleted file mode 100644 index d8f90e4a..00000000 --- a/src/max44000/jsupm_max44000.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_max44000 -%include "../upm.i" - -%{ - #include "max44000.hpp" -%} - -%include "max44000.hpp" diff --git a/src/max44000/max44000.i b/src/max44000/max44000.i new file mode 100644 index 00000000..508c1986 --- /dev/null +++ b/src/max44000/max44000.i @@ -0,0 +1,14 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_max44000) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "max44000.hpp" +%} +%include "max44000.hpp" +/* END Common SWIG syntax */ diff --git a/src/max44000/pyupm_max44000.i b/src/max44000/pyupm_max44000.i deleted file mode 100644 index 399e3377..00000000 --- a/src/max44000/pyupm_max44000.i +++ /dev/null @@ -1,11 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_max44000 -%include "../upm.i" - -%include "stdint.i" - -%include "max44000.hpp" -%{ - #include "max44000.hpp" -%} diff --git a/src/max44009/javaupm_max44009.i b/src/max44009/javaupm_max44009.i deleted file mode 100644 index ffa43057..00000000 --- a/src/max44009/javaupm_max44009.i +++ /dev/null @@ -1,21 +0,0 @@ -%module javaupm_max44009 - -%include "../upm.i" -%include "arrays_java.i"; -%include "../java_buffer.i" -%include "cpointer.i" -%include "typemaps.i" - -%import "../interfaces/javaupm_iLightSensor.i" - -%typemap(javaimports) SWIGTYPE %{ -import upm_interfaces.*; -%} - -%{ - #include "max44009.hpp" -%} - -%include "max44009.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_max44009) diff --git a/src/max44009/jsupm_max44009.i b/src/max44009/jsupm_max44009.i deleted file mode 100644 index afebbae5..00000000 --- a/src/max44009/jsupm_max44009.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_max44009 -%include "../upm.i" - -%{ - #include "max44009.hpp" -%} - -%include "max44009.hpp" diff --git a/src/max44009/max44009.i b/src/max44009/max44009.i new file mode 100644 index 00000000..21c139e9 --- /dev/null +++ b/src/max44009/max44009.i @@ -0,0 +1,19 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%include "arrays_java.i"; +%include "../java_buffer.i" +%typemap(javaimports) SWIGTYPE %{import upm_interfaces.*;%} +%import "../interfaces/javaupm_iLightSensor.i" + +JAVA_JNI_LOADLIBRARY(javaupm_max44009) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "max44009.hpp" +%} +%include "max44009.hpp" +/* END Common SWIG syntax */ diff --git a/src/max44009/pyupm_max44009.i b/src/max44009/pyupm_max44009.i deleted file mode 100644 index 17dc7f28..00000000 --- a/src/max44009/pyupm_max44009.i +++ /dev/null @@ -1,12 +0,0 @@ -%module pyupm_max44009 -%include "../upm.i" -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" - - -%include "stdint.i" - -%include "max44009.hpp" -%{ - #include "max44009.hpp" -%} diff --git a/src/max5487/javaupm_max5487.i b/src/max5487/javaupm_max5487.i deleted file mode 100644 index 0b76385f..00000000 --- a/src/max5487/javaupm_max5487.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_max5487 -%include "../upm.i" - -%{ - #include "max5487.hpp" -%} - -%include "max5487.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_max5487) \ No newline at end of file diff --git a/src/max5487/jsupm_max5487.i b/src/max5487/jsupm_max5487.i deleted file mode 100644 index 9dd9c51b..00000000 --- a/src/max5487/jsupm_max5487.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_max5487 -%include "../upm.i" - -%{ - #include "max5487.hpp" -%} - -%include "max5487.hpp" diff --git a/src/max5487/pyupm_max5487.i b/src/max5487/pyupm_max5487.i deleted file mode 100644 index 1d796f85..00000000 --- a/src/max5487/pyupm_max5487.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_max5487 -%include "../upm.i" - -%include "max5487.hpp" -%{ - #include "max5487.hpp" -%} diff --git a/src/maxds3231m/javaupm_maxds3231m.i b/src/maxds3231m/javaupm_maxds3231m.i deleted file mode 100644 index 7177e14d..00000000 --- a/src/maxds3231m/javaupm_maxds3231m.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_maxds3231m -%include "../upm.i" - -%{ - #include "maxds3231m.hpp" -%} - -%include "maxds3231m.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_maxds3231m) \ No newline at end of file diff --git a/src/maxds3231m/jsupm_maxds3231m.i b/src/maxds3231m/jsupm_maxds3231m.i deleted file mode 100644 index aba6c8c9..00000000 --- a/src/maxds3231m/jsupm_maxds3231m.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_maxds3231m -%include "../upm.i" - -%{ - #include "maxds3231m.hpp" -%} - -%include "maxds3231m.hpp" diff --git a/src/maxds3231m/pyupm_maxds3231m.i b/src/maxds3231m/pyupm_maxds3231m.i deleted file mode 100644 index 6f4af98e..00000000 --- a/src/maxds3231m/pyupm_maxds3231m.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_maxds3231m -%include "../upm.i" - -%include "maxds3231m.hpp" -%{ - #include "maxds3231m.hpp" -%} diff --git a/src/maxsonarez/javaupm_maxsonarez.i b/src/maxsonarez/javaupm_maxsonarez.i deleted file mode 100644 index b9e84b7d..00000000 --- a/src/maxsonarez/javaupm_maxsonarez.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_maxsonarez -%include "../upm.i" - -%{ - #include "maxsonarez.hpp" -%} - -%include "maxsonarez.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_maxsonarez) \ No newline at end of file diff --git a/src/maxsonarez/jsupm_maxsonarez.i b/src/maxsonarez/jsupm_maxsonarez.i deleted file mode 100644 index 05911d38..00000000 --- a/src/maxsonarez/jsupm_maxsonarez.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_maxsonarez -%include "../upm.i" - -%{ - #include "maxsonarez.hpp" -%} - -%include "maxsonarez.hpp" diff --git a/src/maxsonarez/pyupm_maxsonarez.i b/src/maxsonarez/pyupm_maxsonarez.i deleted file mode 100644 index a1722795..00000000 --- a/src/maxsonarez/pyupm_maxsonarez.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_maxsonarez -%include "../upm.i" - -%include "maxsonarez.hpp" -%{ - #include "maxsonarez.hpp" -%} diff --git a/src/mb704x/javaupm_mb704x.i b/src/mb704x/javaupm_mb704x.i deleted file mode 100644 index 81b01068..00000000 --- a/src/mb704x/javaupm_mb704x.i +++ /dev/null @@ -1,12 +0,0 @@ -%module javaupm_mb704x -%include "../upm.i" -%include "std_string.i" -%include "stdint.i" -%include "typemaps.i" - -%include "mb704x.hpp" -%{ - #include "mb704x.hpp" -%} - -JAVA_JNI_LOADLIBRARY(javaupm_mb704x) diff --git a/src/mb704x/jsupm_mb704x.i b/src/mb704x/jsupm_mb704x.i deleted file mode 100644 index c86ac5ad..00000000 --- a/src/mb704x/jsupm_mb704x.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_mb704x -%include "../upm.i" -%include "std_string.i" - -%include "mb704x.hpp" -%{ - #include "mb704x.hpp" -%} diff --git a/src/mb704x/mb704x.i b/src/mb704x/mb704x.i new file mode 100644 index 00000000..f88ca406 --- /dev/null +++ b/src/mb704x/mb704x.i @@ -0,0 +1,14 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_mb704x) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "mb704x.hpp" +%} +%include "mb704x.hpp" +/* END Common SWIG syntax */ diff --git a/src/mb704x/pyupm_mb704x.i b/src/mb704x/pyupm_mb704x.i deleted file mode 100644 index 31c7bb2d..00000000 --- a/src/mb704x/pyupm_mb704x.i +++ /dev/null @@ -1,10 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_mb704x -%include "../upm.i" -%include "std_string.i" - -%include "mb704x.hpp" -%{ - #include "mb704x.hpp" -%} diff --git a/src/mcp2515/javaupm_mcp2515.i b/src/mcp2515/javaupm_mcp2515.i deleted file mode 100644 index 3a696446..00000000 --- a/src/mcp2515/javaupm_mcp2515.i +++ /dev/null @@ -1,18 +0,0 @@ -%module javaupm_mcp2515 -%include "../upm.i" -%include "typemaps.i" -%include "arrays_java.i" -%include "../java_buffer.i" -%include "std_string.i" - -%{ - #include "mcp2515.hpp" - #include "mcp2515_regs.h" -%} -%include "mcp2515_regs.h" -%include "mcp2515.hpp" - -%ignore installISR(int pin, void *, void *); - -JAVA_ADD_INSTALLISR_PIN(upm::MCP2515) -JAVA_JNI_LOADLIBRARY(javaupm_mcp2515) diff --git a/src/mcp2515/jsupm_mcp2515.i b/src/mcp2515/jsupm_mcp2515.i deleted file mode 100644 index 4578b6d8..00000000 --- a/src/mcp2515/jsupm_mcp2515.i +++ /dev/null @@ -1,13 +0,0 @@ -%module jsupm_mcp2515 -%include "../upm.i" -%include "cpointer.i" -%include "std_string.i" -%include "../carrays_uint8_t.i" - -%pointer_functions(float, floatp); - -%include "mcp2515_regs.h" -%include "mcp2515.hpp" -%{ - #include "mcp2515.hpp" -%} diff --git a/src/mcp2515/mcp2515.i b/src/mcp2515/mcp2515.i new file mode 100644 index 00000000..86375ab0 --- /dev/null +++ b/src/mcp2515/mcp2515.i @@ -0,0 +1,25 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%include "arrays_java.i" +%include "../java_buffer.i" + +%ignore installISR(int pin, void *, void *); + +JAVA_JNI_LOADLIBRARY(javaupm_mcp2515) +JAVA_ADD_INSTALLISR_PIN(upm::MCP2515) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%include "../carrays_uint8_t.i" +%pointer_functions(float, floatp); + +%{ +#include "mcp2515_regs.h" +#include "mcp2515.hpp" +%} +%include "mcp2515_regs.h" +%include "mcp2515.hpp" +/* END Common SWIG syntax */ diff --git a/src/mcp2515/pyupm_mcp2515.i b/src/mcp2515/pyupm_mcp2515.i deleted file mode 100644 index 1d204db0..00000000 --- a/src/mcp2515/pyupm_mcp2515.i +++ /dev/null @@ -1,17 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_mcp2515 -%include "../upm.i" -%include "cpointer.i" -%include "std_string.i" -%include "../carrays_uint8_t.i" - -%include "stdint.i" - -%pointer_functions(float, floatp); - -%include "mcp2515_regs.h" -%include "mcp2515.hpp" -%{ - #include "mcp2515.hpp" -%} diff --git a/src/mcp9808/javaupm_mcp9808.i b/src/mcp9808/javaupm_mcp9808.i deleted file mode 100644 index bbad4576..00000000 --- a/src/mcp9808/javaupm_mcp9808.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_mcp9808 -%include "../upm.i" - -%{ - #include "mcp9808.hpp" -%} - -%include "mcp9808.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_mcp9808) \ No newline at end of file diff --git a/src/mcp9808/jsupm_mcp9808.i b/src/mcp9808/jsupm_mcp9808.i deleted file mode 100644 index 4bd46cb5..00000000 --- a/src/mcp9808/jsupm_mcp9808.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_mcp9808 -%include "../upm.i" - -%{ - #include "mcp9808.hpp" -%} - -%include "mcp9808.hpp" diff --git a/src/mcp9808/pyupm_mcp9808.i b/src/mcp9808/pyupm_mcp9808.i deleted file mode 100644 index d6eb43b6..00000000 --- a/src/mcp9808/pyupm_mcp9808.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_mcp9808 -%include "../upm.i" - -%include "mcp9808.hpp" -%{ - #include "mcp9808.hpp" -%} diff --git a/src/md/javaupm_md.i b/src/md/javaupm_md.i deleted file mode 100644 index 9d048039..00000000 --- a/src/md/javaupm_md.i +++ /dev/null @@ -1,11 +0,0 @@ -%module javaupm_md -%include "../upm.i" - -%{ - #include "md.hpp" -%} - -%include "md_defs.h" -%include "md.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_md) diff --git a/src/md/jsupm_md.i b/src/md/jsupm_md.i deleted file mode 100644 index 0c19d26d..00000000 --- a/src/md/jsupm_md.i +++ /dev/null @@ -1,9 +0,0 @@ -%module jsupm_md -%include "../upm.i" - -%include "md_defs.h" -%include "md.hpp" -%{ - #include "md.hpp" -%} - diff --git a/src/md/md.i b/src/md/md.i new file mode 100644 index 00000000..40daf824 --- /dev/null +++ b/src/md/md.i @@ -0,0 +1,16 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_md) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "md_defs.h" +#include "md.hpp" +%} +%include "md_defs.h" +%include "md.hpp" +/* END Common SWIG syntax */ diff --git a/src/md/pyupm_md.i b/src/md/pyupm_md.i deleted file mode 100644 index 9dab0f5e..00000000 --- a/src/md/pyupm_md.i +++ /dev/null @@ -1,10 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_md -%include "../upm.i" - -%include "md_defs.h" -%include "md.hpp" -%{ - #include "md.hpp" -%} diff --git a/src/mg811/javaupm_mg811.i b/src/mg811/javaupm_mg811.i deleted file mode 100644 index 7a1cda24..00000000 --- a/src/mg811/javaupm_mg811.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_mg811 -%include "../upm.i" - -%{ - #include "mg811.hpp" -%} - -%include "mg811.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_mg811) \ No newline at end of file diff --git a/src/mg811/jsupm_mg811.i b/src/mg811/jsupm_mg811.i deleted file mode 100644 index 06fd8b5c..00000000 --- a/src/mg811/jsupm_mg811.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_mg811 -%include "../upm.i" - -%{ - #include "mg811.hpp" -%} - -%include "mg811.hpp" diff --git a/src/mg811/pyupm_mg811.i b/src/mg811/pyupm_mg811.i deleted file mode 100644 index b8327f82..00000000 --- a/src/mg811/pyupm_mg811.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_mg811 -%include "../upm.i" - -%include "mg811.hpp" -%{ - #include "mg811.hpp" -%} diff --git a/src/mhz16/javaupm_mhz16.i b/src/mhz16/javaupm_mhz16.i deleted file mode 100644 index cc5da80d..00000000 --- a/src/mhz16/javaupm_mhz16.i +++ /dev/null @@ -1,18 +0,0 @@ -%module javaupm_mhz16 -%include "../upm.i" -%include "cpointer.i" -%include "typemaps.i" -%include "arrays_java.i"; -%include "../java_buffer.i" - -%apply int *OUTPUT { int *gas, int *temp }; - -%{ - #include "mhz16.hpp" - speed_t int_B9600 = B9600; -%} - -%include "mhz16.hpp" -speed_t int_B9600 = B9600; - -JAVA_JNI_LOADLIBRARY(javaupm_mhz16) \ No newline at end of file diff --git a/src/mhz16/jsupm_mhz16.i b/src/mhz16/jsupm_mhz16.i deleted file mode 100644 index 14e6f28a..00000000 --- a/src/mhz16/jsupm_mhz16.i +++ /dev/null @@ -1,13 +0,0 @@ -%module jsupm_mhz16 -%include "../upm.i" -%include "cpointer.i" - -/* Send "int *" to JavaScript as intp */ -%pointer_functions(int, intp); -%{ - #include "mhz16.hpp" - speed_t int_B9600 = B9600; -%} - -%include "mhz16.hpp" -speed_t int_B9600 = B9600; diff --git a/src/mhz16/mhz16.i b/src/mhz16/mhz16.i new file mode 100644 index 00000000..4f3dca0a --- /dev/null +++ b/src/mhz16/mhz16.i @@ -0,0 +1,23 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%include "arrays_java.i"; +%include "../java_buffer.i" + +%apply int *OUTPUT { int *gas, int *temp }; + +JAVA_JNI_LOADLIBRARY(javaupm_mhz16) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%pointer_functions(int, intp); + +%{ +#include "mhz16.hpp" +speed_t int_B9600 = B9600; +%} +%include "mhz16.hpp" +speed_t int_B9600 = B9600; +/* END Common SWIG syntax */ diff --git a/src/mhz16/pyupm_mhz16.i b/src/mhz16/pyupm_mhz16.i deleted file mode 100644 index 0b89fd98..00000000 --- a/src/mhz16/pyupm_mhz16.i +++ /dev/null @@ -1,14 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_mhz16 -%include "../upm.i" -%include "cpointer.i" - -/* Send "int *" to JavaScript as intp */ -%pointer_functions(int, intp); -%{ - #include "mhz16.hpp" - speed_t int_B9600 = B9600; -%} -%include "mhz16.hpp" -speed_t int_B9600 = B9600; diff --git a/src/mic/jsupm_mic.i b/src/mic/jsupm_mic.i deleted file mode 100644 index 567f8b24..00000000 --- a/src/mic/jsupm_mic.i +++ /dev/null @@ -1,9 +0,0 @@ -%module jsupm_mic -%include "../upm.i" -%include "../carrays_uint16_t.i" - -%{ - #include "mic.hpp" -%} - -%include "mic.hpp" diff --git a/src/mic/javaupm_mic.i b/src/mic/mic.i similarity index 64% rename from src/mic/javaupm_mic.i rename to src/mic/mic.i index 294a8e9b..8a8eef60 100644 --- a/src/mic/javaupm_mic.i +++ b/src/mic/mic.i @@ -1,11 +1,8 @@ -%module javaupm_mic -%include "../upm.i" -%include "stdint.i" -%include "arrays_java.i" +%include "../common_top.i" -%{ - #include "mic.hpp" -%} +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%include "arrays_java.i" %typemap(jni) (uint16_t *buffer, int len) "jshortArray"; %typemap(jtype) (uint16_t *buffer, int len) "short[]"; @@ -37,6 +34,25 @@ JCALL3(ReleaseShortArrayElements, jenv, $input, (jshort *)$2, 0); } -%include "mic.hpp" +JAVA_JNI_LOADLIBRARY(javaupm_mic) +#endif +/* END Java syntax */ -JAVA_JNI_LOADLIBRARY(javaupm_mic) \ No newline at end of file +/* BEGIN Javascript syntax ------------------------------------------------- */ +#ifdef SWIGJAVASCRIPT +%include "../carrays_uint16_t.i" +#endif +/* END Javascript syntax */ + +/* BEGIN Python syntax ----------------------------------------------------- */ +#ifdef SWIGPYTHON +%include "../carrays_uint16_t.i" +#endif +/* END Python syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "mic.hpp" +%} +%include "mic.hpp" +/* END Common SWIG syntax */ diff --git a/src/mic/pyupm_mic.i b/src/mic/pyupm_mic.i deleted file mode 100644 index 9cf904ba..00000000 --- a/src/mic/pyupm_mic.i +++ /dev/null @@ -1,10 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_mic -%include "../upm.i" -%include "../carrays_uint16_t.i" - -%{ - #include "mic.hpp" -%} -%include "mic.hpp" diff --git a/src/micsv89/javaupm_micsv89.i b/src/micsv89/javaupm_micsv89.i deleted file mode 100644 index 6e3f96eb..00000000 --- a/src/micsv89/javaupm_micsv89.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_micsv89 -%include "../upm.i" - -%{ - #include "micsv89.hpp" -%} - -%include "micsv89.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_micsv89) \ No newline at end of file diff --git a/src/micsv89/jsupm_micsv89.i b/src/micsv89/jsupm_micsv89.i deleted file mode 100644 index 5e51fac0..00000000 --- a/src/micsv89/jsupm_micsv89.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_micsv89 -%include "../upm.i" - -%{ - #include "micsv89.hpp" -%} - -%include "micsv89.hpp" diff --git a/src/micsv89/pyupm_micsv89.i b/src/micsv89/pyupm_micsv89.i deleted file mode 100644 index ab35c63f..00000000 --- a/src/micsv89/pyupm_micsv89.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_micsv89 -%include "../upm.i" - -%include "micsv89.hpp" -%{ - #include "micsv89.hpp" -%} diff --git a/src/mlx90614/javaupm_mlx90614.i b/src/mlx90614/javaupm_mlx90614.i deleted file mode 100644 index 24dbb20e..00000000 --- a/src/mlx90614/javaupm_mlx90614.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_mlx90614 -%include "../upm.i" - -%{ - #include "mlx90614.hpp" -%} - -%include "mlx90614.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_mlx90614) \ No newline at end of file diff --git a/src/mlx90614/jsupm_mlx90614.i b/src/mlx90614/jsupm_mlx90614.i deleted file mode 100644 index 7ccde4c4..00000000 --- a/src/mlx90614/jsupm_mlx90614.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_mlx90614 -%include "../upm.i" - -%{ - #include "mlx90614.hpp" -%} - -%include "mlx90614.hpp" diff --git a/src/mlx90614/pyupm_mlx90614.i b/src/mlx90614/pyupm_mlx90614.i deleted file mode 100644 index 44f35e2d..00000000 --- a/src/mlx90614/pyupm_mlx90614.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_mlx90614 -%include "../upm.i" - -%include "mlx90614.hpp" -%{ - #include "mlx90614.hpp" -%} diff --git a/src/mma7361/jsupm_mma7361.i b/src/mma7361/jsupm_mma7361.i deleted file mode 100644 index 2ff13f7f..00000000 --- a/src/mma7361/jsupm_mma7361.i +++ /dev/null @@ -1,14 +0,0 @@ -%module jsupm_mma7361 -%include "../upm.i" -%include "std_string.i" -%include "cpointer.i" - -/* Send "int *" and "float *" to JavaScript as intp and floatp */ -%pointer_functions(int, intp); -%pointer_functions(float, floatp); - -%include "mma7361.hpp" -%{ - #include "mma7361.hpp" -%} - diff --git a/src/mma7361/javaupm_mma7361.i b/src/mma7361/mma7361.i similarity index 58% rename from src/mma7361/javaupm_mma7361.i rename to src/mma7361/mma7361.i index 5d617d7d..32fbfef1 100644 --- a/src/mma7361/javaupm_mma7361.i +++ b/src/mma7361/mma7361.i @@ -1,8 +1,7 @@ -%module javaupm_mma7361 -%include "../upm.i" -%include "std_string.i" -%include "cpointer.i" -%include "typemaps.i" +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA %include "arrays_java.i"; %include "../java_buffer.i" @@ -36,9 +35,27 @@ %ignore getAcceleration(float *, float *, float *); %ignore getVolts(float *, float *, float *); -%include "mma7361.hpp" -%{ - #include "mma7361.hpp" -%} - JAVA_JNI_LOADLIBRARY(javaupm_mma7361) +#endif +/* END Java syntax */ + +/* BEGIN Javascript syntax ------------------------------------------------- */ +#ifdef SWIGJAVASCRIPT +%pointer_functions(int, intp); +%pointer_functions(float, floatp); +#endif +/* END Javascript syntax */ + +/* BEGIN Python syntax ----------------------------------------------------- */ +#ifdef SWIGPYTHON +%pointer_functions(int, intp); +%pointer_functions(float, floatp); +#endif +/* END Python syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "mma7361.hpp" +%} +%include "mma7361.hpp" +/* END Common SWIG syntax */ diff --git a/src/mma7361/pyupm_mma7361.i b/src/mma7361/pyupm_mma7361.i deleted file mode 100644 index b8e63b26..00000000 --- a/src/mma7361/pyupm_mma7361.i +++ /dev/null @@ -1,16 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_mma7361 -%include "../upm.i" -%include "std_string.i" -%include "cpointer.i" - -/* Send "int *" and "float *" to python as intp and floatp */ -%pointer_functions(int, intp); -%pointer_functions(float, floatp); - -%include "mma7361.hpp" -%{ - #include "mma7361.hpp" -%} - diff --git a/src/mma7455/jsupm_mma7455.i b/src/mma7455/jsupm_mma7455.i deleted file mode 100644 index b0673971..00000000 --- a/src/mma7455/jsupm_mma7455.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_mma7455 -%include "../upm.i" - -%{ - #include "mma7455.hpp" -%} - -%include "mma7455.hpp" diff --git a/src/mma7455/javaupm_mma7455.i b/src/mma7455/mma7455.i similarity index 51% rename from src/mma7455/javaupm_mma7455.i rename to src/mma7455/mma7455.i index 110ad852..5422a748 100644 --- a/src/mma7455/javaupm_mma7455.i +++ b/src/mma7455/mma7455.i @@ -1,17 +1,20 @@ -%module javaupm_mma7455 -%include "../upm.i" -%include "typemaps.i" +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA %include "arrays_java.i"; %include "../java_buffer.i" %include "std_vector.i" - +%apply short *OUTPUT { short * ptrX, short * ptrY, short * ptrZ }; %template(ShortVector) std::vector; -%apply short *OUTPUT { short * ptrX, short * ptrY, short * ptrZ }; +JAVA_JNI_LOADLIBRARY(javaupm_mma7455) +#endif +/* END Java syntax */ +/* BEGIN Common SWIG syntax ------------------------------------------------- */ %{ #include "mma7455.hpp" %} %include "mma7455.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_mma7455) +/* END Common SWIG syntax */ diff --git a/src/mma7455/pyupm_mma7455.i b/src/mma7455/pyupm_mma7455.i deleted file mode 100644 index 6df1889c..00000000 --- a/src/mma7455/pyupm_mma7455.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_mma7455 -%include "../upm.i" - -%include "mma7455.hpp" -%{ - #include "mma7455.hpp" -%} diff --git a/src/mma7660/jsupm_mma7660.i b/src/mma7660/jsupm_mma7660.i deleted file mode 100644 index 33f1afe5..00000000 --- a/src/mma7660/jsupm_mma7660.i +++ /dev/null @@ -1,14 +0,0 @@ -%module jsupm_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_regs.h" -%include "mma7660.hpp" -%{ - #include "mma7660.hpp" -%} - diff --git a/src/mma7660/javaupm_mma7660.i b/src/mma7660/mma7660.i similarity index 59% rename from src/mma7660/javaupm_mma7660.i rename to src/mma7660/mma7660.i index 38d2ada5..1e216213 100644 --- a/src/mma7660/javaupm_mma7660.i +++ b/src/mma7660/mma7660.i @@ -1,25 +1,31 @@ -%module javaupm_mma7660 -%include "../upm.i" -%include "cpointer.i" -%include "typemaps.i" +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA %include "arrays_java.i"; %include "../java_buffer.i" %include "std_vector.i" +%apply float *OUTPUT { float *ax, float *ay, float *az }; +%apply int *OUTPUT { int *x, int *y, int *z }; +%ignore installISR(int , void *, void *); + %template(IntVector) std::vector; %template(FloatVector) std::vector; -%apply int *OUTPUT { int *x, int *y, int *z }; -%apply float *OUTPUT { float *ax, float *ay, float *az }; +JAVA_ADD_INSTALLISR_PIN(upm::MMA7660) +JAVA_JNI_LOADLIBRARY(javaupm_mma7660) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%pointer_functions(int, intp); +%pointer_functions(float, floatp); %{ -#include "mma7660.hpp" #include "mma7660_regs.h" +#include "mma7660.hpp" %} %include "mma7660_regs.h" %include "mma7660.hpp" - -%ignore installISR(int , void *, void *); - -JAVA_ADD_INSTALLISR_PIN(upm::MMA7660) -JAVA_JNI_LOADLIBRARY(javaupm_mma7660) +/* END Common SWIG syntax */ diff --git a/src/mma7660/pyupm_mma7660.i b/src/mma7660/pyupm_mma7660.i deleted file mode 100644 index 61fa86c2..00000000 --- a/src/mma7660/pyupm_mma7660.i +++ /dev/null @@ -1,15 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_mma7660 -%include "../upm.i" -%include "cpointer.i" - -/* Send "int *" and "float *" to python as intp and floatp */ -%pointer_functions(int, intp); -%pointer_functions(float, floatp); - -%include "mma7660_regs.h" -%include "mma7660.hpp" -%{ - #include "mma7660.hpp" -%} diff --git a/src/mma8x5x/javaupm_mma8x5x.i b/src/mma8x5x/javaupm_mma8x5x.i deleted file mode 100644 index 5dffbf6d..00000000 --- a/src/mma8x5x/javaupm_mma8x5x.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_mma8x5x -%include "../upm.i" - -%{ - #include "mma8x5x.hpp" -%} - -%include "mma8x5x.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_mma8x5x) \ No newline at end of file diff --git a/src/mma8x5x/jsupm_mma8x5x.i b/src/mma8x5x/jsupm_mma8x5x.i deleted file mode 100644 index cc0fae9d..00000000 --- a/src/mma8x5x/jsupm_mma8x5x.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_mma8x5x -%include "../upm.i" - -%{ - #include "mma8x5x.hpp" -%} - -%include "mma8x5x.hpp" diff --git a/src/mma8x5x/pyupm_mma8x5x.i b/src/mma8x5x/pyupm_mma8x5x.i deleted file mode 100644 index dd87ea76..00000000 --- a/src/mma8x5x/pyupm_mma8x5x.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_mma8x5x -%include "../upm.i" - -%include "mma8x5x.hpp" -%{ - #include "mma8x5x.hpp" -%} diff --git a/src/mmc35240/javaupm_mmc35240.i b/src/mmc35240/javaupm_mmc35240.i deleted file mode 100644 index 2682deea..00000000 --- a/src/mmc35240/javaupm_mmc35240.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_mmc35240 -%include "../upm.i" - -%{ - #include "mmc35240.hpp" -%} - -%include "mmc35240.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_mmc35240) diff --git a/src/mmc35240/jsupm_mmc35240.i b/src/mmc35240/jsupm_mmc35240.i deleted file mode 100644 index b9f943cf..00000000 --- a/src/mmc35240/jsupm_mmc35240.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_mmc35240 -%include "../upm.i" - -%{ - #include "mmc35240.hpp" -%} - -%include "mmc35240.hpp" diff --git a/src/mmc35240/pyupm_mmc35240.i b/src/mmc35240/pyupm_mmc35240.i deleted file mode 100644 index 5f1ecef1..00000000 --- a/src/mmc35240/pyupm_mmc35240.i +++ /dev/null @@ -1,10 +0,0 @@ -%module pyupm_mmc35240 -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" - -%include "../upm.i" - -%include "mmc35240.hpp" -%{ - #include "mmc35240.hpp" -%} diff --git a/src/moisture/javaupm_moisture.i b/src/moisture/javaupm_moisture.i deleted file mode 100644 index 750063c5..00000000 --- a/src/moisture/javaupm_moisture.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_moisture -%include "../upm.i" - -%{ - #include "moisture.hpp" -%} - -%include "moisture.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_moisture) \ No newline at end of file diff --git a/src/moisture/jsupm_moisture.i b/src/moisture/jsupm_moisture.i deleted file mode 100644 index 49605004..00000000 --- a/src/moisture/jsupm_moisture.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_moisture -%include "../upm.i" - -%{ - #include "moisture.hpp" -%} - -%include "moisture.hpp" \ No newline at end of file diff --git a/src/moisture/pyupm_moisture.i b/src/moisture/pyupm_moisture.i deleted file mode 100644 index 4e288e6c..00000000 --- a/src/moisture/pyupm_moisture.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_moisture -%include "../upm.i" - -%include "moisture.hpp" -%{ - #include "moisture.hpp" -%} \ No newline at end of file diff --git a/src/mpl3115a2/javaupm_mpl3115a2.i b/src/mpl3115a2/javaupm_mpl3115a2.i deleted file mode 100644 index 02950ee5..00000000 --- a/src/mpl3115a2/javaupm_mpl3115a2.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_mpl3115a2 -%include "../upm.i" - -%{ - #include "mpl3115a2.hpp" -%} - -%include "mpl3115a2.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_mpl3115a2) \ No newline at end of file diff --git a/src/mpl3115a2/jsupm_mpl3115a2.i b/src/mpl3115a2/jsupm_mpl3115a2.i deleted file mode 100644 index 45785207..00000000 --- a/src/mpl3115a2/jsupm_mpl3115a2.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_mpl3115a2 -%include "../upm.i" - -%{ - #include "mpl3115a2.hpp" -%} - -%include "mpl3115a2.hpp" diff --git a/src/mpl3115a2/pyupm_mpl3115a2.i b/src/mpl3115a2/pyupm_mpl3115a2.i deleted file mode 100644 index 62cd0c7c..00000000 --- a/src/mpl3115a2/pyupm_mpl3115a2.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_mpl3115a2 -%include "../upm.i" - -%include "mpl3115a2.hpp" -%{ - #include "mpl3115a2.hpp" -%} diff --git a/src/mpr121/javaupm_mpr121.i b/src/mpr121/javaupm_mpr121.i deleted file mode 100644 index 5dd0f36e..00000000 --- a/src/mpr121/javaupm_mpr121.i +++ /dev/null @@ -1,12 +0,0 @@ -%module javaupm_mpr121 -%include "../upm.i" -%include "arrays_java.i"; -%include "../java_buffer.i" - -%{ - #include "mpr121.hpp" -%} - -%include "mpr121.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_mpr121) \ No newline at end of file diff --git a/src/mpr121/jsupm_mpr121.i b/src/mpr121/jsupm_mpr121.i deleted file mode 100644 index a1a14d05..00000000 --- a/src/mpr121/jsupm_mpr121.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_mpr121 -%include "../upm.i" - -%{ - #include "mpr121.hpp" -%} - -%include "mpr121.hpp" diff --git a/src/mpr121/mpr121.i b/src/mpr121/mpr121.i new file mode 100644 index 00000000..308cc5d0 --- /dev/null +++ b/src/mpr121/mpr121.i @@ -0,0 +1,17 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%include "arrays_java.i"; +%include "../java_buffer.i" + +JAVA_JNI_LOADLIBRARY(javaupm_mpr121) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "mpr121.hpp" +%} +%include "mpr121.hpp" +/* END Common SWIG syntax */ diff --git a/src/mpr121/pyupm_mpr121.i b/src/mpr121/pyupm_mpr121.i deleted file mode 100644 index 88123dad..00000000 --- a/src/mpr121/pyupm_mpr121.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_mpr121 -%include "../upm.i" - -%include "mpr121.hpp" -%{ - #include "mpr121.hpp" -%} diff --git a/src/mpu9150/javaupm_mpu9150.i b/src/mpu9150/javaupm_mpu9150.i deleted file mode 100644 index 1464d14e..00000000 --- a/src/mpu9150/javaupm_mpu9150.i +++ /dev/null @@ -1,24 +0,0 @@ -%module javaupm_mpu9150 -%include "../upm.i" -%include "typemaps.i" -%include "arrays_java.i" -%include "../java_buffer.i" -%include "std_vector.i" - -%template(FloatVector) std::vector; - -%apply int {mraa::Edge}; - -%{ -#include "mpu60x0.hpp" -#include "mpu9150.hpp" -%} -%include "mpu60x0.hpp" -%include "mpu9150.hpp" - -%define GETTER get_gpioIRQ() -%enddef - -JAVA_ADD_INSTALLISR_GPIO(upm::MPU60X0) - -JAVA_JNI_LOADLIBRARY(javaupm_mpu9150) diff --git a/src/mpu9150/jsupm_mpu9150.i b/src/mpu9150/jsupm_mpu9150.i deleted file mode 100644 index f0a728b5..00000000 --- a/src/mpu9150/jsupm_mpu9150.i +++ /dev/null @@ -1,30 +0,0 @@ -%module jsupm_mpu9150 -%include "../upm.i" -%include "cpointer.i" - -%pointer_functions(float, floatp); - -%{ - #include "mpu9150.hpp" -%} - -%include "ak8975.hpp" -%{ - #include "ak8975.hpp" -%} - -%include "mpu60x0.hpp" -%{ - #include "mpu60x0.hpp" -%} - -%include "mpu9150.hpp" -%{ - #include "mpu9150.hpp" -%} - -%include "mpu9250.hpp" -%{ - #include "mpu9250.hpp" -%} - diff --git a/src/mpu9150/mpu9150.i b/src/mpu9150/mpu9150.i new file mode 100644 index 00000000..557c5dda --- /dev/null +++ b/src/mpu9150/mpu9150.i @@ -0,0 +1,47 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%include "std_vector.i" +%include "arrays_java.i" +%include "../java_buffer.i" + +%template(FloatVector) std::vector; + +%apply int {mraa::Edge}; + +%define GETTER get_gpioIRQ() +%enddef + +JAVA_ADD_INSTALLISR_GPIO(upm::MPU60X0) + +JAVA_JNI_LOADLIBRARY(javaupm_mpu9150) +#endif +/* END Java syntax */ + +/* BEGIN Javascript syntax ------------------------------------------------- */ +#ifdef SWIGJAVASCRIPT +%include "std_vector.i" +%pointer_functions(float, floatp); +#endif +/* END Javascript syntax */ + +/* BEGIN Python syntax ----------------------------------------------------- */ +#ifdef SWIGPYTHON +%include "std_vector.i" +%pointer_functions(float, floatp); +#endif +/* END Python syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "ak8975.hpp" +#include "mpu60x0.hpp" +#include "mpu9150.hpp" +#include "mpu9250.hpp" +%} +%include "ak8975.hpp" +%include "mpu60x0.hpp" +%include "mpu9150.hpp" +%include "mpu9250.hpp" +/* END Common SWIG syntax */ diff --git a/src/mpu9150/pyupm_mpu9150.i b/src/mpu9150/pyupm_mpu9150.i deleted file mode 100644 index 9cda9e95..00000000 --- a/src/mpu9150/pyupm_mpu9150.i +++ /dev/null @@ -1,30 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_mpu9150 -%include "../upm.i" -%include "cpointer.i" - -%include "stdint.i" - -%pointer_functions(float, floatp); - -%include "ak8975.hpp" -%{ - #include "ak8975.hpp" -%} - -%include "mpu60x0.hpp" -%{ - #include "mpu60x0.hpp" -%} - -%include "mpu9150.hpp" -%{ - #include "mpu9150.hpp" -%} - -%include "mpu9250.hpp" -%{ - #include "mpu9250.hpp" -%} - diff --git a/src/mq303a/javaupm_mq303a.i b/src/mq303a/javaupm_mq303a.i deleted file mode 100644 index 3ddf5a80..00000000 --- a/src/mq303a/javaupm_mq303a.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_mq303a -%include "../upm.i" - -%{ - #include "mq303a.hpp" -%} - -%include "mq303a.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_mq303a) \ No newline at end of file diff --git a/src/mq303a/jsupm_mq303a.i b/src/mq303a/jsupm_mq303a.i deleted file mode 100644 index f2547495..00000000 --- a/src/mq303a/jsupm_mq303a.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_mq303a -%include "../upm.i" - -%{ - #include "mq303a.hpp" -%} - -%include "mq303a.hpp" diff --git a/src/mq303a/pyupm_mq303a.i b/src/mq303a/pyupm_mq303a.i deleted file mode 100644 index 6dd97f9c..00000000 --- a/src/mq303a/pyupm_mq303a.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_mq303a -%include "../upm.i" - -%include "mq303a.hpp" -%{ - #include "mq303a.hpp" -%} diff --git a/src/ms5611/javaupm_ms5611.i b/src/ms5611/javaupm_ms5611.i deleted file mode 100644 index a177d41d..00000000 --- a/src/ms5611/javaupm_ms5611.i +++ /dev/null @@ -1,17 +0,0 @@ -%module javaupm_ms5611 -%include "../upm.i" - -%import "../interfaces/javaupm_iTemperatureSensor.i" -%import "../interfaces/javaupm_iPressureSensor.i" - -%typemap(javaimports) SWIGTYPE %{ -import upm_interfaces.*; -%} - -%{ - #include "ms5611.hpp" -%} - -%include "ms5611.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_ms5611) diff --git a/src/ms5611/jsupm_ms5611.i b/src/ms5611/jsupm_ms5611.i deleted file mode 100644 index 529dee29..00000000 --- a/src/ms5611/jsupm_ms5611.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_ms5611 -%include "../upm.i" - -%{ - #include "ms5611.hpp" -%} - -%include "ms5611.hpp" diff --git a/src/ms5611/ms5611.i b/src/ms5611/ms5611.i new file mode 100644 index 00000000..e02dde16 --- /dev/null +++ b/src/ms5611/ms5611.i @@ -0,0 +1,18 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%import "../interfaces/javaupm_iTemperatureSensor.i" +%import "../interfaces/javaupm_iPressureSensor.i" +%typemap(javaimports) SWIGTYPE %{import upm_interfaces.*;%} + +JAVA_JNI_LOADLIBRARY(javaupm_ms5611) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "ms5611.hpp" +%} +%include "ms5611.hpp" +/* END Common SWIG syntax */ diff --git a/src/ms5611/pyupm_ms5611.i b/src/ms5611/pyupm_ms5611.i deleted file mode 100644 index 19c0cb70..00000000 --- a/src/ms5611/pyupm_ms5611.i +++ /dev/null @@ -1,9 +0,0 @@ -%module pyupm_ms5611 -%include "../upm.i" -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" - -%include "ms5611.hpp" -%{ - #include "ms5611.hpp" -%} diff --git a/src/ms5803/javaupm_ms5803.i b/src/ms5803/javaupm_ms5803.i deleted file mode 100644 index 8554e494..00000000 --- a/src/ms5803/javaupm_ms5803.i +++ /dev/null @@ -1,15 +0,0 @@ -%module javaupm_ms5803 -%include "../upm.i" -%include "typemaps.i" -%include "arrays_java.i" -%include "../java_buffer.i" -%include "std_string.i" - -%include "ms5803_defs.h" -%include "ms5803.hpp" -%{ - #include "ms5803.hpp" -%} - - -JAVA_JNI_LOADLIBRARY(javaupm_ms5803) diff --git a/src/ms5803/jsupm_ms5803.i b/src/ms5803/jsupm_ms5803.i deleted file mode 100644 index 7828af88..00000000 --- a/src/ms5803/jsupm_ms5803.i +++ /dev/null @@ -1,12 +0,0 @@ -%module jsupm_ms5803 -%include "../upm.i" -%include "cpointer.i" -%include "std_string.i" - -%pointer_functions(float, floatp); - -%include "ms5803_defs.h" -%include "ms5803.hpp" -%{ - #include "ms5803.hpp" -%} diff --git a/src/ms5803/ms5803.i b/src/ms5803/ms5803.i new file mode 100644 index 00000000..4fb325a5 --- /dev/null +++ b/src/ms5803/ms5803.i @@ -0,0 +1,21 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%include "arrays_java.i" +%include "../java_buffer.i" + +JAVA_JNI_LOADLIBRARY(javaupm_ms5803) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%pointer_functions(float, floatp); + +%{ +#include "ms5803_defs.h" +#include "ms5803.hpp" +%} +%include "ms5803_defs.h" +%include "ms5803.hpp" +/* END Common SWIG syntax */ diff --git a/src/ms5803/pyupm_ms5803.i b/src/ms5803/pyupm_ms5803.i deleted file mode 100644 index 25198284..00000000 --- a/src/ms5803/pyupm_ms5803.i +++ /dev/null @@ -1,16 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_ms5803 -%include "../upm.i" -%include "cpointer.i" -%include "std_string.i" - -%include "stdint.i" - -%pointer_functions(float, floatp); - -%include "ms5803_defs.h" -%include "ms5803.hpp" -%{ - #include "ms5803.hpp" -%} diff --git a/src/my9221/javaupm_my9221.i b/src/my9221/javaupm_my9221.i deleted file mode 100644 index 8bda1c70..00000000 --- a/src/my9221/javaupm_my9221.i +++ /dev/null @@ -1,19 +0,0 @@ -%module javaupm_my9221 -%include "../upm.i" - -%include "my9221.hpp" -%{ - #include "my9221.hpp" -%} - -%include "groveledbar.hpp" -%{ - #include "groveledbar.hpp" -%} - -%include "grovecircularled.hpp" -%{ - #include "grovecircularled.hpp" -%} - -JAVA_JNI_LOADLIBRARY(javaupm_my9221) diff --git a/src/my9221/jsupm_my9221.i b/src/my9221/jsupm_my9221.i deleted file mode 100644 index 29df86bd..00000000 --- a/src/my9221/jsupm_my9221.i +++ /dev/null @@ -1,18 +0,0 @@ -%module jsupm_my9221 -%include "../upm.i" - -%include "my9221.hpp" -%{ - #include "my9221.hpp" -%} - -%include "groveledbar.hpp" -%{ - #include "groveledbar.hpp" -%} - -%include "grovecircularled.hpp" -%{ - #include "grovecircularled.hpp" -%} - diff --git a/src/my9221/my9221.i b/src/my9221/my9221.i new file mode 100644 index 00000000..bd947182 --- /dev/null +++ b/src/my9221/my9221.i @@ -0,0 +1,18 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_my9221) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "groveledbar.hpp" +#include "my9221.hpp" +#include "grovecircularled.hpp" +%} +%include "my9221.hpp" +%include "groveledbar.hpp" +%include "grovecircularled.hpp" +/* END Common SWIG syntax */ diff --git a/src/my9221/pyupm_my9221.i b/src/my9221/pyupm_my9221.i deleted file mode 100644 index 9339600d..00000000 --- a/src/my9221/pyupm_my9221.i +++ /dev/null @@ -1,19 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_my9221 -%include "../upm.i" - -%include "my9221.hpp" -%{ - #include "my9221.hpp" -%} - -%include "groveledbar.hpp" -%{ - #include "groveledbar.hpp" -%} - -%include "grovecircularled.hpp" -%{ - #include "grovecircularled.hpp" -%} diff --git a/src/nlgpio16/javaupm_nlgpio16.i b/src/nlgpio16/javaupm_nlgpio16.i deleted file mode 100644 index 04f28031..00000000 --- a/src/nlgpio16/javaupm_nlgpio16.i +++ /dev/null @@ -1,13 +0,0 @@ -%module javaupm_nlgpio16 -%include "../upm.i" -%include "carrays.i" -%include "std_string.i" - -%{ - #include "nlgpio16.hpp" -%} - -%include "nlgpio16.hpp" -%array_class(char, charArray); - -JAVA_JNI_LOADLIBRARY(javaupm_nlgpio16) diff --git a/src/nlgpio16/jsupm_nlgpio16.i b/src/nlgpio16/jsupm_nlgpio16.i deleted file mode 100644 index a5118b2a..00000000 --- a/src/nlgpio16/jsupm_nlgpio16.i +++ /dev/null @@ -1,11 +0,0 @@ -%module jsupm_nlgpio16 -%include "../upm.i" -%include "carrays.i" -%include "std_string.i" - -%{ - #include "nlgpio16.hpp" -%} - -%include "nlgpio16.hpp" -%array_class(char, charArray); diff --git a/src/nlgpio16/nlgpio16.i b/src/nlgpio16/nlgpio16.i new file mode 100644 index 00000000..00a55bbe --- /dev/null +++ b/src/nlgpio16/nlgpio16.i @@ -0,0 +1,16 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_nlgpio16) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%include "carrays.i" +%{ +#include "nlgpio16.hpp" +%} +%include "nlgpio16.hpp" +%array_class(char, charArray); +/* END Common SWIG syntax */ diff --git a/src/nlgpio16/pyupm_nlgpio16.i b/src/nlgpio16/pyupm_nlgpio16.i deleted file mode 100644 index 2405324c..00000000 --- a/src/nlgpio16/pyupm_nlgpio16.i +++ /dev/null @@ -1,12 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_nlgpio16 -%include "../upm.i" -%include "carrays.i" -%include "std_string.i" - -%{ - #include "nlgpio16.hpp" -%} -%include "nlgpio16.hpp" -%array_class(char, charArray); diff --git a/src/nmea_gps/javaupm_nmea_gps.i b/src/nmea_gps/javaupm_nmea_gps.i deleted file mode 100644 index c2fea16d..00000000 --- a/src/nmea_gps/javaupm_nmea_gps.i +++ /dev/null @@ -1,12 +0,0 @@ -%module javaupm_nmea_gps -%include "../upm.i" -%include "std_string.i" -%include "stdint.i" -%include "typemaps.i" - -%include "nmea_gps.hpp" -%{ - #include "nmea_gps.hpp" -%} - -JAVA_JNI_LOADLIBRARY(javaupm_nmea_gps) diff --git a/src/nmea_gps/jsupm_nmea_gps.i b/src/nmea_gps/jsupm_nmea_gps.i deleted file mode 100644 index cd8494b5..00000000 --- a/src/nmea_gps/jsupm_nmea_gps.i +++ /dev/null @@ -1,9 +0,0 @@ -%module jsupm_nmea_gps -%include "../upm.i" -%include "std_string.i" - -%include "nmea_gps.hpp" -%{ - #include "nmea_gps.hpp" -%} - diff --git a/src/nmea_gps/nmea_gps.i b/src/nmea_gps/nmea_gps.i new file mode 100644 index 00000000..8d66ce98 --- /dev/null +++ b/src/nmea_gps/nmea_gps.i @@ -0,0 +1,14 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_nmea_gps) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "nmea_gps.hpp" +%} +%include "nmea_gps.hpp" +/* END Common SWIG syntax */ diff --git a/src/nmea_gps/pyupm_nmea_gps.i b/src/nmea_gps/pyupm_nmea_gps.i deleted file mode 100644 index cd3c2113..00000000 --- a/src/nmea_gps/pyupm_nmea_gps.i +++ /dev/null @@ -1,11 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_nmea_gps -%include "../upm.i" -%include "std_string.i" - -%include "nmea_gps.hpp" -%{ - #include "nmea_gps.hpp" -%} - diff --git a/src/nrf24l01/javaupm_nrf24l01.i b/src/nrf24l01/javaupm_nrf24l01.i deleted file mode 100644 index a4fb2c9b..00000000 --- a/src/nrf24l01/javaupm_nrf24l01.i +++ /dev/null @@ -1,22 +0,0 @@ -%include "../upm.i" - -#ifdef ANDROID - %module javaupm_nrf24l01 -#else - %module(directors="1") javaupm_nrf24l01 - %feature("director") Callback; - SWIG_DIRECTOR_OWNED(Callback) -#endif - - -%include "arrays_java.i"; -%apply signed char[] {uint8_t *}; - -%include "Callback.hpp" -%{ - #include "nrf24l01.hpp" -%} - -%include "nrf24l01.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_nrf24l01) diff --git a/src/nrf24l01/jsupm_nrf24l01.i b/src/nrf24l01/jsupm_nrf24l01.i deleted file mode 100644 index 71ed7091..00000000 --- a/src/nrf24l01/jsupm_nrf24l01.i +++ /dev/null @@ -1,9 +0,0 @@ -%module jsupm_nrf24l01 -%include "../upm.i" -%include "../carrays_uint8_t.i" - -%{ - #include "nrf24l01.hpp" -%} - -%include "nrf24l01.hpp" diff --git a/src/nrf24l01/nrf24l01.i b/src/nrf24l01/nrf24l01.i new file mode 100644 index 00000000..20c2dfec --- /dev/null +++ b/src/nrf24l01/nrf24l01.i @@ -0,0 +1,35 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +#ifndef ANDROID +%module(directors="1") javaupm_nrf24l01 +%feature("director") Callback; +SWIG_DIRECTOR_OWNED(Callback) +#endif +%include "arrays_java.i"; +%apply signed char[] {uint8_t *}; + +JAVA_JNI_LOADLIBRARY(javaupm_nrf24l01) +#endif +/* END Java syntax */ + +/* BEGIN Javascript syntax ------------------------------------------------- */ +#ifdef SWIGJAVASCRIPT +%include "../carrays_uint8_t.i" +#endif +/* END Javascript syntax */ + +/* BEGIN Python syntax ----------------------------------------------------- */ +#ifdef SWIGPYTHON +%include "../carrays_uint8_t.i" +#endif +/* END Python syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "nrf24l01.hpp" +%} +%include "Callback.hpp" +%include "nrf24l01.hpp" +/* END Common SWIG syntax */ diff --git a/src/nrf24l01/pyupm_nrf24l01.i b/src/nrf24l01/pyupm_nrf24l01.i deleted file mode 100644 index e2e00874..00000000 --- a/src/nrf24l01/pyupm_nrf24l01.i +++ /dev/null @@ -1,10 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_nrf24l01 -%include "../upm.i" -%include "../carrays_uint8_t.i" - -%include "nrf24l01.hpp" -%{ - #include "nrf24l01.hpp" -%} diff --git a/src/nrf8001/javaupm_nrf8001.i b/src/nrf8001/javaupm_nrf8001.i deleted file mode 100644 index 322a9aa7..00000000 --- a/src/nrf8001/javaupm_nrf8001.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_nrf8001 -%include "../upm.i" - -%{ - #include "nrf8001.hpp" -%} - -%include "nrf8001.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_nrf8001) diff --git a/src/nrf8001/jsupm_nrf8001.i b/src/nrf8001/jsupm_nrf8001.i deleted file mode 100644 index d9d710da..00000000 --- a/src/nrf8001/jsupm_nrf8001.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_nrf8001 -%include "../upm.i" - -%{ - #include "nrf8001.hpp" -%} - -%include "nrf8001.hpp" diff --git a/src/nrf8001/pyupm_nrf8001.i b/src/nrf8001/pyupm_nrf8001.i deleted file mode 100644 index 00579618..00000000 --- a/src/nrf8001/pyupm_nrf8001.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_nrf8001 -%include "../upm.i" - -%include "nrf8001.hpp" -%{ - #include "nrf8001.hpp" -%} diff --git a/src/nunchuck/javaupm_nunchuck.i b/src/nunchuck/javaupm_nunchuck.i deleted file mode 100644 index 7806787e..00000000 --- a/src/nunchuck/javaupm_nunchuck.i +++ /dev/null @@ -1,11 +0,0 @@ -%module javaupm_nunchuck -%include "../upm.i" -%include "../java_buffer.i" - -%{ - #include "nunchuck.hpp" -%} - -%include "nunchuck.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_nunchuck) \ No newline at end of file diff --git a/src/nunchuck/jsupm_nunchuck.i b/src/nunchuck/jsupm_nunchuck.i deleted file mode 100644 index 006895e0..00000000 --- a/src/nunchuck/jsupm_nunchuck.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_nunchuck -%include "../upm.i" - -%{ - #include "nunchuck.hpp" -%} - -%include "nunchuck.hpp" diff --git a/src/nunchuck/nunchuck.i b/src/nunchuck/nunchuck.i new file mode 100644 index 00000000..77caf869 --- /dev/null +++ b/src/nunchuck/nunchuck.i @@ -0,0 +1,16 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%include "../java_buffer.i" + +JAVA_JNI_LOADLIBRARY(javaupm_nunchuck) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "nunchuck.hpp" +%} +%include "nunchuck.hpp" +/* END Common SWIG syntax */ diff --git a/src/nunchuck/pyupm_nunchuck.i b/src/nunchuck/pyupm_nunchuck.i deleted file mode 100644 index 411484ff..00000000 --- a/src/nunchuck/pyupm_nunchuck.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_nunchuck -%include "../upm.i" - -%include "nunchuck.hpp" -%{ - #include "nunchuck.hpp" -%} diff --git a/src/o2/javaupm_o2.i b/src/o2/javaupm_o2.i deleted file mode 100644 index 7be25969..00000000 --- a/src/o2/javaupm_o2.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_o2 -%include "../upm.i" - -%{ - #include "o2.hpp" -%} - -%include "o2.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_o2) \ No newline at end of file diff --git a/src/o2/jsupm_o2.i b/src/o2/jsupm_o2.i deleted file mode 100644 index 79a7a9bc..00000000 --- a/src/o2/jsupm_o2.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_o2 -%include "../upm.i" - -%{ - #include "o2.hpp" -%} - -%include "o2.hpp" diff --git a/src/o2/pyupm_o2.i b/src/o2/pyupm_o2.i deleted file mode 100644 index 962dc801..00000000 --- a/src/o2/pyupm_o2.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_o2 -%include "../upm.i" - -%include "o2.hpp" -%{ - #include "o2.hpp" -%} diff --git a/src/otp538u/javaupm_otp538u.i b/src/otp538u/javaupm_otp538u.i deleted file mode 100644 index 914c6120..00000000 --- a/src/otp538u/javaupm_otp538u.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_otp538u -%include "../upm.i" - -%{ - #include "otp538u.hpp" -%} - -%include "otp538u.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_otp538u) \ No newline at end of file diff --git a/src/otp538u/jsupm_otp538u.i b/src/otp538u/jsupm_otp538u.i deleted file mode 100644 index 038cdb5b..00000000 --- a/src/otp538u/jsupm_otp538u.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_otp538u -%include "../upm.i" - -%{ - #include "otp538u.hpp" -%} - -%include "otp538u.hpp" diff --git a/src/otp538u/pyupm_otp538u.i b/src/otp538u/pyupm_otp538u.i deleted file mode 100644 index 28c8ace6..00000000 --- a/src/otp538u/pyupm_otp538u.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_otp538u -%include "../upm.i" - -%include "otp538u.hpp" -%{ - #include "otp538u.hpp" -%} diff --git a/src/ozw/javaupm_ozw.i b/src/ozw/javaupm_ozw.i deleted file mode 100644 index 32d45821..00000000 --- a/src/ozw/javaupm_ozw.i +++ /dev/null @@ -1,50 +0,0 @@ -%module javaupm_ozw -%include "../upm.i" -%include "cpointer.i" -%include "typemaps.i" -%include "arrays_java.i"; -%include "../java_buffer.i" - -%apply unsigned char *OUTPUT { uint8_t *val }; - -%include "ozw.hpp" -%{ - #include "ozw.hpp" -%} - -%include "ozwinterface.hpp" -%{ - #include "ozwinterface.hpp" -%} - -%include "ozwdump.hpp" -%{ - #include "ozwdump.hpp" -%} - -%include "aeotecss6.hpp" -%{ - #include "aeotecss6.hpp" -%} - -%include "aeotecsdg2.hpp" -%{ - #include "aeotecsdg2.hpp" -%} - -%include "aeotecdw2e.hpp" -%{ - #include "aeotecdw2e.hpp" -%} - -%include "aeotecdsb09104.hpp" -%{ - #include "aeotecdsb09104.hpp" -%} - -%include "tzemt400.hpp" -%{ - #include "tzemt400.hpp" -%} - -JAVA_JNI_LOADLIBRARY(javaupm_ozw) diff --git a/src/ozw/jsupm_ozw.i b/src/ozw/jsupm_ozw.i deleted file mode 100644 index 42eb1300..00000000 --- a/src/ozw/jsupm_ozw.i +++ /dev/null @@ -1,46 +0,0 @@ -%module jsupm_ozw -%include "../upm.i" -%include "cpointer.i" -%include "stdint.i" - -%pointer_functions(float, floatp); - -%include "ozw.hpp" -%{ - #include "ozw.hpp" -%} - -%include "ozwinterface.hpp" -%{ - #include "ozwinterface.hpp" -%} - -%include "ozwdump.hpp" -%{ - #include "ozwdump.hpp" -%} - -%include "aeotecss6.hpp" -%{ - #include "aeotecss6.hpp" -%} - -%include "aeotecsdg2.hpp" -%{ - #include "aeotecsdg2.hpp" -%} - -%include "aeotecdw2e.hpp" -%{ - #include "aeotecdw2e.hpp" -%} - -%include "aeotecdsb09104.hpp" -%{ - #include "aeotecdsb09104.hpp" -%} - -%include "tzemt400.hpp" -%{ - #include "tzemt400.hpp" -%} diff --git a/src/ozw/ozw.i b/src/ozw/ozw.i new file mode 100644 index 00000000..8dc6f23c --- /dev/null +++ b/src/ozw/ozw.i @@ -0,0 +1,34 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%include "arrays_java.i"; +%include "../java_buffer.i" +%apply unsigned char *OUTPUT { uint8_t *val }; + +JAVA_JNI_LOADLIBRARY(javaupm_ozw) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%pointer_functions(float, floatp); + +%{ +#include "ozwinterface.hpp" +#include "ozw.hpp" +#include "aeotecdsb09104.hpp" +#include "aeotecdw2e.hpp" +#include "aeotecsdg2.hpp" +#include "aeotecss6.hpp" +#include "ozwdump.hpp" +#include "tzemt400.hpp" +%} +%include "ozwinterface.hpp" +%include "ozw.hpp" +%include "aeotecdsb09104.hpp" +%include "aeotecdw2e.hpp" +%include "aeotecsdg2.hpp" +%include "aeotecss6.hpp" +%include "ozwdump.hpp" +%include "tzemt400.hpp" +/* END Common SWIG syntax */ diff --git a/src/ozw/pyupm_ozw.i b/src/ozw/pyupm_ozw.i deleted file mode 100644 index 31faaa93..00000000 --- a/src/ozw/pyupm_ozw.i +++ /dev/null @@ -1,49 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_ozw -%include "../upm.i" -%include "cpointer.i" - -%include "stdint.i" - -%pointer_functions(float, floatp); - -%include "ozw.hpp" -%{ - #include "ozw.hpp" -%} - -%include "ozwinterface.hpp" -%{ - #include "ozwinterface.hpp" -%} - -%include "ozwdump.hpp" -%{ - #include "ozwdump.hpp" -%} - -%include "aeotecss6.hpp" -%{ - #include "aeotecss6.hpp" -%} - -%include "aeotecsdg2.hpp" -%{ - #include "aeotecsdg2.hpp" -%} - -%include "aeotecdw2e.hpp" -%{ - #include "aeotecdw2e.hpp" -%} - -%include "aeotecdsb09104.hpp" -%{ - #include "aeotecdsb09104.hpp" -%} - -%include "tzemt400.hpp" -%{ - #include "tzemt400.hpp" -%} diff --git a/src/p9813/javaupm_p9813.i b/src/p9813/javaupm_p9813.i deleted file mode 100644 index a0f35742..00000000 --- a/src/p9813/javaupm_p9813.i +++ /dev/null @@ -1,11 +0,0 @@ -%module javaupm_p9813 - -%include "../upm.i" -%include "typemaps.i" - -%{ - #include "p9813.hpp" -%} -%include "p9813.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_p9813) diff --git a/src/p9813/jsupm_p9813.i b/src/p9813/jsupm_p9813.i deleted file mode 100644 index 9d4cf8f9..00000000 --- a/src/p9813/jsupm_p9813.i +++ /dev/null @@ -1,7 +0,0 @@ -%module jsupm_p9813 -%include "../upm.i" - -%include "p9813.hpp" -%{ - #include "p9813.hpp" -%} diff --git a/src/p9813/p9813.i b/src/p9813/p9813.i new file mode 100644 index 00000000..4584595c --- /dev/null +++ b/src/p9813/p9813.i @@ -0,0 +1,14 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_p9813) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "p9813.hpp" +%} +%include "p9813.hpp" +/* END Common SWIG syntax */ diff --git a/src/p9813/pyupm_p9813.i b/src/p9813/pyupm_p9813.i deleted file mode 100644 index 5b530abf..00000000 --- a/src/p9813/pyupm_p9813.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_p9813 -%include "../upm.i" - -%include "p9813.hpp" -%{ - #include "p9813.hpp" -%} diff --git a/src/pca9685/javaupm_pca9685.i b/src/pca9685/javaupm_pca9685.i deleted file mode 100644 index e2468da1..00000000 --- a/src/pca9685/javaupm_pca9685.i +++ /dev/null @@ -1,11 +0,0 @@ -%module javaupm_pca9685 -%include "../upm.i" -%include "cpointer.i" - -%{ - #include "pca9685.hpp" -%} - -%include "pca9685.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_pca9685) \ No newline at end of file diff --git a/src/pca9685/jsupm_pca9685.i b/src/pca9685/jsupm_pca9685.i deleted file mode 100644 index db3b629e..00000000 --- a/src/pca9685/jsupm_pca9685.i +++ /dev/null @@ -1,9 +0,0 @@ -%module jsupm_pca9685 -%include "../upm.i" -%include "cpointer.i" - -%{ - #include "pca9685.hpp" -%} - -%include "pca9685.hpp" diff --git a/src/pca9685/pca9685.i b/src/pca9685/pca9685.i new file mode 100644 index 00000000..ffe142e3 --- /dev/null +++ b/src/pca9685/pca9685.i @@ -0,0 +1,14 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_pca9685) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "pca9685.hpp" +%} +%include "pca9685.hpp" +/* END Common SWIG syntax */ diff --git a/src/pca9685/pyupm_pca9685.i b/src/pca9685/pyupm_pca9685.i deleted file mode 100644 index cd9c41c6..00000000 --- a/src/pca9685/pyupm_pca9685.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_pca9685 -%include "../upm.i" - -%include "pca9685.hpp" -%{ - #include "pca9685.hpp" -%} diff --git a/src/pn532/javaupm_pn532.i b/src/pn532/javaupm_pn532.i deleted file mode 100644 index 799cbb37..00000000 --- a/src/pn532/javaupm_pn532.i +++ /dev/null @@ -1,18 +0,0 @@ -%module javaupm_pn532 -%include "../upm.i" -%include "typemaps.i" -%include "arrays_java.i" - -%apply signed char[] {uint8_t *}; -%apply unsigned char *INOUT {uint8_t *responseLength}; -%apply unsigned char *OUTPUT {uint8_t *uidLength}; - -%ignore i2cContext; - -%{ - #include "pn532.hpp" -%} - -%include "pn532.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_pn532) \ No newline at end of file diff --git a/src/pn532/jsupm_pn532.i b/src/pn532/jsupm_pn532.i deleted file mode 100644 index 66e55995..00000000 --- a/src/pn532/jsupm_pn532.i +++ /dev/null @@ -1,9 +0,0 @@ -%module jsupm_pn532 -%include "../upm.i" -%include "../carrays_uint8_t.i" - -%{ - #include "pn532.hpp" -%} - -%include "pn532.hpp" diff --git a/src/pn532/pn532.i b/src/pn532/pn532.i new file mode 100644 index 00000000..6456cd55 --- /dev/null +++ b/src/pn532/pn532.i @@ -0,0 +1,32 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%include "arrays_java.i" +%ignore i2cContext; +%apply signed char[] {uint8_t *}; +%apply unsigned char *OUTPUT {uint8_t *uidLength}; +%apply unsigned char *INOUT {uint8_t *responseLength}; + +JAVA_JNI_LOADLIBRARY(javaupm_pn532) +#endif +/* END Java syntax */ + +/* BEGIN Javascript syntax ------------------------------------------------- */ +#ifdef SWIGJAVASCRIPT +%include "../carrays_uint8_t.i" +#endif +/* END Javascript syntax */ + +/* BEGIN Python syntax ----------------------------------------------------- */ +#ifdef SWIGPYTHON +%include "../carrays_uint8_t.i" +#endif +/* END Python syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "pn532.hpp" +%} +%include "pn532.hpp" +/* END Common SWIG syntax */ diff --git a/src/pn532/pyupm_pn532.i b/src/pn532/pyupm_pn532.i deleted file mode 100644 index 11437a9e..00000000 --- a/src/pn532/pyupm_pn532.i +++ /dev/null @@ -1,10 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_pn532 -%include "../upm.i" -%include "../carrays_uint8_t.i" - -%include "pn532.hpp" -%{ - #include "pn532.hpp" -%} diff --git a/src/ppd42ns/javaupm_ppd42ns.i b/src/ppd42ns/javaupm_ppd42ns.i deleted file mode 100644 index 168e702d..00000000 --- a/src/ppd42ns/javaupm_ppd42ns.i +++ /dev/null @@ -1,11 +0,0 @@ -%module javaupm_ppd42ns -%include "../upm.i" - -%include "ppd42ns_data.h" -%include "ppd42ns.hpp" -%{ - #include "ppd42ns.hpp" -%} - - -JAVA_JNI_LOADLIBRARY(javaupm_ppd42ns) diff --git a/src/ppd42ns/jsupm_ppd42ns.i b/src/ppd42ns/jsupm_ppd42ns.i deleted file mode 100644 index e0ebe9b0..00000000 --- a/src/ppd42ns/jsupm_ppd42ns.i +++ /dev/null @@ -1,9 +0,0 @@ -%module jsupm_ppd42ns -%include "../upm.i" - -%include "ppd42ns_data.h" -%include "ppd42ns.hpp" -%{ - #include "ppd42ns.hpp" -%} - diff --git a/src/ppd42ns/ppd42ns.i b/src/ppd42ns/ppd42ns.i new file mode 100644 index 00000000..1f1cfd00 --- /dev/null +++ b/src/ppd42ns/ppd42ns.i @@ -0,0 +1,15 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_ppd42ns) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "ppd42ns.hpp" +%} +%include "ppd42ns_data.h" +%include "ppd42ns.hpp" +/* END Common SWIG syntax */ diff --git a/src/ppd42ns/pyupm_ppd42ns.i b/src/ppd42ns/pyupm_ppd42ns.i deleted file mode 100644 index 8ad44681..00000000 --- a/src/ppd42ns/pyupm_ppd42ns.i +++ /dev/null @@ -1,10 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_ppd42ns -%include "../upm.i" - -%include "ppd42ns_data.h" -%include "ppd42ns.hpp" -%{ - #include "ppd42ns.hpp" -%} diff --git a/src/pulsensor/javaupm_pulsensor.i b/src/pulsensor/javaupm_pulsensor.i deleted file mode 100644 index ca62cde4..00000000 --- a/src/pulsensor/javaupm_pulsensor.i +++ /dev/null @@ -1,27 +0,0 @@ -#ifdef ANDROID - %module javaupm_pulsensor -#else - %module(directors="1") javaupm_pulsensor -#endif - -%include "../upm.i" -%include "arrays_java.i" - -#ifndef ANDROID - %feature("director") Callback; - SWIG_DIRECTOR_OWNED(Callback) -#endif - -%ignore sample_thread; -%ignore pin_ctx; -%ignore do_sample; -%ignore callback; - -%include "Callback.hpp" -%{ - #include "pulsensor.hpp" -%} - -%include "pulsensor.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_pulsensor) diff --git a/src/pulsensor/jsupm_pulsensor.i b/src/pulsensor/jsupm_pulsensor.i deleted file mode 100644 index f401d1ec..00000000 --- a/src/pulsensor/jsupm_pulsensor.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_pulsensor -%include "../upm.i" - -%{ - #include "pulsensor.hpp" -%} - -%include "pulsensor.hpp" diff --git a/src/pulsensor/pulsensor.i b/src/pulsensor/pulsensor.i new file mode 100644 index 00000000..091bae19 --- /dev/null +++ b/src/pulsensor/pulsensor.i @@ -0,0 +1,27 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +#ifndef ANDROID +%module(directors="1") javaupm_pulsensor +%feature("director") Callback; +SWIG_DIRECTOR_OWNED(Callback) +#endif +%include "arrays_java.i" + +%ignore sample_thread; +%ignore pin_ctx; +%ignore do_sample; +%ignore callback; + +JAVA_JNI_LOADLIBRARY(javaupm_pulsensor) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "pulsensor.hpp" +%} +%include "pulsensor.hpp" +%include "Callback.hpp" +/* END Common SWIG syntax */ diff --git a/src/pulsensor/pyupm_pulsensor.i b/src/pulsensor/pyupm_pulsensor.i deleted file mode 100644 index 2425780d..00000000 --- a/src/pulsensor/pyupm_pulsensor.i +++ /dev/null @@ -1,11 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_pulsensor -%include "../upm.i" - -%include "stdint.i" - -%include "pulsensor.hpp" -%{ - #include "pulsensor.hpp" -%} diff --git a/src/relay/javaupm_relay.i b/src/relay/javaupm_relay.i deleted file mode 100644 index a8e3b1d7..00000000 --- a/src/relay/javaupm_relay.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_relay -%include "../upm.i" - -%{ - #include "relay.hpp" -%} - -%include "relay.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_relay) diff --git a/src/relay/jsupm_relay.i b/src/relay/jsupm_relay.i deleted file mode 100644 index 02276c9f..00000000 --- a/src/relay/jsupm_relay.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_relay -%include "../upm.i" - -%{ - #include "relay.hpp" -%} - -%include "relay.hpp" diff --git a/src/relay/pyupm_relay.i b/src/relay/pyupm_relay.i deleted file mode 100644 index abdb0b1e..00000000 --- a/src/relay/pyupm_relay.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_relay -%include "../upm.i" - -%include "relay.hpp" -%{ - #include "relay.hpp" -%} diff --git a/src/rf22/javaupm_rf22.i b/src/rf22/javaupm_rf22.i deleted file mode 100644 index d7d39a40..00000000 --- a/src/rf22/javaupm_rf22.i +++ /dev/null @@ -1,20 +0,0 @@ -#ifdef ANDROID - %module javaupm_rf22 -#else - %module(directors="1") javaupm_rf22 -#endif - -%include "../upm.i" -%include "arrays_java.i" -%include "typemaps.i" - -%apply uint8_t *INOUT { uint8_t* len }; -%apply signed char[] {uint8_t*}; - -%{ - #include "rf22.hpp" -%} - -%include "rf22.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_rf22) diff --git a/src/rf22/jsupm_rf22.i b/src/rf22/jsupm_rf22.i deleted file mode 100644 index 069b3b06..00000000 --- a/src/rf22/jsupm_rf22.i +++ /dev/null @@ -1,9 +0,0 @@ -%module jsupm_rf22 -%include "../upm.i" -%include "../carrays_uint8_t.i" - -%{ - #include "rf22.hpp" -%} - -%include "rf22.hpp" diff --git a/src/rf22/pyupm_rf22.i b/src/rf22/pyupm_rf22.i deleted file mode 100644 index 1d00fd09..00000000 --- a/src/rf22/pyupm_rf22.i +++ /dev/null @@ -1,10 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_rf22 -%include "../upm.i" -%include "../carrays_uint8_t.i" - -%include "rf22.hpp" -%{ - #include "rf22.hpp" -%} diff --git a/src/rf22/rf22.i b/src/rf22/rf22.i new file mode 100644 index 00000000..f029c0a9 --- /dev/null +++ b/src/rf22/rf22.i @@ -0,0 +1,34 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +#ifndef ANDROID +%module(directors="1") javaupm_rf22 +#endif + +%include "arrays_java.i" +%apply uint8_t *INOUT { uint8_t* len }; +%apply signed char[] {uint8_t*}; + +JAVA_JNI_LOADLIBRARY(javaupm_rf22) +#endif +/* END Java syntax */ + +/* BEGIN Javascript syntax ------------------------------------------------- */ +#ifdef SWIGJAVASCRIPT +%include "../carrays_uint8_t.i" +#endif +/* END Javascript syntax */ + +/* BEGIN Python syntax ----------------------------------------------------- */ +#ifdef SWIGPYTHON +%include "../carrays_uint8_t.i" +#endif +/* END Python syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "rf22.hpp" +%} +%include "rf22.hpp" +/* END Common SWIG syntax */ diff --git a/src/rfr359f/javaupm_rfr359f.i b/src/rfr359f/javaupm_rfr359f.i deleted file mode 100644 index 98a76f6f..00000000 --- a/src/rfr359f/javaupm_rfr359f.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_rfr359f -%include "../upm.i" - -%{ - #include "rfr359f.hpp" -%} - -%include "rfr359f.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_rfr359f) \ No newline at end of file diff --git a/src/rfr359f/jsupm_rfr359f.i b/src/rfr359f/jsupm_rfr359f.i deleted file mode 100644 index 93709a5e..00000000 --- a/src/rfr359f/jsupm_rfr359f.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_rfr359f -%include "../upm.i" - -%{ - #include "rfr359f.hpp" -%} - -%include "rfr359f.hpp" diff --git a/src/rfr359f/pyupm_rfr359f.i b/src/rfr359f/pyupm_rfr359f.i deleted file mode 100644 index 3bed0a7e..00000000 --- a/src/rfr359f/pyupm_rfr359f.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_rfr359f -%include "../upm.i" - -%include "rfr359f.hpp" -%{ - #include "rfr359f.hpp" -%} diff --git a/src/rgbringcoder/javaupm_rgbringcoder.i b/src/rgbringcoder/javaupm_rgbringcoder.i deleted file mode 100644 index 6b7758d9..00000000 --- a/src/rgbringcoder/javaupm_rgbringcoder.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_rgbringcoder -%include "../upm.i" - -%{ - #include "rgbringcoder.hpp" -%} - -%include "rgbringcoder.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_rgbringcoder) \ No newline at end of file diff --git a/src/rgbringcoder/jsupm_rgbringcoder.i b/src/rgbringcoder/jsupm_rgbringcoder.i deleted file mode 100644 index a208aced..00000000 --- a/src/rgbringcoder/jsupm_rgbringcoder.i +++ /dev/null @@ -1,9 +0,0 @@ -%module jsupm_rgbringcoder -%include "../upm.i" -%include "stdint.i" - -%{ - #include "rgbringcoder.hpp" -%} - -%include "rgbringcoder.hpp" diff --git a/src/rgbringcoder/pyupm_rgbringcoder.i b/src/rgbringcoder/pyupm_rgbringcoder.i deleted file mode 100644 index fb4f9342..00000000 --- a/src/rgbringcoder/pyupm_rgbringcoder.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_rgbringcoder -%include "../upm.i" - -%include "rgbringcoder.hpp" -%{ - #include "rgbringcoder.hpp" -%} diff --git a/src/rgbringcoder/rgbringcoder.i b/src/rgbringcoder/rgbringcoder.i new file mode 100644 index 00000000..eccfd291 --- /dev/null +++ b/src/rgbringcoder/rgbringcoder.i @@ -0,0 +1,14 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_rgbringcoder) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "rgbringcoder.hpp" +%} +%include "rgbringcoder.hpp" +/* END Common SWIG syntax */ diff --git a/src/rhusb/javaupm_rhusb.i b/src/rhusb/javaupm_rhusb.i deleted file mode 100644 index 779b735e..00000000 --- a/src/rhusb/javaupm_rhusb.i +++ /dev/null @@ -1,14 +0,0 @@ -%module javaupm_rhusb -%include "../upm.i" -%include "typemaps.i" -%include "cpointer.i" -%include "arrays_java.i"; -%include "../java_buffer.i" - -%{ - #include "rhusb.hpp" -%} - -%include "rhusb.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_rhusb) diff --git a/src/rhusb/jsupm_rhusb.i b/src/rhusb/jsupm_rhusb.i deleted file mode 100644 index 17a14667..00000000 --- a/src/rhusb/jsupm_rhusb.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_rhusb -%include "../upm.i" -%include "stdint.i" - -%include "rhusb.hpp" -%{ - #include "rhusb.hpp" -%} diff --git a/src/rhusb/pyupm_rhusb.i b/src/rhusb/pyupm_rhusb.i deleted file mode 100644 index b5fd64eb..00000000 --- a/src/rhusb/pyupm_rhusb.i +++ /dev/null @@ -1,10 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_rhusb -%include "../upm.i" -%include "stdint.i" - -%include "rhusb.hpp" -%{ - #include "rhusb.hpp" -%} diff --git a/src/rhusb/rhusb.i b/src/rhusb/rhusb.i new file mode 100644 index 00000000..f1e69d89 --- /dev/null +++ b/src/rhusb/rhusb.i @@ -0,0 +1,16 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%include "arrays_java.i"; +%include "../java_buffer.i" +JAVA_JNI_LOADLIBRARY(javaupm_rhusb) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "rhusb.hpp" +%} +%include "rhusb.hpp" +/* END Common SWIG syntax */ diff --git a/src/rn2903/javaupm_rn2903.i b/src/rn2903/javaupm_rn2903.i deleted file mode 100644 index afab2970..00000000 --- a/src/rn2903/javaupm_rn2903.i +++ /dev/null @@ -1,13 +0,0 @@ -%module javaupm_rn2903 -%include "../upm.i" -%include "std_string.i" -%include "stdint.i" -%include "typemaps.i" - -%include "rn2903_defs.h" -%include "rn2903.hpp" -%{ - #include "rn2903.hpp" -%} - -JAVA_JNI_LOADLIBRARY(javaupm_rn2903) diff --git a/src/rn2903/jsupm_rn2903.i b/src/rn2903/jsupm_rn2903.i deleted file mode 100644 index 498bc4b3..00000000 --- a/src/rn2903/jsupm_rn2903.i +++ /dev/null @@ -1,9 +0,0 @@ -%module jsupm_rn2903 -%include "../upm.i" -%include "std_string.i" - -%include "rn2903_defs.h" -%include "rn2903.hpp" -%{ - #include "rn2903.hpp" -%} diff --git a/src/rn2903/pyupm_rn2903.i b/src/rn2903/pyupm_rn2903.i deleted file mode 100644 index 4edd70df..00000000 --- a/src/rn2903/pyupm_rn2903.i +++ /dev/null @@ -1,11 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_rn2903 -%include "../upm.i" -%include "std_string.i" - -%include "rn2903_defs.h" -%include "rn2903.hpp" -%{ - #include "rn2903.hpp" -%} diff --git a/src/rn2903/rn2903.i b/src/rn2903/rn2903.i new file mode 100644 index 00000000..1fbb0a07 --- /dev/null +++ b/src/rn2903/rn2903.i @@ -0,0 +1,16 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_rn2903) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "rn2903_defs.h" +#include "rn2903.hpp" +%} +%include "rn2903_defs.h" +%include "rn2903.hpp" +/* END Common SWIG syntax */ diff --git a/src/rotary/javaupm_rotary.i b/src/rotary/javaupm_rotary.i deleted file mode 100644 index d78d7379..00000000 --- a/src/rotary/javaupm_rotary.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_rotary -%include "../upm.i" - -%{ - #include "rotary.hpp" -%} - -%include "rotary.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_rotary) diff --git a/src/rotary/jsupm_rotary.i b/src/rotary/jsupm_rotary.i deleted file mode 100644 index 71b9ed91..00000000 --- a/src/rotary/jsupm_rotary.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_rotary -%include "../upm.i" - -%{ - #include "rotary.hpp" -%} - -%include "rotary.hpp" diff --git a/src/rotary/pyupm_rotary.i b/src/rotary/pyupm_rotary.i deleted file mode 100644 index ac0a6642..00000000 --- a/src/rotary/pyupm_rotary.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_rotary -%include "../upm.i" - -%include "rotary.hpp" -%{ - #include "rotary.hpp" -%} diff --git a/src/rotaryencoder/javaupm_rotaryencoder.i b/src/rotaryencoder/javaupm_rotaryencoder.i deleted file mode 100644 index 29285736..00000000 --- a/src/rotaryencoder/javaupm_rotaryencoder.i +++ /dev/null @@ -1,12 +0,0 @@ -%module javaupm_rotaryencoder -%include "../upm.i" - -%ignore signalAISR; - -%{ - #include "rotaryencoder.hpp" -%} - -%include "rotaryencoder.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_rotaryencoder) \ No newline at end of file diff --git a/src/rotaryencoder/jsupm_rotaryencoder.i b/src/rotaryencoder/jsupm_rotaryencoder.i deleted file mode 100644 index b217742c..00000000 --- a/src/rotaryencoder/jsupm_rotaryencoder.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_rotaryencoder -%include "../upm.i" - -%{ - #include "rotaryencoder.hpp" -%} - -%include "rotaryencoder.hpp" diff --git a/src/rotaryencoder/pyupm_rotaryencoder.i b/src/rotaryencoder/pyupm_rotaryencoder.i deleted file mode 100644 index 51e9ba5a..00000000 --- a/src/rotaryencoder/pyupm_rotaryencoder.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_rotaryencoder -%include "../upm.i" - -%include "rotaryencoder.hpp" -%{ - #include "rotaryencoder.hpp" -%} diff --git a/src/rotaryencoder/rotaryencoder.i b/src/rotaryencoder/rotaryencoder.i new file mode 100644 index 00000000..25bec23d --- /dev/null +++ b/src/rotaryencoder/rotaryencoder.i @@ -0,0 +1,16 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%ignore signalAISR; + +JAVA_JNI_LOADLIBRARY(javaupm_rotaryencoder) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "rotaryencoder.hpp" +%} +%include "rotaryencoder.hpp" +/* END Common SWIG syntax */ diff --git a/src/rpr220/javaupm_rpr220.i b/src/rpr220/javaupm_rpr220.i deleted file mode 100644 index 7c5fb42b..00000000 --- a/src/rpr220/javaupm_rpr220.i +++ /dev/null @@ -1,12 +0,0 @@ -%module javaupm_rpr220 -%include "../upm.i" - - -%{ - #include "rpr220.hpp" -%} -%include "rpr220.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_rpr220) - -JAVA_ADD_INSTALLISR(upm::RPR220) diff --git a/src/rpr220/jsupm_rpr220.i b/src/rpr220/jsupm_rpr220.i deleted file mode 100644 index 6c83979a..00000000 --- a/src/rpr220/jsupm_rpr220.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_rpr220 -%include "../upm.i" - -%{ - #include "rpr220.hpp" -%} - -%include "rpr220.hpp" diff --git a/src/rpr220/pyupm_rpr220.i b/src/rpr220/pyupm_rpr220.i deleted file mode 100644 index e079625f..00000000 --- a/src/rpr220/pyupm_rpr220.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_rpr220 -%include "../upm.i" - -%include "rpr220.hpp" -%{ - #include "rpr220.hpp" -%} diff --git a/src/rpr220/rpr220.i b/src/rpr220/rpr220.i new file mode 100644 index 00000000..6924374f --- /dev/null +++ b/src/rpr220/rpr220.i @@ -0,0 +1,15 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_ADD_INSTALLISR(upm::RPR220) +JAVA_JNI_LOADLIBRARY(javaupm_rpr220) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "rpr220.hpp" +%} +%include "rpr220.hpp" +/* END Common SWIG syntax */ diff --git a/src/rsc/javaupm_rsc.i b/src/rsc/javaupm_rsc.i deleted file mode 100644 index 69ba5090..00000000 --- a/src/rsc/javaupm_rsc.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_rsc -%include "../upm.i" - -%{ - #include "rsc.hpp" -%} - -%include "rsc.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_rsc) diff --git a/src/rsc/jsupm_rsc.i b/src/rsc/jsupm_rsc.i deleted file mode 100644 index cf413563..00000000 --- a/src/rsc/jsupm_rsc.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_rsc -%include "../upm.i" - -%{ - #include "rsc.hpp" -%} - -%include "rsc.hpp" diff --git a/src/rsc/pyupm_rsc.i b/src/rsc/pyupm_rsc.i deleted file mode 100644 index badfd65a..00000000 --- a/src/rsc/pyupm_rsc.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_rsc -%include "../upm.i" - -%include "rsc.hpp" -%{ - #include "rsc.hpp" -%} diff --git a/src/scam/javaupm_scam.i b/src/scam/javaupm_scam.i deleted file mode 100644 index b74fcf90..00000000 --- a/src/scam/javaupm_scam.i +++ /dev/null @@ -1,11 +0,0 @@ -%module javaupm_scam -%include "../upm.i" -%include "../java_buffer.i" - -%{ - #include "scam.hpp" -%} - -%include "scam.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_scam) diff --git a/src/scam/jsupm_scam.i b/src/scam/jsupm_scam.i deleted file mode 100644 index 7a633b86..00000000 --- a/src/scam/jsupm_scam.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_scam -%include "../upm.i" - -%{ - #include "scam.hpp" -%} - -%include "scam.hpp" diff --git a/src/scam/pyupm_scam.i b/src/scam/pyupm_scam.i deleted file mode 100644 index bce93ce4..00000000 --- a/src/scam/pyupm_scam.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_scam -%include "../upm.i" - -%{ - #include "scam.hpp" -%} -%include "scam.hpp" diff --git a/src/scam/scam.i b/src/scam/scam.i new file mode 100644 index 00000000..4ea720a3 --- /dev/null +++ b/src/scam/scam.i @@ -0,0 +1,16 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%include "../java_buffer.i" + +JAVA_JNI_LOADLIBRARY(javaupm_scam) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "scam.hpp" +%} +%include "scam.hpp" +/* END Common SWIG syntax */ diff --git a/src/sensortemplate/common.i b/src/sensortemplate/common.i deleted file mode 100644 index fe6001b6..00000000 --- a/src/sensortemplate/common.i +++ /dev/null @@ -1,11 +0,0 @@ -/* Include global UPM interface file */ -%include "../upm.i" - -%{ - /* SWIG preprocessor copies this directly to the output wrapper*/ - #include "sensortemplate.hpp" -%} - -/* %include is a SWIG directive. SWIG will wrap types exposed in this - * header to the target language. */ -%include "sensortemplate.hpp" diff --git a/src/sensortemplate/javaupm_sensortemplate.i b/src/sensortemplate/javaupm_sensortemplate.i deleted file mode 100644 index 6759bfe3..00000000 --- a/src/sensortemplate/javaupm_sensortemplate.i +++ /dev/null @@ -1,8 +0,0 @@ -/* Specify the name of the target JAVA module */ -%module javaupm_sensortemplate - -/* Include the base sensor interface file */ -%include "common.i" - -/* Add the JAVA code to load the module */ -JAVA_JNI_LOADLIBRARY(javaupm_sensortemplate) diff --git a/src/sensortemplate/jsupm_sensortemplate.i b/src/sensortemplate/jsupm_sensortemplate.i deleted file mode 100644 index 3f505167..00000000 --- a/src/sensortemplate/jsupm_sensortemplate.i +++ /dev/null @@ -1,5 +0,0 @@ -/* Specify the name of the target JavaScript module */ -%module jsupm_sensortemplate - -/* Include the base sensor interface file */ -%include "common.i" diff --git a/src/sensortemplate/pyupm_sensortemplate.i b/src/sensortemplate/pyupm_sensortemplate.i deleted file mode 100644 index af557b4e..00000000 --- a/src/sensortemplate/pyupm_sensortemplate.i +++ /dev/null @@ -1,9 +0,0 @@ -/* Specify the name of the target JAVA module */ -%module pyupm_sensortemplate - -/* If documentation is enabled, a full "pyupm_doxy2swig.i file will be - * generated and used... Otherwise, use a stub */ -%include "pyupm_doxy2swig.i" - -/* Include the base sensor interface file */ -%include "common.i" diff --git a/src/sensortemplate/sensortemplate.i b/src/sensortemplate/sensortemplate.i new file mode 100644 index 00000000..ee757875 --- /dev/null +++ b/src/sensortemplate/sensortemplate.i @@ -0,0 +1,29 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +/* Add the JAVA code to load the module */ +JAVA_JNI_LOADLIBRARY(javaupm_sensortemplate) +#endif +/* END Java syntax */ + +/* BEGIN Javascript syntax ------------------------------------------------- */ +#ifdef SWIGJAVASCRIPT +#endif +/* END Javascript syntax */ + +/* BEGIN Python syntax ----------------------------------------------------- */ +#ifdef SWIGPYTHON +#endif +/* END Python syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +/* SWIG preprocessor copies this directly to the output wrapper*/ +#include "sensortemplate.hpp" +%} + +/* %include is a SWIG directive. SWIG will wrap types exposed in this + * header to the target language. */ +%include "sensortemplate.hpp" +/* END Common SWIG syntax */ diff --git a/src/servo/javaupm_servo.i b/src/servo/javaupm_servo.i deleted file mode 100644 index 28a631ab..00000000 --- a/src/servo/javaupm_servo.i +++ /dev/null @@ -1,19 +0,0 @@ -%module javaupm_servo -%include "../upm.i" - -%include "servo.hpp" -%{ - #include "servo.hpp" -%} - -%include "es08a.hpp" -%{ - #include "es08a.hpp" -%} - -%include "es9257.hpp" -%{ - #include "es9257.hpp" -%} - -JAVA_JNI_LOADLIBRARY(javaupm_servo) \ No newline at end of file diff --git a/src/servo/jsupm_servo.i b/src/servo/jsupm_servo.i deleted file mode 100644 index 72ef29c9..00000000 --- a/src/servo/jsupm_servo.i +++ /dev/null @@ -1,17 +0,0 @@ -%module jsupm_servo -%include "../upm.i" - -%include "servo.hpp" -%{ - #include "servo.hpp" -%} - -%include "es08a.hpp" -%{ - #include "es08a.hpp" -%} - -%include "es9257.hpp" -%{ - #include "es9257.hpp" -%} diff --git a/src/servo/pyupm_servo.i b/src/servo/pyupm_servo.i deleted file mode 100644 index 40239753..00000000 --- a/src/servo/pyupm_servo.i +++ /dev/null @@ -1,19 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_servo -%include "../upm.i" - -%include "servo.hpp" -%{ - #include "servo.hpp" -%} - -%include "es08a.hpp" -%{ - #include "es08a.hpp" -%} - -%include "es9257.hpp" -%{ - #include "es9257.hpp" -%} diff --git a/src/servo/servo.i b/src/servo/servo.i new file mode 100644 index 00000000..b9ed6354 --- /dev/null +++ b/src/servo/servo.i @@ -0,0 +1,18 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_servo) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "es08a.hpp" +#include "servo.hpp" +#include "es9257.hpp" +%} +%include "servo.hpp" +%include "es9257.hpp" +%include "es08a.hpp" +/* END Common SWIG syntax */ diff --git a/src/sht1x/javaupm_sht1x.i b/src/sht1x/javaupm_sht1x.i deleted file mode 100644 index 3c8d8f6a..00000000 --- a/src/sht1x/javaupm_sht1x.i +++ /dev/null @@ -1,13 +0,0 @@ -%module javaupm_sht1x -%include "../upm.i" -%include "std_string.i" -%include "stdint.i" -%include "typemaps.i" - -%include "sht1x_defs.h" -%include "sht1x.hpp" -%{ - #include "sht1x.hpp" -%} - -JAVA_JNI_LOADLIBRARY(javaupm_sht1x) diff --git a/src/sht1x/jsupm_sht1x.i b/src/sht1x/jsupm_sht1x.i deleted file mode 100644 index a9deb10e..00000000 --- a/src/sht1x/jsupm_sht1x.i +++ /dev/null @@ -1,9 +0,0 @@ -%module jsupm_sht1x -%include "../upm.i" -%include "std_string.i" - -%include "sht1x_defs.h" -%include "sht1x.hpp" -%{ - #include "sht1x.hpp" -%} diff --git a/src/sht1x/pyupm_sht1x.i b/src/sht1x/pyupm_sht1x.i deleted file mode 100644 index 5636256c..00000000 --- a/src/sht1x/pyupm_sht1x.i +++ /dev/null @@ -1,11 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_sht1x -%include "../upm.i" -%include "std_string.i" - -%include "sht1x_defs.h" -%include "sht1x.hpp" -%{ - #include "sht1x.hpp" -%} diff --git a/src/sht1x/sht1x.i b/src/sht1x/sht1x.i new file mode 100644 index 00000000..3dee709c --- /dev/null +++ b/src/sht1x/sht1x.i @@ -0,0 +1,16 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_sht1x) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "sht1x_defs.h" +#include "sht1x.hpp" +%} +%include "sht1x_defs.h" +%include "sht1x.hpp" +/* END Common SWIG syntax */ diff --git a/src/si1132/javaupm_si1132.i b/src/si1132/javaupm_si1132.i deleted file mode 100644 index d61335b4..00000000 --- a/src/si1132/javaupm_si1132.i +++ /dev/null @@ -1,22 +0,0 @@ -#ifdef ANDROID - %module javaupm_si1132 -#else - %module(directors="1") javaupm_si1132 -#endif - -%include "../upm.i" - -%import "../interfaces/javaupm_iLightSensor.i" - -%typemap(javaimports) SWIGTYPE %{ -import upm_interfaces.*; -%} - -JAVA_JNI_LOADLIBRARY(javaupm_si1132) - -%include "si1132.hpp" -%{ - #include "si1132.hpp" -%} - - diff --git a/src/si1132/jsupm_si1132.i b/src/si1132/jsupm_si1132.i deleted file mode 100644 index 5e117dfe..00000000 --- a/src/si1132/jsupm_si1132.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_si1132 -%include "../upm.i" - -%{ - #include "si1132.hpp" -%} - -%include "si1132.hpp" diff --git a/src/si1132/pyupm_si1132.i b/src/si1132/pyupm_si1132.i deleted file mode 100644 index 4a7d32e6..00000000 --- a/src/si1132/pyupm_si1132.i +++ /dev/null @@ -1,12 +0,0 @@ -%module pyupm_si1132 -%include "../upm.i" -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" - - -%include "stdint.i" - -%include "si1132.hpp" -%{ - #include "si1132.hpp" -%} diff --git a/src/si1132/si1132.i b/src/si1132/si1132.i new file mode 100644 index 00000000..94f0d4b7 --- /dev/null +++ b/src/si1132/si1132.i @@ -0,0 +1,21 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +#ifndef ANDROID + %module(directors="1") javaupm_si1132 +#endif + +%typemap(javaimports) SWIGTYPE %{import upm_interfaces.*;%} +%import "../interfaces/javaupm_iLightSensor.i" + +JAVA_JNI_LOADLIBRARY(javaupm_si1132) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "si1132.hpp" +%} +%include "si1132.hpp" +/* END Common SWIG syntax */ diff --git a/src/si114x/javaupm_si114x.i b/src/si114x/javaupm_si114x.i deleted file mode 100644 index f3a1efc8..00000000 --- a/src/si114x/javaupm_si114x.i +++ /dev/null @@ -1,11 +0,0 @@ -%module javaupm_si114x -%include "../upm.i" -%include "cpointer.i" - -%{ - #include "si114x.hpp" -%} - -%include "si114x.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_si114x) \ No newline at end of file diff --git a/src/si114x/jsupm_si114x.i b/src/si114x/jsupm_si114x.i deleted file mode 100644 index 1b0d0157..00000000 --- a/src/si114x/jsupm_si114x.i +++ /dev/null @@ -1,9 +0,0 @@ -%module jsupm_si114x -%include "../upm.i" -%include "cpointer.i" - -%{ - #include "si114x.hpp" -%} - -%include "si114x.hpp" diff --git a/src/si114x/pyupm_si114x.i b/src/si114x/pyupm_si114x.i deleted file mode 100644 index 8a71e3a7..00000000 --- a/src/si114x/pyupm_si114x.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_si114x -%include "../upm.i" - -%include "si114x.hpp" -%{ - #include "si114x.hpp" -%} diff --git a/src/si114x/si114x.i b/src/si114x/si114x.i new file mode 100644 index 00000000..b6015ef1 --- /dev/null +++ b/src/si114x/si114x.i @@ -0,0 +1,14 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_si114x) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "si114x.hpp" +%} +%include "si114x.hpp" +/* END Common SWIG syntax */ diff --git a/src/si7005/javaupm_si7005.i b/src/si7005/javaupm_si7005.i deleted file mode 100644 index a653c8f5..00000000 --- a/src/si7005/javaupm_si7005.i +++ /dev/null @@ -1,22 +0,0 @@ -%module javaupm_si7005 - -%include "../upm.i" -%include "arrays_java.i"; -%include "../java_buffer.i" -%include "cpointer.i" -%include "typemaps.i" - -%import "../interfaces/javaupm_iTemperatureSensor.i" -%import "../interfaces/javaupm_iHumiditySensor.i" - -%typemap(javaimports) SWIGTYPE %{ -import upm_interfaces.*; -%} - -%{ - #include "si7005.hpp" -%} - -%include "si7005.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_si7005) diff --git a/src/si7005/jsupm_si7005.i b/src/si7005/jsupm_si7005.i deleted file mode 100644 index 6f614eef..00000000 --- a/src/si7005/jsupm_si7005.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_si7005 -%include "../upm.i" - -%{ - #include "si7005.hpp" -%} - -%include "si7005.hpp" diff --git a/src/si7005/pyupm_si7005.i b/src/si7005/pyupm_si7005.i deleted file mode 100644 index a7fd9f4a..00000000 --- a/src/si7005/pyupm_si7005.i +++ /dev/null @@ -1,12 +0,0 @@ -%module pyupm_si7005 -%include "../upm.i" -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" - - -%include "stdint.i" - -%include "si7005.hpp" -%{ - #include "si7005.hpp" -%} diff --git a/src/si7005/si7005.i b/src/si7005/si7005.i new file mode 100644 index 00000000..cf15e116 --- /dev/null +++ b/src/si7005/si7005.i @@ -0,0 +1,21 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%include "arrays_java.i"; +%include "../java_buffer.i" +%typemap(javaimports) SWIGTYPE %{import upm_interfaces.*;%} + +%import "../interfaces/javaupm_iTemperatureSensor.i" +%import "../interfaces/javaupm_iHumiditySensor.i" + +JAVA_JNI_LOADLIBRARY(javaupm_si7005) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "si7005.hpp" +%} +%include "si7005.hpp" +/* END Common SWIG syntax */ diff --git a/src/slide/javaupm_slide.i b/src/slide/javaupm_slide.i deleted file mode 100644 index d06f49de..00000000 --- a/src/slide/javaupm_slide.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_slide -%include "../upm.i" - -%{ - #include "slide.hpp" -%} - -%include "slide.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_slide) diff --git a/src/slide/jsupm_slide.i b/src/slide/jsupm_slide.i deleted file mode 100644 index cb63c6f0..00000000 --- a/src/slide/jsupm_slide.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_slide -%include "../upm.i" - -%{ - #include "slide.hpp" -%} - -%include "slide.hpp" diff --git a/src/slide/pyupm_slide.i b/src/slide/pyupm_slide.i deleted file mode 100644 index bc0f2cad..00000000 --- a/src/slide/pyupm_slide.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_slide -%include "../upm.i" - -%include "slide.hpp" -%{ - #include "slide.hpp" -%} diff --git a/src/sm130/javaupm_sm130.i b/src/sm130/javaupm_sm130.i deleted file mode 100644 index 4bf92c6b..00000000 --- a/src/sm130/javaupm_sm130.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_sm130 -%include "../upm.i" - -%{ - #include "sm130.hpp" -%} - -%include "sm130.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_sm130) \ No newline at end of file diff --git a/src/sm130/jsupm_sm130.i b/src/sm130/jsupm_sm130.i deleted file mode 100644 index ee9e2bc6..00000000 --- a/src/sm130/jsupm_sm130.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_sm130 -%include "../upm.i" - -%{ - #include "sm130.hpp" -%} - -%include "sm130.hpp" diff --git a/src/sm130/pyupm_sm130.i b/src/sm130/pyupm_sm130.i deleted file mode 100644 index 6b188c40..00000000 --- a/src/sm130/pyupm_sm130.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_sm130 -%include "../upm.i" - -%include "sm130.hpp" -%{ - #include "sm130.hpp" -%} diff --git a/src/smartdrive/javaupm_smartdrive.i b/src/smartdrive/javaupm_smartdrive.i deleted file mode 100644 index 8d70f7bf..00000000 --- a/src/smartdrive/javaupm_smartdrive.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_smartdrive -%include "../upm.i" - -%{ - #include "smartdrive.hpp" -%} - -%include "smartdrive.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_smartdrive) diff --git a/src/smartdrive/jsupm_smartdrive.i b/src/smartdrive/jsupm_smartdrive.i deleted file mode 100644 index d8b0b55c..00000000 --- a/src/smartdrive/jsupm_smartdrive.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_smartdrive -%include "../upm.i" - -%{ - #include "smartdrive.hpp" -%} - -%include "smartdrive.hpp" diff --git a/src/smartdrive/pyupm_smartdrive.i b/src/smartdrive/pyupm_smartdrive.i deleted file mode 100644 index 4ba82a8a..00000000 --- a/src/smartdrive/pyupm_smartdrive.i +++ /dev/null @@ -1,12 +0,0 @@ -%module pyupm_smartdrive -%include "../upm.i" -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" - - -%include "stdint.i" - -%include "smartdrive.hpp" -%{ - #include "smartdrive.hpp" -%} diff --git a/src/smartdrive/smartdrive.i b/src/smartdrive/smartdrive.i new file mode 100644 index 00000000..45e76fad --- /dev/null +++ b/src/smartdrive/smartdrive.i @@ -0,0 +1,14 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_smartdrive) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "smartdrive.hpp" +%} +%include "smartdrive.hpp" +/* END Common SWIG syntax */ diff --git a/src/speaker/javaupm_speaker.i b/src/speaker/javaupm_speaker.i deleted file mode 100644 index 43507f34..00000000 --- a/src/speaker/javaupm_speaker.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_speaker -%include "../upm.i" - -%{ - #include "speaker.hpp" -%} - -%include "speaker.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_speaker) \ No newline at end of file diff --git a/src/speaker/jsupm_speaker.i b/src/speaker/jsupm_speaker.i deleted file mode 100644 index f5a7f76c..00000000 --- a/src/speaker/jsupm_speaker.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_speaker -%include "../upm.i" - -%{ - #include "speaker.hpp" -%} - -%include "speaker.hpp" diff --git a/src/speaker/pyupm_speaker.i b/src/speaker/pyupm_speaker.i deleted file mode 100644 index e8bd9f4c..00000000 --- a/src/speaker/pyupm_speaker.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_speaker -%include "../upm.i" - -%include "speaker.hpp" -%{ - #include "speaker.hpp" -%} diff --git a/src/ssd1351/javaupm_ssd1351.i b/src/ssd1351/javaupm_ssd1351.i deleted file mode 100644 index ca2c1442..00000000 --- a/src/ssd1351/javaupm_ssd1351.i +++ /dev/null @@ -1,19 +0,0 @@ -%module javaupm_ssd1351 -%include "../upm.i" -%include "typemaps.i" -%include "stdint.i" - -%ignore m_map; -%ignore font; - -%include "ssd1351_gfx.hpp" -%{ - #include "ssd1351_gfx.hpp" -%} - -%include "ssd1351.hpp" -%{ - #include "ssd1351.hpp" -%} - -JAVA_JNI_LOADLIBRARY(javaupm_ssd1351) \ No newline at end of file diff --git a/src/ssd1351/jsupm_ssd1351.i b/src/ssd1351/jsupm_ssd1351.i deleted file mode 100644 index 37677fce..00000000 --- a/src/ssd1351/jsupm_ssd1351.i +++ /dev/null @@ -1,12 +0,0 @@ -%module jsupm_ssd1351 -%include "../upm.i" - -%include "ssd1351_gfx.hpp" -%{ - #include "ssd1351_gfx.hpp" -%} - -%include "ssd1351.hpp" -%{ - #include "ssd1351.hpp" -%} diff --git a/src/ssd1351/pyupm_ssd1351.i b/src/ssd1351/pyupm_ssd1351.i deleted file mode 100644 index 0161adc9..00000000 --- a/src/ssd1351/pyupm_ssd1351.i +++ /dev/null @@ -1,14 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_ssd1351 -%include "../upm.i" - -%include "ssd1351_gfx.hpp" -%{ - #include "ssd1351_gfx.hpp" -%} - -%include "ssd1351.hpp" -%{ - #include "ssd1351.hpp" -%} diff --git a/src/ssd1351/ssd1351.i b/src/ssd1351/ssd1351.i new file mode 100644 index 00000000..6c685829 --- /dev/null +++ b/src/ssd1351/ssd1351.i @@ -0,0 +1,19 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%ignore font; +%ignore m_map; + +JAVA_JNI_LOADLIBRARY(javaupm_ssd1351) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "ssd1351.hpp" +#include "ssd1351_gfx.hpp" +%} +%include "ssd1351_gfx.hpp" +%include "ssd1351.hpp" +/* END Common SWIG syntax */ diff --git a/src/st7735/jsupm_st7735.i b/src/st7735/jsupm_st7735.i deleted file mode 100644 index 34b30573..00000000 --- a/src/st7735/jsupm_st7735.i +++ /dev/null @@ -1,13 +0,0 @@ -%module jsupm_st7735 -%include "../upm.i" -%include "../carrays_uint8_t.i" - -%include "st7735_gfx.hpp" -%{ - #include "st7735_gfx.hpp" -%} - -%include "st7735.hpp" -%{ - #include "st7735.hpp" -%} diff --git a/src/st7735/pyupm_st7735.i b/src/st7735/pyupm_st7735.i deleted file mode 100644 index 7a91aaaf..00000000 --- a/src/st7735/pyupm_st7735.i +++ /dev/null @@ -1,15 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_st7735 -%include "../upm.i" -%include "../carrays_uint8_t.i" - -%include "st7735_gfx.hpp" -%{ - #include "st7735_gfx.hpp" -%} - -%include "st7735.hpp" -%{ - #include "st7735.hpp" -%} diff --git a/src/st7735/javaupm_st7735.i b/src/st7735/st7735.i similarity index 55% rename from src/st7735/javaupm_st7735.i rename to src/st7735/st7735.i index b27d1140..5be51e54 100644 --- a/src/st7735/javaupm_st7735.i +++ b/src/st7735/st7735.i @@ -1,9 +1,8 @@ -%module javaupm_st7735 -%include "../upm.i" -%include "arrays_java.i" -%include "typemaps.i" -%include "stdint.i" +%include "../common_top.i" +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%include "arrays_java.i" %ignore m_map; %ignore Bcmd; %ignore font; @@ -12,7 +11,6 @@ %ignore Rcmd2red; %ignore Rcmd3; - /* %typemap(jni) unsigned char[] "jbyteArray"; %typemap(jtype) unsigned char[] "byte[]"; @@ -35,14 +33,27 @@ $1 = (unsigned char *)JCALL2(GetByteArrayElements, jenv, $input, NULL); } +JAVA_JNI_LOADLIBRARY(javaupm_st7735) +#endif +/* END Java syntax */ + +/* BEGIN Javascript syntax ------------------------------------------------- */ +#ifdef SWIGJAVASCRIPT +%include "../carrays_uint8_t.i" +#endif +/* END Javascript syntax */ + +/* BEGIN Python syntax ----------------------------------------------------- */ +#ifdef SWIGPYTHON +%include "../carrays_uint8_t.i" +#endif +/* END Python syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "st7735_gfx.hpp" +#include "st7735.hpp" +%} %include "st7735_gfx.hpp" -%{ - #include "st7735_gfx.hpp" -%} - %include "st7735.hpp" -%{ - #include "st7735.hpp" -%} - -JAVA_JNI_LOADLIBRARY(javaupm_st7735) \ No newline at end of file +/* END Common SWIG syntax */ diff --git a/src/stepmotor/javaupm_stepmotor.i b/src/stepmotor/javaupm_stepmotor.i deleted file mode 100644 index 8e839e98..00000000 --- a/src/stepmotor/javaupm_stepmotor.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_stepmotor -%include "../upm.i" - -%{ - #include "stepmotor.hpp" -%} - -%include "stepmotor.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_stepmotor) \ No newline at end of file diff --git a/src/stepmotor/jsupm_stepmotor.i b/src/stepmotor/jsupm_stepmotor.i deleted file mode 100644 index dac8f4f4..00000000 --- a/src/stepmotor/jsupm_stepmotor.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_stepmotor -%include "../upm.i" - -%{ - #include "stepmotor.hpp" -%} - -%include "stepmotor.hpp" diff --git a/src/stepmotor/pyupm_stepmotor.i b/src/stepmotor/pyupm_stepmotor.i deleted file mode 100644 index 17cd3337..00000000 --- a/src/stepmotor/pyupm_stepmotor.i +++ /dev/null @@ -1,11 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_stepmotor -%include "../upm.i" - -%include "stdint.i" - -%include "stepmotor.hpp" -%{ - #include "stepmotor.hpp" -%} diff --git a/src/stepmotor/stepmotor.i b/src/stepmotor/stepmotor.i new file mode 100644 index 00000000..16bacc4e --- /dev/null +++ b/src/stepmotor/stepmotor.i @@ -0,0 +1,14 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_stepmotor) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "stepmotor.hpp" +%} +%include "stepmotor.hpp" +/* END Common SWIG syntax */ diff --git a/src/swigme.i.in b/src/swigme.i.in new file mode 100644 index 00000000..15d00fe2 --- /dev/null +++ b/src/swigme.i.in @@ -0,0 +1,16 @@ +/* This SWIG .i file is generated from UPM CMake. If additional functionality + * is required, custom .i files can be placed in the library directory. + */ + +/* Common SWIG syntax */ +%include "../common_top.i" + +%{ +@SWIG_HASH_INCLUDES@ +%} +@SWIG_PERCENT_INCLUDES@ + +/* Java-specific SWIG syntax */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_@libname@) +#endif diff --git a/src/sx1276/javaupm_sx1276.i b/src/sx1276/javaupm_sx1276.i deleted file mode 100644 index 70d79bfd..00000000 --- a/src/sx1276/javaupm_sx1276.i +++ /dev/null @@ -1,17 +0,0 @@ -%module javaupm_sx1276 -%include "../upm.i" -%include "cpointer.i" -%include "typemaps.i" -%include "arrays_java.i"; -%include "../java_buffer.i" - -%{ - #include "sx1276.hpp" -%} - -%ignore send(uint8_t *buffer, uint8_t size, int txTimeout); -%ignore getRxBuffer(); - -%include "sx1276.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_sx1276) diff --git a/src/sx1276/jsupm_sx1276.i b/src/sx1276/jsupm_sx1276.i deleted file mode 100644 index a75f54b3..00000000 --- a/src/sx1276/jsupm_sx1276.i +++ /dev/null @@ -1,9 +0,0 @@ -%module jsupm_sx1276 -%include "../upm.i" -%include "cpointer.i" - -%include "sx1276.hpp" -%{ - #include "sx1276.hpp" -%} - diff --git a/src/sx1276/pyupm_sx1276.i b/src/sx1276/pyupm_sx1276.i deleted file mode 100644 index e2ba3bfe..00000000 --- a/src/sx1276/pyupm_sx1276.i +++ /dev/null @@ -1,15 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_sx1276 -%include "../upm.i" -%include "cpointer.i" - -%include "stdint.i" - -%pointer_functions(float, floatp); - -%include "sx1276.hpp" -%{ - #include "sx1276.hpp" -%} - diff --git a/src/sx1276/sx1276.i b/src/sx1276/sx1276.i new file mode 100644 index 00000000..062c729e --- /dev/null +++ b/src/sx1276/sx1276.i @@ -0,0 +1,22 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%include "arrays_java.i"; +%include "../java_buffer.i" + +%ignore getRxBuffer(); +%ignore send(uint8_t *buffer, uint8_t size, int txTimeout); + +JAVA_JNI_LOADLIBRARY(javaupm_sx1276) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%pointer_functions(float, floatp); + +%{ +#include "sx1276.hpp" +%} +%include "sx1276.hpp" +/* END Common SWIG syntax */ diff --git a/src/sx6119/javaupm_sx6119.i b/src/sx6119/javaupm_sx6119.i deleted file mode 100644 index 89c08bdb..00000000 --- a/src/sx6119/javaupm_sx6119.i +++ /dev/null @@ -1,11 +0,0 @@ -%module javaupm_sx6119 -%include "../upm.i" - -%{ - #include "sx6119.hpp" -%} - -%include "sx6119.hpp" - - -JAVA_JNI_LOADLIBRARY(javaupm_sx6119) \ No newline at end of file diff --git a/src/sx6119/jsupm_sx6119.i b/src/sx6119/jsupm_sx6119.i deleted file mode 100644 index eef43815..00000000 --- a/src/sx6119/jsupm_sx6119.i +++ /dev/null @@ -1,9 +0,0 @@ -%module jsupm_sx6119 -%include "../upm.i" - -%{ - #include "sx6119.hpp" -%} - -%include "sx6119.hpp" - diff --git a/src/sx6119/pyupm_sx6119.i b/src/sx6119/pyupm_sx6119.i deleted file mode 100644 index bc94bd3c..00000000 --- a/src/sx6119/pyupm_sx6119.i +++ /dev/null @@ -1,11 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_sx6119 -%include "../upm.i" - -%{ - #include "sx6119.hpp" -%} - -%include "sx6119.hpp" - diff --git a/src/t3311/javaupm_t3311.i b/src/t3311/javaupm_t3311.i deleted file mode 100644 index 55f0bc45..00000000 --- a/src/t3311/javaupm_t3311.i +++ /dev/null @@ -1,14 +0,0 @@ -%module javaupm_t3311 -%include "../upm.i" -%include "typemaps.i" -%include "cpointer.i" -%include "arrays_java.i"; -%include "../java_buffer.i" - -%{ - #include "t3311.hpp" -%} - -%include "t3311.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_t3311) diff --git a/src/t3311/jsupm_t3311.i b/src/t3311/jsupm_t3311.i deleted file mode 100644 index d9e76e40..00000000 --- a/src/t3311/jsupm_t3311.i +++ /dev/null @@ -1,11 +0,0 @@ -%module jsupm_t3311 -%include "../upm.i" -%include "stdint.i" -%include "cpointer.i" - -%pointer_functions(float, floatp); - -%include "t3311.hpp" -%{ - #include "t3311.hpp" -%} diff --git a/src/t3311/pyupm_t3311.i b/src/t3311/pyupm_t3311.i deleted file mode 100644 index 38ddb47c..00000000 --- a/src/t3311/pyupm_t3311.i +++ /dev/null @@ -1,13 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_t3311 -%include "../upm.i" -%include "stdint.i" -%include "cpointer.i" - -%pointer_functions(float, floatp); - -%include "t3311.hpp" -%{ - #include "t3311.hpp" -%} diff --git a/src/t3311/t3311.i b/src/t3311/t3311.i new file mode 100644 index 00000000..6b76f8da --- /dev/null +++ b/src/t3311/t3311.i @@ -0,0 +1,19 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%include "arrays_java.i"; +%include "../java_buffer.i" + +JAVA_JNI_LOADLIBRARY(javaupm_t3311) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%pointer_functions(float, floatp); + +%{ +#include "t3311.hpp" +%} +%include "t3311.hpp" +/* END Common SWIG syntax */ diff --git a/src/t6713/javaupm_t6713.i b/src/t6713/javaupm_t6713.i deleted file mode 100644 index b813433f..00000000 --- a/src/t6713/javaupm_t6713.i +++ /dev/null @@ -1,21 +0,0 @@ -%module javaupm_t6713 -%include "../upm.i" - -%import "../interfaces/javaupm_iCO2Sensor.i" - -%include "arrays_java.i"; -%include "../java_buffer.i" -%include "cpointer.i" -%include "typemaps.i" - -%typemap(javaimports) SWIGTYPE %{ -import upm_interfaces.*; -%} - -%{ - #include "t6713.hpp" -%} - -%include "t6713.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_t6713) diff --git a/src/t6713/jsupm_t6713.i b/src/t6713/jsupm_t6713.i deleted file mode 100644 index f929b29c..00000000 --- a/src/t6713/jsupm_t6713.i +++ /dev/null @@ -1,9 +0,0 @@ -%module jsupm_t6713 -%include "../upm.i" -%include "../carrays_uint16_t.i" - -%{ - #include "t6713.hpp" -%} - -%include "t6713.hpp" diff --git a/src/t6713/pyupm_t6713.i b/src/t6713/pyupm_t6713.i deleted file mode 100644 index fecdb3dc..00000000 --- a/src/t6713/pyupm_t6713.i +++ /dev/null @@ -1,11 +0,0 @@ -%module pyupm_t6713 -%include "../upm.i" -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" - -%include "stdint.i" - -%include "t6713.hpp" -%{ - #include "t6713.hpp" -%} diff --git a/src/t6713/t6713.i b/src/t6713/t6713.i new file mode 100644 index 00000000..56db9741 --- /dev/null +++ b/src/t6713/t6713.i @@ -0,0 +1,25 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%include "arrays_java.i"; +%include "../java_buffer.i" +%typemap(javaimports) SWIGTYPE %{import upm_interfaces.*;%} +%import "../interfaces/javaupm_iCO2Sensor.i" + +JAVA_JNI_LOADLIBRARY(javaupm_t6713) +#endif +/* END Java syntax */ + +/* BEGIN Javascript syntax ------------------------------------------------- */ +#ifdef SWIGJAVASCRIPT +%include "../carrays_uint16_t.i" +#endif +/* END Javascript syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "t6713.hpp" +%} +%include "t6713.hpp" +/* END Common SWIG syntax */ diff --git a/src/t8100/javaupm_t8100.i b/src/t8100/javaupm_t8100.i deleted file mode 100644 index 5b5143d0..00000000 --- a/src/t8100/javaupm_t8100.i +++ /dev/null @@ -1,13 +0,0 @@ -%module javaupm_t8100 -%include "../upm.i" -%include "typemaps.i" - -%include "bacnetmstp.hpp" -%include "bacnetutil.hpp" -%include "t8100.hpp" -%{ - #include "t8100.hpp" -%} - - -JAVA_JNI_LOADLIBRARY(javaupm_t8100) diff --git a/src/t8100/jsupm_t8100.i b/src/t8100/jsupm_t8100.i deleted file mode 100644 index 147dc736..00000000 --- a/src/t8100/jsupm_t8100.i +++ /dev/null @@ -1,10 +0,0 @@ -%module jsupm_t8100 -%include "../upm.i" -%include "stdint.i" - -%include "bacnetmstp.hpp" -%include "bacnetutil.hpp" -%include "t8100.hpp" -%{ - #include "t8100.hpp" -%} diff --git a/src/t8100/pyupm_t8100.i b/src/t8100/pyupm_t8100.i deleted file mode 100644 index 0300a909..00000000 --- a/src/t8100/pyupm_t8100.i +++ /dev/null @@ -1,12 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_t8100 -%include "../upm.i" -%include "stdint.i" - -%include "bacnetmstp.hpp" -%include "bacnetutil.hpp" -%include "t8100.hpp" -%{ - #include "t8100.hpp" -%} diff --git a/src/t8100/t8100.i b/src/t8100/t8100.i new file mode 100644 index 00000000..da757523 --- /dev/null +++ b/src/t8100/t8100.i @@ -0,0 +1,18 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_t8100) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "bacnetmstp.hpp" +#include "bacnetutil.hpp" +#include "t8100.hpp" +%} +%include "bacnetmstp.hpp" +%include "bacnetutil.hpp" +%include "t8100.hpp" +/* END Common SWIG syntax */ diff --git a/src/ta12200/javaupm_ta12200.i b/src/ta12200/javaupm_ta12200.i deleted file mode 100644 index d1d73a24..00000000 --- a/src/ta12200/javaupm_ta12200.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_ta12200 -%include "../upm.i" - -%{ - #include "ta12200.hpp" -%} - -%include "ta12200.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_ta12200) \ No newline at end of file diff --git a/src/ta12200/jsupm_ta12200.i b/src/ta12200/jsupm_ta12200.i deleted file mode 100644 index 3f90ced4..00000000 --- a/src/ta12200/jsupm_ta12200.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_ta12200 -%include "../upm.i" - -%{ - #include "ta12200.hpp" -%} - -%include "ta12200.hpp" diff --git a/src/ta12200/pyupm_ta12200.i b/src/ta12200/pyupm_ta12200.i deleted file mode 100644 index 368f4e13..00000000 --- a/src/ta12200/pyupm_ta12200.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_ta12200 -%include "../upm.i" - -%include "ta12200.hpp" -%{ - #include "ta12200.hpp" -%} diff --git a/src/tb7300/javaupm_tb7300.i b/src/tb7300/javaupm_tb7300.i deleted file mode 100644 index 55586a7b..00000000 --- a/src/tb7300/javaupm_tb7300.i +++ /dev/null @@ -1,23 +0,0 @@ -%module javaupm_tb7300 -%include "../upm.i" -%include "typemaps.i" - -// We need to use this method for enum wrapping since the enum typedefs used -// by the derived classes (like ANALOG_VALUES_T) are passed to methods -// in the base class which expect a uint32_t. This is fine, and -// works everywhere except Java. It's type safety is a little too -// stringent in these cases. %javaconst(1) is generally recommended -// as it avoids JNI calls to determine the enumerant values at -// runtime. -%include "enumtypeunsafe.swg" -%javaconst(1); - -%include "bacnetmstp.hpp" -%include "bacnetutil.hpp" -%include "tb7300.hpp" -%{ - #include "tb7300.hpp" -%} - - -JAVA_JNI_LOADLIBRARY(javaupm_tb7300) diff --git a/src/tb7300/jsupm_tb7300.i b/src/tb7300/jsupm_tb7300.i deleted file mode 100644 index e18f5924..00000000 --- a/src/tb7300/jsupm_tb7300.i +++ /dev/null @@ -1,10 +0,0 @@ -%module jsupm_tb7300 -%include "../upm.i" -%include "stdint.i" - -%include "bacnetmstp.hpp" -%include "bacnetutil.hpp" -%include "tb7300.hpp" -%{ - #include "tb7300.hpp" -%} diff --git a/src/tb7300/pyupm_tb7300.i b/src/tb7300/pyupm_tb7300.i deleted file mode 100644 index b87c6c9f..00000000 --- a/src/tb7300/pyupm_tb7300.i +++ /dev/null @@ -1,12 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_tb7300 -%include "../upm.i" -%include "stdint.i" - -%include "bacnetmstp.hpp" -%include "bacnetutil.hpp" -%include "tb7300.hpp" -%{ - #include "tb7300.hpp" -%} diff --git a/src/tb7300/tb7300.i b/src/tb7300/tb7300.i new file mode 100644 index 00000000..1f1b7f68 --- /dev/null +++ b/src/tb7300/tb7300.i @@ -0,0 +1,29 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +/* We need to use this method for enum wrapping since the enum typedefs used + * by the derived classes (like ANALOG_VALUES_T) are passed to methods + * in the base class which expect a uint32_t. This is fine, and + * works everywhere except Java. It's type safety is a little too + * stringent in these cases. %javaconst(1) is generally recommended + * as it avoids JNI calls to determine the enumerant values at + * runtime. + */ +%include "enumtypeunsafe.swg" +%javaconst(1); + +JAVA_JNI_LOADLIBRARY(javaupm_tb7300) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "bacnetmstp.hpp" +#include "bacnetutil.hpp" +#include "tb7300.hpp" +%} +%include "bacnetmstp.hpp" +%include "bacnetutil.hpp" +%include "tb7300.hpp" +/* END Common SWIG syntax */ diff --git a/src/tca9548a/javaupm_tca9548a.i b/src/tca9548a/javaupm_tca9548a.i deleted file mode 100644 index ff4c380a..00000000 --- a/src/tca9548a/javaupm_tca9548a.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_tca9548a -%include "../upm.i" - -%{ - #include "tca9548a.hpp" -%} - -%include "tca9548a.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_tca9548a) diff --git a/src/tca9548a/jsupm_tca9548a.i b/src/tca9548a/jsupm_tca9548a.i deleted file mode 100644 index 12490eed..00000000 --- a/src/tca9548a/jsupm_tca9548a.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_tca9548a -%include "../upm.i" - -%{ - #include "tca9548a.hpp" -%} - -%include "tca9548a.hpp" diff --git a/src/tca9548a/pyupm_tca9548a.i b/src/tca9548a/pyupm_tca9548a.i deleted file mode 100644 index e058d0ca..00000000 --- a/src/tca9548a/pyupm_tca9548a.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_tca9548a -%include "../upm.i" - -%include "tca9548a.hpp" -%{ - #include "tca9548a.hpp" -%} diff --git a/src/tcs3414cs/javaupm_tcs3414cs.i b/src/tcs3414cs/javaupm_tcs3414cs.i deleted file mode 100644 index e3251704..00000000 --- a/src/tcs3414cs/javaupm_tcs3414cs.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_tcs3414cs -%include "../upm.i" - -%{ - #include "tcs3414cs.hpp" -%} - -%include "tcs3414cs.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_tcs3414cs) \ No newline at end of file diff --git a/src/tcs3414cs/jsupm_tcs3414cs.i b/src/tcs3414cs/jsupm_tcs3414cs.i deleted file mode 100644 index db7f4535..00000000 --- a/src/tcs3414cs/jsupm_tcs3414cs.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_tcs3414cs -%include "../upm.i" - -%{ - #include "tcs3414cs.hpp" -%} - -%include "tcs3414cs.hpp" diff --git a/src/tcs3414cs/pyupm_tcs3414cs.i b/src/tcs3414cs/pyupm_tcs3414cs.i deleted file mode 100644 index 9743835a..00000000 --- a/src/tcs3414cs/pyupm_tcs3414cs.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_tcs3414cs -%include "../upm.i" - -%include "tcs3414cs.hpp" -%{ - #include "tcs3414cs.hpp" -%} diff --git a/src/tcs37727/javaupm_tcs37727.i b/src/tcs37727/javaupm_tcs37727.i deleted file mode 100644 index c93b48f9..00000000 --- a/src/tcs37727/javaupm_tcs37727.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_tcs37727 -%include "../upm.i" - -%{ - #include "tcs37727.hpp" -%} - -%include "tcs37727.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_tcs37727) \ No newline at end of file diff --git a/src/tcs37727/jsupm_tcs37727.i b/src/tcs37727/jsupm_tcs37727.i deleted file mode 100644 index 823d6a39..00000000 --- a/src/tcs37727/jsupm_tcs37727.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_tcs37727 -%include "../upm.i" - -%{ - #include "tcs37727.hpp" -%} - -%include "tcs37727.hpp" diff --git a/src/tcs37727/pyupm_tcs37727.i b/src/tcs37727/pyupm_tcs37727.i deleted file mode 100644 index e9f45d58..00000000 --- a/src/tcs37727/pyupm_tcs37727.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_tcs37727 -%include "../upm.i" - -%include "tcs37727.hpp" -%{ - #include "tcs37727.hpp" -%} diff --git a/src/teams/javaupm_teams.i b/src/teams/javaupm_teams.i deleted file mode 100644 index 744a2d52..00000000 --- a/src/teams/javaupm_teams.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_teams -%include "../upm.i" -%include "std_string.i" - -%include "teams.hpp" -%{ - #include "teams.hpp" -%} - -JAVA_JNI_LOADLIBRARY(javaupm_teams) diff --git a/src/teams/jsupm_teams.i b/src/teams/jsupm_teams.i deleted file mode 100644 index 97d6628e..00000000 --- a/src/teams/jsupm_teams.i +++ /dev/null @@ -1,10 +0,0 @@ -%module jsupm_teams -%include "../upm.i" -%include "std_string.i" - -%{ - #include "teams.hpp" -%} - -%include "teams.hpp" - diff --git a/src/teams/pyupm_teams.i b/src/teams/pyupm_teams.i deleted file mode 100644 index f8903487..00000000 --- a/src/teams/pyupm_teams.i +++ /dev/null @@ -1,11 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_teams -%include "../upm.i" -%include "std_string.i" - -%{ - #include "teams.hpp" -%} -%include "teams.hpp" - diff --git a/src/teams/teams.i b/src/teams/teams.i new file mode 100644 index 00000000..a3cfc2f0 --- /dev/null +++ b/src/teams/teams.i @@ -0,0 +1,14 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_teams) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "teams.hpp" +%} +%include "teams.hpp" +/* END Common SWIG syntax */ diff --git a/src/temperature/javaupm_temperature.i b/src/temperature/javaupm_temperature.i deleted file mode 100644 index 150eb71a..00000000 --- a/src/temperature/javaupm_temperature.i +++ /dev/null @@ -1,10 +0,0 @@ -%module (docstring="Temperature sensor") javaupm_temperature - -%include "../upm.i" - -%include "temperature.hpp" -%{ - #include "temperature.hpp" -%} - -JAVA_JNI_LOADLIBRARY(javaupm_temperature) diff --git a/src/temperature/jsupm_temperature.i b/src/temperature/jsupm_temperature.i deleted file mode 100644 index 41f3277d..00000000 --- a/src/temperature/jsupm_temperature.i +++ /dev/null @@ -1,7 +0,0 @@ -%module jsupm_temperature -%include "../upm.i" - -%include "temperature.hpp" -%{ - #include "temperature.hpp" -%} diff --git a/src/temperature/pyupm_temperature.i b/src/temperature/pyupm_temperature.i deleted file mode 100644 index 1242d4d7..00000000 --- a/src/temperature/pyupm_temperature.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_temperature -%include "../upm.i" - -%include "temperature.hpp" -%{ - #include "temperature.hpp" -%} diff --git a/src/tex00/javaupm_tex00.i b/src/tex00/javaupm_tex00.i deleted file mode 100644 index ba345860..00000000 --- a/src/tex00/javaupm_tex00.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_tex00 -%include "../upm.i" -%include "std_string.i" - -%include "tex00.hpp" -%{ - #include "tex00.hpp" -%} - -JAVA_JNI_LOADLIBRARY(javaupm_tex00) diff --git a/src/tex00/jsupm_tex00.i b/src/tex00/jsupm_tex00.i deleted file mode 100644 index 3ddae3b0..00000000 --- a/src/tex00/jsupm_tex00.i +++ /dev/null @@ -1,10 +0,0 @@ -%module jsupm_tex00 -%include "../upm.i" -%include "std_string.i" - -%{ - #include "tex00.hpp" -%} - -%include "tex00.hpp" - diff --git a/src/tex00/pyupm_tex00.i b/src/tex00/pyupm_tex00.i deleted file mode 100644 index 94b9e219..00000000 --- a/src/tex00/pyupm_tex00.i +++ /dev/null @@ -1,11 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_tex00 -%include "../upm.i" -%include "std_string.i" - -%{ - #include "tex00.hpp" -%} -%include "tex00.hpp" - diff --git a/src/tex00/tex00.i b/src/tex00/tex00.i new file mode 100644 index 00000000..1497f2a5 --- /dev/null +++ b/src/tex00/tex00.i @@ -0,0 +1,14 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_tex00) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "tex00.hpp" +%} +%include "tex00.hpp" +/* END Common SWIG syntax */ diff --git a/src/th02/javaupm_th02.i b/src/th02/javaupm_th02.i deleted file mode 100644 index f58bfb74..00000000 --- a/src/th02/javaupm_th02.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_th02 -%include "../upm.i" - -%{ - #include "th02.hpp" -%} - -%include "th02.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_th02) \ No newline at end of file diff --git a/src/th02/jsupm_th02.i b/src/th02/jsupm_th02.i deleted file mode 100644 index 8ab407f8..00000000 --- a/src/th02/jsupm_th02.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_th02 -%include "../upm.i" - -%{ - #include "th02.hpp" -%} - -%include "th02.hpp" diff --git a/src/th02/pyupm_th02.i b/src/th02/pyupm_th02.i deleted file mode 100644 index f68e5aa2..00000000 --- a/src/th02/pyupm_th02.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_th02 -%include "../upm.i" - -%include "th02.hpp" -%{ - #include "th02.hpp" -%} diff --git a/src/tm1637/javaupm_tm1637.i b/src/tm1637/javaupm_tm1637.i deleted file mode 100644 index bf56cfb3..00000000 --- a/src/tm1637/javaupm_tm1637.i +++ /dev/null @@ -1,20 +0,0 @@ -%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.hpp" -%} - -%include "tm1637.hpp" - - -JAVA_JNI_LOADLIBRARY(javaupm_tm1637) \ No newline at end of file diff --git a/src/tm1637/jsupm_tm1637.i b/src/tm1637/jsupm_tm1637.i deleted file mode 100644 index 3a71411d..00000000 --- a/src/tm1637/jsupm_tm1637.i +++ /dev/null @@ -1,15 +0,0 @@ -%module jsupm_tm1637 -%include "../upm.i" -%include "../carrays_uint8_t.i" - -%varargs(4, int digit = 0) write; - -%rename("writeArray") write(uint8_t *digits); -%rename("writeString") write(std::string digits); - -%{ - #include "tm1637.hpp" -%} - -%include "tm1637.hpp" - diff --git a/src/tm1637/pyupm_tm1637.i b/src/tm1637/pyupm_tm1637.i deleted file mode 100644 index a607e707..00000000 --- a/src/tm1637/pyupm_tm1637.i +++ /dev/null @@ -1,12 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_tm1637 -%include "../upm.i" -%include "../carrays_uint8_t.i" - -%varargs(4, int digit = 0) write; - -%{ - #include "tm1637.hpp" -%} -%include "tm1637.hpp" diff --git a/src/tm1637/tm1637.i b/src/tm1637/tm1637.i new file mode 100644 index 00000000..c7a41426 --- /dev/null +++ b/src/tm1637/tm1637.i @@ -0,0 +1,32 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_tm1637) +#endif +/* END Java syntax */ + +/* BEGIN Javascript syntax ------------------------------------------------- */ +#ifdef SWIGJAVASCRIPT +%include "../carrays_uint8_t.i" +#endif +/* END Javascript syntax */ + +/* BEGIN Python syntax ----------------------------------------------------- */ +#ifdef SWIGPYTHON +%include "../carrays_uint8_t.i" +#endif +/* END Python syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%rename("writeArray") write(uint8_t *digits); +%rename("writeString") write(std::string digits); + +%varargs(4, int digit = 0) write; +%apply uint8_t *INPUT { uint8_t *digits } + +%{ +#include "tm1637.hpp" +%} +%include "tm1637.hpp" +/* END Common SWIG syntax */ diff --git a/src/tmp006/javaupm_tmp006.i b/src/tmp006/javaupm_tmp006.i deleted file mode 100644 index 75f6cc4c..00000000 --- a/src/tmp006/javaupm_tmp006.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_tmp006 -%include "../upm.i" - -%{ - #include "tmp006.hpp" -%} - -%include "tmp006.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_tmp006) \ No newline at end of file diff --git a/src/tmp006/jsupm_tmp006.i b/src/tmp006/jsupm_tmp006.i deleted file mode 100644 index 66c9fd9f..00000000 --- a/src/tmp006/jsupm_tmp006.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_tmp006 -%include "../upm.i" - -%{ - #include "tmp006.hpp" -%} - -%include "tmp006.hpp" diff --git a/src/tmp006/pyupm_tmp006.i b/src/tmp006/pyupm_tmp006.i deleted file mode 100644 index d866f7a5..00000000 --- a/src/tmp006/pyupm_tmp006.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_tmp006 -%include "../upm.i" - -%include "tmp006.hpp" -%{ - #include "tmp006.hpp" -%} diff --git a/src/tsl2561/javaupm_tsl2561.i b/src/tsl2561/javaupm_tsl2561.i deleted file mode 100644 index 249d1fa5..00000000 --- a/src/tsl2561/javaupm_tsl2561.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_tsl2561 -%include "../upm.i" - -%{ - #include "tsl2561.hpp" -%} - -%include "tsl2561.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_tsl2561) \ No newline at end of file diff --git a/src/tsl2561/jsupm_tsl2561.i b/src/tsl2561/jsupm_tsl2561.i deleted file mode 100644 index d3447309..00000000 --- a/src/tsl2561/jsupm_tsl2561.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_tsl2561 -%include "../upm.i" - -%{ - #include "tsl2561.hpp" -%} - -%include "tsl2561.hpp" diff --git a/src/tsl2561/pyupm_tsl2561.i b/src/tsl2561/pyupm_tsl2561.i deleted file mode 100644 index be8dd1b4..00000000 --- a/src/tsl2561/pyupm_tsl2561.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_tsl2561 -%include "../upm.i" - -%include "tsl2561.hpp" -%{ - #include "tsl2561.hpp" -%} diff --git a/src/ttp223/javaupm_ttp223.i b/src/ttp223/javaupm_ttp223.i deleted file mode 100644 index 65043218..00000000 --- a/src/ttp223/javaupm_ttp223.i +++ /dev/null @@ -1,18 +0,0 @@ -%module (docstring="TTP223 Touch Sensor") javaupm_ttp223 - -%include "../upm.i" - -%apply int {mraa::Edge} - - -%{ - #include "ttp223.hpp" -%} - -%include "ttp223.hpp" - -#%ignore installISR(mraa::Edge , void *, void *) - -JAVA_ADD_INSTALLISR_EDGE(upm::TTP223) - -JAVA_JNI_LOADLIBRARY(javaupm_ttp223) diff --git a/src/ttp223/jsupm_ttp223.i b/src/ttp223/jsupm_ttp223.i deleted file mode 100644 index d408deab..00000000 --- a/src/ttp223/jsupm_ttp223.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_ttp223 -%include "../upm.i" - -%{ - #include "ttp223.hpp" -%} - -%include "ttp223.hpp" diff --git a/src/ttp223/pyupm_ttp223.i b/src/ttp223/pyupm_ttp223.i deleted file mode 100644 index 7f26ec8c..00000000 --- a/src/ttp223/pyupm_ttp223.i +++ /dev/null @@ -1,10 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_ttp223 -%include "../upm.i" - -%include "ttp223.hpp" -%{ - #include "ttp223.hpp" -%} - diff --git a/src/ttp223/ttp223.i b/src/ttp223/ttp223.i new file mode 100644 index 00000000..bba2a34f --- /dev/null +++ b/src/ttp223/ttp223.i @@ -0,0 +1,20 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%module (docstring="TTP223 Touch Sensor") javaupm_ttp223 + +%apply int {mraa::Edge} + +JAVA_ADD_INSTALLISR_EDGE(upm::TTP223) + +JAVA_JNI_LOADLIBRARY(javaupm_ttp223) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "ttp223.hpp" +%} +%include "ttp223.hpp" +/* END Common SWIG syntax */ diff --git a/src/uartat/javaupm_uartat.i b/src/uartat/javaupm_uartat.i deleted file mode 100644 index 5017220e..00000000 --- a/src/uartat/javaupm_uartat.i +++ /dev/null @@ -1,13 +0,0 @@ -%module javaupm_uartat -%include "../upm.i" -%include "std_string.i" -%include "stdint.i" -%include "typemaps.i" - -%include "uartat_defs.h" -%include "uartat.hpp" -%{ - #include "uartat.hpp" -%} - -JAVA_JNI_LOADLIBRARY(javaupm_uartat) diff --git a/src/uartat/jsupm_uartat.i b/src/uartat/jsupm_uartat.i deleted file mode 100644 index 960a5abe..00000000 --- a/src/uartat/jsupm_uartat.i +++ /dev/null @@ -1,9 +0,0 @@ -%module jsupm_uartat -%include "../upm.i" -%include "std_string.i" - -%include "uartat_defs.h" -%include "uartat.hpp" -%{ - #include "uartat.hpp" -%} diff --git a/src/uartat/pyupm_uartat.i b/src/uartat/pyupm_uartat.i deleted file mode 100644 index d06a3875..00000000 --- a/src/uartat/pyupm_uartat.i +++ /dev/null @@ -1,11 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_uartat -%include "../upm.i" -%include "std_string.i" - -%include "uartat_defs.h" -%include "uartat.hpp" -%{ - #include "uartat.hpp" -%} diff --git a/src/uartat/uartat.i b/src/uartat/uartat.i new file mode 100644 index 00000000..68eb424a --- /dev/null +++ b/src/uartat/uartat.i @@ -0,0 +1,16 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_uartat) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "uartat_defs.h" +#include "uartat.hpp" +%} +%include "uartat_defs.h" +%include "uartat.hpp" +/* END Common SWIG syntax */ diff --git a/src/uln200xa/javaupm_uln200xa.i b/src/uln200xa/javaupm_uln200xa.i deleted file mode 100644 index 68b6f6f4..00000000 --- a/src/uln200xa/javaupm_uln200xa.i +++ /dev/null @@ -1,11 +0,0 @@ -%module javaupm_uln200xa -%include "../upm.i" - -%include "uln200xa_defs.h" -%include "uln200xa.hpp" -%{ - #include "uln200xa.hpp" -%} - - -JAVA_JNI_LOADLIBRARY(javaupm_uln200xa) diff --git a/src/uln200xa/jsupm_uln200xa.i b/src/uln200xa/jsupm_uln200xa.i deleted file mode 100644 index cb3d6c2a..00000000 --- a/src/uln200xa/jsupm_uln200xa.i +++ /dev/null @@ -1,9 +0,0 @@ -%module jsupm_uln200xa -%include "../upm.i" - -%include "uln200xa_defs.h" -%include "uln200xa.hpp" -%{ - #include "uln200xa.hpp" -%} - diff --git a/src/uln200xa/pyupm_uln200xa.i b/src/uln200xa/pyupm_uln200xa.i deleted file mode 100644 index 01d3541f..00000000 --- a/src/uln200xa/pyupm_uln200xa.i +++ /dev/null @@ -1,10 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_uln200xa -%include "../upm.i" - -%include "uln200xa_defs.h" -%include "uln200xa.hpp" -%{ - #include "uln200xa.hpp" -%} diff --git a/src/uln200xa/uln200xa.i b/src/uln200xa/uln200xa.i new file mode 100644 index 00000000..46553730 --- /dev/null +++ b/src/uln200xa/uln200xa.i @@ -0,0 +1,15 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_uln200xa) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "uln200xa.hpp" +%} +%include "uln200xa_defs.h" +%include "uln200xa.hpp" +/* END Common SWIG syntax */ diff --git a/src/ultrasonic/javaupm_ultrasonic.i b/src/ultrasonic/javaupm_ultrasonic.i deleted file mode 100644 index 9adfa549..00000000 --- a/src/ultrasonic/javaupm_ultrasonic.i +++ /dev/null @@ -1,12 +0,0 @@ -%module javaupm_ultrasonic -%include "../upm.i" - -%ignore signalISR; - -%{ - #include "ultrasonic.hpp" -%} - -%include "ultrasonic.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_ultrasonic) diff --git a/src/ultrasonic/jsupm_ultrasonic.i b/src/ultrasonic/jsupm_ultrasonic.i deleted file mode 100644 index f2a87a5d..00000000 --- a/src/ultrasonic/jsupm_ultrasonic.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_ultrasonic -%include "../upm.i" - -%{ - #include "ultrasonic.hpp" -%} - -%include "ultrasonic.hpp" diff --git a/src/ultrasonic/pyupm_ultrasonic.i b/src/ultrasonic/pyupm_ultrasonic.i deleted file mode 100644 index 62766b57..00000000 --- a/src/ultrasonic/pyupm_ultrasonic.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_ultrasonic -%include "../upm.i" - -%include "ultrasonic.hpp" -%{ - #include "ultrasonic.hpp" -%} diff --git a/src/ultrasonic/ultrasonic.i b/src/ultrasonic/ultrasonic.i new file mode 100644 index 00000000..6a9de920 --- /dev/null +++ b/src/ultrasonic/ultrasonic.i @@ -0,0 +1,16 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%ignore signalISR; + +JAVA_JNI_LOADLIBRARY(javaupm_ultrasonic) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "ultrasonic.hpp" +%} +%include "ultrasonic.hpp" +/* END Common SWIG syntax */ diff --git a/src/upm_exception.i b/src/upm_exception.i index bc9ebdb9..2d12fe35 100644 --- a/src/upm_exception.i +++ b/src/upm_exception.i @@ -1,65 +1,63 @@ -/* Standardized exception handling for UPM +/* Standardized exception handling for UPM * * catch blocks should be listed in order from most specific to least * specific. */ +%{#include %} %include "exception.i" -%exception { - try { - $action - } catch (std::invalid_argument& e) { - std::string s1("UPM Invalid Argument: "), s2(e.what()); - s1 = s1 + s2; - SWIG_exception(SWIG_ValueError, s1.c_str()); +%exception { +try { + $action +} catch (std::invalid_argument& e) { + std::string s1("UPM Invalid Argument: "), s2(e.what()); + s1 = s1 + s2; + SWIG_exception(SWIG_ValueError, s1.c_str()); - } catch (std::domain_error& e) { - std::string s1("UPM Domain Error: "), s2(e.what()); - s1 = s1 + s2; - SWIG_exception(SWIG_ValueError, s1.c_str() ); +} catch (std::domain_error& e) { + std::string s1("UPM Domain Error: "), s2(e.what()); + s1 = s1 + s2; + SWIG_exception(SWIG_ValueError, s1.c_str() ); - } catch (std::overflow_error& e) { - std::string s1("UPM Overflow Error: "), s2(e.what()); - s1 = s1 + s2; - SWIG_exception(SWIG_OverflowError, s1.c_str() ); +} catch (std::overflow_error& e) { + std::string s1("UPM Overflow Error: "), s2(e.what()); + s1 = s1 + s2; + SWIG_exception(SWIG_OverflowError, s1.c_str() ); - } catch (std::out_of_range& e) { - std::string s1("UPM Out of Range: "), s2(e.what()); - s1 = s1 + s2; - SWIG_exception(SWIG_IndexError, s1.c_str() ); +} catch (std::out_of_range& e) { + std::string s1("UPM Out of Range: "), s2(e.what()); + s1 = s1 + s2; + SWIG_exception(SWIG_IndexError, s1.c_str() ); - } catch (std::length_error& e) { - std::string s1("UPM Length Error: "), s2(e.what()); - s1 = s1 + s2; - SWIG_exception(SWIG_IndexError, s1.c_str() ); +} catch (std::length_error& e) { + std::string s1("UPM Length Error: "), s2(e.what()); + s1 = s1 + s2; + SWIG_exception(SWIG_IndexError, s1.c_str() ); - } catch (std::logic_error& e) { - std::string s1("UPM Logic Error: "), s2(e.what()); - s1 = s1 + s2; - SWIG_exception(SWIG_RuntimeError, s1.c_str() ); +} catch (std::logic_error& e) { + std::string s1("UPM Logic Error: "), s2(e.what()); + s1 = s1 + s2; + SWIG_exception(SWIG_RuntimeError, s1.c_str() ); - } catch (std::bad_alloc& e) { - /* for an allocation exception, don't try to create a string... */ - SWIG_exception(SWIG_MemoryError, e.what() ); +} catch (std::bad_alloc& e) { + /* for an allocation exception, don't try to create a string... */ + SWIG_exception(SWIG_MemoryError, e.what() ); - } catch (std::runtime_error& e) { - /* catch other std::runtime_error exceptions here */ - std::string s1("UPM Runtime Error: "), s2(e.what()); - s1 = s1 + s2; - SWIG_exception(SWIG_RuntimeError, s1.c_str()); +} catch (std::runtime_error& e) { + /* catch other std::runtime_error exceptions here */ + std::string s1("UPM Runtime Error: "), s2(e.what()); + s1 = s1 + s2; + SWIG_exception(SWIG_RuntimeError, s1.c_str()); - } catch (std::exception& e) { - /* catch other std::exceptions here */ - std::string s1("UPM Error: "), s2(e.what()); - s1 = s1 + s2; - SWIG_exception(SWIG_SystemError, s1.c_str() ); - - } catch (...) { - /* catch everything else */ - SWIG_exception(SWIG_UnknownError, "UPM Unknown exception" ); - - } +} catch (std::exception& e) { + /* catch other std::exceptions here */ + std::string s1("UPM Error: "), s2(e.what()); + s1 = s1 + s2; + SWIG_exception(SWIG_SystemError, s1.c_str() ); +} catch (...) { + /* catch everything else */ + SWIG_exception(SWIG_UnknownError, "UPM Unknown exception" ); +} } - diff --git a/src/urm37/javaupm_urm37.i b/src/urm37/javaupm_urm37.i deleted file mode 100644 index 859da92c..00000000 --- a/src/urm37/javaupm_urm37.i +++ /dev/null @@ -1,12 +0,0 @@ -%module javaupm_urm37 -%include "../upm.i" -%include "std_string.i" - -%{ - #include "urm37.hpp" -%} - -%include "urm37.hpp" - - -JAVA_JNI_LOADLIBRARY(javaupm_urm37) \ No newline at end of file diff --git a/src/urm37/jsupm_urm37.i b/src/urm37/jsupm_urm37.i deleted file mode 100644 index 744978a9..00000000 --- a/src/urm37/jsupm_urm37.i +++ /dev/null @@ -1,10 +0,0 @@ -%module jsupm_urm37 -%include "../upm.i" -%include "std_string.i" - -%{ - #include "urm37.hpp" -%} - -%include "urm37.hpp" - diff --git a/src/urm37/pyupm_urm37.i b/src/urm37/pyupm_urm37.i deleted file mode 100644 index c5c35f75..00000000 --- a/src/urm37/pyupm_urm37.i +++ /dev/null @@ -1,11 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_urm37 -%include "../upm.i" -%include "std_string.i" - -%{ - #include "urm37.hpp" -%} -%include "urm37.hpp" - diff --git a/src/urm37/urm37.i b/src/urm37/urm37.i new file mode 100644 index 00000000..16cd9fc5 --- /dev/null +++ b/src/urm37/urm37.i @@ -0,0 +1,14 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_urm37) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "urm37.hpp" +%} +%include "urm37.hpp" +/* END Common SWIG syntax */ diff --git a/src/utilities/CMakeLists.txt b/src/utilities/CMakeLists.txt index da59de8e..56d24d12 100644 --- a/src/utilities/CMakeLists.txt +++ b/src/utilities/CMakeLists.txt @@ -3,4 +3,5 @@ upm_mixed_module_init (NAME utilities CPP_HDR upm_utilities.hpp CPP_SRC upm_utilities.cxx C_HDR upm_utilities.h - C_SRC upm_utilities.c) + C_SRC upm_utilities.c + CPP_WRAPS_C) diff --git a/src/utilities/javaupm_utilities.i b/src/utilities/javaupm_utilities.i deleted file mode 100644 index 05a8999c..00000000 --- a/src/utilities/javaupm_utilities.i +++ /dev/null @@ -1,12 +0,0 @@ -%module javaupm_utilities - -%pragma(java) jniclasscode=%{ - static { - try { - System.loadLibrary("javaupm_utilities"); - } catch (UnsatisfiedLinkError e) { - System.err.println("Native code library failed to load. \n" + e); - System.exit(1); - } - } -%} diff --git a/src/utilities/jsupm_utilities.i b/src/utilities/jsupm_utilities.i deleted file mode 100644 index 0493a3b9..00000000 --- a/src/utilities/jsupm_utilities.i +++ /dev/null @@ -1 +0,0 @@ -%module jsupm_utilities diff --git a/src/utilities/pyupm_utilities.i b/src/utilities/pyupm_utilities.i deleted file mode 100644 index 7b0e4f6e..00000000 --- a/src/utilities/pyupm_utilities.i +++ /dev/null @@ -1 +0,0 @@ -%module pyupm_utilities diff --git a/src/utilities/utilities.i b/src/utilities/utilities.i new file mode 100644 index 00000000..f61ce96a --- /dev/null +++ b/src/utilities/utilities.i @@ -0,0 +1,14 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_utilities) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "upm_utilities.hpp" +%} +%include "upm_utilities.hpp" +/* END Common SWIG syntax */ diff --git a/src/vcap/javaupm_vcap.i b/src/vcap/javaupm_vcap.i deleted file mode 100644 index 12c86f29..00000000 --- a/src/vcap/javaupm_vcap.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_vcap -%include "../upm.i" -%include "std_string.i" - -%include "vcap.hpp" -%{ - #include "vcap.hpp" -%} - -JAVA_JNI_LOADLIBRARY(javaupm_vcap) diff --git a/src/vcap/jsupm_vcap.i b/src/vcap/jsupm_vcap.i deleted file mode 100644 index 0b5e5ebc..00000000 --- a/src/vcap/jsupm_vcap.i +++ /dev/null @@ -1,10 +0,0 @@ -%module jsupm_vcap -%include "../upm.i" -%include "std_string.i" - -%include "vcap.hpp" -%{ - #include "vcap.hpp" -%} - - diff --git a/src/vcap/pyupm_vcap.i b/src/vcap/pyupm_vcap.i deleted file mode 100644 index 1422ba5e..00000000 --- a/src/vcap/pyupm_vcap.i +++ /dev/null @@ -1,12 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_vcap -%include "../upm.i" -%include "std_string.i" - -%include "vcap.hpp" -%{ - #include "vcap.hpp" -%} - - diff --git a/src/vcap/vcap.i b/src/vcap/vcap.i new file mode 100644 index 00000000..f7f5bff9 --- /dev/null +++ b/src/vcap/vcap.i @@ -0,0 +1,14 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_vcap) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "vcap.hpp" +%} +%include "vcap.hpp" +/* END Common SWIG syntax */ diff --git a/src/vdiv/javaupm_vdiv.i b/src/vdiv/javaupm_vdiv.i deleted file mode 100644 index 49e416eb..00000000 --- a/src/vdiv/javaupm_vdiv.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_vdiv -%include "../upm.i" - -%{ - #include "vdiv.hpp" -%} - -%include "vdiv.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_vdiv) \ No newline at end of file diff --git a/src/vdiv/jsupm_vdiv.i b/src/vdiv/jsupm_vdiv.i deleted file mode 100644 index 1fdf2deb..00000000 --- a/src/vdiv/jsupm_vdiv.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_vdiv -%include "../upm.i" - -%{ - #include "vdiv.hpp" -%} - -%include "vdiv.hpp" diff --git a/src/vdiv/pyupm_vdiv.i b/src/vdiv/pyupm_vdiv.i deleted file mode 100644 index e3046ccd..00000000 --- a/src/vdiv/pyupm_vdiv.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_vdiv -%include "../upm.i" - -%include "vdiv.hpp" -%{ - #include "vdiv.hpp" -%} diff --git a/src/veml6070/javaupm_veml6070.i b/src/veml6070/javaupm_veml6070.i deleted file mode 100644 index ddb9b8fa..00000000 --- a/src/veml6070/javaupm_veml6070.i +++ /dev/null @@ -1,11 +0,0 @@ -%module javaupm_veml6070 -%include "../upm.i" -%include "stdint.i" -%include "typemaps.i" - -%{ - #include "veml6070.hpp" -%} -%include "veml6070.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_veml6070) diff --git a/src/veml6070/jsupm_veml6070.i b/src/veml6070/jsupm_veml6070.i deleted file mode 100644 index f40f9e4e..00000000 --- a/src/veml6070/jsupm_veml6070.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_veml6070 -%include "../upm.i" - -%{ - #include "veml6070.hpp" -%} - -%include "veml6070.hpp" diff --git a/src/veml6070/pyupm_veml6070.i b/src/veml6070/pyupm_veml6070.i deleted file mode 100644 index a756ccf3..00000000 --- a/src/veml6070/pyupm_veml6070.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_veml6070 -%include "../upm.i" - -%include "veml6070.hpp" -%{ - #include "veml6070.hpp" -%} diff --git a/src/veml6070/veml6070.i b/src/veml6070/veml6070.i new file mode 100644 index 00000000..a6990fa1 --- /dev/null +++ b/src/veml6070/veml6070.i @@ -0,0 +1,14 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_veml6070) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "veml6070.hpp" +%} +%include "veml6070.hpp" +/* END Common SWIG syntax */ diff --git a/src/water/javaupm_water.i b/src/water/javaupm_water.i deleted file mode 100644 index 79610e24..00000000 --- a/src/water/javaupm_water.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_water -%include "../upm.i" - -%{ - #include "water.hpp" -%} - -%include "water.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_water) \ No newline at end of file diff --git a/src/water/jsupm_water.i b/src/water/jsupm_water.i deleted file mode 100644 index 7d353140..00000000 --- a/src/water/jsupm_water.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_water -%include "../upm.i" - -%{ - #include "water.hpp" -%} - -%include "water.hpp" diff --git a/src/water/pyupm_water.i b/src/water/pyupm_water.i deleted file mode 100644 index 19b85a24..00000000 --- a/src/water/pyupm_water.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_water -%include "../upm.i" - -%include "water.hpp" -%{ - #include "water.hpp" -%} diff --git a/src/waterlevel/javaupm_waterlevel.i b/src/waterlevel/javaupm_waterlevel.i deleted file mode 100644 index 1e1358c2..00000000 --- a/src/waterlevel/javaupm_waterlevel.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_waterlevel -%include "../upm.i" - -%{ - #include "waterlevel.hpp" -%} - -%include "waterlevel.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_waterlevel) \ No newline at end of file diff --git a/src/waterlevel/jsupm_waterlevel.i b/src/waterlevel/jsupm_waterlevel.i deleted file mode 100644 index 7eef6828..00000000 --- a/src/waterlevel/jsupm_waterlevel.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_waterlevel -%include "../upm.i" - -%{ - #include "waterlevel.hpp" -%} - -%include "waterlevel.hpp" diff --git a/src/waterlevel/pyupm_waterlevel.i b/src/waterlevel/pyupm_waterlevel.i deleted file mode 100644 index ef132849..00000000 --- a/src/waterlevel/pyupm_waterlevel.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_waterlevel -%include "../upm.i" - -%include "waterlevel.hpp" -%{ - #include "waterlevel.hpp" -%} diff --git a/src/wfs/javaupm_wfs.i b/src/wfs/javaupm_wfs.i deleted file mode 100644 index 340388e4..00000000 --- a/src/wfs/javaupm_wfs.i +++ /dev/null @@ -1,12 +0,0 @@ -%module javaupm_wfs -%include "../upm.i" - -%ignore flowISR; - -%{ - #include "wfs.hpp" -%} - -%include "wfs.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_wfs) diff --git a/src/wfs/jsupm_wfs.i b/src/wfs/jsupm_wfs.i deleted file mode 100644 index 52cbaf23..00000000 --- a/src/wfs/jsupm_wfs.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_wfs -%include "../upm.i" - -%{ - #include "wfs.hpp" -%} - -%include "wfs.hpp" diff --git a/src/wfs/pyupm_wfs.i b/src/wfs/pyupm_wfs.i deleted file mode 100644 index 18e8e9b7..00000000 --- a/src/wfs/pyupm_wfs.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_wfs -%include "../upm.i" - -%include "wfs.hpp" -%{ - #include "wfs.hpp" -%} diff --git a/src/wfs/wfs.i b/src/wfs/wfs.i new file mode 100644 index 00000000..c9634cd1 --- /dev/null +++ b/src/wfs/wfs.i @@ -0,0 +1,16 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%ignore flowISR; + +JAVA_JNI_LOADLIBRARY(javaupm_wfs) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%{ +#include "wfs.hpp" +%} +%include "wfs.hpp" +/* END Common SWIG syntax */ diff --git a/src/wheelencoder/javaupm_wheelencoder.i b/src/wheelencoder/javaupm_wheelencoder.i deleted file mode 100644 index 4877afaa..00000000 --- a/src/wheelencoder/javaupm_wheelencoder.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_wheelencoder -%include "../upm.i" - -%{ - #include "wheelencoder.hpp" -%} - -%include "wheelencoder.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_wheelencoder) \ No newline at end of file diff --git a/src/wheelencoder/jsupm_wheelencoder.i b/src/wheelencoder/jsupm_wheelencoder.i deleted file mode 100644 index bd6bd12f..00000000 --- a/src/wheelencoder/jsupm_wheelencoder.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_wheelencoder -%include "../upm.i" - -%{ - #include "wheelencoder.hpp" -%} - -%include "wheelencoder.hpp" diff --git a/src/wheelencoder/pyupm_wheelencoder.i b/src/wheelencoder/pyupm_wheelencoder.i deleted file mode 100644 index b76f78ab..00000000 --- a/src/wheelencoder/pyupm_wheelencoder.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_wheelencoder -%include "../upm.i" - -%include "wheelencoder.hpp" -%{ - #include "wheelencoder.hpp" -%} diff --git a/src/wt5001/javaupm_wt5001.i b/src/wt5001/javaupm_wt5001.i deleted file mode 100644 index 9c9c861e..00000000 --- a/src/wt5001/javaupm_wt5001.i +++ /dev/null @@ -1,36 +0,0 @@ -%module javaupm_wt5001 -%include "../upm.i" -%include "stdint.i" -%include "typemaps.i" -%include "../java_buffer.i" -%include "../java_exceptions.i" - -%apply uint8_t *OUTPUT { uint8_t *vol }; -%apply uint8_t *OUTPUT { uint8_t *ps }; -%apply uint16_t *OUTPUT { uint16_t *numf }; -%apply uint16_t *OUTPUT { uint16_t *curf }; -%apply uint16_t *OUTPUT { uint16_t *year }; -%apply uint8_t *OUTPUT { uint8_t *month, uint8_t *day }; -%apply uint8_t *OUTPUT { uint8_t *hour, uint8_t *minute, uint8_t *second }; - -%{ - #include "wt5001.hpp" - speed_t int_B9600 = B9600; -%} - -%ignore getVolume(uint8_t *vol); -READDATA_EXCEPTION(getVolume()) - -%ignore getPlayState(uint8_t *ps); -READDATA_EXCEPTION(getPlayState()) - -%ignore getNumFiles(WT5001_PLAYSOURCE_T psrc, uint16_t *numf); -READDATA_EXCEPTION(getNumFiles(WT5001_PLAYSOURCE_T psrc)) - -%ignore getCurrentFile(uint16_t *curf); -READDATA_EXCEPTION(getCurrentFile()) - -%include "wt5001.hpp" -speed_t int_B9600 = B9600; - -JAVA_JNI_LOADLIBRARY(javaupm_wt5001) \ No newline at end of file diff --git a/src/wt5001/jsupm_wt5001.i b/src/wt5001/jsupm_wt5001.i deleted file mode 100644 index 336e693a..00000000 --- a/src/wt5001/jsupm_wt5001.i +++ /dev/null @@ -1,12 +0,0 @@ -%module jsupm_wt5001 -%include "../upm.i" -%include "../carrays_uint8_t.i" -%include "../carrays_uint16_t.i" - -%{ - #include "wt5001.hpp" - speed_t int_B9600 = B9600; -%} - -%include "wt5001.hpp" -speed_t int_B9600 = B9600; diff --git a/src/wt5001/pyupm_wt5001.i b/src/wt5001/pyupm_wt5001.i deleted file mode 100644 index 9494b802..00000000 --- a/src/wt5001/pyupm_wt5001.i +++ /dev/null @@ -1,18 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_wt5001 -%include "../upm.i" -%include "../carrays_uint8_t.i" -%include "../carrays_uint16_t.i" - -%rename("getVolumeNoParam") getVolume(); -%rename("getPlayStateNoParam") getPlayState(); -%rename("getNumFilesOneParam") getNumFiles(WT5001_PLAYSOURCE_T psrc); -%rename("getCurrentFileNoParam") getCurrentFile(); - -%{ - #include "wt5001.hpp" - speed_t int_B9600 = B9600; -%} -%include "wt5001.hpp" -speed_t int_B9600 = B9600; diff --git a/src/wt5001/wt5001.i b/src/wt5001/wt5001.i new file mode 100644 index 00000000..55e074c2 --- /dev/null +++ b/src/wt5001/wt5001.i @@ -0,0 +1,58 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%include "../java_buffer.i" +%include "../java_exceptions.i" + +%apply uint8_t *OUTPUT { uint8_t *vol }; +%apply uint8_t *OUTPUT { uint8_t *ps }; +%apply uint16_t *OUTPUT { uint16_t *numf }; +%apply uint16_t *OUTPUT { uint16_t *curf }; +%apply uint16_t *OUTPUT { uint16_t *year }; +%apply uint8_t *OUTPUT { uint8_t *month, uint8_t *day }; +%apply uint8_t *OUTPUT { uint8_t *hour, uint8_t *minute, uint8_t *second }; + +%ignore getVolume(uint8_t *vol); +READDATA_EXCEPTION(getVolume()) + +%ignore getPlayState(uint8_t *ps); +READDATA_EXCEPTION(getPlayState()) + +%ignore getNumFiles(WT5001_PLAYSOURCE_T psrc, uint16_t *numf); +READDATA_EXCEPTION(getNumFiles(WT5001_PLAYSOURCE_T psrc)) + +%ignore getCurrentFile(uint16_t *curf); +READDATA_EXCEPTION(getCurrentFile()) + +JAVA_JNI_LOADLIBRARY(javaupm_wt5001) +#endif +/* END Java syntax */ + +/* BEGIN Javascript syntax ------------------------------------------------- */ +#ifdef SWIGJAVASCRIPT +%include "../carrays_uint8_t.i" +%include "../carrays_uint16_t.i" +#endif +/* END Javascript syntax */ + +/* BEGIN Python syntax ----------------------------------------------------- */ +#ifdef SWIGPYTHON +%rename("getVolumeNoParam") getVolume(); +%rename("getPlayStateNoParam") getPlayState(); +%rename("getNumFilesOneParam") getNumFiles(WT5001_PLAYSOURCE_T psrc); +%rename("getCurrentFileNoParam") getCurrentFile(); +#endif +/* END Python syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%include "../carrays_uint8_t.i" +%include "../carrays_uint16_t.i" + +%{ +#include "wt5001.hpp" +speed_t int_B9600 = B9600; +%} +%include "wt5001.hpp" +speed_t int_B9600 = B9600; +/* END Common SWIG syntax */ diff --git a/src/xbee/javaupm_xbee.i b/src/xbee/javaupm_xbee.i deleted file mode 100644 index c34fab4d..00000000 --- a/src/xbee/javaupm_xbee.i +++ /dev/null @@ -1,13 +0,0 @@ -%module javaupm_xbee -%include "../upm.i" -%include "carrays.i" -%include "std_string.i" - -%{ - #include "xbee.hpp" -%} - -%include "xbee.hpp" -%array_class(char, charArray); - -JAVA_JNI_LOADLIBRARY(javaupm_xbee) \ No newline at end of file diff --git a/src/xbee/jsupm_xbee.i b/src/xbee/jsupm_xbee.i deleted file mode 100644 index 1d7339dd..00000000 --- a/src/xbee/jsupm_xbee.i +++ /dev/null @@ -1,11 +0,0 @@ -%module jsupm_xbee -%include "../upm.i" -%include "carrays.i" -%include "std_string.i" - -%{ - #include "xbee.hpp" -%} - -%include "xbee.hpp" -%array_class(char, charArray); diff --git a/src/xbee/pyupm_xbee.i b/src/xbee/pyupm_xbee.i deleted file mode 100644 index 22837a7d..00000000 --- a/src/xbee/pyupm_xbee.i +++ /dev/null @@ -1,12 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_xbee -%include "../upm.i" -%include "carrays.i" -%include "std_string.i" - -%{ - #include "xbee.hpp" -%} -%include "xbee.hpp" -%array_class(char, charArray); diff --git a/src/xbee/xbee.i b/src/xbee/xbee.i new file mode 100644 index 00000000..840dbe42 --- /dev/null +++ b/src/xbee/xbee.i @@ -0,0 +1,16 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +JAVA_JNI_LOADLIBRARY(javaupm_xbee) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%include "carrays.i" +%{ +#include "xbee.hpp" +%} +%include "xbee.hpp" +%array_class(char, charArray); +/* END Common SWIG syntax */ diff --git a/src/yg1006/javaupm_yg1006.i b/src/yg1006/javaupm_yg1006.i deleted file mode 100644 index 30436197..00000000 --- a/src/yg1006/javaupm_yg1006.i +++ /dev/null @@ -1,10 +0,0 @@ -%module javaupm_yg1006 -%include "../upm.i" - -%{ - #include "yg1006.hpp" -%} - -%include "yg1006.hpp" - -JAVA_JNI_LOADLIBRARY(javaupm_yg1006) \ No newline at end of file diff --git a/src/yg1006/jsupm_yg1006.i b/src/yg1006/jsupm_yg1006.i deleted file mode 100644 index e9ae926a..00000000 --- a/src/yg1006/jsupm_yg1006.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_yg1006 -%include "../upm.i" - -%{ - #include "yg1006.hpp" -%} - -%include "yg1006.hpp" diff --git a/src/yg1006/pyupm_yg1006.i b/src/yg1006/pyupm_yg1006.i deleted file mode 100644 index 43dd3ac8..00000000 --- a/src/yg1006/pyupm_yg1006.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_yg1006 -%include "../upm.i" - -%include "yg1006.hpp" -%{ - #include "yg1006.hpp" -%} diff --git a/src/zfm20/common.i b/src/zfm20/common.i deleted file mode 100644 index a9041311..00000000 --- a/src/zfm20/common.i +++ /dev/null @@ -1,11 +0,0 @@ -%include "../upm.i" - -/* Make it easy to use the methods which take a uint& id and score */ -%include "typemaps.i" -%apply uint16_t &OUTPUT {uint16_t &id}; -%apply uint16_t &OUTPUT {uint16_t &score}; - -%{ - #include "zfm20.hpp" -%} -%include "zfm20.hpp" diff --git a/src/zfm20/javaupm_zfm20.i b/src/zfm20/javaupm_zfm20.i deleted file mode 100644 index 27e93318..00000000 --- a/src/zfm20/javaupm_zfm20.i +++ /dev/null @@ -1,9 +0,0 @@ -%module javaupm_zfm20 -%include "stdint.i" -%include "typemaps.i" -%include "arrays_java.i"; -%include "../java_buffer.i"; - -%include "common.i" - -JAVA_JNI_LOADLIBRARY(javaupm_zfm20) diff --git a/src/zfm20/jsupm_zfm20.i b/src/zfm20/jsupm_zfm20.i deleted file mode 100644 index 5def2e28..00000000 --- a/src/zfm20/jsupm_zfm20.i +++ /dev/null @@ -1,10 +0,0 @@ -%module jsupm_zfm20 -%include "../carrays_uint8_t.i" -%include "../carrays_uint16_t.i" -%include "../carrays_uint32_t.i" -%include "cpointer.i" - -/* Send "int *" to JavaScript as intp */ -%pointer_functions(int, intp); - -%include "common.i" diff --git a/src/zfm20/pyupm_zfm20.i b/src/zfm20/pyupm_zfm20.i deleted file mode 100644 index e16cb23c..00000000 --- a/src/zfm20/pyupm_zfm20.i +++ /dev/null @@ -1,9 +0,0 @@ -// Include doxygen-generated documentation -%include "pyupm_doxy2swig.i" -%module pyupm_zfm20 -%include "../carrays_uint8_t.i" -%include "../carrays_uint16_t.i" -%include "../carrays_uint32_t.i" -%include "cpointer.i" - -%include "common.i" diff --git a/src/zfm20/zfm20.i b/src/zfm20/zfm20.i new file mode 100644 index 00000000..e93aa2f6 --- /dev/null +++ b/src/zfm20/zfm20.i @@ -0,0 +1,24 @@ +%include "../common_top.i" + +/* BEGIN Java syntax ------------------------------------------------------- */ +#ifdef SWIGJAVA +%include "arrays_java.i"; +%include "../java_buffer.i"; + +JAVA_JNI_LOADLIBRARY(javaupm_zfm20) +#endif +/* END Java syntax */ + +/* BEGIN Common SWIG syntax ------------------------------------------------- */ +%apply uint16_t &OUTPUT {uint16_t &id}; +%apply uint16_t &OUTPUT {uint16_t &score}; +%include "../carrays_uint8_t.i" +%include "../carrays_uint16_t.i" +%include "../carrays_uint32_t.i" +%pointer_functions(int, intp); + +%{ +#include "zfm20.hpp" +%} +%include "zfm20.hpp" +/* END Common SWIG syntax */ diff --git a/tests/check_autoloadlibrary.py b/tests/check_autoloadlibrary.py index f4519e71..4d8b2f91 100755 --- a/tests/check_autoloadlibrary.py +++ b/tests/check_autoloadlibrary.py @@ -25,7 +25,7 @@ class AutoLoadLibrary(u.TestCase): for subdir, dirs, files in os.walk(rootDir): for fileName in files: - if fnmatch.fnmatch(fileName, 'javaupm_*.i'): + if fnmatch.fnmatch(fileName, '*.i'): moduleName = fileName[:-2] snippet = prefix + moduleName + suffix diff --git a/tests/check_consistency.py b/tests/check_consistency.py index 3a129080..a816d1d4 100755 --- a/tests/check_consistency.py +++ b/tests/check_consistency.py @@ -18,7 +18,7 @@ class BlacklistConsistency(u.TestCase): for libraryName in blacklist: files = os.listdir( os.path.join(rootDir, libraryName)) - interfaceFileName = "javaupm_" + libraryName + ".i" + interfaceFileName = libraryName + ".i" if interfaceFileName in files: self.fail("\n" + libraryName + " is in javaswig blacklist.\n" + \