C++ Core: Add base class per sensor/actuator type

Adding base classes for UPM sensors and actuators.

Signed-off-by: Noel Eck <noel.eck@intel.com>

.travis.yml

@@ -7,16 +7,20 @@ services:
   - docker
 
 before_install:
-  - sudo rm /usr/local/bin/docker-compose
-  - curl -L https://github.com/docker/compose/releases/download/1.9.0/docker-compose-`uname -s`-`uname -m` > docker-compose
-  - chmod +x docker-compose
-  - sudo mv docker-compose /usr/local/bin
+  - sudo wget -q https://github.com/docker/compose/releases/download/1.9.0/docker-compose-`uname -s`-`uname -m` -O /usr/local/bin/docker-compose
 
 jobs:
   fast_finish: true
   allow_failures:
     - env: TARGET=ipk
   include:
+    - &run-with-clang-minimal
+      stage: Clang 3.8 - minimal with unit tests
+      env: TARGET=minimal
+      before_script: docker-compose pull ${TARGET}
+      script:
+        - export CC=clang-3.8 CXX=clang++-3.8
+        - BUILDARCH=MOCK docker-compose run ${TARGET}
     - &run-with-clang
       stage: Clang 3.8
       env: TARGET=python
@@ -71,6 +75,10 @@ jobs:
         - docker-compose run ${TARGET}
     - <<: *run-additional-jobs
       env: TARGET=android
+    - <<: *run-additional-jobs
+      env: TARGET=cordova
+    - <<: *run-additional-jobs
+      env: TARGET=examples
     - <<: *run-additional-jobs
       env: TARGET=sonar-scan
     - <<: *run-additional-jobs

CMakeLists.txt

