diff --git a/examples/java/iMoisture_Example.java b/examples/java/iMoisture_Example.java new file mode 100644 index 00000000..c8faab27 --- /dev/null +++ b/examples/java/iMoisture_Example.java @@ -0,0 +1,28 @@ +/** + * Author: Serban Waltter + */ + +import upm_new_interfaces.*; + +import upm_moisture.*; +import upm_ims.*; + +import java.util.ArrayList; + +/** + * iMoisture_Example + */ +public class iMoisture_Example { + + public static void main(String[] args) { + ArrayList sensors = new ArrayList(); + sensors.add(new IMS(0)); + sensors.add(new Moisture(2)); + + while (true) { + for (int i = 0; i < sensors.size(); i++) { + System.out.println("Moisture from sensor " + i + " is " + sensors.get(i).getMoisture()); + } + } + } +} \ No newline at end of file diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e95d9959..b1ce6047 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -427,7 +427,7 @@ function(upm_swig_node) # Include interface directory if (module_iface) - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) + include_directories(${PROJECT_SOURCE_DIR}/include) endif() # Decide between ${libname}.i or a language-specific .i @@ -516,6 +516,9 @@ function(upm_swig_java) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/.. ${DEPEND_DIRS}) + if (module_iface) + include_directories(${PROJECT_SOURCE_DIR}/include) + endif() # Decide between ${libname}.i or a language-specific .i _get_current_dot_i_file(javaupm SWIG_CURRENT_DOT_I_FILE) @@ -550,7 +553,6 @@ function(upm_swig_java) endif () if(module_iface) add_dependencies(javaupm_${libname} javaupm_new_interfaces) - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) set (NEW_INTERFACES_JAR_FILE ${CMAKE_BINARY_DIR}/interfaces/upm_new_interfaces.jar) endif() # For linker to report unresolved symbols. Note, there is currently no test diff --git a/src/grovemoisture/CMakeLists.txt b/src/grovemoisture/CMakeLists.txt index df307ab9..8be2d2ef 100644 --- a/src/grovemoisture/CMakeLists.txt +++ b/src/grovemoisture/CMakeLists.txt @@ -2,4 +2,5 @@ set (libname "grovemoisture") set (libdescription "Moisture Sensor") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) +set (module_iface iMoisture.hpp) upm_module_init(mraa) diff --git a/src/ims/CMakeLists.txt b/src/ims/CMakeLists.txt index be3aea22..2ab309a4 100644 --- a/src/ims/CMakeLists.txt +++ b/src/ims/CMakeLists.txt @@ -4,7 +4,7 @@ upm_mixed_module_init (NAME ims C_SRC ims.c CPP_HDR ims.hpp CPP_SRC ims.cxx - IFACE_HDR iLight.hpp iTemperature.hpp + IFACE_HDR iMoisture.hpp iTemperature.hpp FTI_SRC ims_fti.c CPP_WRAPS_C REQUIRES mraa utilities-c) diff --git a/src/moisture/CMakeLists.txt b/src/moisture/CMakeLists.txt index 814e9e8a..62ffae70 100644 --- a/src/moisture/CMakeLists.txt +++ b/src/moisture/CMakeLists.txt @@ -4,6 +4,7 @@ upm_mixed_module_init (NAME moisture C_SRC moisture.c CPP_HDR moisture.hpp CPP_SRC moisture.cxx + IFACE_HDR iMoisture.hpp FTI_SRC moisture_fti.c CPP_WRAPS_C REQUIRES mraa)