@@ -8,6 +8,7 @@ option (BUILDFTI "Build Funtion Table Interface (FTI) in C sensor libraries" OFF
 option (BUILDSWIGPYTHON "Build swig python modules" ON)
 option (BUILDSWIGNODE "Build swig node modules" ON)
 option (BUILDSWIGJAVA "Build swig java modules" OFF)
+option (BUILDCORDOVA "Build cordova bindings" OFF)
 option (BUILDEXAMPLES "Build C/C++/JAVA examples" OFF)
 option (IPK "Generate IPK using CPack" OFF)
 option (RPM "Generate RPM using CPack" OFF)
@@ -91,7 +92,11 @@ endfunction ()
 # Compiler flags common to both C and CXX
 # Enable -Wall
 # GCC-6 added -Wmisleading-indentation to -Wall, skip these for now
-set (C_CXX_WARNING_FLAGS -Wall -Wno-misleading-indentation -Wno-strict-aliasing)
+set (C_CXX_WARNING_FLAGS -Wall
+    -Wno-misleading-indentation
+    -Wno-strict-aliasing
+    -Wno-deprecated-declarations # Temp fix for MRAA deprecated methods
+    )
 
 # Warnings as errors?
 if (WERROR)
@@ -104,6 +109,7 @@ endif (WERROR)
 upm_add_compile_flags(C ${C_CXX_WARNING_FLAGS}
   -Winit-self
   -Wimplicit
+  -Wsign-compare
   -Wmissing-parameter-type)
 
 # Set CXX compiler warning flags at top-level scope and emit a warning about
@@ -111,6 +117,7 @@ upm_add_compile_flags(C ${C_CXX_WARNING_FLAGS}
 upm_add_compile_flags(CXX ${C_CXX_WARNING_FLAGS}
   -Wnon-virtual-dtor
   -Woverloaded-virtual
+  -Wsign-compare
   -Wreorder)
 
 # Allow exception error handling for Android C++
@@ -123,7 +130,7 @@ find_package (PkgConfig REQUIRED)
 
 # Force a libmraa search and minimum required version every time a config is generated
 unset(MRAA_FOUND CACHE)
-set(MRAA_MINIMUM 1.8.0)
+set(MRAA_MINIMUM 1.9.0)
 pkg_check_modules (MRAA REQUIRED mraa>=${MRAA_MINIMUM})
 # Also, get full path to the mraa library
 find_library(MRAA_LIBRARY NAMES mraa HINTS ${MRAA_LIBDIR})
@@ -151,11 +158,6 @@ if (BUILDSWIGNODE)
   find_package (Node REQUIRED)
   if (BUILDTESTS)
     find_package (Npm REQUIRED)
-    if(NPM_EXECUTABLE)
-        message(STATUS "NPM Executable found at: ${NPM_EXECUTABLE}")
-    else()
-        message(FATAL_ERROR "Please install NPM first, you can't run tests without it")
-    endif()
   endif (BUILDTESTS)
 endif (BUILDSWIGNODE)
 
@@ -168,6 +170,17 @@ if (BUILDSWIGJAVA)
   find_library(MRAAJAVA_LIBRARY NAMES mraajava HINTS ${MRAA_LIBDIR})
 endif (BUILDSWIGJAVA)
 
+# Cordova binding
+if (BUILDCORDOVA)
+  if (NOT BUILDSWIGJAVA)
+    message(FATAL_ERROR "Cordova bindings require JAVA packages, please enable BUILDSWIGJAVA (-DBUILDSWIGJAVA=on).")
+  endif()
+
+  find_package (Node REQUIRED)
+  find_package (Npm REQUIRED)
+  find_package (UpmCordovaGenerator 0.2.1 REQUIRED)
+endif (BUILDCORDOVA)
+
 # Find swig if any wrapper is enabled
 if (BUILDSWIGPYTHON OR BUILDSWIGNODE OR BUILDSWIGJAVA)
   find_package (SWIG 3.0.5 REQUIRED)
@@ -216,7 +229,7 @@ include (GetGitRevisionDescription)
 git_describe (VERSION "--tags")
 # If git_describe fails, use a dirty version
 if (${VERSION} MATCHES -NOTFOUND)
-  set (VERSION "v1.5.0")
+  set (VERSION "v1.6.0")
   message (WARNING "Failed to retrieve UPM version with 'git describe' (using "
       "${VERSION}). Check that git is installed and this is a valid git repo.")
 endif ()
@@ -278,37 +291,36 @@ else()
   set (C_EXTENSIONS OFF)
 endif()
 
-# The doc target depends on each sensor target
+# The doc target depends on the C/C++ source and all libraries
 #
 # doc
+#   ├──> src
+#   ├──> include
 #   ├──> libupm_sensor0
 #   ├──> libupm_sensor1
-#   ├──> libupm_sensor2
+#   ├──> ...
 #   └──> libupm_sensor_n
 #
 # The pydoc target builds documentation with sphinx via inspection by loading
-# each python module.  Those modules must include the CXX documentation via
+# each python2 module.  Those modules must include the CXX documentation via
 # a monolithic swig file generated by doxy2swig
 #
 # pydoc
 #  └──> _pyupm_sensor0_python2
-#        ├──────> libupm_sensor0
-#        └──────> doxy2swig
+#        ├──> libupm_sensor0
+#        └──> doxy2swig
 #
 # The doxy2swig target is dependent upon the doc target IF BUILDDOC=ON,
-# otherwise doxy2swig uses an empty file.  Doxy2swig also depends on each
-# sensor target
 #
 # doxy2swig
-#  ├──> BUILDDOC=ON───> doc
-#  └──> libupm_sensor0
+#  └──> BUILDDOC=ON───> doc
 #
 # The jsdoc target builds js documentation via yuidoc and only requires
 # the doc target
 #
 # jsdoc ─> doc
 #
-if (BUILDDOC)
+function (CreateDocumentationTargets)
   # Add a target to generate API documentation with Doxygen
   find_package (Doxygen 1.8 REQUIRED)
   if (DOXYGEN_FOUND AND DOXYGEN_VERSION VERSION_GREATER "1.8")
@@ -320,12 +332,17 @@ if (BUILDDOC)
     foreach(PNG_FILE ${PNG_FILES})
       configure_file(${CMAKE_CURRENT_SOURCE_DIR}/docs/${PNG_FILE} ${CMAKE_CURRENT_BINARY_DIR}/html/docs/${PNG_FILE} COPYONLY)
     endforeach()
-    add_custom_target (doc
-      ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
+
+    # Custom command to run doxygen (note depends on ALL UPM C++ targets)
+    add_custom_command (
+      OUTPUT ${CMAKE_BINARY_DIR}/xml/index.xml
+      DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile ${UPM_TARGETS_CXX}
+      COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
       COMMAND tar -czf html/xml.tar.gz -C xml .
       WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-      COMMENT "Generating API documentation with Doxygen" VERBATIM
-    )
+      COMMENT "Generating C/C++ API documentation with Doxygen"
+      VERBATIM)
+    add_custom_target(doc DEPENDS ${CMAKE_BINARY_DIR}/xml/index.xml)
   else ()
     message (SEND_ERROR "ERROR - Failed to find a compatible version of Doxygen. API doc will not be generated")
   endif (DOXYGEN_FOUND AND DOXYGEN_VERSION VERSION_GREATER "1.8")
@@ -333,24 +350,47 @@ if (BUILDDOC)
   # Check if Sphinx is installed and add target to generate API documentation
   # Currently, the per-module documentation for python is generated from the
   # python2 modules.
+  # Since python2 is required for documentation, only copy from python2 paths, this
+  # ensures that sphinx doesn't run across python2 and python3 binaries.  When running
+  # the sphinx tools, explicitly run from the python2 interpreter (tested with the sphinx
+  # 1.3.6 python2 and python3 modules).
   if(BUILDSWIGPYTHON)
+    # Generate python module documentation from doxygen collateral
+    #
+    # doxygen index.xml -> doxy2swig.py -> pyupm_doxy2swig.i
+    add_custom_command (
+      OUTPUT ${CMAKE_BINARY_DIR}/src/pyupm_doxy2swig.i
+      COMMAND ${PYTHON2_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/doxy2swig.py
+              ${CMAKE_BINARY_DIR}/xml/index.xml --quiet
+              ${CMAKE_BINARY_DIR}/src/pyupm_doxy2swig.i
+      COMMENT "Generating pyupm_doxy2swig.i from Doxygen output for use by SWIG"
+      DEPENDS doc
+      VERBATIM)
+    add_custom_target(pyupm_doxy2swig DEPENDS ${CMAKE_BINARY_DIR}/src/pyupm_doxy2swig.i)
+    foreach (_python2_target ${UPM_TARGETS_PYTHON2})
+      add_dependencies(${_python2_target} pyupm_doxy2swig)
+    endforeach()
+
     find_package (Sphinx 1.3 REQUIRED)
     if (SPHINX_FOUND AND SPHINX_VERSION VERSION_GREATER "1.3")
       configure_file (${CMAKE_CURRENT_SOURCE_DIR}/doxy/conf.py.in ${CMAKE_CURRENT_BINARY_DIR}/pydoc/conf.py @ONLY)
       configure_file (${CMAKE_CURRENT_SOURCE_DIR}/doxy/index.rst ${CMAKE_CURRENT_BINARY_DIR}/pydoc/index.rst COPYONLY)
-      add_custom_target (pydoc ALL
+      add_custom_command (
+        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pydoc.stamp
         COMMAND rm -r -f ${CMAKE_BINARY_DIR}/pyupm && mkdir -p ${CMAKE_BINARY_DIR}/pyupm
-        COMMAND find ${CMAKE_BINARY_DIR}/src -name "_pyupm_*.so" -exec cp {} ${CMAKE_BINARY_DIR}/pyupm \;
-        COMMAND find ${CMAKE_BINARY_DIR}/src -name "pyupm_*.py" -exec cp {} ${CMAKE_BINARY_DIR}/pyupm \;
-        COMMAND ${SPHINX_API_EXECUTABLE} -f -o pydoc  ${CMAKE_BINARY_DIR}/pyupm
+        COMMAND find ${CMAKE_BINARY_DIR}/src -path "*python${MIN_VER_PYTHON2}/_pyupm_*.so" -exec cp {} ${CMAKE_BINARY_DIR}/pyupm \;
+        COMMAND find ${CMAKE_BINARY_DIR}/src -path "*python${MIN_VER_PYTHON2}/pyupm_*.py" -exec cp {} ${CMAKE_BINARY_DIR}/pyupm \;
+        COMMAND ${PYTHON2_EXECUTABLE} ${SPHINX_API_EXECUTABLE} -f -o pydoc  ${CMAKE_BINARY_DIR}/pyupm
         # TODO: use a separate cmake FILE module for string replacement instead
-        COMMAND ${SPHINX_EXECUTABLE} -b html pydoc html/python
+        COMMAND ${PYTHON2_EXECUTABLE} ${SPHINX_EXECUTABLE} -b html pydoc html/python
         COMMAND sed -i.bak s|\">pyupm_|\">|g html/python/index.html html/python/modules.html
         COMMAND sed -i.bak s|[[:space:]][mM]odule</a>|</a>|g html/python/index.html html/python/modules.html
-        DEPENDS doc
+        COMMAND cmake -E touch ${CMAKE_CURRENT_BINARY_DIR}/pydoc.stamp
         WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-        COMMENT "Generating API documentation with Sphinx" VERBATIM
-      )
+        COMMENT "Generating Python API documentation with Sphinx"
+        DEPENDS doc ${UPM_TARGETS_PYTHON2}
+        VERBATIM)
+      add_custom_target(pydoc DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/pydoc.stamp)
     else ()
       message (SEND_ERROR "ERROR - Failed to find a compatible version of Sphinx. Python API doc will not be generated")
     endif ()
@@ -360,19 +400,22 @@ if (BUILDDOC)
   if(BUILDSWIGNODE)
     find_package (Yuidoc 0.10 REQUIRED)
     if (YUIDOC_FOUND AND YUIDOC_VERSION VERSION_GREATER "0.10")
-      add_custom_target (jsdoc ALL
+      add_custom_command (
+        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/jsdoc/jsdoc.stamp
         COMMAND ${CMAKE_SOURCE_DIR}/doxy/doxygen2jsdoc/docgen.js -m upm -i xml -o jsdoc -t ${CMAKE_CURRENT_SOURCE_DIR}/src -g ../../
         COMMAND ${YUIDOC_EXECUTABLE} -C --no-sort --helpers ${CMAKE_SOURCE_DIR}/doxy/node/generators/yuidoc/helper.js --themedir ${CMAKE_SOURCE_DIR}/doxy/node/generators/yuidoc/tmpl -o html/node jsdoc/yuidoc/upm
         COMMAND ${CMAKE_SOURCE_DIR}/doxy/doxygen2jsdoc/tolower.js -i html/node
-        DEPENDS doc
+        COMMAND cmake -E touch ${CMAKE_CURRENT_BINARY_DIR}/jsdoc/jsdoc.stamp
         WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-        COMMENT "Generating API documentation with Yuidoc" VERBATIM
-      )
+        COMMENT "Generating Javascript API documentation with Yuidoc"
+        DEPENDS doc
+        VERBATIM)
+      add_custom_target(jsdoc DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/jsdoc/jsdoc.stamp)
     else ()
       message (SEND_ERROR "ERROR - Failed to find a compatible version of Yuidoc. Node.js API doc will not be generated")
     endif ()
   endif(BUILDSWIGNODE)
-endif (BUILDDOC)
+endfunction()
 
 if (IPK)
  # Get target package arch from Yocto ADT sysroot if set or host OS, mapping to Ubuntu name if necessary
@@ -439,9 +482,6 @@ endif()
 # UPM common headers
 set (UPM_COMMON_HEADER_DIRS ${CMAKE_HOME_DIRECTORY}/include)
 
-# Generate a build-only C++ header to add functionality to SWIG'ed modules
-configure_file (${PROJECT_SOURCE_DIR}/cmake/modules/version.hpp.in ${PROJECT_BINARY_DIR}/src/version.hpp @ONLY)
-
 # UPM source
 add_subdirectory (src)
 
@@ -454,6 +494,12 @@ if (BUILDTESTS)
   add_subdirectory (tests)
 endif()
 
+# Setup documentation AFTER all source targets have been added
+if (BUILDDOC)
+  CreateDocumentationTargets()
+endif()
+
 # Install C headers
 install(DIRECTORY include/ DESTINATION include/upm
-    FILES_MATCHING PATTERN "*.h")
+    COMPONENT ${CMAKE_PROJECT_NAME}-dev
+    FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp")

README.md

@@ -138,7 +138,7 @@ unable to compile code that was working fine before a library update, make sure
 you check the [API changes](docs/apichanges.md) section first.
 
 **NOTE** - Several important API changes are currently underway for some of our
-widely used libraries including `libupm-grove` and `libupm-i2clcd`!
+widely used libraries including `libupm-grove`
 
 ### Changelog
 Version changelog [here](docs/changelog.md).

cmake/modules/FindNode.cmake

@@ -5,13 +5,11 @@
     endif()
 endmacro()
 
-
 find_program (NODEJS_EXECUTABLE NAMES node nodejs
     HINTS
     $ENV{NODE_DIR}
     PATH_SUFFIXES bin
-    DOC "Node.js interpreter"
-)
+    DOC "Node.js interpreter")
 
 include (FindPackageHandleStandardArgs)
 
@@ -23,16 +21,20 @@ if (UV_ROOT_DIR)
 endif()
 
 # Now look for node. Flag an error if not found
-find_path (NODE_ROOT_DIR "include/node/node.h" "include/src/node.h" "src/node.h"
-  PATHS /usr/include/nodejs /usr/local/include/nodejs /usr/local/include)
+find_path (NODE_ROOT_DIR
+    NAMES node.h src/node.h
+    PATH_SUFFIXES node node4 node5 node6 node7 node8 nodejs
+    PATHS /usr/include /usr/local/include)
+
 if (NODE_ROOT_DIR)
-  add_include_dir(${NODE_ROOT_DIR}/include/src)
-  add_include_dir(${NODE_ROOT_DIR}/src)
-  add_include_dir(${NODE_ROOT_DIR}/include/node)
-  add_include_dir(${NODE_ROOT_DIR}/include/deps/v8/include)
+    add_include_dir(${NODE_ROOT_DIR})
+    add_include_dir(${NODE_ROOT_DIR}/deps/uv/include)
     add_include_dir(${NODE_ROOT_DIR}/deps/v8/include)
     add_include_dir(${NODE_ROOT_DIR}/include/deps/uv/include)
-  add_include_dir(${NODE_ROOT_DIR}/deps/uv/include)
+    add_include_dir(${NODE_ROOT_DIR}/include/deps/v8/include)
+    add_include_dir(${NODE_ROOT_DIR}/include/node)
+    add_include_dir(${NODE_ROOT_DIR}/include/src)
+    add_include_dir(${NODE_ROOT_DIR}/src)
 else()
     unset(NODEJS_INCLUDE_DIRS)
     message(ERROR " - node.h not found")
@@ -52,11 +54,6 @@ if (NOT UV_ROOT_DIR)
     message(ERROR " - uv.h not found")
 endif()
 
-find_package_handle_standard_args (Nodejs DEFAULT_MSG
-    NODEJS_EXECUTABLE
-    NODEJS_INCLUDE_DIRS
-)
-
 if (NODEJS_EXECUTABLE)
     execute_process(COMMAND ${NODEJS_EXECUTABLE} --version
         OUTPUT_VARIABLE _VERSION
@@ -88,13 +85,15 @@ if (NODEJS_EXECUTABLE)
         set (V8_VERSION_MINOR "28")
         set (V8_VERSION_PATCH "72")
         set (V8_VERSION_STRING "3.28.72")
-        message ("defaulted to node 0.10.30")
+        message (STATUS "defaulted to node 0.10.30")
     endif ()
     string (REGEX REPLACE "\n" "" NODE_VERSION_STRING ${NODE_VERSION_STRING})
     string (REGEX REPLACE "\n" "" V8_VERSION_STRING ${V8_VERSION_STRING})
-    message (STATUS "Node version is ${NODE_VERSION_STRING}")
-    message (STATUS "Node using v8 ${V8_VERSION_STRING}")
-    mark_as_advanced (NODEJS_EXECUTABLE)
-endif ()
 
     mark_as_advanced (NODEJS_EXECUTABLE)
+
+    find_package_handle_standard_args (Nodejs
+        REQUIRED_VARS NODEJS_EXECUTABLE NODEJS_INCLUDE_DIRS
+        VERSION_VAR NODE_VERSION_STRING)
+    message(STATUS "Found v8: ${V8_ROOT_DIR}/v8.h (found version \"${V8_VERSION_STRING}\")")
+endif ()

cmake/modules/FindNpm.cmake

@@ -1,13 +1,71 @@
-# Finding and pointing a variable to the npm executable if found
-# Only works on Linux systems as of now
+# FindNpm
+# --------
+#
+# Find npm
+#
+# This module finds an installed npm.  It sets the following variables:
+#
+#   NPM_FOUND - Set to true if npm is found
+#   NPM_DIR - The directory where npm is installed
+#   NPM_GLOBAL_NODE_MODULE_DIR - The global node_modules directory
+#   NPM_EXECUTABLE - The path to the npm executable
+#   NPM_VERSION  - The version number of the npm executable
 
-find_program(NPM_EXECUTABLE NAMES npm
-    HINTS
-    /usr
-)
+find_program(NPM_EXECUTABLE NAMES npm HINTS /usr)
 
+# If npm was found, fill in the rest
 if (NPM_EXECUTABLE)
-    message(STATUS "NPM Executable found at ${NPM_EXECUTABLE}")
+    # Set the global node_modules location
+    execute_process(COMMAND ${NPM_EXECUTABLE} root -g
+        OUTPUT_VARIABLE NPM_GLOBAL_NODE_MODULE_DIR
+        ERROR_VARIABLE NPM_root_g_error
+        RESULT_VARIABLE NPM_root_g_result_code)
+    # Remove and newlines
+    string (STRIP ${NPM_GLOBAL_NODE_MODULE_DIR} NPM_GLOBAL_NODE_MODULE_DIR)
+    if(NPM_root_g_result_code)
+        if(NPM_FIND_REQUIRED)
+            message(SEND_ERROR "Command \"${NPM_EXECUTABLE} root -g\" failed with output:\n${NPM_root_g_error}")
         else ()
-    message(ERROR "Unable to find NPM installation, please install NPM")
+            message(STATUS "Command \"${NPM_EXECUTABLE} root -g\" failed with output:\n${NPM_root_g_error}")
         endif ()
+    endif()
+    unset(NPM_root_g_error)
+    unset(NPM_root_g_result_code)
+
+    # Set the NPM dir
+    if (EXISTS "${NPM_GLOBAL_NODE_MODULE_DIR}/npm")
+        set(NPM_DIR "${NPM_GLOBAL_NODE_MODULE_DIR}/npm")
+    endif()
+
+    # Set the VERSION
+    execute_process(COMMAND ${NPM_EXECUTABLE} -v
+        OUTPUT_VARIABLE NPM_VERSION
+        ERROR_VARIABLE NPM_version_error
+        RESULT_VARIABLE NPM_version_result_code)
+
+    if(NPM_version_result_code)
+        if(NPM_FIND_REQUIRED)
+            message(SEND_ERROR "Command \"${NPM_EXECUTABLE} -v\" failed with output:\n${NPM_version_error}")
+        else()
+            message(STATUS "Command \"${NPM_EXECUTABLE} -v\" failed with output:\n${NPM_version_error}")
+        endif ()
+    endif ()
+    unset(NPM_version_error)
+    unset(NPM_version_result_code)
+
+    # Remove and newlines
+    string (STRIP ${NPM_VERSION} NPM_VERSION)
+
+    set (NPM_FOUND TRUE)
+else()
+    # Fail on REQUIRED
+    if (Npm_FIND_REQUIRED)
+        message(SEND_ERROR "Failed to find npm executable")
+    endif()
+endif ()
+
+find_package_handle_standard_args(NPM
+    REQUIRED_VARS NPM_EXECUTABLE NPM_DIR
+    VERSION_VAR NPM_VERSION )
+
+mark_as_advanced(NPM_DIR NPM_GLOBAL_NODE_MODULE_DIR NPM_EXECUTABLE NPM_VERSION)

cmake/modules/FindUpmCordovaGenerator.cmake

@@ -0,0 +1,20 @@
+find_program (UPM_CORDOVA_BINDING NAMES upm-cordova-binding
+    DOC "UPM Cordova binding generator")
+
+include (FindPackageHandleStandardArgs)
+
+# Get version
+if (UPM_CORDOVA_BINDING)
+    execute_process(COMMAND ${NPM_EXECUTABLE} info upm-cordova-binding version
+        OUTPUT_VARIABLE UPM_CORDOVA_BINDING_VERSION
+        ERROR_VARIABLE UPM_CORDOVA_BINDING_VERSION
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+        ERROR_STRIP_TRAILING_WHITESPACE)
+endif()
+
+find_package_handle_standard_args(UpmCordovaGenerator
+    REQUIRED_VARS UPM_CORDOVA_BINDING
+    VERSION_VAR UPM_CORDOVA_BINDING_VERSION
+    FAIL_MESSAGE "Unable to find the npm package for generating UPM Cordova bindings.  The generator can be installed via: 'npm install -g upm-cordova-binding'")
+
+mark_as_advanced (UPM_CORDOVA_BINDING UPM_CORDOVA_BINDING_VERSION)

cmake/modules/version.hpp.in

@@ -1,6 +0,0 @@
-#include <string>
-
-inline std::string getVersion()
-{
-    return "@upm_VERSION_STRING@";
-}

docker-compose.yaml

@@ -3,7 +3,7 @@ version: '2.1'
 services:
 
   base:
-    image: dnoliver/upm-base
+    image: inteliotdevkit/upm-base
     environment:
       - http_proxy
       - https_proxy
@@ -13,8 +13,9 @@ services:
       - BUILDFTI=${BUILDFTI:-ON}
       - BUILDSWIGPYTHON=${BUILDSWIGPYTHON:-OFF}
       - BUILDSWIGJAVA=${BUILDSWIGJAVA:-OFF}
+      - BUILDCORDOVA=${BUILDCORDOVA:-OFF}
       - BUILDSWIGNODE=${BUILDSWIGNODE:-OFF}
-      - BUILDEXAMPLES=${BUILDEXAMPLES:-ON}
+      - BUILDEXAMPLES=${BUILDEXAMPLES:-OFF}
       - IPK=${IPK:-OFF}
       - RPM=${RPM:-OFF}
       - NPM=${NPM:-OFF}
@@ -26,9 +27,18 @@ services:
     volumes:
       - .:${UPM_SRC_DIR:-/usr/src/app}
 
-  doc:
+  all:
     extends: base
-    image: dnoliver/upm-all
+    image: inteliotdevkit/upm-all
+
+  minimal:
+    extends: base
+    environment:
+      - BUILDFTI=OFF
+    command: bash -c "./scripts/run-cmake.sh && cd build && make && ctest -R unit --output-on-failure"
+
+  doc:
+    extends: all
     environment:
       - BUILDSWIGPYTHON=ON
       - BUILDSWIGJAVA=ON
@@ -36,35 +46,43 @@ services:
       - BUILDDOC=ON
     command: bash -c "./scripts/run-cmake.sh && ./scripts/build-doc.sh"
 
+  examples:
+    extends: all
+    environment:
+      - BUILDSWIGPYTHON=ON
+      - BUILDSWIGJAVA=ON
+      - BUILDSWIGNODE=ON
+      - BUILDEXAMPLES=ON
+    command: bash -c "./scripts/run-cmake.sh && cd build && make -j8"
+
   ipk:
-    extends: base
+    extends: all
     environment:
       - IPK=ON
       - BUILDDOC=OFF
     command: bash -c "./scripts/run-cmake.sh && make -Cbuild -j8 package"
 
   rpm:
-    extends: doc
+    extends: all
     environment:
       - RPM=ON
       - BUILDDOC=OFF
     command: bash -c "./scripts/run-cmake.sh && make -Cbuild -j8 package"
 
   npm:
-    extends: doc
+    extends: all
     environment:
       - NPM=ON
       - BUILDDOC=OFF
     command: bash -c "./scripts/run-cmake.sh && make -Cbuild -j8 npmpkg"
 
   sonar-scan:
-    extends: base
-    image: dnoliver/upm-all
+    extends: all
     environment:
       - BUILDSWIGPYTHON=ON
       - BUILDSWIGNODE=ON
       - BUILDSWIGJAVA=ON
-      - BUILDSWIGEXAMPLES=ON
+      - BUILDEXAMPLES=ON
       - SONAR_TOKEN
       - SONAR_ORG
       - SONAR_PROJ_KEY
@@ -77,36 +95,43 @@ services:
 
   python:
     extends: base
-    image: dnoliver/upm-python
+    image: inteliotdevkit/upm-python
     environment:
       - BUILDSWIGPYTHON=ON
     command: bash -c "./scripts/run-cmake.sh && cd build && make -j8 && make -j8 install && ldconfig && ctest --output-on-failure"
 
   java:
     extends: base
-    image: dnoliver/upm-java
+    image: inteliotdevkit/upm-java
     environment:
       - BUILDSWIGJAVA=ON
     command: bash -c "./scripts/run-cmake.sh && cd build && make -j8 && make -j8 install && ldconfig && ctest --output-on-failure"
 
   android:
     extends: java
-    image: dnoliver/upm-android
+    image: inteliotdevkit/upm-android
     environment:
       - BUILDTESTS=OFF
     command: bash -c "./scripts/build-android.sh"
 
+  cordova:
+    extends: all
+    environment:
+      - BUILDSWIGJAVA=ON
+      - BUILDCORDOVA=ON
+    command: bash -c "./scripts/run-cmake.sh && cd build && make -j8 && make -j8"
+
   node4:
     extends: base
-    image: dnoliver/upm-node4
+    image: inteliotdevkit/upm-node4
     environment:
       - BUILDSWIGNODE=ON
     command: bash -c "./scripts/run-cmake.sh && cd build && make -j8 && make -j8 install && ldconfig && ctest --output-on-failure -E examplenames_js"
 
   node5:
     extends: node4
-    image: dnoliver/upm-node5
+    image: inteliotdevkit/upm-node5
 
   node6:
     extends: node4
-    image: dnoliver/upm-node6
+    image: inteliotdevkit/upm-node6

docs/apichanges.md

@@ -4,6 +4,22 @@ API Changes                       {#apichanges}
 Here's a list of other API changes made to the library that break source/binary
 compatibility between releases:
 
+# vNext
+ * The interface of **kx122** has been modified to return values instead of
+ receiving pointers.  This applies to member functions: getWhoAmI,
+ getInterruptSource, getBufferStatus, getRawBufferSamples, and getBufferSamples.
+
+# v1.6.0
+
+ * Several C libraries had their init function pin type modified from uint8_t
+ to int allowing usage with subplatforms
+ * Our **led** class constructor has been overloaded with a string based
+ variant that uses the new MRAA LED APIs
+ * The **i2clcd** library has finally been renamed to **lcd** and is now
+ mostly considered a bundle for ssd lcd display controllers only
+ * The **zfm20** class constructor has been overloaded with a string variant
+ that allows initialization using any UART device
+
 # v1.5.0
 
  * **VEML6070** This sensor class no longer needs an I2C address when
@@ -138,13 +154,13 @@ compatibility between releases:
  * **lcm1602/jhd1313m1** These drivers had been rewritten in C, with
  C++ wrappers and placed into their own libraries in the previous
  version of UPM, however, the original C++ implementation was kept in
- the lcd/i2clcd library for compatibility reasons with existing code.
+ the lcd library for compatibility reasons with existing code.
  To avoid collisions with the header files, the new *lcm1602* and
  *jhd1313m1* drivers had their C++ headers renamed to use a **.hxx**
  suffix.
 
     In this version of UPM, the *lcm1602* and *jhd1313m1* drivers have
-    been removed from the lcd/i2clcd library.  In addition, the header
+    been removed from the lcd library.  In addition, the header
     files for the new implementation have been renamed from their
     **.hxx** suffix to the normal **.hpp** suffix.
 

docs/building.md

@@ -106,22 +106,22 @@ make install
 Often developers are only interested in building one module or even just the
 python/node module to do some quick testing using scripting. In order to do
 this you need to use the target name for the python or node module you want to
-rebuild. For example the lcd module target name is i2clcd. Therefore the python
-module target name will be prefixed by _pyupm_. Just do the following to build
-only that module. Modules not using the UPM cmake macros may have different
-naming.
+rebuild. For example, the lcd module target will have a python2 target prefixed
+by _pyupm_ (_pyupm_lcd-python2). Modules not using the UPM cmake macros may
+have different naming.  To build the python2 lcd module (and all dependencies),
+use the following make target:
 
 ~~~~~~~~~~~~~
-make _pyupm_i2clcd
+make _pyupm_lcd-python2
 ~~~~~~~~~~~~~
 
 Sometimes you want to build a small C++ example against an installed library.
 This is fairly easy if installed system-wide. Just link against the correct
-library (in this case libupm-i2clcd) and then add /usr/include/upm to the
+library (in this case libupm-lcd) and then add /usr/include/upm to the
 loader path:
 
 ~~~~~~~~~~~~
-g++ test.cxx -lupm-i2clcd -I/usr/include/upm
+g++ test.cxx -lupm-lcd -I/usr/include/upm
 ~~~~~~~~~~~~
 
 You can also use pkg-config to return the information to you, which is
@@ -129,9 +129,37 @@ considered the correct way if including UPM in a build system like cmake or
 autotools on linux.
 
 ~~~~~~~~~~~
-pkg-config --cflags --libs upm-i2clcd
+pkg-config --cflags --libs upm-lcd
 ~~~~~~~~~~~
 
+## Building for Android Things
+
+Requirements:
+* [io.mraa.at](https://search.maven.org/#artifactdetails%7Cio.mraa.at%7Cmraa%7C1.8.0%7Caar)
+* [io.mraa.at.upm](https://search.maven.org/#artifactdetails%7Cio.mraa.at.upm%7Cupm_zfm20%7C1.3.0%7Caar)
+* [Android NDK](https://developer.android.com/ndk/downloads/index.html) >= 14b
+
+### Android NDK r14b
+
+~~~~~~~~~~~~~{.sh}
+NDK_HOME="/path/to/android-ndk-r14b"
+MRAA_INSTALL_DIR="/path/to/mraa/install"
+
+cmake -DBUILDSWIG=ON \
+      -DBUILDSWIGPYTHON=OFF \
+      -DBUILDSWIGNODE=OFF \
+      -DBUILDSWIGJAVA=ON \
+      -DANDROID_COMPILER_FLAGS_CXX='-std=c++11' \
+      -DANDROID_PIE=1 \
+      -DANDROID_PLATFORM=android-24 \
+      -DANDROID_STL_FORCE_FEATURES=ON \
+      -DANDROID_STL=c++_shared \
+      -DANDROID_TOOLCHAIN_NAME=x86-i686 \
+      -DCMAKE_TOOLCHAIN_FILE=$NDK_HOME/build/cmake/android.toolchain.cmake \
+      -DCMAKE_FIND_ROOT_PATH=$MRAA_INSTALL_DIR \
+      ..
+~~~~~~~~~~~~~
+
 ## Building with Docker
 
 You can use `docker` and `docker-compose` to generate a complete build environment
@@ -192,7 +220,7 @@ $ docker run \
       --env BUILDSWIGPYTHON=ON \
       --env BUILDSWIGJAVA=OFF \
       --env BUILDSWIGNODE=OFF \
-      dnoliver/upm-python \
+      inteliotdevkit/upm-python \
       bash -c "./scripts/run-cmake.sh && make -Cbuild"
 ```
 
@@ -226,6 +254,6 @@ $ docker run \
     --env http_proxy=$http_proxy \
     --env https_proxy=$https_proxy \
     --env no_proxy=$no_proxy \
-    dnoliver/upm-python \
+    inteliotdevkit/upm-python \
     bash -c "./scripts/run-cmake.sh && make -Cbuild"
 ```

docs/changelog.md

@@ -4,6 +4,16 @@ Changelog                         {#changelog}
 Here's a list summarizing some of the key undergoing changes to our library
 from earlier versions:
 
+### v1.6.0
+
+ * Extended LED library to support the new MRAA gpio-leds APIs
+ * Many CMake changes around SWIG wrapper generation and improved FindNodejs
+ detection module
+ * Several code fixes based on static code analysis
+ * Improved documentation generation and Travis CI builds
+ * Cleaned-up doxygen tags in headers and class names in JSON library files
+ * New sensor: lis3dh
+
 ### v1.5.0
 
  * Introduced a flexible JSON format for technical sensor specifications, notes

docs/contributions.md

@@ -125,6 +125,8 @@ function make_new_sensor {
     # Search/replace the new files, replacing all instances of sensortemplate
     perl -p -i -e "s/SensorTemplate/${SensorName}/g" src/${sensorname}/* examples/*/*${sensorname}* examples/*/*${SensorName}*
     perl -p -i -e "s/sensortemplate/${sensorname}/g" src/${sensorname}/* examples/*/*${sensorname}* examples/*/*${SensorName}*
+    # Remove objects starting with "//" from the new library descriptor .json file
+    perl -p -i -e 'BEGIN{undef $/;} s/\s+"\/\/.*?},//smg' src/${sensorname}/${sensorname}.json
     # Add mynewmodule example target for java
     perl -p -i -e "s/^((.*)SensorTemplateSample sensortemplate(.*))/\1\n\2${SensorName}Sample ${sensorname}\3/g" examples/java/CMakeLists.txt
     # Add mynewmodule example mappings for doxygen

docs/creating_java_bindings.md

@@ -257,30 +257,19 @@ __Callbacks in the UPM Java library are implemented as follows (we use the a110x
 
 We extend the sensor class with another method, _installISR\(jobject runnable\)_, which is a wrapper over the original _installISR\(void \(\*isr\)\(void \*\), void \*arg\)_ method. This will install the _mraa\_java\_isr\_callback\(\)_ method as the interrupt service routine \(ISR\) to be called, with _jobject runnable_ as argument.
 
-SWIGJAVA is a symbol that is always defined by SWIG when using Java. We enclose the _installISR\(jobject runnable\)_ method in a _\#if defined(SWIGJAVA)_ check, to ensure the code only exists when creating a wrapper for Java.
+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/a110x.i:
 ```c++
-#if defined(SWIGJAVA)
-void A110X::installISR(jobject runnable)
-{
-    installISR(mraa_java_isr_callback, runnable);
-}
-#endif
+JAVA_ADD_INSTALLISR(upm::A110X)
 ```
 
-We hide the underlying method, _installISR\(void \(\*isr\)\(void \*\), void \*arg\)_ , and expose only the _installISR\(jobject runnable\)_ to SWIG, through the use of the SWIGJAVA symbol. When SWIGJAVA is defined, we change the access modifier of the underlying method to private.
+Will expand to the following SWIG wrapper code:
 
 ```c++
-public:
-#if defined(SWIGJAVA)
-    void installISR(jobject runnable);
-#else
-    void installISR(void (*isr)(void *), void *arg);
-#endif
-private:
-#if defined(SWIGJAVA)
-    void installISR(void (*isr)(void *), void *arg);
-#endif
+SWIGINTERN void upm_A110X_installISR__SWIG_1(upm::A110X *self,jobject runnable){
+self->installISR(mraa_java_isr_callback, runnable);
+}
 ```
 
 To use callback in java, we create a ISR class, which implements the Java Runnable interface, and we override the _run\(\)_ method with the code to be executed when the interrupt is received. An example for the a110x Hall sensor that increments a counter each time an interrupt is received:
@@ -311,39 +300,3 @@ class A110XISR implements Runnable {
     }
 }
 ```
-#### Issues with java callbacks and workarounds
-
-__SWIGJAVA not defined at compile time__
-
-Consider the following files:
-* example.h - Header file for our source file
-* example.cxx - Source file containing the class Example, for which we build java bindings
-* example.i - The SWIG interface, that includes the example.h header file
-
-The build process of a java module using SWIG is split into two steps:
-
-1. Generating the intermediate files, from the SWIG interface file. This will produce the java class file (Example.java), the JNI file (exampleJNI.java) and wrapper file (example_wrap.cxx). The source file (example.cxx) is not needed in the first step.
-  ```
-  swig -c++ -java example.i
-  ```
-
-2. Generating the shared library from the C++ sources and wrapper file
-  ```
-  g++ -fPIC -c example.cxx example_wrap.cxx -I/usr/lib/jvm/java-1.8.0/include -I/usr/lib/jvm/java-1.8.0/include/linux
-  g++ -shared example_wrap.o sensor.o -o libexample.so
-  ```
-
-SWIGJAVA is always defined when SWIG parses the interface file, meaning it will be defined when it parses the header file (example.h) that is included in the interface file (example.i).
-SWIG also adds the "#define SWIGJAVA" directive in the wrapper file (example_wrap.cxx).
-However, in generating the shared library the SWIGJAVA symbol is only defined in the example_wrap.cxx file, because of the added "#define SWIGJAVA" directive. But we have also used the "#if defined(SWIGJAVA)" check in the source file (example.cxx), and thus need to define SWIGJAVA for it too. If we define the SWIGJAVA symbol as a compile flag, when compiling the source code to object code, the SWIGJAVA compile flag and #define SWIGJAVA" directive will clash and give a double definition warning (only a warning).
-
-In this example it is simple to compile the two source codes separately, one with the compile flag, the other without, and then create the shared library (libexample.so).
-But in a big automatic build like the java upm libraries, this may prove too hard or too complicated to do. A workaround to this would be to define a custom symbol (e.q. JAVACALLBACK in the upm library) and also test for it. In short, replace:
-```c++
-#if defined(SWIGJAVA)
-```
-by
-```c++
-#if defined(SWIGJAVA) || defined(JAVACALLBACK)
-```
-

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.

doxy/Doxyfile.in

@@ -702,7 +702,7 @@ CITE_BIB_FILES         =
 # messages are off.
 # The default value is: NO.
 
-QUIET                  = NO
+QUIET                  = YES
 
 # The WARNINGS tag can be used to turn on/off the warning messages that are
 # generated to standard error ( stderr) by doxygen. If WARNINGS is set to YES

doxy/Doxyfile.java.in

@@ -702,7 +702,7 @@ CITE_BIB_FILES         =
 # messages are off.
 # The default value is: NO.
 
-QUIET                  = NO
+QUIET                  = YES
 
 # The WARNINGS tag can be used to turn on/off the warning messages that are
 # generated to standard error ( stderr) by doxygen. If WARNINGS is set to YES

doxy/samples.mapping.txt

@@ -1,79 +1,79 @@
 # Mapping examples across provided languages
-a110x.cxx	A110XSample.java	a110x.js	a110x.py
-a110x-intr.cxx	A110X_intrSample.java	a110x-intr.js	a110x-intr.py
-adc121c021.cxx	ADC121C021Sample.java	adc121c021.js	adc121c021.py
-adxl345.cxx	Adxl345Sample.java	adxl345.js	adxl345.py
-biss0001.cxx	BISS0001Sample.java	biss0001.js	biss0001.py
-bmpx8x.cxx	BMPX8XSample.java	bmpx8x.js	bmpx8x.py
+a110x.cxx A110X_Example.java a110x.js a110x.py
+a110x-intr.cxx A110X_intr_Example.java a110x-intr.js a110x-intr.py
+adc121c021.cxx ADC121C021_Example.java adc121c021.js adc121c021.py
+adxl345.cxx Adxl345_Example.java adxl345.js adxl345.py
+biss0001.cxx BISS0001_Example.java biss0001.js biss0001.py
+bmpx8x.cxx BMPX8X_Example.java bmpx8x.js bmpx8x.py
 bno055.cxx BNO055_Example.java bno055.js bno055.py
-button.cxx	ButtonSample.java	button.js	button.py
-buzzer.cxx	BuzzerSample.java	buzzer.js	buzzer.py
-cjq4435.cxx	CJQ4435Sample.java	cjq4435.js	cjq4435.py
-ds1307.cxx	DS1307Sample.java	ds1307.js	ds1307.py
-enc03r.cxx	ENC03RSample.java	enc03r.js	enc03r.py
-servo-es08a.cxx	ES08ASample.java	es08a.js	es08a.py
-groveehr.cxx	GroveEHRSample.java	groveehr.js	groveehr.py
-my9221-groveledbar.cxx	GroveLEDBar.java	groveledbar.js	groveledbar.py
-grove-groveled.cxx	GroveLEDSample.java	groveled.js	groveled.py
-grovelinefinder.cxx	GroveLineFinderSample.java	grovelinefinder.js	grovelinefinder.py
-grovemoisture.cxx	GroveMoistureSample.java	grovemoisture.js	grovemoisture.py
-grovescam.cxx	GROVESCAMSample.java	grovescam.js	grovescam.py
-grovewfs.cxx	GroveWFSSample.java	grovewfs.js	grovewfs.py
-guvas12d.cxx	GUVAS12DSample.java	guvas12d.js	guvas12d.py
-h3lis331dl.cxx	H3LIS331DLSample.java	h3lis331dl.js	h3lis331dl.py
-hcsr04.cxx	HCSR04Sample.java	hcsr04.js	hcsr04.py
-hm11.cxx	HM11Sample.java	hm11.js	hm11.py
-hmc5883l.cxx	Hmc5883lSample.java	hmc5883l.js	hmc5883l.py
-htu21d.cxx	HTU21DSample.java	htu21d.js	htu21d.py
+button.cxx Button_Example.java button.js button.py
+buzzer.cxx Buzzer_Example.java buzzer.js buzzer.py
+cjq4435.cxx CJQ4435_Example.java cjq4435.js cjq4435.py
+ds1307.cxx DS1307_Example.java ds1307.js ds1307.py
+enc03r.cxx ENC03R_Example.java enc03r.js enc03r.py
+servo-es08a.cxx ES08A_Example.java es08a.js es08a.py
+groveehr.cxx GroveEHR_Example.java groveehr.js groveehr.py
+my9221-groveledbar.cxx GroveLEDBar_Example.java groveledbar.js groveledbar.py
+grove-groveled.cxx GroveLED_Example.java groveled.js groveled.py
+grovelinefinder.cxx GroveLineFinder_Example.java grovelinefinder.js grovelinefinder.py
+grovemoisture.cxx GroveMoisture_Example.java grovemoisture.js grovemoisture.py
+grovescam.cxx GROVESCAM_Example.java grovescam.js grovescam.py
+grovewfs.cxx GroveWFS_Example.java grovewfs.js grovewfs.py
+guvas12d.cxx GUVAS12D_Example.java guvas12d.js guvas12d.py
+h3lis331dl.cxx H3LIS331DL_Example.java h3lis331dl.js h3lis331dl.py
+hcsr04.cxx HCSR04_Example.java hcsr04.js hcsr04.py
+hm11.cxx HM11_Example.java hm11.js hm11.py
+hmc5883l.cxx Hmc5883l_Example.java hmc5883l.js hmc5883l.py
+htu21d.cxx HTU21D_Example.java htu21d.js htu21d.py
 ims.cxx IMS_Example.java ims.js ims.py
-itg3200.cxx	Itg3200Sample.java	itg3200.js	itg3200.py
-jhd1313m1-lcd.cxx	Jhd1313m1_lcdSample.java	jhd1313m1-lcd.js	jhd1313m1-lcd.py
-joystick12.cxx	Joystick12Sample.java	joystick12.js	joystick12.py
-lcm1602-i2c.cxx	Lcm1602_i2cSample.java	lcm1602-i2c.js	lcm1602-i2c.py
-ldt0028.cxx	LDT0028Sample.java	ldt0028.js	ldt0028.py
-light.cxx	LightSample.java	light.js	light.py
-lol.cxx	LoLSample.java	lol.js	lol.py
-lsm303dlh.cxx	LSM303DLHSample.java	lsm303dlh.js	lsm303dlh.py
-m24lr64e.cxx	M24LR64ESample.java	m24lr64e.js	m24lr64e.py
-max44000.cxx	MAX44000Sample.java	max44000.js	max44000.py
-mic.cxx	MicrophoneSample.java	mic.js	mic.py
-mma7455.cxx	MMA7455Sample.java	mma7455.js	mma7455.py
-mma7660.cxx	MMA7660Sample.java	mma7660.js	mma7660.py
-mpl3115a2.cxx	MPL3115A2Sample.java	mpl3115a2.js	mpl3115a2.py
-mpr121.cxx	MPR121Sample.java	mpr121.js	mpr121.py
-mpu9150.cxx	MPU9150Sample.java	mpu9150.js	mpu9150.py
-gas-mq2.cxx	MQ2Sample.java	mq2.js	mq2.py
-mq303a.cxx	MQ303ASample.java	mq303a.js	mq303a.py
-gas-mq5.cxx	MQ5Sample.java	mq5.js	mq5.py
-nrf24l01-receiver.cxx	NRF24L01_receiverSample.java	nrf24l01-receiver.js	nrf24l01-receiver.py
-nrf24l01-transmitter.cxx	NRF24L01_transmitterSample.java	nrf24l01-transmitter.js	nrf24l01-transmitter.py
-nunchuck.cxx	NUNCHUCKSample.java	nunchuck.js	nunchuck.py
-otp538u.cxx	OTP538USample.java	otp538u.js	otp538u.py
-ppd42ns.cxx	PPD42NSSample.java	ppd42ns.js	ppd42ns.py
-pulsensor.cxx	PulsensorSample.java	pulsensor.js	pulsensor.py
-relay.cxx	RelaySample.java	relay.js	relay.py
-rfr359f.cxx	RFR359FSample.java	rfr359f.js	rfr359f.py
-rotary.cxx	RotarySample.java	rotary.js	rotary.py
-rotaryencoder.cxx	RotaryEncoderSample.java	rotaryencoder.js	rotaryencoder.py
-rpr220.cxx	RPR220Sample.java	rpr220.js	rpr220.py
-rpr220-intr.cxx	RPR220_intrSample.java	rpr220-intr.js	rpr220-intr.py
-slide.cxx	SlideSample.java	slide.js	slide.py
-speaker.cxx	SpeakerSample.java	speaker.js	speaker.py
-i2clcd-ssd1308-oled.cxx	SSD1308_oledSample.java	ssd1308-oled.js	ssd1308-oled.py
-i2clcd-ssd1327-oled.cxx	SSD1327_oledSample.java	ssd1327-oled.js	ssd1327-oled.py
-st7735.cxx	ST7735Sample.java	st7735.js	st7735.py
-stepmotor.cxx	StepMotorSample.java	stepmotor.js	stepmotor.py
-tm1637.cxx	TM1637Sample.java	tm1637.js	tm1637.py
-gas-tp401.cxx	TP401Sample.java	tp401.js	tp401.py
-tsl2561.cxx	TSL2561Sample.java	tsl2561.js	tsl2561.py
-ttp223.cxx	TTP223Sample.java	ttp223.js	ttp223.py
-uln200xa.cxx	ULN200XASample.java	uln200xa.js	uln200xa.py
-vdiv.cxx	VDivSample.java	vdiv.js	vdiv.py
-water.cxx	WaterSample.java	water.js	water.py
-wt5001.cxx	WT5001Sample.java	wt5001.js	wt5001.py
-yg1006.cxx	YG1006Sample.java	yg1006.js	yg1006.py
-sensortemplate.cxx	SensorTemplateSample.java	sensortemplate.js	sensortemplate.py
-p9813.cxx	P9813Sample.java	p9813.js	p9813.py
+itg3200.cxx Itg3200_Example.java itg3200.js itg3200.py
+jhd1313m1-lcd.cxx Jhd1313m1_lcd_Example.java jhd1313m1-lcd.js jhd1313m1-lcd.py
+joystick12.cxx Joystick12_Example.java joystick12.js joystick12.py
+lcm1602-i2c.cxx Lcm1602_i2c_Example.java lcm1602-i2c.js lcm1602-i2c.py
+ldt0028.cxx LDT0028_Example.java ldt0028.js ldt0028.py
+light.cxx Light_Example.java light.js light.py
+lol.cxx LoL_Example.java lol.js lol.py
+lsm303dlh.cxx LSM303DLH_Example.java lsm303dlh.js lsm303dlh.py
+m24lr64e.cxx M24LR64E_Example.java m24lr64e.js m24lr64e.py
+max44000.cxx MAX44000_Example.java max44000.js max44000.py
+mic.cxx Microphone_Example.java mic.js mic.py
+mma7455.cxx MMA7455_Example.java mma7455.js mma7455.py
+mma7660.cxx MMA7660_Example.java mma7660.js mma7660.py
+mpl3115a2.cxx MPL3115A2_Example.java mpl3115a2.js mpl3115a2.py
+mpr121.cxx MPR121_Example.java mpr121.js mpr121.py
+mpu9150.cxx MPU9150_Example.java mpu9150.js mpu9150.py
+gas-mq2.cxx MQ2_Example.java mq2.js mq2.py
+mq303a.cxx MQ303A_Example.java mq303a.js mq303a.py
+gas-mq5.cxx MQ5_Example.java mq5.js mq5.py
+nrf24l01-receiver.cxx NRF24L01_receiver_Example.java nrf24l01-receiver.js nrf24l01-receiver.py
+nrf24l01-transmitter.cxx NRF24L01_transmitter_Example.java nrf24l01-transmitter.js nrf24l01-transmitter.py
+nunchuck.cxx NUNCHUCK_Example.java nunchuck.js nunchuck.py
+otp538u.cxx OTP538U_Example.java otp538u.js otp538u.py
+ppd42ns.cxx PPD42NS_Example.java ppd42ns.js ppd42ns.py
+pulsensor.cxx Pulsensor_Example.java pulsensor.js pulsensor.py
+relay.cxx Relay_Example.java relay.js relay.py
+rfr359f.cxx RFR359F_Example.java rfr359f.js rfr359f.py
+rotary.cxx Rotary_Example.java rotary.js rotary.py
+rotaryencoder.cxx RotaryEncoder_Example.java rotaryencoder.js rotaryencoder.py
+rpr220.cxx RPR220_Example.java rpr220.js rpr220.py
+rpr220-intr.cxx RPR220_intr_Example.java rpr220-intr.js rpr220-intr.py
+slide.cxx Slide_Example.java slide.js slide.py
+speaker.cxx Speaker_Example.java speaker.js speaker.py
+lcd-ssd1308-oled.cxx SSD1308_oled_Example.java ssd1308-oled.js ssd1308-oled.py
+lcd-ssd1327-oled.cxx SSD1327_oled_Example.java ssd1327-oled.js ssd1327-oled.py
+st7735.cxx ST7735_Example.java st7735.js st7735.py
+stepmotor.cxx StepMotor_Example.java stepmotor.js stepmotor.py
+tm1637.cxx TM1637_Example.java tm1637.js tm1637.py
+gas-tp401.cxx TP401_Example.java tp401.js tp401.py
+tsl2561.cxx TSL2561_Example.java tsl2561.js tsl2561.py
+ttp223.cxx TTP223_Example.java ttp223.js ttp223.py
+uln200xa.cxx ULN200XA_Example.java uln200xa.js uln200xa.py
+vdiv.cxx VDiv_Example.java vdiv.js vdiv.py
+water.cxx Water_Example.java water.js water.py
+wt5001.cxx WT5001_Example.java wt5001.js wt5001.py
+yg1006.cxx YG1006_Example.java yg1006.js yg1006.py
+sensortemplate.cxx SensorTemplate_Example.java sensortemplate.js sensortemplate.py
+p9813.cxx P9813_Example.java p9813.js p9813.py
 tcs37727.cxx tcs37727.py
 tmp006.cxx tmp006.py
 mma8x5x.cxx mma8x5x.py

examples/CMakeLists.txt

@@ -41,7 +41,7 @@
 #       a110x.c             Requires libupmc-a110x
 #       lcm1602-i2c.c       Requires libupmc-lcm1602
 #       bmp280-bme280.c     Requires libupmc-bmp280
-#       i2clcd-eboled.cxx   Requires libupm-i2clcd
+#       lcd-eboled.cxx   Requires libupm-lcd
 #
 #
 function (add_example example_src)
@@ -117,4 +117,16 @@ if(BUILDEXAMPLES)
     if(BUILDSWIGJAVA)
         add_subdirectory (java)
     endif()
+
+    # Add all examples as an install component (if building examples)
+    install (DIRECTORY ${PROJECT_SOURCE_DIR}/examples
+        DESTINATION ${CMAKE_INSTALL_DATADIR}/upm
+        COMPONENT ${CMAKE_PROJECT_NAME}-examples
+        FILES_MATCHING
+            PATTERN "*.c"
+            PATTERN "*.cxx"
+            PATTERN "*.hpp"
+            PATTERN "*.java"
+            PATTERN "*.js"
+            PATTERN "*.py")
 endif()

examples/c++/CMakeLists.txt

@@ -4,15 +4,15 @@ file (GLOB example_src_list RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cxx")
 # - Handle special cases here --------------------------------------------------
 
 # Test humidity interface for 2 sensor libraries
-add_example(interfaces-humiditysensor.cxx TARGETS si7005 bmp280)
+add_example(core-humiditysensor.cxx TARGETS si7005 bmp280)
 # Test pressure interface for 2 sensor libraries
-add_example(interfaces-pressuresensor.cxx TARGETS bmp280 bmpx8x)
+add_example(core-pressuresensor.cxx TARGETS bmp280 bmpx8x)
 # Test temperature interface for 3 sensor libraries
-add_example(interfaces-temperaturesensor.cxx TARGETS bmp280 bmpx8x si7005)
+add_example(core-temperaturesensor.cxx TARGETS bmp280 bmpx8x si7005)
 # Test light interface for 2 sensor libraries
-add_example(interfaces-lightsensor.cxx TARGETS si1132 max44009)
+add_example(core-lightsensor.cxx TARGETS si1132 max44009)
 # Test light controller interface for 3 sensor libraries
-add_example(interfaces-lightcontroller.cxx TARGETS lp8860 ds1808lc hlg150h)
+add_example(core-lightcontroller.cxx TARGETS lp8860 ds1808lc hlg150h)
 
 # - Create an executable for all other src files in this directory -------------
 foreach (_example_src ${example_src_list})

examples/c++/ads1x15-adc-sensor.cxx

@@ -43,14 +43,14 @@ main()
     mraa::Gpio gpio(EDISON_GPIO_SI7005_CS);
     gpio.dir(mraa::DIR_OUT_HIGH);
 
-    /* Show usage from the IADC interface */
-    upm::IADC* adc = static_cast<upm::IADC*>(&sensor);
+    /* Show usage from the iADC interface */
+    upm::iADC* adc = static_cast<upm::iADC*>(&sensor);
 
     if (adc == NULL) {
         std::cout << "ADC not detected" << std::endl;
         return 1;
     }
-    std::cout << "ADC " << adc->getModuleName() << " detected. ";
+    std::cout << "ADC " << adc->Name() << " detected. ";
     std::cout << adc->getNumInputs() << " inputs available" << std::endl;
     while (true) {
         for (unsigned int i = 0; i < adc->getNumInputs(); ++i) {

examples/c++/core-humiditysensor.cxx

@@ -38,14 +38,14 @@
 #define EDISON_GPIO_SI7005_CS 20
 
 //! [Interesting]
-// Simple example of using ILightSensor to determine
+// Simple example of using iHumiditySensor to determine
 // which sensor is present and return its name.
-// ILightSensor is then used to get readings from sensor
+// iHumiditySensor is then used to get readings from sensor
 
-upm::IHumiditySensor*
+upm::iHumiditySensor*
 getHumiditySensor()
 {
-    upm::IHumiditySensor* humiditySensor = NULL;
+    upm::iHumiditySensor* humiditySensor = NULL;
 
     try {
         humiditySensor = new upm::BME280(mraa_get_sub_platform_id(FT4222_I2C_BUS));
@@ -66,22 +66,26 @@ getHumiditySensor()
 int
 main()
 {
-    upm::IHumiditySensor* humiditySensor = getHumiditySensor();
-    if (humiditySensor == NULL) {
+    upm::iHumiditySensor* sensor = getHumiditySensor();
+
+    if (sensor == NULL) {
         std::cout << "Humidity sensor not detected" << std::endl;
         return 1;
     }
-    std::cout << "Humidity sensor " << humiditySensor->getModuleName() << " detected" << std::endl;
-    while (true) {
+
+    std::cout << "Humidity sensor " << sensor->Name() << " detected" << std::endl;
+
     try {
-            int value = humiditySensor->getHumidityRelative();
-            std::cout << "Humidity = " << value << "%" << std::endl;
+        std::map<std::string, float> values = sensor->HumidityAll();
+        for (std::map<std::string, float>::const_iterator it = values.begin();
+                it != values.end(); ++it)
+            std::cout << it->first << " = " << it->second
+                << sensor->Unit(it->first) << std::endl;
     } catch (std::exception& e) {
         std::cerr << e.what() << std::endl;
     }
-        upm_delay(1);
-    }
-    delete humiditySensor;
+
+    delete sensor;
     return 0;
 }
 

examples/c++/core-lightcontroller.cxx

@@ -66,7 +66,7 @@ main(int argc, char** argv)
 
     upm::ILightController* lightController = getLightController();
     if (lightController != NULL) {
-        std::cout << "Detected light controller " << lightController->getModuleName() << std::endl;
+        //std::cout << "Detected light controller " << lightController->getModuleName() << std::endl;
     } else {
         std::cerr << "Error. Unsupported platform." << std::endl;
         return 1;

examples/c++/core-lightsensor.cxx

@@ -36,14 +36,14 @@
 #define FT4222_I2C_BUS 0
 
 //! [Interesting]
-// Simple example of using ILightSensor to determine
+// Simple example of using iLightSensor to determine
 // which sensor is present and return its name.
-// ILightSensor is then used to get readings from sensor
+// iLightSensor is then used to get readings from sensor
 
-upm::ILightSensor*
+upm::iLightSensor*
 getLightSensor()
 {
-    upm::ILightSensor* lightSensor = NULL;
+    upm::iLightSensor* lightSensor = NULL;
     try {
         lightSensor = new upm::SI1132(mraa_get_sub_platform_id(FT4222_I2C_BUS));
         return lightSensor;
@@ -62,22 +62,26 @@ getLightSensor()
 int
 main()
 {
-    upm::ILightSensor* lightSensor = getLightSensor();
-    if (lightSensor == NULL) {
+    upm::iLightSensor* sensor = getLightSensor();
+
+    if (sensor == NULL) {
         std::cout << "Light sensor not detected" << std::endl;
         return 1;
     }
-    std::cout << "Light sensor " << lightSensor->getModuleName() << " detected" << std::endl;
-    while (true) {
+
+    std::cout << "Light sensor " << sensor->Name() << " detected" << std::endl;
+
     try {
-            float value = lightSensor->getVisibleLux();
-            std::cout << "Light level = " << value << " lux" << std::endl;
+        std::map<std::string, float> values = sensor->LightAll();
+        for (std::map<std::string, float>::const_iterator it = values.begin();
+                it != values.end(); ++it)
+            std::cout << it->first << " = " << it->second
+                << sensor->Unit(it->first) << std::endl;
     } catch (std::exception& e) {
         std::cerr << e.what() << std::endl;
     }
-        upm_delay(1);
-    }
-    delete lightSensor;
+
+    delete sensor;
     return 0;
 }
 

examples/c++/core-pressuresensor.cxx

@@ -36,14 +36,14 @@
 #define FT4222_I2C_BUS 0
 
 //! [Interesting]
-// Simple example of using ILightSensor to determine
+// Simple example of using iPressureSensor to determine
 // which sensor is present and return its name.
-// ILightSensor is then used to get readings from sensor
+// iPressureSensor is then used to get readings from sensor
 
-upm::IPressureSensor*
+upm::iPressureSensor*
 getPressureSensor()
 {
-    upm::IPressureSensor* pressureSensor = NULL;
+    upm::iPressureSensor* pressureSensor = NULL;
     try {
         pressureSensor = new upm::BME280(mraa_get_sub_platform_id(FT4222_I2C_BUS));
         return pressureSensor;
@@ -63,22 +63,26 @@ getPressureSensor()
 int
 main()
 {
-    upm::IPressureSensor* pressureSensor = getPressureSensor();
-    if (pressureSensor == NULL) {
+    upm::iPressureSensor* sensor = getPressureSensor();
+
+    if (sensor == NULL) {
         std::cout << "Pressure sensor not detected" << std::endl;
         return 1;
     }
-    std::cout << "Pressure sensor " << pressureSensor->getModuleName() << " detected" << std::endl;
-    while (true) {
+
+    std::cout << "Pressure sensor " << sensor->Name() << " detected" << std::endl;
+
     try {
-            int value = pressureSensor->getPressurePa();
-            std::cout << "Pressure = " << value << " Pa" << std::endl;
+        std::map<std::string, float> values = sensor->PressureAll();
+        for (std::map<std::string, float>::const_iterator it = values.begin();
+                it != values.end(); ++it)
+            std::cout << it->first << " = " << it->second
+                << sensor->Unit(it->first) << std::endl;
     } catch (std::exception& e) {
         std::cerr << e.what() << std::endl;
     }
-        upm_delay(1);
-    }
-    delete pressureSensor;
+
+    delete sensor;
     return 0;
 }
 

examples/c++/core-temperaturesensor.cxx

@@ -39,14 +39,14 @@
 #define EDISON_GPIO_SI7005_CS 20
 
 //! [Interesting]
-// Simple example of using ITemperatureSensor to determine
+// Simple example of using iTemperatureSensor to determine
 // which sensor is present and return its name.
-// ITemperatureSensor is then used to get readings from sensor
+// iTemperatureSensor is then used to get readings from sensor
 
-upm::ITemperatureSensor*
+upm::iTemperatureSensor*
 getTemperatureSensor()
 {
-    upm::ITemperatureSensor* temperatureSensor = NULL;
+    upm::iTemperatureSensor* temperatureSensor = NULL;
 
     try {
         temperatureSensor = new upm::BME280(mraa_get_sub_platform_id(FT4222_I2C_BUS));
@@ -73,23 +73,26 @@ getTemperatureSensor()
 int
 main()
 {
-    upm::ITemperatureSensor* temperatureSensor = getTemperatureSensor();
-    if (temperatureSensor == NULL) {
+    upm::iTemperatureSensor* sensor = getTemperatureSensor();
+
+    if (sensor == NULL) {
         std::cout << "Temperature sensor not detected" << std::endl;
         return 1;
     }
-    std::cout << "Temperature sensor " << temperatureSensor->getModuleName() << " detected"
-              << std::endl;
-    while (true) {
+
+    std::cout << "Temperature sensor " << sensor->Name() << " detected" << std::endl;
+
     try {
-            int value = temperatureSensor->getTemperatureCelsius();
-            std::cout << "Temperature = " << value << "C" << std::endl;
+        std::map<std::string, float> values = sensor->TemperatureAll();
+        for (std::map<std::string, float>::const_iterator it = values.begin();
+                it != values.end(); ++it)
+            std::cout << it->first << " = " << it->second
+                << sensor->Unit(it->first) << std::endl;
     } catch (std::exception& e) {
         std::cerr << e.what() << std::endl;
     }
-        upm_delay(1);
-    }
-    delete temperatureSensor;
+
+    delete sensor;
     return 0;
 }
 

examples/c++/ims.cxx

@@ -47,7 +47,7 @@ main(int argc, char** argv)
     //! [Interesting]
 
     // Instantiate a IMS instance using i2c bus 0 and default address
-    upm::IMS sensor(0);
+    upm::IMS sensor("i:0:0x20");
 
     int i2c_addr_cur = IMS_ADDRESS_DEFAULT + 1;
     while (shouldRun) {

examples/c++/kx122.cxx

@@ -0,0 +1,65 @@
+/*
+* The MIT License (MIT)
+*
+* Author: Samuli Rissanen <samuli.rissanen@hotmail.com>
+* Copyright (c) 2018 Rohm Semiconductor.
+*
+* Permission is hereby granted, free of charge, to any person obtaining a copy of
+* this software and associated documentation files (the "Software"), to deal in
+* the Software without restriction, including without limitation the rights to
+* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+* the Software, and to permit persons to whom the Software is furnished to do so,
+* subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in all
+* copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <iostream>
+
+#include <signal.h>
+#include <unistd.h>
+
+#include "kx122.hpp"
+#include "upm_utilities.h"
+
+bool shouldRun = true;
+
+void sig_handler(int signo)
+{
+  if (signo == SIGINT){
+    shouldRun = false;
+  }
+}
+
+int main(int argc, char **argv)
+{
+  signal(SIGINT,sig_handler);
+
+  //! [Interesting]
+  upm::KX122 sensor(0,-1,24);
+
+  sensor.softwareReset();
+  sensor.deviceInit(KX122_ODR_50,HIGH_RES,KX122_RANGE_2G);
+
+  float x,y,z;
+  int wait_time = sensor.getSamplePeriod() * MICRO_S;
+  if (wait_time < 0) wait_time = 1000;
+
+  while(shouldRun){
+    sensor.getAccelerationData(&x,&y,&z);
+
+    printf("%.02f | %.02f | %.02f\n",x,y,z);
+    upm_delay_us(wait_time);
+  }
+  //! [Interesting]
+
+  return 0;
+}

examples/c++/lis3dh.cxx

@@ -0,0 +1,81 @@
+/*
+ * Author: Alex Tereschenko <alext.mkrs@gmail.com>
+ * Copyright (c) 2018 Alex Tereschenko.
+ *
+ * Based on LIS2DS12 example by
+ * Author: Jon Trulson <jtrulson@ics.com>
+ * Copyright (c) 2017 Intel Corporation.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <iostream>
+#include <signal.h>
+
+#include "lis3dh.hpp"
+#include "upm_utilities.h"
+
+using namespace std;
+
+int shouldRun = true;
+
+void
+sig_handler(int signo)
+{
+    if (signo == SIGINT)
+        shouldRun = false;
+}
+
+int
+main(int argc, char** argv)
+{
+    signal(SIGINT, sig_handler);
+    //! [Interesting]
+
+    // Instantiate an LIS3DH using default I2C parameters
+    upm::LIS3DH sensor;
+
+    // For SPI, bus 0, you would pass -1 as the address, and a valid pin
+    // for CS: LIS3DH(0, -1, 10);
+
+    // now output data every 250 milliseconds
+    while (shouldRun) {
+        float x, y, z;
+
+        sensor.update();
+
+        sensor.getAccelerometer(&x, &y, &z);
+        cout << "Accelerometer x: " << x << " y: " << y << " z: " << z << " g" << endl;
+
+        // we show both C and F for temperature
+        cout << "Compensation Temperature: " << sensor.getTemperature() << " C / "
+             << sensor.getTemperature(true) << " F" << endl;
+
+        cout << endl;
+
+        upm_delay_us(250000);
+    }
+
+    //! [Interesting]
+
+    cout << "Exiting..." << endl;
+
+    return 0;
+}

examples/c++/noelstemplightreader.cxx

@@ -0,0 +1,49 @@
+#include <iostream>
+#include <unistd.h>
+
+#include "core/iUpmObject.hpp"
+#include "noelstemplightreader.hpp"
+
+void printMap(upm::NoelsTempLightReader &sensor, std::map<std::string, float> &data)
+{
+    if (data.empty())
+        std::cout << "Empty map" << std::endl;
+    for (std::map<std::string, float>::const_iterator it = data.begin();
+            it != data.end(); ++it)
+    {
+        std::cout << "label: " << it->first << ", value: " << it->second
+            << ", unit: " << sensor.Unit(it->first) << std::endl;
+    }
+    std::cout << std::endl;
+}
+
+int main ()
+{
+    upm::NoelsTempLightReader sensor;
+    std::cout << "iUpmObject JsonDefinition..." << std::endl << ((upm::iUpmObject&)sensor).JsonDefinition() << std::endl << std::endl;
+    std::cout << "iSensorType JsonDefinition..." << std::endl << ((upm::iSensorType&)sensor).JsonDefinition() << std::endl << std::endl;
+    std::cout << "iMraa JsonDefinition..." << std::endl << ((upm::iMraa&)sensor).JsonDefinition() << std::endl << std::endl;
+    std::cout << "NoelsTempLightReader JsonDefinition..." << std::endl << sensor.JsonDefinition() << std::endl << std::endl;
+
+    std::cout << "Read all light values..." << std::endl;
+    std::map<std::string, float> values = sensor.LightAll();
+    printMap(sensor, values);
+
+    std::cout << "Read a single light value for light0..." << std::endl;
+    std::cout << "Single value = " << sensor.LightForSource("light0") << std::endl << std::endl;
+
+    try
+    {
+        std::cout << "Read a single light value for lightX (doesn't exist)..." << std::endl;
+        sensor.LightForSource("lightX");
+    }
+    catch (const std::exception& e) { std::cout << e.what() << std::endl << std::endl;}
+
+    std::cout << "Read a light value for lightX (doesn't exist)..." << std::endl;
+    values = sensor.LightForSources(std::vector<std::string>({"lightX"}));
+    printMap(sensor, values);
+
+    std::cout << "Read all values as JsonDefinition..." << std::endl << sensor.JsonValues() << std::endl;
+
+    return 0;
+}

examples/c++/nrf24l01-receiver.cxx

@@ -46,22 +46,33 @@ sig_handler(int signo)
 }
 
 //! [Interesting]
-void
-nrf_handler()
+class mycb : public virtual Callback
 {
-    std::cout << "Reciever :: " << *((uint32_t*) &(comm.m_rxBuffer[0])) << std::endl;
+    public:
+        mycb(upm::NRF24L01 *com) : _com(com) {}
+        virtual void run()
+        {
+            if (_com != NULL)
+                std::cout << "Reciever :: " << *((uint32_t*) &(_com->m_rxBuffer[0])) << std::endl;
+            else
+                std::cout << "Example callback!" << std::endl;
         }
+    private:
+        upm::NRF24L01* _com;
+};
 
 int
 main(int argc, char** argv)
 {
+    mycb cb(&comm);
+
     comm.setSourceAddress((uint8_t*) local_address);
     comm.setDestinationAddress((uint8_t*) broadcast_address);
     comm.setPayload(MAX_BUFFER);
     comm.configure();
     comm.setSpeedRate(upm::NRF_250KBPS);
     comm.setChannel(99);
-    comm.setDataReceivedHandler(nrf_handler);
+    comm.setDataReceivedHandler(&cb);
 
     signal(SIGINT, sig_handler);
 

examples/c++/nrf24l01-transmitter.cxx

@@ -46,10 +46,21 @@ sig_handler(int signo)
     }
 }
 
-void
-nrf_handler()
+class mycb : public virtual Callback
 {
+    public:
+        mycb(upm::NRF24L01 *com) : _com(com) {}
+        virtual void run()
+        {
+            if (_com != NULL)
+                std::cout << "Reciever :: " << *((uint32_t*) &(_com->m_rxBuffer[0])) << std::endl;
+            else
+                std::cout << "Example callback!" << std::endl;
         }
+    private:
+        upm::NRF24L01* _com;
+};
+
 
 int
 main(int argc, char** argv)
@@ -57,12 +68,14 @@ main(int argc, char** argv)
     //! [Interesting]
     uint32_t dummyData = 0;
     upm::NRF24L01 comm(7, 8);
+    mycb cb(&comm);
+
     comm.setSourceAddress((uint8_t*) srcAddress);
     comm.setDestinationAddress((uint8_t*) destAddress);
     comm.setPayload(MAX_BUFFER);
     comm.setChannel(99);
     comm.configure();
-    comm.setDataReceivedHandler(nrf_handler);
+    comm.setDataReceivedHandler(&cb);
 
     signal(SIGINT, sig_handler);
 

examples/c++/pulsensor.cxx

@@ -42,17 +42,24 @@ sig_handler(int signo)
     }
 }
 
-void
-handler(clbk_data data)
+
+//! [Interesting]
+class mycb : public virtual Callback
 {
-    printf("callback data (%d)\n", data.is_heart_beat);
+    public:
+        virtual void run(clbk_data arg)
+        {
+            printf("callback data (%d)\n", arg.is_heart_beat);
         }
+};
+
 
 int
 main(int argc, char** argv)
 {
+    mycb cb;
     //! [Interesting]
-    Pulsensor sensor(handler);
+    Pulsensor sensor(&cb);
 
     sensor.start_sampler();
     while (!doWork) {

examples/c++/servo-es08a.cxx

@@ -31,7 +31,7 @@ int
 main(int argc, char** argv)
 {
     //! [Interesting]
-    upm::ES08A servo(5);
+    upm::ES08A servo("p:5");
 
     // Sets the shaft to 180, then to 90, then to 0,
     // then back to 90, and finally back to 180,

examples/c++/t6713-co2-sensor.cxx

@@ -42,18 +42,18 @@ main()
     /* Create an instance of the T6713 sensor */
     upm::T6713 sensor(EDISON_I2C_BUS);
 
-    /* Show usage from the ICO2Sensor interface */
-    upm::ICO2Sensor* cO2Sensor = static_cast<upm::ICO2Sensor*>(&sensor);
+    /* Show usage from the iCO2Sensor interface */
+    upm::iCO2Sensor* cO2Sensor = static_cast<upm::iCO2Sensor*>(&sensor);
 
     if (cO2Sensor == NULL) {
         std::cout << "CO2 sensor not detected" << std::endl;
         return 1;
     }
-    std::cout << "CO2 sensor " << cO2Sensor->getModuleName() << " detected" << std::endl;
+    std::cout << "CO2 sensor " << cO2Sensor->Name() << " detected" << std::endl;
     while (true) {
         try {
-            uint16_t value = cO2Sensor->getPpm();
-            std::cout << "CO2 level = " << value << " ppm" << std::endl;
+            uint16_t value = cO2Sensor->CO2ForSource(cO2Sensor->Sources()[0]);
+            std::cout << "CO2 level = " << value << cO2Sensor->Units()[0] << std::endl;
         } catch (std::exception& e) {
             std::cerr << e.what() << std::endl;
         }

examples/c++/zfm20.cxx

@@ -38,7 +38,7 @@ main(int argc, char** argv)
     upm::ZFM20 fp(0);
 
     // make sure port is initialized properly.  57600 baud is the default.
-    if (!fp.setupTty(B57600)) {
+    if (!fp.setupTty(57600)) {
         cerr << "Failed to setup tty port parameters" << endl;
         return 1;
     }
@@ -83,7 +83,7 @@ main(int argc, char** argv)
 
     // we search for a print matching slot 1, where we shored our last
     // converted fingerprint
-    if ((rv = fp.search(1, &id, &score)) != ZFM20::ERR_OK) {
+    if ((rv = fp.search(1, id, score)) != ZFM20::ERR_OK) {
         if (rv == ZFM20::ERR_FP_NOTFOUND) {
             cout << "Finger Print not found" << endl;
             return 0;

examples/c/ds18b20.c

@@ -62,8 +62,7 @@ int main(int argc, char **argv)
         // update our values for all sensors
         ds18b20_update(sensor, -1);
 
-        int i;
-        for (i=0; i<ds18b20_devices_found(sensor); i++)
+        for (unsigned int i=0; i<ds18b20_devices_found(sensor); i++)
         {
             printf("Device %02d: Temperature: %f C\n",
                     i, ds18b20_get_temperature(sensor, i));

examples/c/kx122.c

@@ -0,0 +1,71 @@
+/*
+* The MIT License (MIT)
+*
+* Author: Samuli Rissanen <samuli.rissanen@hotmail.com>
+* Copyright (c) 2018 Rohm Semiconductor.
+*
+* Permission is hereby granted, free of charge, to any person obtaining a copy of
+* this software and associated documentation files (the "Software"), to deal in
+* the Software without restriction, including without limitation the rights to
+* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+* the Software, and to permit persons to whom the Software is furnished to do so,
+* subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in all
+* copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <stdio.h>
+#include <unistd.h>
+#include <signal.h>
+
+#include "kx122.h"
+#include "upm_utilities.h"
+
+bool shouldRun = true;
+
+void sig_handler(int signo)
+{
+  if(signo == SIGINT){
+    shouldRun = false;
+  }
+}
+
+int main(int argc, char **argv)
+{
+  signal(SIGINT,sig_handler);
+
+  //! [Interesting]
+  kx122_context sensor = kx122_init(0, -1, 24, 10000);
+  if (!sensor)
+  {
+      printf("kx122_init() failed.\n");
+      return 1;
+  }
+
+  kx122_sensor_software_reset(sensor);
+  kx122_device_init(sensor,KX122_ODR_50,HIGH_RES,KX122_RANGE_2G);
+
+  float x,y,z;
+  int wait_time = (kx122_get_sample_period(sensor) * MICRO_S);
+  if (wait_time < 0) wait_time = 1000;
+
+  while(shouldRun){
+    kx122_get_acceleration_data(sensor,&x,&y,&z);
+
+    printf("%.02f | %.02f | %.02f\n",x,y,z);
+    upm_delay_us(wait_time);
+  }
+
+  kx122_close(sensor);
+  //! [Interesting]
+
+  return 0;
+}

examples/c/lis3dh.c

@@ -0,0 +1,97 @@
+/*
+ * Author: Alex Tereschenko <alext.mkrs@gmail.com>
+ * Copyright (c) 2018 Alex Tereschenko.
+ *
+ * Based on LIS2DS12 example by
+ * Author: Jon Trulson <jtrulson@ics.com>
+ * Copyright (c) 2017 Intel Corporation.
+ *
+ * The MIT License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <signal.h>
+#include <stdio.h>
+#include <unistd.h>
+
+#include "lis3dh.h"
+#include "upm_utilities.h"
+
+bool shouldRun = true;
+
+void
+sig_handler(int signo)
+{
+    if (signo == SIGINT)
+        shouldRun = false;
+}
+
+int
+main(int argc, char** argv)
+{
+    signal(SIGINT, sig_handler);
+//! [Interesting]
+
+#if defined(CONFIG_BOARD_ARDUINO_101_SSS)
+    // ARDUINO_101_SSS (ARC core) must use I2C
+    // Instantiate a LIS3DH instance using default i2c bus and address
+    lis3dh_context sensor = lis3dh_init(LIS3DH_DEFAULT_I2C_BUS, LIS3DH_DEFAULT_I2C_ADDR, -1);
+#elif defined(CONFIG_BOARD_ARDUINO_101)
+    // ARDUINO_101 (Quark core) must use SPI
+    // Instantiate a LIS3DH instance using default SPI bus and pin 10 as CS
+    lis3dh_context sensor = lis3dh_init(LIS3DH_DEFAULT_SPI_BUS, -1, 10);
+#else
+    // everything else use I2C by default
+    // Instantiate a LIS3DH instance using default i2c bus and address
+    lis3dh_context sensor = lis3dh_init(LIS3DH_DEFAULT_I2C_BUS, LIS3DH_DEFAULT_I2C_ADDR, -1);
+#endif
+
+    if (!sensor) {
+        printf("lis3dh_init() failed.\n");
+        return 1;
+    }
+
+    // now output data every 250 milliseconds
+    while (shouldRun) {
+        float x, y, z;
+
+        if (lis3dh_update(sensor)) {
+            printf("lis3dh_update() failed\n");
+            lis3dh_close(sensor);
+            return 1;
+        }
+
+        lis3dh_get_accelerometer(sensor, &x, &y, &z);
+        printf("Acceleration x: %f y: %f z: %f g\n", x, y, z);
+
+        printf("Compensation Temperature: %f C\n\n", lis3dh_get_temperature(sensor));
+
+        upm_delay_ms(250);
+    }
+
+    printf("Exiting...\n");
+
+    lis3dh_close(sensor);
+
+    //! [Interesting]
+
+    return 0;
+}

examples/java/A110X_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class A110XSample {
+public class A110X_Example {
 	
 	public static void main(String[] args) throws InterruptedException {
 		//! [Interesting]

examples/java/A110X_intr_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class A110X_intrSample {
+public class A110X_intr_Example {
 	
 	public static int counter=0;
 		
@@ -52,6 +52,6 @@ class A110XISR implements Runnable {
 		super();
 	}
 	public void run(){
-		A110X_intrSample.counter++;
+		A110X_intr_Example.counter++;
 	}
 }

examples/java/ADC121C021_Example.java

@@ -23,7 +23,7 @@
  */
 
 //NOT TESTED!!!
-public class ADC121C021Sample {
+public class ADC121C021_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/AM2315_Example.java

@@ -23,7 +23,7 @@
  */
 import upm_am2315.AM2315;
 
-public class AM2315Example {
+public class AM2315_Example {
 
 	static {
 		try {

examples/java/APA102_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class APA102Sample {
+public class APA102_Example {
 
   public static void main(String[] args) throws InterruptedException {
     // ! [Interesting]

examples/java/Ad8232_Example.java

@@ -23,7 +23,7 @@
 */
 import upm_ad8232.AD8232;
 
-public class Ad8232Example {
+public class Ad8232_Example {
 
 	public static void main(String[] args) {
 		// TODO Auto-generated method stub

examples/java/Ads1015_Example.java

@@ -31,7 +31,7 @@ import java.io.*;
 import java.util.concurrent.*;
 import upm_ads1x15.*;
 
-public class Ads1015Sample
+public class Ads1015_Example
 {
     static boolean running = true;
     static int id = 0; // Sample number

examples/java/Ads1115_Example.java

@@ -30,7 +30,7 @@ import java.io.*;
 import java.util.concurrent.*;
 import upm_ads1x15.*;
 
-public class Ads1115Sample
+public class Ads1115_Example
 {
     static boolean running = true;
     static int id = 0; // Sample number

examples/java/Adxl345_Example.java

@@ -23,7 +23,7 @@
  */
 
 //NOT TESTED!!!
-public class Adxl345Sample {
+public class Adxl345_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/Apds9002_Example.java

@@ -24,7 +24,7 @@
 
 import upm_apds9002.APDS9002;
 
-public class Apds9002 {
+public class Apds9002_Example {
 
 	public static void main(String[] args) {
 		// TODO Auto-generated method stub

examples/java/BISS0001_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class BISS0001Sample{
+public class BISS0001_Example{
 
 	public static void main(String[] args) throws InterruptedException {
 //! [Interesting]

examples/java/BMA220_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class BMA220Sample {
+public class BMA220_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/BME280_Interface_Example.java

@@ -24,9 +24,9 @@
  */
 
 import upm_bmp280.*;
-import upm_interfaces.*;
+import upm_core.*;
 
-public class BME280_InterfaceExample
+public class BME280_Interface_Example
 {
     public static void main(String[] args) throws InterruptedException
     {
@@ -35,9 +35,9 @@ public class BME280_InterfaceExample
         // Instantiate a BME280 instance using default i2c bus and address
         BME280 sensor = new BME280();
 
-        ITemperatureSensor t_sensor = sensor;
-        IHumiditySensor h_sensor = sensor;
-        IPressureSensor p_sensor = sensor;
+        iTemperatureSensor t_sensor = sensor;
+        iHumiditySensor h_sensor = sensor;
+        iPressureSensor p_sensor = sensor;
 
         // For SPI, bus 0, you would pass -1 as the address, and a
         // valid pin for CS:
@@ -51,15 +51,15 @@ public class BME280_InterfaceExample
                 System.out.println("Calling Interface Functions: ");
 
                 System.out.println("Compensation Temperature: "
-                                   + t_sensor.getTemperatureCelsius()
+                                   + t_sensor.TemperatureForSource("temperature")
                                    + " C / ");
 
                 System.out.println("Pressure: "
-                                   + p_sensor.getPressurePa()
+                                   + p_sensor.PressureForSource("pressure")
                                    + " Pa");
 
                 System.out.println("Humidity: "
-                                   + h_sensor.getHumidityRelative()
+                                   + h_sensor.HumidityForSource("humidity")
                                    + " %RH");
 
                 System.out.println();

examples/java/BMPX8X_Example.java

@@ -23,7 +23,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class BMPX8XSample {
+public class BMPX8X_Example {
 
     public static void main(String[] args) throws InterruptedException {
 // ! [Interesting]

examples/java/Button_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class ButtonSample {
+public class Button_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/Button_intr_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class Button_intrSample {
+public class Button_intr_Example {
 
 	public static int counter = 0;
 
@@ -47,7 +47,7 @@ class ButtonISR implements Runnable {
 	}
 
 	public void run() {
-		Button_intrSample.counter++;
+		Button_intr_Example.counter++;
 		System.out.println("Button pressed!");
 	}
 }

examples/java/Buzzer_Example.java

@@ -23,7 +23,7 @@
  */
 
 import upm_buzzer.Buzzer;
-public class BuzzerSample {
+public class Buzzer_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/CJQ4435_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class CJQ4435Sample {
+public class CJQ4435_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// Instantiate a CJQ4435 MOSFET on a PWM capable digital pin D3

examples/java/CMakeLists.txt

@@ -1,223 +1,261 @@
+# The purpose of this CMakeLists.txt is to compile all listed JAVA examples
+# during build time (ensuring that ALL examples compile against their
+# dependency JAVA packages).
+
 find_package(Java REQUIRED)
 include(UseJava)
 
-macro(add_example example_name jar_name)
-    set(example_src "${example_name}.java")
-    set(example_jar "${CMAKE_CURRENT_BINARY_DIR}/../../src/${jar_name}/upm_${jar_name}.jar")
+# Add a JAVA example target for the provided JAVA source file which depends
+# on UPM JAVA targets.
+#
+# Usage:
+#   add_example(example_class_name upm_target_dependency_list)
+#
+# Parameters:
+#   example_class_name: JAVA class name.  This name MUST match the JAVA
+#                       example file name.
+#                       <example_class_name>.java
+#   upm_target_dependency_list: One or more UPM library targets.  This
+#                       function assumes a javaupm_<target> also exists.
+#
+# Examples:
+#   # Creates SensorFooExample JAVA target, depends on target: sensorfoo,
+#   # and will add upm_sensorfoo.jar to the javac classpath.
+#   add_example(SensorFooExample sensorfoo)
+#
+#   # Creates SensorFooExample JAVA target, depends on targets: sensorfoo,
+#   # and core and will add both upm_sensorfoo.jar and upm_core.jar
+#   # to the javac classpath.
+#   add_example(SensorFooExample "sensorfoo;core"")
+#
+function(add_example example_class_name dependency_list)
+    set(example_file "${example_class_name}.java")
 
-    add_jar(${example_name} SOURCES ${example_src} INCLUDE_JARS ${example_jar})
-    add_dependencies(${example_name} javaupm_${jar_name})
-endmacro()
+    # Build a list of all dependency jar files
+    set(jar_file_list "")
 
-macro(add_example_with_path example_name jar_path jar_name)
-    set(example_src "${example_name}.java")
-    set(example_jar "${CMAKE_CURRENT_BINARY_DIR}/../../src/${jar_path}/upm_${jar_name}.jar")
+    # Build a list of all dependency java target names
+    set(java_targets_list "")
 
-    add_jar(${example_name} SOURCES ${example_src} INCLUDE_JARS ${example_jar})
-    add_dependencies(${example_name} javaupm_${jar_name})
-endmacro()
+    # Iterate over the dependencies
+    foreach(dependency ${dependency_list})
+        set(java_target "javaupm_${dependency}")
 
-macro(add_example_multiple_jars example_name example_jar_name jar_name_list)
-    set(example_src "${example_name}.java")
+        # Append to the targets list
+        list(APPEND java_targets_list ${java_target})
 
-    set(list_of_jars "")
-    foreach(jar_name ${jar_name_list})
-        set(example_jar "${CMAKE_CURRENT_BINARY_DIR}/../../src/${jar_name}/upm_${jar_name}.jar")
-        list(APPEND list_of_jars ${example_jar})
+        # If a dependency target does NOT exist, print a warning and skip
+        if (NOT TARGET ${java_target})
+            message(STATUS "Example ${example_file} is missing a required CMake target (${java_target}), skipping...")
+            return()
+        endif()
+
+        # Get the jar for this java_target (saved as a property)
+        get_target_property(jar_file ${java_target} JAR_FILE_ABSOLUTE)
+
+        # Append to the jar list
+        list(APPEND jar_file_list ${jar_file})
     endforeach()
 
-    add_jar(${example_name} SOURCES ${example_src} INCLUDE_JARS ${list_of_jars})
-    add_dependencies(${example_name} javaupm_${example_jar_name})
-endmacro()
+    # Add the jar/s
+    add_jar(${example_class_name} SOURCES ${example_file} INCLUDE_JARS ${jar_file_list})
 
-add_example(A110X_intrSample a110x)
-add_example(A110XSample a110x)
-add_example(ADC121C021Sample adc121c021)
-add_example(Adxl345Sample adxl345)
-add_example(Apds9002 apds9002)
-add_example(BISS0001Sample biss0001)
-add_example_multiple_jars(BMPX8XSample bmpx8x "bmpx8x;interfaces")
-add_example(BuzzerSample buzzer)
-add_example(CJQ4435Sample cjq4435)
-add_example(DS1307Sample ds1307)
-add_example(ENC03RSample enc03r)
-add_example(ES08ASample servo)
-add_example(ButtonSample button)
-add_example(GroveButtonSample grove)
-add_example(Button_intrSample button)
-add_example(GroveButton_intrSample grove)
-add_example(Collision collision)
-add_example(EHRSample ehr)
-add_example(GroveEHRSample groveehr)
-add_example(Emg emg)
-add_example(GroveEmg groveemg)
-add_example(Gsr gsr)
-add_example(GroveGsr grovegsr)
-add_example(LEDSample led)
-add_example(LightSample light)
-add_example(GroveLightSample grove)
-add_example(GroveLineFinderSample grovelinefinder)
-add_example(LineFinderSample linefinder)
-add_example(GroveLed_multiSample grove)
-add_example(GroveLEDSample grove)
-add_example(GroveMDSample grovemd)
-add_example(MDSample md)
-add_example(MoistureSample moisture)
-add_example(GroveMoistureSample grovemoisture)
-add_example(GroveMQ3 gas)
-add_example(GroveMQ9 gas)
-add_example(O2Example o2)
-add_example(GroveO2Example groveo2)
-add_example(GroveQTouch at42qt1070)
-add_example(RelaySample relay)
-add_example(GroveRelaySample grove)
-add_example(RotarySample rotary)
-add_example(GroveRotarySample grove)
-add_example(GROVESCAMSample grovescam)
-add_example(SCAMSample scam)
-add_example(SlideSample slide)
-add_example(GroveSlideSample grove)
-add_example(SpeakerSample speaker)
-add_example(GroveSpeakerSample grovespeaker)
-add_example(TemperatureSample temperature)
-add_example(GroveTempSample grove)
-add_example(VDivSample vdiv)
-add_example(GroveVDivSample grovevdiv)
-add_example(WaterSample water)
-add_example(GroveWaterSample grovewater)
-add_example(GroveWFSSample grovewfs)
-add_example(WFSSample wfs)
-add_example(GUVAS12DSample guvas12d)
-add_example(H3LIS331DLSample h3lis331dl)
-add_example(HCSR04Sample hcsr04)
-add_example(HM11Sample hm11)
-add_example(Hmc5883lSample hmc5883l)
-add_example(HMTRPSample hmtrp)
-add_example(HP20xExample hp20x)
-add_example(HTU21DSample htu21d)
-add_example(Itg3200Sample itg3200)
-add_example(Joystick12Sample joystick12)
-add_example(LDT0028Sample ldt0028)
-add_example(LoLSample lol)
-add_example(LSM303DLHSample lsm303dlh)
-add_example(M24LR64ESample m24lr64e)
-add_example(MAX44000Sample max44000)
-add_example(MHZ16Sample mhz16)
-add_example(MicrophoneSample mic)
-add_example(MMA7455Sample mma7455)
-add_example(MMA7660Sample mma7660)
-add_example(MPL3115A2Sample mpl3115a2)
-add_example(MPR121Sample mpr121)
-add_example(MPU9150Sample mpu9150)
-add_example(MQ2Sample gas)
-add_example(MQ303ASample mq303a)
-add_example(MQ5Sample gas)
-add_example(GroveLEDBar my9221)
-add_example(NRF24L01_receiverSample nrf24l01)
-add_example(NRF24L01_transmitterSample nrf24l01)
-add_example(NUNCHUCKSample nunchuck)
-add_example(OTP538USample otp538u)
-add_example(PPD42NSSample ppd42ns)
-add_example(PulsensorSample pulsensor)
-add_example(RFR359FSample rfr359f)
-add_example(RotaryEncoderSample rotaryencoder)
-add_example(RPR220_intrSample rpr220)
-add_example(RPR220Sample rpr220)
-add_example(ST7735Sample st7735)
-if (NOT ANDROID)
-  add_example(StepMotorSample stepmotor)
-endif ()
-add_example(TM1637Sample tm1637)
-add_example(TP401Sample gas)
-add_example(TSL2561Sample tsl2561)
-add_example(TTP223Sample ttp223)
-add_example(ULN200XASample uln200xa)
-add_example(WaterLevelSensor waterlevel)
-add_example(WT5001Sample wt5001)
-add_example(YG1006Sample yg1006)
-add_example(ZFM20Sample zfm20)
-add_example(Ad8232Example ad8232)
-add_example(Gp2y0aExample gp2y0a)
-add_example(Th02Example th02)
-add_example(FlexSensorExample flex)
-add_example(CWLSXXA_Example cwlsxxa)
-add_example(TEAMS_Example teams)
-add_example(APA102Sample apa102)
-add_example(TEX00_Example tex00)
+    # Add a dependency from this jar to all dependency java targets
+    add_dependencies(${example_class_name} ${java_targets_list})
+endfunction()
+
+add_example(A110X_Example a110x)
+add_example(A110X_intr_Example a110x)
+add_example(Ad8232_Example ad8232)
+add_example(ADC121C021_Example adc121c021)
+add_example(Ads1015_Example "ads1x15;core")
+add_example(Ads1115_Example ads1x15)
+add_example(Adxl345_Example adxl345)
+add_example(AM2315_Example am2315)
+add_example(APA102_Example apa102)
+add_example(Apds9002_Example apds9002)
+add_example(BH1750_Example bh1750)
+add_example(BISS0001_Example biss0001)
+add_example(BMA250E_Example bma250e)
+add_example(BMC150_Example bmx055)
+add_example(BME280_Example "bmp280;core")
+add_example(BMG160_Example bmg160)
+add_example(BMI055_Example bmx055)
 add_example(BMI160_Example bmi160)
-add_example(Tsl2561 tsl2561)
-add_example(AM2315Example am2315)
-add_example(MAX31855Example max31855)
-add_example(MAX5487Example max5487)
-add_example(MAXds3231mExample maxds3231m)
-add_example(ECS1030Example ecs1030)
-add_example(SM130Example sm130)
+add_example(BMM150_Example bmm150)
+add_example(BMP280_Example "bmp280;core")
+add_example(BMPX8X_Example "bmpx8x;core")
+add_example(BMX055_Example bmx055)
+add_example(BNO055_Example bno055)
+add_example(Button_Example button)
+add_example(Button_intr_Example button)
+add_example(Buzzer_Example buzzer)
+add_example(CJQ4435_Example cjq4435)
+add_example(Collision_Example collision)
+add_example(CWLSXXA_Example cwlsxxa)
+add_example(DFREC_Example dfrec)
+add_example(DFRORP_Example dfrorp)
+add_example(DS1307_Example ds1307)
+add_example(ECEZO_Example ecezo)
+add_example(ECS1030_Example ecs1030)
+add_example(EHR_Example ehr)
+add_example(Emg_Example emg)
+add_example(ENC03R_Example enc03r)
+add_example(ES08A_Example "servo;core")
+add_example(FlexSensor_Example flex)
+add_example(Gp2y0a_Example gp2y0a)
+add_example(GroveButton_Example grove)
+add_example(GroveButton_intr_Example grove)
+add_example(GroveEHR_Example groveehr)
+add_example(GroveEmg_Example groveemg)
+add_example(GroveGsr_Example grovegsr)
+add_example(GroveLEDBar_Example my9221)
+add_example(GroveLED_Example grove)
+add_example(GroveLed_multi_Example grove)
+add_example(GroveLight_Example grove)
+add_example(GroveLineFinder_Example grovelinefinder)
+add_example(GroveMD_Example grovemd)
+add_example(GroveMoisture_Example grovemoisture)
+add_example(GroveMQ3_Example gas)
+add_example(GroveMQ9_Example gas)
+add_example(GroveO2_Example groveo2)
+add_example(GroveQTouch_Example at42qt1070)
+add_example(GroveRelay_Example grove)
+add_example(GroveRotary_Example grove)
+add_example(GROVESCAM_Example grovescam)
+add_example(GroveSlide_Example grove)
+add_example(GroveSpeaker_Example grovespeaker)
+add_example(GroveTemp_Example grove)
+add_example(GroveVDiv_Example grovevdiv)
+add_example(GroveWater_Example grovewater)
+add_example(GroveWFS_Example grovewfs)
+add_example(Gsr_Example gsr)
+add_example(GUVAS12D_Example guvas12d)
+add_example(H3LIS331DL_Example h3lis331dl)
+add_example(HCSR04_Example hcsr04)
+add_example(HKA5_Example hka5)
+add_example(HM11_Example hm11)
+add_example(Hmc5883l_Example hmc5883l)
+add_example(HMTRP_Example hmtrp)
+add_example(HP20x_Example hp20x)
+add_example(HTU21D_Example htu21d)
+add_example(Itg3200_Example itg3200)
+add_example(Jhd1313m1_Example jhd1313m1)
+add_example(Jhd1313m1_lcd_Example jhd1313m1)
+add_example(Joystick12_Example joystick12)
+add_example(KX122_Example kx122)
+add_example(Lcm1602_i2c_Example lcm1602)
+add_example(Lcm1602_parallel_Example lcm1602)
+add_example(LDT0028_Example ldt0028)
+add_example(LE910_Example uartat)
+add_example(LED_Example led)
+add_example(Light_Example light)
+add_example(LineFinder_Example linefinder)
+add_example(LIS2DS12_Example lis2ds12)
+add_example(LoL_Example lol)
+add_example(LSM303AGR_Example lsm303agr)
+add_example(LSM303D_Example lsm303d)
+add_example(LSM303DLH_Example lsm303dlh)
+add_example(LSM6DS3H_Example lsm6ds3h)
+add_example(LSM6DSL_Example lsm6dsl)
+add_example(M24LR64E_Example m24lr64e)
+add_example(MAX30100_Example max30100)
+add_example(MAX31855_Example max31855)
+add_example(MAX44000_Example max44000)
+add_example(MAX5487_Example max5487)
+add_example(MAXds3231m_Example maxds3231m)
+add_example(MB704X_Example mb704x)
+add_example(MCP2515_Example mcp2515)
+add_example(MCP2515_TXRX_Example mcp2515)
+add_example(MD_Example md)
+add_example(MHZ16_Example mhz16)
+add_example(Microphone_Example mic)
+add_example(MMA7361_Example mma7361)
+add_example(MMA7455_Example mma7455)
+add_example(MMA7660_Example mma7660)
+add_example(Moisture_Example moisture)
+add_example(MPL3115A2_Example mpl3115a2)
+add_example(MPR121_Example mpr121)
+add_example(MPU9150_Example mpu9150)
+add_example(MQ2_Example gas)
+add_example(MQ303A_Example mq303a)
+add_example(MQ5_Example gas)
+add_example(MS5803_Example ms5803)
+add_example(NMEAGPS_Example nmea_gps)
+add_example(NMEAGPS_I2C_Example nmea_gps)
+add_example(NRF24L01_receiver_Example nrf24l01)
+add_example(NRF24L01_transmitter_Example nrf24l01)
+add_example(NUNCHUCK_Example nunchuck)
+add_example(O2_Example o2)
+add_example(OTP538U_Example otp538u)
+add_example(P9813_Example p9813)
+add_example(PPD42NS_Example ppd42ns)
+add_example(Pulsensor_Example pulsensor)
+add_example(Relay_Example relay)
+add_example(RFR359F_Example rfr359f)
+add_example(RN2903_Example rn2903)
+add_example(RN2903_P2P_RX_Example rn2903)
+add_example(RN2903_P2P_TX_Example rn2903)
+add_example(RotaryEncoder_Example rotaryencoder)
+add_example(Rotary_Example rotary)
+add_example(RPR220_Example rpr220)
+add_example(RPR220_intr_Example rpr220)
+add_example(SCAM_Example scam)
+add_example(SensorTemplate_Example sensortemplate)
+add_example(SHT1X_Example sht1x)
+add_example(Slide_Example slide)
+add_example(SM130_Example sm130)
+add_example(Speaker_Example speaker)
+add_example(SpeakerPWM_Example speaker)
+add_example(SSD1308_oled_Example lcd)
+add_example(SSD1327_oled_Example lcd)
+add_example(ST7735_Example st7735)
+add_example(TEAMS_Example teams)
+add_example(Temperature_Example temperature)
+add_example(TEX00_Example tex00)
+add_example(Th02_Example th02)
+add_example(TM1637_Example tm1637)
+add_example(TP401_Example gas)
+add_example(TSL2561_Example tsl2561)
+add_example(TTP223_Example ttp223)
+add_example(ULN200XA_Example uln200xa)
+add_example(VDiv_Example vdiv)
+add_example(VEML6070_Example veml6070)
+add_example(Water_Example water)
+add_example(WaterLevelSensor_Example waterlevel)
+add_example(WFS_Example wfs)
+add_example(WT5001_Example wt5001)
+add_example(YG1006_Example yg1006)
+add_example(ZFM20_Example zfm20)
+
+if(SWIG_VERSION VERSION_GREATER 3.0.8)
+    add_example(BME280_Interface_Example "bmp280;core")
+    add_example(IMS_Example "ims;core")
+    add_example(RHUSB_Example "rhusb;core")
+endif()
+
+if (OPENZWAVE_FOUND)
+    add_example(AeotecDSB09104_Example ozw)
+    add_example(AeotecDW2E_Example ozw)
+    add_example(AeotecSDG2_Example ozw)
+    add_example(AeotecSS6_Example ozw)
+    add_example(TZEMT400_Example ozw)
+endif()
+
 if (MODBUS_FOUND)
     add_example(H803X_Example h803x)
 endif()
+
 if (BACNET_FOUND)
     add_example(E50HX_Example e50hx)
     add_example(T8100_Example t8100)
     add_example(TB7300_Example tb7300)
 endif()
+
 if (JPEG_FOUND)
     add_example(VCAP_Example vcap)
 endif()
-add_example_multiple_jars(BMP280_Example bmp280 "bmp280;interfaces")
-add_example(BNO055_Example bno055)
-add_example(BMX055_Example bmx055)
-add_example(NMEAGPS_Example nmea_gps)
-add_example(MMA7361_Example mma7361)
-add_example(BH1750_Example bh1750)
-add_example(HKA5_Example hka5)
-add_example(DFRORP_Example dfrorp)
-add_example(DFREC_Example dfrec)
-add_example(SHT1X_Example sht1x)
-add_example(MS5803_Example ms5803)
-add_example(ECEZO_Example ecezo)
-add_example(IMS_Example ims)
-add_example(MB704X_Example mb704x)
-add_example(MCP2515_Example mcp2515)
-add_example_multiple_jars(Ads1015Sample ads1x15 "ads1x15;interfaces")
-add_example(MAX30100_Example max30100)
-add_example(Ads1115Sample ads1x15)
-add_example(SensorTemplateSample sensortemplate)
-add_example(P9813Sample p9813)
-add_example(BMG160_Example bmg160)
-add_example(BMA250E_Example bma250e)
-add_example(BMM150_Example bmm150)
-add_example(LSM303AGR_Example lsm303agr)
-add_example(LSM303D_Example lsm303d)
-add_example(VEML6070Sample veml6070)
-add_example(RN2903_Example rn2903)
-add_example(LIS2DS12_Example lis2ds12)
-add_example(LSM6DS3H_Example lsm6ds3h)
-add_example(LSM6DSL_Example lsm6dsl)
 
-add_example_with_path(Jhd1313m1_lcdSample jhd1313m1 jhd1313m1)
-add_example_with_path(Jhd1313m1Sample jhd1313m1 jhd1313m1)
-add_example_with_path(Lcm1602_i2cSample lcm1602 lcm1602)
-add_example_with_path(Lcm1602_parallelSample lcm1602 lcm1602)
-add_example_with_path(SSD1308_oledSample lcd i2clcd)
-add_example_with_path(SSD1327_oledSample lcd i2clcd)
-add_example_multiple_jars(BME280_Example bmp280 "bmp280;interfaces")
-
-if(SWIG_VERSION VERSION_GREATER 3.0.8)
-  add_example_multiple_jars(BME280_InterfaceExample bmp280 "bmp280;interfaces")
+if (NOT ANDROID)
+    add_example(StepMotor_Example stepmotor)
 endif ()
-
-add_example_with_path(BMC150_Example bmx055 bmx055)
-add_example_with_path(BMI055_Example bmx055 bmx055)
-if (OPENZWAVE_FOUND)
-  add_example_with_path(AeotecSS6_Example ozw ozw)
-  add_example_with_path(AeotecSDG2_Example ozw ozw)
-  add_example_with_path(AeotecDW2E_Example ozw ozw)
-  add_example_with_path(AeotecDSB09104_Example ozw ozw)
-  add_example_with_path(TZEMT400_Example ozw ozw)
-endif()
-add_example_with_path(NMEAGPS_I2C_Example nmea_gps nmea_gps)
-add_example_with_path(MCP2515_TXRX_Example mcp2515 mcp2515)
-add_example_with_path(LE910_Example uartat uartat)
-add_example_with_path(SpeakerPWMSample speaker speaker)
-add_example_with_path(RN2903_P2P_RX_Example rn2903 rn2903)
-add_example_with_path(RN2903_P2P_TX_Example rn2903 rn2903)

examples/java/Collision_Example.java

@@ -24,7 +24,7 @@
 
 import upm_collision.*;
 
-public class Collision {
+public class Collision_Example {
 
 	public static void main(String[] args) {
 		// Initializing the sensor on D2 on the Base Shield

examples/java/DFRPH_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class DFRPHSample {
+public class DFRPH_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/DS1307_Example.java

@@ -23,7 +23,7 @@
  */
 
 //NOT TESTED!!!
-public class DS1307Sample {
+public class DS1307_Example {
 
 	static private void printTime(upm_ds1307.DS1307 rtc) {
 		System.out.print("The time is: " + rtc.getMonth() + "/" + rtc.getDayOfMonth() + "/"

examples/java/ECS1030_Example.java

@@ -23,7 +23,7 @@
  */
 import upm_ecs1030.ECS1030;
 
-public class ECS1030Example {
+public class ECS1030_Example {
 
 	static {
 		try {

examples/java/EHR_Example.java

@@ -23,7 +23,7 @@
  */
 
 //NOT TESTED!!!
-public class EHRSample {
+public class EHR_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/ENC03R_Example.java

@@ -23,7 +23,7 @@
  */
 
 
-public class ENC03RSample {
+public class ENC03R_Example {
 	private static final long CALIBRATION_SAMPLES = 1000;
 
 	public static void main(String[] args) throws InterruptedException {

examples/java/ES08A_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class ES08ASample {
+public class ES08A_Example {
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]
 		upm_servo.ES08A servo = new upm_servo.ES08A(6);

examples/java/Emg_Example.java

@@ -23,7 +23,7 @@
  */
 import upm_emg.EMG;
 
-public class Emg {
+public class Emg_Example {
 
 	public static void main(String[] args) {
 		// TODO Auto-generated method stub

examples/java/FlexSensor_Example.java

@@ -1,6 +1,6 @@
 import upm_flex.Flex;
 
-public class FlexSensorExample {
+public class FlexSensor_Example {
 
 	static {
 		try {

examples/java/GROVESCAM_Example.java

@@ -23,7 +23,7 @@
  */
 
 //NOT TESTED!!!
-public class GROVESCAMSample {
+public class GROVESCAM_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/GUVAS12D_Example.java

@@ -23,7 +23,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class GUVAS12DSample {
+public class GUVAS12D_Example {
     // analog voltage, usually 3.3 or 5.0
     private static final float GUVAS12D_AREF = 5;
 

examples/java/Gp2y0a_Example.java

@@ -23,7 +23,7 @@
  */
 import upm_gp2y0a.GP2Y0A;
 
-public class Gp2y0aExample {
+public class Gp2y0a_Example {
 	
 	public static final float GP2Y0A_AREF 		= 5;
 	public static final short SAMPLES_PER_QUERY = 20;

examples/java/GroveButton_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class GroveButtonSample {
+public class GroveButton_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/GroveButton_intr_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class GroveButton_intrSample {
+public class GroveButton_intr_Example {
 
 	public static int counter = 0;
 
@@ -47,7 +47,7 @@ class ButtonISR implements Runnable {
 	}
 
 	public void run() {
-		GroveButton_intrSample.counter++;
+		GroveButton_intr_Example.counter++;
 		System.out.println("Button pressed!");
 	}
 }

examples/java/GroveCollision_Example.java

@@ -24,7 +24,7 @@
 
 import upm_grovecollision.*;
 
-public class GroveCollision {
+public class GroveCollision_Example {
 
 	public static void main(String[] args) {
 		// Initializing the sensor on D2 on the Base Shield

examples/java/GroveEHR_Example.java

@@ -23,7 +23,7 @@
  */
 
 //NOT TESTED!!!
-public class GroveEHRSample {
+public class GroveEHR_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/GroveEmg_Example.java

@@ -23,7 +23,7 @@
  */
 import upm_groveemg.GroveEMG;
 
-public class GroveEmg {
+public class GroveEmg_Example {
 
 	public static void main(String[] args) {
 		// TODO Auto-generated method stub

examples/java/GroveGsr_Example.java

@@ -24,7 +24,7 @@
 
 import upm_grovegsr.GroveGSR;
 
-public class GroveGsr {
+public class GroveGsr_Example {
 
 	public static void main(String[] args) {
 		// TODO Auto-generated method stub

examples/java/GroveLEDBar_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class GroveLEDBar {
+public class GroveLEDBar_Example {
 
     public static void main(String[] args) throws InterruptedException {
         //! [Interesting]

examples/java/GroveLED_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class GroveLEDSample {
+public class GroveLED_Example {
 	public static void main (String args[]) throws InterruptedException {
 		//! [Interesting]
         upm_grove.GroveLed led = new upm_grove.GroveLed(2);

examples/java/GroveLed_multi_Example.java

@@ -23,7 +23,7 @@
  */
 
 //NOT TESTED!!!
-public class GroveLed_multiSample {
+public class GroveLed_multi_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/GroveLight_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class GroveLightSample {
+public class GroveLight_Example {
 	public static void main(String args[]) throws InterruptedException {
 		// ! [Interesting]
 		upm_grove.GroveLight gl = new upm_grove.GroveLight(2);

examples/java/GroveLineFinder_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class GroveLineFinderSample {
+public class GroveLineFinder_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/GroveMD_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class GroveMDSample {
+public class GroveMD_Example {
 	private static final short speed50 = 127;
 	private static final short speed0 = 0;
 

examples/java/GroveMQ3_Example.java

@@ -34,7 +34,7 @@ import upm_gas.MQ9;
 import upm_gas.TP401;
 import upm_gas.thresholdContext;
 
-public class GroveMQ3 {
+public class GroveMQ3_Example {
 
 	public static void main(String[] args) {
 		// TODO Auto-generated method stub

examples/java/GroveMQ9_Example.java

@@ -34,7 +34,7 @@ import upm_gas.MQ9;
 import upm_gas.TP401;
 import upm_gas.thresholdContext;
 
-public class GroveMQ9 {
+public class GroveMQ9_Example {
 
 	public static void main(String[] args) {
 		// TODO Auto-generated method stub

examples/java/GroveMoisture_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class GroveMoistureSample {
+public class GroveMoisture_Example {
 	public static void main(String args[]) throws InterruptedException {
 		// ! [Interesting]
 		upm_grovemoisture.GroveMoisture gm = new upm_grovemoisture.GroveMoisture(1);

examples/java/GroveO2_Example.java

@@ -24,7 +24,7 @@
 
 import upm_groveo2.GroveO2;
 
-public class GroveO2Example {
+public class GroveO2_Example {
 
 	public static void main(String[] args) {
 		// TODO Auto-generated method stub

examples/java/GroveQTouch_Example.java

@@ -24,7 +24,7 @@
 
 import upm_at42qt1070.AT42QT1070;
 
-public class GroveQTouch {
+public class GroveQTouch_Example {
 
 	public static void main(String[] args) {
 		// TODO Auto-generated method stub

examples/java/GroveRelay_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class GroveRelaySample {
+public class GroveRelay_Example {
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]
 		// Create the button object using UART

examples/java/GroveRotary_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class GroveRotarySample {
+public class GroveRotary_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/GroveSlide_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class GroveSlideSample {
+public class GroveSlide_Example {
 	public static void main (String args[]) throws InterruptedException {
 		//! [Interesting]
         // Instantiate new grove slide potentiometer on  analog pin A0

examples/java/GroveSpeaker_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class GroveSpeakerSample {
+public class GroveSpeaker_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/GroveTemp_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class GroveTempSample {
+public class GroveTemp_Example {
 	public static void main (String args[]) throws InterruptedException {
 		//! [Interesting]
         upm_grove.GroveTemp temp = new upm_grove.GroveTemp(3);

examples/java/GroveUltraSonic_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class GroveUltraSonicSample {
+public class GroveUltraSonic_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/GroveVDiv_Example.java

@@ -23,7 +23,7 @@
  */
 
 //NOT TESTED!!!
-public class GroveVDivSample {
+public class GroveVDiv_Example {
 	private static final short gain3 = 3;
 	private static final short gain10 = 10;
 

examples/java/GroveWFS_Example.java

@@ -23,7 +23,7 @@
  */
 
 //NOT TESTED!!!
-public class GroveWFSSample {
+public class GroveWFS_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/GroveWater_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class GroveWaterSample {
+public class GroveWater_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]