naming.md: remove personal info

Project's community can be engaged via Github to provide help and comments on new contributions.
porting.md: remove personal information
2025-03-14 20:47:30 +03:00 · 2021-07-23 13:02:23 -07:00 · 2021-07-23 12:58:00 -07:00 · 2020-09-01 13:11:26 -07:00 · 2020-03-05 15:14:11 -08:00 · 2020-03-05 15:13:36 -08:00
3061 changed files with 55880 additions and 56233 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -12,8 +12,21 @@ before_install:
 jobs:
  fast_finish: true
  allow_failures:
-    - env: TARGET=ipk
+    - env: TARGET=android
  include:
+    - &run-with-clang-minimal
+      stage: Clang 3.8 - minimal with unit tests
+      env:
+        - TARGET=minimal
+        - CMAKE_BUILD_TYPE=Debug
+      before_script: docker-compose pull ${TARGET}
+      script:
+        - export CC=clang-3.8 CXX=clang++-3.8
+        - docker-compose run ${TARGET}
+    - <<: *run-with-clang-minimal
+      env:
+        - TARGET=minimal
+        - CMAKE_BUILD_TYPE=Release
    - &run-with-clang
      stage: Clang 3.8
      env: TARGET=python
@ -68,13 +81,11 @@ 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
-      env: TARGET=ipk
-    - <<: *run-additional-jobs
-      env: TARGET=rpm
    - <<: *run-additional-jobs
      env: TARGET=npm
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -8,9 +8,8 @@ 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)
 option (NPM "Generate NPM/GYP tarballs" OFF)
 option (BUILDTESTS "Generate check-ups for upm" OFF)
 option (WERROR "Make all warnings into errors." ON)
@ -90,8 +89,15 @@ endfunction ()

 # Compiler flags common to both C and CXX
 # Enable -Wall
+set (C_CXX_WARNING_FLAGS -Wall
+    -Wno-strict-aliasing
+    -Wno-deprecated-declarations # Temp fix for MRAA deprecated methods
+    )
+
 # GCC-6 added -Wmisleading-indentation to -Wall, skip these for now
-set (C_CXX_WARNING_FLAGS -Wall -Wno-misleading-indentation -Wno-strict-aliasing)
+if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "6")
+  list (APPEND C_CXX_WARNING_FLAGS -Wno-misleading-indentation)
+endif ()

 # Warnings as errors?
 if (WERROR)
@ -125,7 +131,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.9.0)
+set(MRAA_MINIMUM 2.0.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})
@ -145,6 +151,11 @@ pkg_check_modules (MODBUS libmodbus>=3.1.2)
 # Check for OPENZWAVE
 pkg_check_modules (OPENZWAVE libopenzwave)

+# Check for TinyB
+pkg_check_modules (TINYB tinyb>=0.5.1)
+# And get full path to the tinyb library
+find_library(TINYB_LIBRARY NAMES tinyb HINTS ${TINYB_LIBDIR})
+
 # Find JPEG
 find_package (JPEG)

@ -165,6 +176,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)
@ -213,7 +235,7 @@ include (GetGitRevisionDescription)
 git_describe (VERSION "--tags")
 # If git_describe fails, use a dirty version
 if (${VERSION} MATCHES -NOTFOUND)
-  set (VERSION "v1.6.0")
+  set (VERSION "v1.7.1")
  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 ()
@ -236,11 +258,6 @@ set (upm_VERSION_MINOR ${VERSION_MINOR})
 set (upm_VERSION_PATCH ${VERSION_PATCH})
 set (upm_VERSION_STRING ${upm_VERSION_MAJOR}.${upm_VERSION_MINOR}.${upm_VERSION_PATCH})

-# Detect arch
-include (TargetArch)
-target_architecture (DETECTED_ARCH)
-message (STATUS "Target arch is ${DETECTED_ARCH}")
-
 # enable c++11 standards support unconditionally
 include(CheckCXXCompilerFlag)
 if (CMAKE_VERSION VERSION_LESS "3.1")
@ -275,37 +292,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")
@ -317,12 +333,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 C/C++ 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")
@ -335,11 +356,28 @@ if (BUILDDOC)
  # 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 -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 \;
@ -348,10 +386,12 @@ if (BUILDDOC)
        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 Python 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 ()
@ -361,81 +401,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 Javascript 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)
-
-if (IPK)
- # Get target package arch from Yocto ADT sysroot if set or host OS, mapping to Ubuntu name if necessary
-  if (DEFINED ENV{OECORE_TARGET_SYSROOT})
-    GET_FILENAME_COMPONENT (DETECTED_SYSROOT $ENV{OECORE_TARGET_SYSROOT} NAME)
-    string (REGEX REPLACE "-poky-linux" "" TARGET_ARCH "${DETECTED_SYSROOT}")
-  else ()
-    # Debian uses amd64 to denote x86_64
-    if (DETECTED_ARCH STREQUAL "x86_64")
-      set (TARGET_ARCH "amd64")
-    else ()
-      set (TARGET_ARCH ${DETECTED_ARCH})
-    endif ()
-  endif ()
-  message (STATUS "Package arch is ${TARGET_ARCH}")
-
-  set(CPACK_GENERATOR "DEB")
-  set(OPKG_ARCH ${TARGET_ARCH})
-  set(CPACK_BINARY_DIR ${CMAKE_BINARY_DIR})
-  set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Intel IoT-Devkit") #required
-  set(upm_PACKAGE_ON_TAG ".")
-  if ("${VERSION_COMMIT}" STREQUAL "")
-    set(upm_PACKAGE_ON_TAG "")
-  endif()
-  set(CPACK_PACKAGE_VERSION
-      "${upm_VERSION_MAJOR}.${upm_VERSION_MINOR}.${upm_VERSION_PATCH}${upm_PACKAGE_ON_TAG}${VERSION_COMMIT}")
-  set(CPACK_PACKAGE_NAME "upm")
-  set(CPACK_DEBIAN_PACKAGE_SECTION "libs")
-  set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE ${TARGET_ARCH})
-  set(CPACK_SYSTEM_NAME ${TARGET_ARCH})
-  set(CPACK_DEBIAN_PACKAGE_DEPENDS "mraa (>= ${MRAA_VERSION})")
-  set(CPACK_DEBIAN_PACKAGE_PROVIDES "upm-dev, upm-dbg, upm-doc")
-  set(CPACK_DEBIAN_PACKAGE_REPLACES ${CPACK_DEBIAN_PACKAGE_PROVIDES})
-  set(CPACK_DEBIAN_PACKAGE_CONFLICTS ${CPACK_DEBIAN_PACKAGE_PROVIDES})
-  set(WDIR "${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}")
-  include (CPack)
-endif()
-
-if (RPM)
-  message (STATUS "RPM packaging enabled for ${DETECTED_ARCH}")
-  set(CPACK_GENERATOR "RPM")
-  set(CPACK_PACKAGE_NAME "upm")
-  set(upm_PACKAGE_ON_TAG ".")
-  if ("${VERSION_COMMIT}" STREQUAL "")
-    set(upm_PACKAGE_ON_TAG "")
-  endif()
-  set(CPACK_PACKAGE_VERSION
-      "${upm_VERSION_MAJOR}.${upm_VERSION_MINOR}.${upm_VERSION_PATCH}${upm_PACKAGE_ON_TAG}${VERSION_COMMIT}")
-  set(CPACK_PACKAGE_CONTACT "Intel IoT-Devkit")
-  set(CPACK_PACKAGE_VENDOR "Intel IoT-Devkit")
-  set(CPACK_RPM_PACKAGE_REQUIRES "mraa >= ${MRAA_VERSION}")
-  set(CPACK_RPM_PACKAGE_PROVIDES "${CPACK_PACKAGE_NAME}-devel")
-  set(CPACK_RPM_PACKAGE_LICENSE "MIT")
-  EXECUTE_PROCESS(COMMAND rpm --showrc
-    COMMAND grep -E "dist[[:space:]]*\\."
-    COMMAND sed -e "s/^.*dist\\s*\\.//"
-    COMMAND tr \\n \\t
-    COMMAND sed  -e s/\\t//
-    OUTPUT_VARIABLE DIST_TAG)
-  set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}.${DIST_TAG}.${DETECTED_ARCH}")
-  include(CPack)
-endif()
+endfunction()

 # UPM common headers
 set (UPM_COMMON_HEADER_DIRS ${CMAKE_HOME_DIRECTORY}/include)
@ -455,7 +436,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
    COMPONENT ${CMAKE_PROJECT_NAME}-dev
-    FILES_MATCHING PATTERN "*.h")
+    FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp")
--- a/44
+++ b/44
@ -0,0 +1,44 @@
+# Contributing to Eclipse UPM
+
+Thanks for your interest in this project.
+
+## Project description
+
+The Eclipse UPM repository provides software drivers for a wide variety of
+commonly used sensors and actuators. These software drivers interact with the
+underlying hardware platform (or microcontroller), as well as with the attached
+sensors, through calls to Eclipse MRAA APIs.
+
+* https://projects.eclipse.org/projects/iot.upm
+
+## Developer resources
+
+Information regarding source code management, builds, coding standards, and
+more.
+
+* https://projects.eclipse.org/projects/iot.upm/developer
+
+The project maintains the following source code repositories
+
+
+## Eclipse Contributor Agreement
+
+Before your contribution can be accepted by the project team contributors must
+electronically sign the Eclipse Contributor Agreement (ECA).
+
+* http://www.eclipse.org/legal/ECA.php
+
+Commits that are provided by non-committers must have a Signed-off-by field in
+the footer indicating that the author is aware of the terms by which the
+contribution has been provided to the project. The non-committer must
+additionally have an Eclipse Foundation account and must have a signed Eclipse
+Contributor Agreement (ECA) on file.
+
+For more information, please see the Eclipse Committer Handbook:
+https://www.eclipse.org/projects/handbook/#resources-commit
+
+## Contact
+
+Contact the project developers via the project's "dev" list.
+
+* 
--- a/2
+++ b/2
@ -1,5 +1,5 @@
 The MIT License (MIT)
-Copyright © 2014-2016 Intel Corporation
+Copyright © 2014-2019 Intel Corporation and others

 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
--- a/README.md
+++ b/README.md
@ -1,34 +1,36 @@
 <p align="center">
-  <img src="https://github.com/intel-iot-devkit/upm/blob/master/docs/icons/upm_logo.png" height="150px" width="auto" algt="UPM Logo"/>
+  <img src="https://github.com/eclipse/upm/blob/master/docs/icons/upm_logo.png" height="150px" width="auto" algt="UPM Logo"/>
 </p>

-UPM (Useful Packages & Modules) Sensor/Actuator repository for MRAA
+Eclipse UPM Sensor and Actuator Repository
 ==============

-The UPM repository provides software drivers for a wide variety of commonly
-used sensors and actuators. These software drivers interact with the
+The Eclipse UPM repository provides software drivers for a wide variety of
+commonly used sensors and actuators. These software drivers interact with the
 underlying hardware platform (or microcontroller), as well as with the attached
-sensors, through calls to [MRAA](https://github.com/intel-iot-devkit/mraa) APIs.
+sensors, through calls to [Eclipse MRAA](https://github.com/eclipse/mraa) APIs.

-Programmers can access the interfaces for each sensor by including the sensor’s
+Programmers can access the interfaces for each sensor by including the sensor's
 corresponding header file and instantiating the associated sensor class. In the
 typical use case, a constructor initializes the sensor based on parameters that
 identify the sensor, the I/O protocol used and the pin location of the sensor.
+As of UPM 2.0, sensor initialization can also be done, in most cases, via
+overloaded constructors that accept string identifiers.

 We endorse additions that implement the generic C and C++ interfaces provided
-with the libraries. Multiple sensor and actuator types have been defined, for
-instance:
+with the libraries. With the 2.0 release, UPM introduces the following sensor
+interfaces:
+```
+iAcceleration, iAngle, iButton, iClock, iCollision, iDistance,
+iDistanceInterrupter, iEC, iElectromagnet, iEmg, iGas, iGps, iGyroscope,
+iHallEffect, iHeartRate, iHumidity, iLight, iLineFinder, iMagnetometer,
+iMoisture, iMotion, iOrp, iPH, iPressure, iProximity, iTemperature, iVDiv,
+iWater.
+```
+The developer community is invited to propose new interfaces for actuator types.

-* Light controller 
-* Light sensor
-* Temperature sensor
-* Humidity sensor
-* Pressure sensor
-* Gas sensor
-* Analog to digital converter
-
-The developer community is welcome to submit feedback on existing categories or
-suggest new ones.
+The UPM project is joining the Eclipse Foundation as an Eclipse IoT project.
+You can read more about this [here](https://projects.eclipse.org/proposals/eclipse-upm).

 ### Example

@ -61,27 +63,21 @@ A sensor/actuator is expected to work as such (here is the MMA7660 accelerometer
    }
 ```

-Browse through the list of all [examples](https://github.com/intel-iot-devkit/upm/tree/master/examples).
+Browse through the list of all [examples](https://github.com/eclipse/upm/tree/master/examples).

-Multi-sensor samples for the starter and specialized kits can be found in the
+Multi-sensor samples for starter and specialized kits can be found in the
 [iot-devkit-samples](https://github.com/intel-iot-devkit/iot-devkit-samples) repository.

 ### Supported Sensors

 Supported [sensor list](http://iotdk.intel.com/docs/master/upm/modules.html) from API documentation.

-You can also refer to the [Intel® IoT Developer Zone](https://software.intel.com/iot/hardware/sensors).
+### IDE Support and More

-### IDE Support
-
-The UPM sensor libraries are directly supported by the IDEs listed on the Intel®
-Developer Zone Tools & IDEs page.
-
-<a href="https://software.intel.com/iot/tools"><img src="docs/icons/iss.png"/></a>
-
-Intel® System Studio integration offers IoT specific features such as a sensor explorer,
-library sync tools and the ability to easily import existing projects and samples that
-use the UPM libraries. For further details please refer to the IoT User Guides on IDZ.
+The UPM project includes support for multiple industrial-grade sensors, actuators, radios,
+protocols and standards in use today. It is also highly integrated with the Eclipse IDE 
+through the help of the Foundation's partners.
+Learn more about [tools](https://software.intel.com/en-us/tools-by-segment/systems-iot).

 ### Installing UPM

@ -92,33 +88,24 @@ Find notes on how to install UPM on various OS'es on this [page](docs/installing
 See building documentation [here](docs/building.md).

 [![Build Status](https://travis-ci.org/intel-iot-devkit/upm.svg?branch=master)](https://travis-ci.org/intel-iot-devkit/upm)
-
-### Making your own UPM module
-
-A quick way to add a new sensor driver is to port existing code from another
-platform (e.g. Arduino) and swap the IO calls to the MRAA API. This of course
-assumes either ownership of the original code or licensing that allows
-unrestricted redistribution.
-
-The [porting](docs/porting.md) section has more information on this process,
-and there is an example available based on the max31855 [sensor](docs/max31855.md).
-
-Read more on creating Java [bindings](docs/creating_java_bindings.md) for your
-new driver.
+[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=upm-master&metric=alert_status)](https://sonarcloud.io/dashboard?id=upm-master)

 ### Guidelines and rules for new UPM contributions

 Before you begin development, take a look at our naming [conventions](docs/naming.md).
 The name you pick for a newly added sensor needs to be unique in the UPM library.

-Then, please go over this short set of rules for new [contributions](docs/contributions.md).
+Next, review the project's [contribution guide](docs/contributions.md).
+
 Make sure you add yourself as an author on every new code file submitted.
 If you are providing a fix with significant changes, feel free to add yourself
-as a contributor. Signing-off your commits is mandatory.
+as a contributor. Signing-off your commits and accepting the ECA is mandatory
+for making new contributions to this project.

 Documenting your code is also a big part of the task. We have a strict set of
 tags used to classify our sensors and their capabilities. You can find out more
 about this in our [section](docs/documentation.md) on documenting a sensor API.
+
 Finally, if you really want to ensure consistency with the rest of the library,
 and the intel-iot-devkit repositories in general, take a look at our extensive
 [author guide](docs/guidelines.md).
@ -137,9 +124,6 @@ our API in a way that will break backwards compatibility. If you find yourself
 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`
-
 ### Changelog
 Version changelog [here](docs/changelog.md).

--- a/cmake/Toolchains/oe-sdk_cross.cmake
+++ b/cmake/Toolchains/oe-sdk_cross.cmake
@ -1,25 +0,0 @@
-# this toolchain file comes from gnuradio project
-
-set( CMAKE_SYSTEM_NAME Linux )
-#set( CMAKE_C_COMPILER  $ENV{CC} )
-#set( CMAKE_CXX_COMPILER  $ENV{CXX} )
-string(REGEX MATCH "sysroots/([a-zA-Z0-9]+)" CMAKE_SYSTEM_PROCESSOR $ENV{SDKTARGETSYSROOT})
-string(REGEX REPLACE "sysroots/" "" CMAKE_SYSTEM_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR})
-set( CMAKE_CXX_FLAGS $ENV{CXXFLAGS}  CACHE STRING "" FORCE )
-set( CMAKE_C_FLAGS $ENV{CFLAGS} CACHE STRING "" FORCE ) #same flags for C sources
-set( CMAKE_LDFLAGS_FLAGS ${CMAKE_CXX_FLAGS} CACHE STRING "" FORCE ) #same flags for C sources
-set( CMAKE_LIBRARY_PATH ${OECORE_TARGET_SYSROOT}/usr/lib )
-set( CMAKE_FIND_ROOT_PATH $ENV{OECORE_TARGET_SYSROOT} $ENV{OECORE_NATIVE_SYSROOT} )
-set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER )
-set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY )
-set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY )
-set( CMAKE_INSTALL_PREFIX $ENV{OECORE_TARGET_SYSROOT}/usr CACHE STRING "" FORCE)
-set( ORC_INCLUDE_DIRS $ENV{OECORE_TARGET_SYSROOT}/usr/include/orc-0.4 )
-set( ORC_LIBRARY_DIRS $ENV{OECORE_TARGET_SYSROOT}/usr/lib )
-
-# for java
-set( JAVA_AWT_INCLUDE_PATH $ENV{JAVA_HOME}/include CACHE PATH "" FORCE)
-set( JAVA_AWT_LIBRARY $ENV{JAVA_HOME}/jre/lib/amd64/libjawt.so CACHE FILEPATH "" FORCE)
-set( JAVA_INCLUDE_PATH $ENV{JAVA_HOME}/include CACHE PATH "" FORCE)
-set( JAVA_INCLUDE_PATH2 $ENV{JAVA_HOME}/include/linux CACHE PATH "" FORCE)
-set( JAVA_JVM_LIBRARY $ENV{JAVA_HOME}/jre/lib/amd64/libjvm.so CACHE FILEPATH "" FORCE)
--- a/cmake/modules/FindUpmCordovaGenerator.cmake
+++ b/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)
--- a/cmake/modules/TargetArch.cmake
+++ b/cmake/modules/TargetArch.cmake
@ -1,136 +0,0 @@
-# Based on the Qt 5 processor detection code, so should be very accurate
-# https://qt.gitorious.org/qt/qtbase/blobs/master/src/corelib/global/qprocessordetection.h
-# Currently handles arm (v5, v6, v7), x86 (32/64), ia64, and ppc (32/64)
-
-# Regarding POWER/PowerPC, just as is noted in the Qt source,
-# "There are many more known variants/revisions that we do not handle/detect."
-
-set(archdetect_c_code "
-#if defined(__arm__) || defined(__TARGET_ARCH_ARM)
-    #if defined(__ARM_ARCH_7__) \\
-        || defined(__ARM_ARCH_7A__) \\
-        || defined(__ARM_ARCH_7R__) \\
-        || defined(__ARM_ARCH_7M__) \\
-        || (defined(__TARGET_ARCH_ARM) && __TARGET_ARCH_ARM-0 >= 7)
-        #error cmake_ARCH armv7
-    #elif defined(__ARM_ARCH_6__) \\
-        || defined(__ARM_ARCH_6J__) \\
-        || defined(__ARM_ARCH_6T2__) \\
-        || defined(__ARM_ARCH_6Z__) \\
-        || defined(__ARM_ARCH_6K__) \\
-        || defined(__ARM_ARCH_6ZK__) \\
-        || defined(__ARM_ARCH_6M__) \\
-        || (defined(__TARGET_ARCH_ARM) && __TARGET_ARCH_ARM-0 >= 6)
-        #error cmake_ARCH armv6
-    #elif defined(__ARM_ARCH_5TEJ__) \\
-        || (defined(__TARGET_ARCH_ARM) && __TARGET_ARCH_ARM-0 >= 5)
-        #error cmake_ARCH armv5
-    #else
-        #error cmake_ARCH arm
-    #endif
-#elif defined(__i586) || defined(__i586__)
-    #error cmake_ARCH i586
-#elif defined(__i386) || defined(__i386__) || defined(_M_IX86)
-    #error cmake_ARCH i386
-#elif defined(__x86_64) || defined(__x86_64__) || defined(__amd64) || defined(_M_X64)
-    #error cmake_ARCH x86_64
-#elif defined(__ia64) || defined(__ia64__) || defined(_M_IA64)
-    #error cmake_ARCH ia64
-#elif defined(__ppc__) || defined(__ppc) || defined(__powerpc__) \\
-      || defined(_ARCH_COM) || defined(_ARCH_PWR) || defined(_ARCH_PPC)  \\
-      || defined(_M_MPPC) || defined(_M_PPC)
-    #if defined(__ppc64__) || defined(__powerpc64__) || defined(__64BIT__)
-        #error cmake_ARCH ppc64
-    #else
-        #error cmake_ARCH ppc
-    #endif
-#endif
-
-#error cmake_ARCH unknown
-")
-
-# Set ppc_support to TRUE before including this file or ppc and ppc64
-# will be treated as invalid architectures since they are no longer supported by Apple
-
-function(target_architecture output_var)
-    if(APPLE AND CMAKE_OSX_ARCHITECTURES)
-        # On OS X we use CMAKE_OSX_ARCHITECTURES *if* it was set
-        # First let's normalize the order of the values
-
-        # Note that it's not possible to compile PowerPC applications if you are using
-        # the OS X SDK version 10.6 or later - you'll need 10.4/10.5 for that, so we
-        # disable it by default
-        # See this page for more information:
-        # http://stackoverflow.com/questions/5333490/how-can-we-restore-ppc-ppc64-as-well-as-full-10-4-10-5-sdk-support-to-xcode-4
-
-        # Architecture defaults to i386 or ppc on OS X 10.5 and earlier, depending on the CPU type detected at runtime.
-        # On OS X 10.6+ the default is x86_64 if the CPU supports it, i386 otherwise.
-
-        foreach(osx_arch ${CMAKE_OSX_ARCHITECTURES})
-            if("${osx_arch}" STREQUAL "ppc" AND ppc_support)
-                set(osx_arch_ppc TRUE)
-            elseif("${osx_arch}" STREQUAL "i386")
-                set(osx_arch_i386 TRUE)
-            elseif("${osx_arch}" STREQUAL "x86_64")
-                set(osx_arch_x86_64 TRUE)
-            elseif("${osx_arch}" STREQUAL "ppc64" AND ppc_support)
-                set(osx_arch_ppc64 TRUE)
-            else()
-                message(FATAL_ERROR "Invalid OS X arch name: ${osx_arch}")
-            endif()
-        endforeach()
-
-        # Now add all the architectures in our normalized order
-        if(osx_arch_ppc)
-            list(APPEND ARCH ppc)
-        endif()
-
-        if(osx_arch_i386)
-            list(APPEND ARCH i386)
-        endif()
-
-        if(osx_arch_x86_64)
-            list(APPEND ARCH x86_64)
-        endif()
-
-        if(osx_arch_ppc64)
-            list(APPEND ARCH ppc64)
-        endif()
-    else()
-        file(WRITE "${CMAKE_BINARY_DIR}/arch.c" "${archdetect_c_code}")
-
-        enable_language(C)
-
-        # Detect the architecture in a rather creative way...
-        # This compiles a small C program which is a series of ifdefs that selects a
-        # particular #error preprocessor directive whose message string contains the
-        # target architecture. The program will always fail to compile (both because
-        # file is not a valid C program, and obviously because of the presence of the
-        # #error preprocessor directives... but by exploiting the preprocessor in this
-        # way, we can detect the correct target architecture even when cross-compiling,
-        # since the program itself never needs to be run (only the compiler/preprocessor)
-        try_run(
-            run_result_unused
-            compile_result_unused
-            "${CMAKE_BINARY_DIR}"
-            "${CMAKE_BINARY_DIR}/arch.c"
-            COMPILE_OUTPUT_VARIABLE ARCH
-            CMAKE_FLAGS CMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
-        )
-
-        # Parse the architecture name from the compiler output
-        string(REGEX MATCH "cmake_ARCH ([a-zA-Z0-9_]+)" ARCH "${ARCH}")
-
-        # Get rid of the value marker leaving just the architecture name
-        string(REPLACE "cmake_ARCH " "" ARCH "${ARCH}")
-
-        # If we are compiling with an unknown architecture this variable should
-        # already be set to "unknown" but in the case that it's empty (i.e. due
-        # to a typo in the code), then set it to unknown
-        if (NOT ARCH)
-            set(ARCH unknown)
-        endif()
-    endif()
-
-    set(${output_var} "${ARCH}" PARENT_SCOPE)
-endfunction()
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@ -13,8 +13,10 @@ services:
      - BUILDFTI=${BUILDFTI:-ON}
      - BUILDSWIGPYTHON=${BUILDSWIGPYTHON:-OFF}
      - BUILDSWIGJAVA=${BUILDSWIGJAVA:-OFF}
+      - BUILDCORDOVA=${BUILDCORDOVA:-OFF}
      - BUILDSWIGNODE=${BUILDSWIGNODE:-OFF}
      - BUILDEXAMPLES=${BUILDEXAMPLES:-OFF}
+      - CMAKE_BUILD_TYPE
      - IPK=${IPK:-OFF}
      - RPM=${RPM:-OFF}
      - NPM=${NPM:-OFF}
@ -30,6 +32,12 @@ services:
    extends: base
    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:
@ -48,20 +56,6 @@ services:
      - BUILDEXAMPLES=ON
    command: bash -c "./scripts/run-cmake.sh && cd build && make -j8"

-  ipk:
-    extends: all
-    environment:
-      - IPK=ON
-      - BUILDDOC=OFF
-    command: bash -c "./scripts/run-cmake.sh && make -Cbuild -j8 package"
-
-  rpm:
-    extends: all
-    environment:
-      - RPM=ON
-      - BUILDDOC=OFF
-    command: bash -c "./scripts/run-cmake.sh && make -Cbuild -j8 package"
-
  npm:
    extends: all
    environment:
@ -70,12 +64,10 @@ services:
    command: bash -c "./scripts/run-cmake.sh && make -Cbuild -j8 npmpkg"

  sonar-scan:
-    extends: all
+    extends: base
+    image: inteliotdevkit/upm-sonar
    environment:
-      - BUILDSWIGPYTHON=ON
-      - BUILDSWIGNODE=ON
-      - BUILDSWIGJAVA=ON
-      - BUILDEXAMPLES=ON
+      - BUILDTESTS=OFF
      - SONAR_TOKEN
      - SONAR_ORG
      - SONAR_PROJ_KEY
@ -107,6 +99,13 @@ services:
      - 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: inteliotdevkit/upm-node4
--- a/docs/apichanges.md
+++ b/docs/apichanges.md
@ -4,6 +4,25 @@ API Changes                       {#apichanges}
 Here's a list of other API changes made to the library that break source/binary
 compatibility between releases:

+# v2.0.0
+ * Sensors implementing the old interfaces (bme280, bmpx8x, si7005, si1132,
+ max44009, lp8860, ds1808lc, hlg150h) have been updated to use the new ones,
+ hence some function names and parameters will be different.
+ * Removed deprecated basic grove classes from project, see API changes for
+ v1.1.0 and prior for a complete list
+
+# v1.7.0
+ * 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.
+ * The **tm1637** constructor has been updated and the fast GPIO parameter
+ has been removed with the deprecation of supporting MRAA functions. The
+ GPIO lines will initialize by default in fast mode when available.
+ * The generic **nmea_gps** library for GPS devices has been greatly enhanced
+ with new APIs to offer better control over acquisition intervals and simplify
+ parsing of the returned data.
+
 # v1.6.0

 * Several C libraries had their init function pin type modified from uint8_t
--- a/docs/building.md
+++ b/docs/building.md
@ -96,13 +96,16 @@ You can also generate the include and lib directories containing all the sensor
 headers and library files respectively with *make install*. Further, you may
 choose to generate these only for a specific sensor you modified, and this can
 be achieved by building from the individual makefile of the sensor. Assuming
-you're in the build directory, to make the lcd module you would:
+you're in the build directory, to build/install the lcd module you would:

 ~~~~~~~~~~~~~
 cd src/lcd
 make install
 ~~~~~~~~~~~~~

+Note: 'make install' under src/lcd will build all targets (and dependencies)
+for the lcd but will NOT install dependencies.
+
 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
--- a/docs/changelog.md
+++ b/docs/changelog.md
@ -4,6 +4,37 @@ Changelog                         {#changelog}
 Here's a list summarizing some of the key undergoing changes to our library
 from earlier versions:

+### v2.0.0
+
+ * Reworked existing interfaces and extended the list to include iAcceleration,
+ iAngle, iButton, iClock, iCollision, iDistance, iDistanceInterrupter, iEC,
+ iElectromagnet, iEmg, iGas, iGps, iGyroscope, iHallEffect, iHeartRate, iHumidity,
+ iLight, iLineFinder, iMagnetometer, iMoisture, iMotion, iOrp, iPH, iPressure,
+ iProximity, iTemperature, iVDiv, iWater
+ * Provided overloaded string based constructors for a good number of sensors,
+ allowing initialization from external frameworks without type knowledge
+ * Removed deprecated basic grove classes from project
+ * Replaced 6 unsafe occurrences of sprintf() usage
+ * Cleaned-up build system around target arch detection and cpack usage, added
+ detection and resolution of tinyb library when used as a dependency
+ * New sensors: 2jciebu01_ble, 2jciebu01_usb
+
+### v1.7.1
+
+ * Bumped library compatibility to new MRAA 2.0 APIs
+ * Added installation details for Fedora
+ * Minor fixes based on static analysis vulnerability report
+
+### v1.7.0
+
+ * Added Cordova bindings based on Java packages
+ * Complete rework of the nmea_gps library giving more control over data
+ acquisition and parsing
+ * Added GTest support for unit tests
+ * Removed calls to deprecated MRAA fast GPIO functions
+ * Several bug fixes and improvements around SWIG type maps and gcc8 support
+ * New sensors: kx122, kxtj3, bh1792, bh1749
+
 ### v1.6.0

 * Extended LED library to support the new MRAA gpio-leds APIs
--- a/docs/contributions.md
+++ b/docs/contributions.md
@ -1,100 +1,53 @@
 Contributing a module                         {#contributions}
 =====================

-Here are the rules of contribution:
- Your new module must have an example that builds against your UPM library.
- Each commit must have a sign-off line by everyone who authored or reviewed
-  them.
- Commits must be named `<file/module>: Some decent description`.
- You must license your module under a FOSS license. The recommended license
-  is MIT but any permissive license is fine. Please consider that people using
-  UPM may want to write proprietary programs with your sensors so we like to
-  avoid GPL. If your license is not MIT please include a LICENSE file in
-  src/mymodule/.
+In order to contribute to the project:
 - The top of each source file must contain a comment block containing the
  license information.
- Please test your module builds before contributing and make sure it works on
-  the latest version of libmraa. If you tested on a specific board/platform
-  please tell us what this was in your PR.
- Try not to break master. In any commit.
+- Commits must be named `<file/module>: Some decent description`.
+- Each commit must have a sign-off line by everyone who authored or reviewed
+  them.
+- Your new module must have an example that builds against your UPM library.
 - Attempt to have some decent API documentation as described in the the @ref
  documentation [guide](documentation.md).

 Including the MIT license
 =========================
 Choosing the [MIT license](http://opensource.org/licenses/MIT) is preferred for
-the UPM repository.  Below is the comment block needed at the top each source
+the UPM repository. Below is the comment block needed at the top each source
 file:

        /*
-         * The MIT License (MIT)
-         *
-         * Author: <your full name> 
+         * Author: <your full name>
         * Copyright (c) <year> <copyright holder>
         *
-         * Author: <contributing author full name - if applicable> 
+         * Author: <contributing author full name - if applicable>
         * Copyright (c) <year> <copyright holder>
         *
-         * 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:
+         * This program and the accompanying materials are made available under the
+         * terms of the MIT License which is available at https://opensource.org/licenses/MIT.
         *
-         * 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.
+         * SPDX-License-Identifier: MIT
         */

-
-Code signing
+Eclipse Contributor Agreement
 ============

-The sign-off is a simple line at the end of the explanation for the
-patch, which certifies that you wrote it or otherwise have the right to pass it
-on as an open-source patch.  The rules are pretty simple: if you can certify
-the below:
+Your contribution cannot be accepted unless you have a signed [ECA - Eclipse Foundation Contributor Agreement](http://www.eclipse.org/legal/ECA.php) in place.

-        Developer's Certificate of Origin 1.1
+Here is the checklist for contributions to be considered _acceptable_:

-        By making a contribution to this project, I certify that:
-
-        (a) The contribution was created in whole or in part by me and I
-            have the right to submit it under the open source license
-            indicated in the file; or
-
-        (b) The contribution is based upon previous work that, to the best
-            of my knowledge, is covered under an appropriate open source
-            license and I have the right under that license to submit that
-            work with modifications, whether created in whole or in part
-            by me, under the same open source license (unless I am
-            permitted to submit under a different license), as indicated
-            in the file; or
-
-        (c) The contribution was provided directly to me by some other
-            person who certified (a), (b) or (c) and I have not modified
-            it.
-
-        (d) I understand and agree that this project and the contribution
-            are public and that a record of the contribution (including all
-            personal information I submit with it, including my sign-off) is
-            maintained indefinitely and may be redistributed consistent with
-            this project or the open source license(s) involved.
-
-then you just add a line to each of your commits with `--signoff` saying
-
-        Signed-off-by: Random J Developer <random@developer.example.org>
-
-using your real name (sorry, no pseudonyms or anonymous contributions.)
-Unsigned commits will not be accepted.
+1. [Create an account at Eclipse](https://dev.eclipse.org/site_login/createaccount.php).
+2. Add your GitHub user name in your account settings.
+3. [Log into the project's portal](https://projects.eclipse.org/) and sign the ["Eclipse ECA"](https://projects.eclipse.org/user/sign/cla).
+4. Ensure that you [_sign-off_](https://wiki.eclipse.org/Development_Resources/Contributing_via_Git#Signing_off_on_a_commit) your Git commits.
+5. Ensure that you use the _same_ email address as your Eclipse account in commits.
+6. Include the appropriate copyright notice and license at the top of each file.

+Your signing of the ECA will be verified by a webservice called 'ip-validation'
+that checks the email address that signed-off on your commits has signed the
+ECA. **Note**: This service is case-sensitive, so ensure the email that signed
+the ECA and that signed-off on your commits is the same, down to the case.

 Creating a new sensor library using the sensortemplate
 =======================================
--- a/docs/creating_java_bindings.md
+++ b/docs/creating_java_bindings.md
@ -259,7 +259,7 @@ We extend the sensor class with another method, _installISR\(jobject runnable\)_

 Java callbacks are added at the SWIG interface level.  For ease-of-use, a collection of macros are available in src/_upm.i.

-src/a110x/javaupm_a110x.i:
+src/a110x/a110x.i:
 ```c++
 JAVA_ADD_INSTALLISR(upm::A110X)
 ```
--- a/docs/icons/allides.png
+++ b/docs/icons/allides.png
--- a/docs/icons/wyliodrin.png
+++ b/docs/icons/wyliodrin.png
--- a/docs/icons/xdk.png
+++ b/docs/icons/xdk.png
--- a/docs/images/LICENSE_CC_3_0.txt
+++ b/docs/images/LICENSE_CC_3_0.txt
@ -1,361 +0,0 @@
-Creative Commons Legal Code
-
-Attribution-NonCommercial-ShareAlike 3.0 Unported
-
-    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
-    LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN
-    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
-    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
-    REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR
-    DAMAGES RESULTING FROM ITS USE.
-
-License
-
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
-COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
-COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
-AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
-
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
-TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY
-BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
-CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
-CONDITIONS.
-
-1. Definitions
-
- a. "Adaptation" means a work based upon the Work, or upon the Work and
-    other pre-existing works, such as a translation, adaptation,
-    derivative work, arrangement of music or other alterations of a
-    literary or artistic work, or phonogram or performance and includes
-    cinematographic adaptations or any other form in which the Work may be
-    recast, transformed, or adapted including in any form recognizably
-    derived from the original, except that a work that constitutes a
-    Collection will not be considered an Adaptation for the purpose of
-    this License. For the avoidance of doubt, where the Work is a musical
-    work, performance or phonogram, the synchronization of the Work in
-    timed-relation with a moving image ("synching") will be considered an
-    Adaptation for the purpose of this License.
- b. "Collection" means a collection of literary or artistic works, such as
-    encyclopedias and anthologies, or performances, phonograms or
-    broadcasts, or other works or subject matter other than works listed
-    in Section 1(g) below, which, by reason of the selection and
-    arrangement of their contents, constitute intellectual creations, in
-    which the Work is included in its entirety in unmodified form along
-    with one or more other contributions, each constituting separate and
-    independent works in themselves, which together are assembled into a
-    collective whole. A work that constitutes a Collection will not be
-    considered an Adaptation (as defined above) for the purposes of this
-    License.
- c. "Distribute" means to make available to the public the original and
-    copies of the Work or Adaptation, as appropriate, through sale or
-    other transfer of ownership.
- d. "License Elements" means the following high-level license attributes
-    as selected by Licensor and indicated in the title of this License:
-    Attribution, Noncommercial, ShareAlike.
- e. "Licensor" means the individual, individuals, entity or entities that
-    offer(s) the Work under the terms of this License.
- f. "Original Author" means, in the case of a literary or artistic work,
-    the individual, individuals, entity or entities who created the Work
-    or if no individual or entity can be identified, the publisher; and in
-    addition (i) in the case of a performance the actors, singers,
-    musicians, dancers, and other persons who act, sing, deliver, declaim,
-    play in, interpret or otherwise perform literary or artistic works or
-    expressions of folklore; (ii) in the case of a phonogram the producer
-    being the person or legal entity who first fixes the sounds of a
-    performance or other sounds; and, (iii) in the case of broadcasts, the
-    organization that transmits the broadcast.
- g. "Work" means the literary and/or artistic work offered under the terms
-    of this License including without limitation any production in the
-    literary, scientific and artistic domain, whatever may be the mode or
-    form of its expression including digital form, such as a book,
-    pamphlet and other writing; a lecture, address, sermon or other work
-    of the same nature; a dramatic or dramatico-musical work; a
-    choreographic work or entertainment in dumb show; a musical
-    composition with or without words; a cinematographic work to which are
-    assimilated works expressed by a process analogous to cinematography;
-    a work of drawing, painting, architecture, sculpture, engraving or
-    lithography; a photographic work to which are assimilated works
-    expressed by a process analogous to photography; a work of applied
-    art; an illustration, map, plan, sketch or three-dimensional work
-    relative to geography, topography, architecture or science; a
-    performance; a broadcast; a phonogram; a compilation of data to the
-    extent it is protected as a copyrightable work; or a work performed by
-    a variety or circus performer to the extent it is not otherwise
-    considered a literary or artistic work.
- h. "You" means an individual or entity exercising rights under this
-    License who has not previously violated the terms of this License with
-    respect to the Work, or who has received express permission from the
-    Licensor to exercise rights under this License despite a previous
-    violation.
- i. "Publicly Perform" means to perform public recitations of the Work and
-    to communicate to the public those public recitations, by any means or
-    process, including by wire or wireless means or public digital
-    performances; to make available to the public Works in such a way that
-    members of the public may access these Works from a place and at a
-    place individually chosen by them; to perform the Work to the public
-    by any means or process and the communication to the public of the
-    performances of the Work, including by public digital performance; to
-    broadcast and rebroadcast the Work by any means including signs,
-    sounds or images.
- j. "Reproduce" means to make copies of the Work by any means including
-    without limitation by sound or visual recordings and the right of
-    fixation and reproducing fixations of the Work, including storage of a
-    protected performance or phonogram in digital form or other electronic
-    medium.
-
-2. Fair Dealing Rights. Nothing in this License is intended to reduce,
-limit, or restrict any uses free from copyright or rights arising from
-limitations or exceptions that are provided for in connection with the
-copyright protection under copyright law or other applicable laws.
-
-3. License Grant. Subject to the terms and conditions of this License,
-Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
-perpetual (for the duration of the applicable copyright) license to
-exercise the rights in the Work as stated below:
-
- a. to Reproduce the Work, to incorporate the Work into one or more
-    Collections, and to Reproduce the Work as incorporated in the
-    Collections;
- b. to create and Reproduce Adaptations provided that any such Adaptation,
-    including any translation in any medium, takes reasonable steps to
-    clearly label, demarcate or otherwise identify that changes were made
-    to the original Work. For example, a translation could be marked "The
-    original work was translated from English to Spanish," or a
-    modification could indicate "The original work has been modified.";
- c. to Distribute and Publicly Perform the Work including as incorporated
-    in Collections; and,
- d. to Distribute and Publicly Perform Adaptations.
-
-The above rights may be exercised in all media and formats whether now
-known or hereafter devised. The above rights include the right to make
-such modifications as are technically necessary to exercise the rights in
-other media and formats. Subject to Section 8(f), all rights not expressly
-granted by Licensor are hereby reserved, including but not limited to the
-rights described in Section 4(e).
-
-4. Restrictions. The license granted in Section 3 above is expressly made
-subject to and limited by the following restrictions:
-
- a. You may Distribute or Publicly Perform the Work only under the terms
-    of this License. You must include a copy of, or the Uniform Resource
-    Identifier (URI) for, this License with every copy of the Work You
-    Distribute or Publicly Perform. You may not offer or impose any terms
-    on the Work that restrict the terms of this License or the ability of
-    the recipient of the Work to exercise the rights granted to that
-    recipient under the terms of the License. You may not sublicense the
-    Work. You must keep intact all notices that refer to this License and
-    to the disclaimer of warranties with every copy of the Work You
-    Distribute or Publicly Perform. When You Distribute or Publicly
-    Perform the Work, You may not impose any effective technological
-    measures on the Work that restrict the ability of a recipient of the
-    Work from You to exercise the rights granted to that recipient under
-    the terms of the License. This Section 4(a) applies to the Work as
-    incorporated in a Collection, but this does not require the Collection
-    apart from the Work itself to be made subject to the terms of this
-    License. If You create a Collection, upon notice from any Licensor You
-    must, to the extent practicable, remove from the Collection any credit
-    as required by Section 4(d), as requested. If You create an
-    Adaptation, upon notice from any Licensor You must, to the extent
-    practicable, remove from the Adaptation any credit as required by
-    Section 4(d), as requested.
- b. You may Distribute or Publicly Perform an Adaptation only under: (i)
-    the terms of this License; (ii) a later version of this License with
-    the same License Elements as this License; (iii) a Creative Commons
-    jurisdiction license (either this or a later license version) that
-    contains the same License Elements as this License (e.g.,
-    Attribution-NonCommercial-ShareAlike 3.0 US) ("Applicable License").
-    You must include a copy of, or the URI, for Applicable License with
-    every copy of each Adaptation You Distribute or Publicly Perform. You
-    may not offer or impose any terms on the Adaptation that restrict the
-    terms of the Applicable License or the ability of the recipient of the
-    Adaptation to exercise the rights granted to that recipient under the
-    terms of the Applicable License. You must keep intact all notices that
-    refer to the Applicable License and to the disclaimer of warranties
-    with every copy of the Work as included in the Adaptation You
-    Distribute or Publicly Perform. When You Distribute or Publicly
-    Perform the Adaptation, You may not impose any effective technological
-    measures on the Adaptation that restrict the ability of a recipient of
-    the Adaptation from You to exercise the rights granted to that
-    recipient under the terms of the Applicable License. This Section 4(b)
-    applies to the Adaptation as incorporated in a Collection, but this
-    does not require the Collection apart from the Adaptation itself to be
-    made subject to the terms of the Applicable License.
- c. You may not exercise any of the rights granted to You in Section 3
-    above in any manner that is primarily intended for or directed toward
-    commercial advantage or private monetary compensation. The exchange of
-    the Work for other copyrighted works by means of digital file-sharing
-    or otherwise shall not be considered to be intended for or directed
-    toward commercial advantage or private monetary compensation, provided
-    there is no payment of any monetary compensation in con-nection with
-    the exchange of copyrighted works.
- d. If You Distribute, or Publicly Perform the Work or any Adaptations or
-    Collections, You must, unless a request has been made pursuant to
-    Section 4(a), keep intact all copyright notices for the Work and
-    provide, reasonable to the medium or means You are utilizing: (i) the
-    name of the Original Author (or pseudonym, if applicable) if supplied,
-    and/or if the Original Author and/or Licensor designate another party
-    or parties (e.g., a sponsor institute, publishing entity, journal) for
-    attribution ("Attribution Parties") in Licensor's copyright notice,
-    terms of service or by other reasonable means, the name of such party
-    or parties; (ii) the title of the Work if supplied; (iii) to the
-    extent reasonably practicable, the URI, if any, that Licensor
-    specifies to be associated with the Work, unless such URI does not
-    refer to the copyright notice or licensing information for the Work;
-    and, (iv) consistent with Section 3(b), in the case of an Adaptation,
-    a credit identifying the use of the Work in the Adaptation (e.g.,
-    "French translation of the Work by Original Author," or "Screenplay
-    based on original Work by Original Author"). The credit required by
-    this Section 4(d) may be implemented in any reasonable manner;
-    provided, however, that in the case of a Adaptation or Collection, at
-    a minimum such credit will appear, if a credit for all contributing
-    authors of the Adaptation or Collection appears, then as part of these
-    credits and in a manner at least as prominent as the credits for the
-    other contributing authors. For the avoidance of doubt, You may only
-    use the credit required by this Section for the purpose of attribution
-    in the manner set out above and, by exercising Your rights under this
-    License, You may not implicitly or explicitly assert or imply any
-    connection with, sponsorship or endorsement by the Original Author,
-    Licensor and/or Attribution Parties, as appropriate, of You or Your
-    use of the Work, without the separate, express prior written
-    permission of the Original Author, Licensor and/or Attribution
-    Parties.
- e. For the avoidance of doubt:
-
-     i. Non-waivable Compulsory License Schemes. In those jurisdictions in
-        which the right to collect royalties through any statutory or
-        compulsory licensing scheme cannot be waived, the Licensor
-        reserves the exclusive right to collect such royalties for any
-        exercise by You of the rights granted under this License;
-    ii. Waivable Compulsory License Schemes. In those jurisdictions in
-        which the right to collect royalties through any statutory or
-        compulsory licensing scheme can be waived, the Licensor reserves
-        the exclusive right to collect such royalties for any exercise by
-        You of the rights granted under this License if Your exercise of
-        such rights is for a purpose or use which is otherwise than
-        noncommercial as permitted under Section 4(c) and otherwise waives
-        the right to collect royalties through any statutory or compulsory
-        licensing scheme; and,
-   iii. Voluntary License Schemes. The Licensor reserves the right to
-        collect royalties, whether individually or, in the event that the
-        Licensor is a member of a collecting society that administers
-        voluntary licensing schemes, via that society, from any exercise
-        by You of the rights granted under this License that is for a
-        purpose or use which is otherwise than noncommercial as permitted
-        under Section 4(c).
- f. Except as otherwise agreed in writing by the Licensor or as may be
-    otherwise permitted by applicable law, if You Reproduce, Distribute or
-    Publicly Perform the Work either by itself or as part of any
-    Adaptations or Collections, You must not distort, mutilate, modify or
-    take other derogatory action in relation to the Work which would be
-    prejudicial to the Original Author's honor or reputation. Licensor
-    agrees that in those jurisdictions (e.g. Japan), in which any exercise
-    of the right granted in Section 3(b) of this License (the right to
-    make Adaptations) would be deemed to be a distortion, mutilation,
-    modification or other derogatory action prejudicial to the Original
-    Author's honor and reputation, the Licensor will waive or not assert,
-    as appropriate, this Section, to the fullest extent permitted by the
-    applicable national law, to enable You to reasonably exercise Your
-    right under Section 3(b) of this License (right to make Adaptations)
-    but not otherwise.
-
-5. Representations, Warranties and Disclaimer
-
-UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING AND TO THE
-FULLEST EXTENT PERMITTED BY APPLICABLE LAW, LICENSOR OFFERS THE WORK AS-IS
-AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE
-WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT
-LIMITATION, WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
-PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS,
-ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT
-DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED
-WARRANTIES, SO THIS EXCLUSION MAY NOT APPLY TO YOU.
-
-6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE
-LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR
-ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES
-ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS
-BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. Termination
-
- a. This License and the rights granted hereunder will terminate
-    automatically upon any breach by You of the terms of this License.
-    Individuals or entities who have received Adaptations or Collections
-    from You under this License, however, will not have their licenses
-    terminated provided such individuals or entities remain in full
-    compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will
-    survive any termination of this License.
- b. Subject to the above terms and conditions, the license granted here is
-    perpetual (for the duration of the applicable copyright in the Work).
-    Notwithstanding the above, Licensor reserves the right to release the
-    Work under different license terms or to stop distributing the Work at
-    any time; provided, however that any such election will not serve to
-    withdraw this License (or any other license that has been, or is
-    required to be, granted under the terms of this License), and this
-    License will continue in full force and effect unless terminated as
-    stated above.
-
-8. Miscellaneous
-
- a. Each time You Distribute or Publicly Perform the Work or a Collection,
-    the Licensor offers to the recipient a license to the Work on the same
-    terms and conditions as the license granted to You under this License.
- b. Each time You Distribute or Publicly Perform an Adaptation, Licensor
-    offers to the recipient a license to the original Work on the same
-    terms and conditions as the license granted to You under this License.
- c. If any provision of this License is invalid or unenforceable under
-    applicable law, it shall not affect the validity or enforceability of
-    the remainder of the terms of this License, and without further action
-    by the parties to this agreement, such provision shall be reformed to
-    the minimum extent necessary to make such provision valid and
-    enforceable.
- d. No term or provision of this License shall be deemed waived and no
-    breach consented to unless such waiver or consent shall be in writing
-    and signed by the party to be charged with such waiver or consent.
- e. This License constitutes the entire agreement between the parties with
-    respect to the Work licensed here. There are no understandings,
-    agreements or representations with respect to the Work not specified
-    here. Licensor shall not be bound by any additional provisions that
-    may appear in any communication from You. This License may not be
-    modified without the mutual written agreement of the Licensor and You.
- f. The rights granted under, and the subject matter referenced, in this
-    License were drafted utilizing the terminology of the Berne Convention
-    for the Protection of Literary and Artistic Works (as amended on
-    September 28, 1979), the Rome Convention of 1961, the WIPO Copyright
-    Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996
-    and the Universal Copyright Convention (as revised on July 24, 1971).
-    These rights and subject matter take effect in the relevant
-    jurisdiction in which the License terms are sought to be enforced
-    according to the corresponding provisions of the implementation of
-    those treaty provisions in the applicable national law. If the
-    standard suite of rights granted under applicable copyright law
-    includes additional rights not granted under this License, such
-    additional rights are deemed to be included in the License; this
-    License is not intended to restrict the license of any rights under
-    applicable law.
-
-
-Creative Commons Notice
-
-    Creative Commons is not a party to this License, and makes no warranty
-    whatsoever in connection with the Work. Creative Commons will not be
-    liable to You or any party on any legal theory for any damages
-    whatsoever, including without limitation any general, special,
-    incidental or consequential damages arising in connection to this
-    license. Notwithstanding the foregoing two (2) sentences, if Creative
-    Commons has expressly identified itself as the Licensor hereunder, it
-    shall have all rights and obligations of Licensor.
-
-    Except for the limited purpose of indicating to the public that the
-    Work is licensed under the CCPL, Creative Commons does not authorize
-    the use by either party of the trademark "Creative Commons" or any
-    related trademark or logo of Creative Commons without the prior
-    written consent of Creative Commons. Any permitted use will be in
-    compliance with Creative Commons' then-current trademark usage
-    guidelines, as may be published on its website or otherwise made
-    available upon request from time to time. For the avoidance of doubt,
-    this trademark restriction does not form part of this License.
-
-    Creative Commons may be contacted at https://creativecommons.org/.
-   
--- a/docs/images/grovebutton.jpg
+++ b/docs/images/grovebutton.jpg
--- a/docs/images/grovecollision.jpg
+++ b/docs/images/grovecollision.jpg
--- a/docs/images/groveehr.jpg
+++ b/docs/images/groveehr.jpg
--- a/docs/images/groveeldriver.jpg
+++ b/docs/images/groveeldriver.jpg
--- a/docs/images/groveelectromagnet.jpg
+++ b/docs/images/groveelectromagnet.jpg
--- a/docs/images/grovegprs.jpg
+++ b/docs/images/grovegprs.jpg
--- a/docs/images/groveled.jpg
+++ b/docs/images/groveled.jpg
--- a/docs/images/grovelight.jpg
+++ b/docs/images/grovelight.jpg
--- a/docs/images/grovelinefinder.jpg
+++ b/docs/images/grovelinefinder.jpg
--- a/docs/images/groveloudness.jpg
+++ b/docs/images/groveloudness.jpg
--- a/docs/images/grovemd.jpg
+++ b/docs/images/grovemd.jpg
--- a/docs/images/grovemoisture.jpg
+++ b/docs/images/grovemoisture.jpg
--- a/docs/images/groveo2.jpg
+++ b/docs/images/groveo2.jpg
--- a/docs/images/groverelay.jpg
+++ b/docs/images/groverelay.jpg
--- a/docs/images/grovergblcd.jpg
+++ b/docs/images/grovergblcd.jpg
--- a/docs/images/groverotary.jpg
+++ b/docs/images/groverotary.jpg
--- a/docs/images/grovescam.jpg
+++ b/docs/images/grovescam.jpg
--- a/docs/images/grovespeaker.jpg
+++ b/docs/images/grovespeaker.jpg
--- a/docs/images/grovetemp.jpg
+++ b/docs/images/grovetemp.jpg
--- a/docs/images/groveultrasonic.jpg
+++ b/docs/images/groveultrasonic.jpg
--- a/docs/images/grovevdiv.jpg
+++ b/docs/images/grovevdiv.jpg
--- a/docs/images/grovewfs.jpg
+++ b/docs/images/grovewfs.jpg
--- a/docs/images/kxtj3.png
+++ b/docs/images/kxtj3.png
--- a/docs/installing.md
+++ b/docs/installing.md
@ -54,6 +54,27 @@ sudo apt-get install libupm-dev libupm-java python-upm python3-upm node-upm upm-
 Running UPM applications on Ubuntu systems requires elevated permissions
 (e.g. run with `sudo`).

+### Fedora Linux
+
+MRAA and UPM are available through the default package repositories on Fedora and can be
+installed in the standard method using dnf.
+
+To install:
+
+```bash
+sudo dnf install upm
+sudo dnf install paython3-upm nodejs-upm upm-examples
+```
+
+### Installing for Red Hat Enterprise Linux, CentOS and Other Linux Distributions
+
+The UPM project does not currently distribute official binaries for RHEL
+or CentOS so developers will have to compile the project from sources as
+described [here](./building.md).
+
+For testing and development purposes it may be possible to share and install
+.deb and .rpm packages across similar Linux builds.
+
 ### Node.js bindings only (NPM)

 This option allows compiling MRAA/UPM on any system with npm and node-gyp.
--- a/docs/max31855.md
+++ b/docs/max31855.md
@ -14,8 +14,7 @@ First thing to do is to create a tree structure like this in upm/src/max31855:

 * max31855.cxx
 * max31855.hpp
-* jsupm_max31855.i
-* pyupm_max31855.i
+* max31855.i
 * CMakeLists.txt

 And then an example file to use & test our lib with in upm/examples/max31855.cxx.
--- a/docs/naming.md
+++ b/docs/naming.md
@ -25,6 +25,4 @@ sensor can inherit your class if they only have minor changes.

 ### Doubt

-If ever, give either of us a ping via email:
-mihai.tudor.panu@intel.com or brendan.le.foll@intel.com
-and we'll try suggest decent names for your module.
+If ever, open a new issue and ask for naming help from the project's community.
--- a/docs/porting.md
+++ b/docs/porting.md
@ -59,7 +59,6 @@ the UPM build system.
 The last step is when you're happy with your module and it works send us a pull
 request! We'd love to include your sensor in our repository.

-If you don't like github you can also send mihai.tudor.panu@intel.com a git
-formatted patch of your sensor. More details are on @ref contributions and on
+More details on @ref contributions and on
 https://help.github.com/articles/creating-a-pull-request

--- a/doxy/README.npm.md
+++ b/doxy/README.npm.md
@ -34,13 +34,6 @@ var lib = require('jsupm_<module-name>');
 ### Supported Sensors
 The full list is available on [Intel® IoT Developer Zone](https://software.intel.com/en-us/iot/hardware/sensors).

-### IDE Integration
-Intel® XDK IoT Edition is the recommended IDE for Node.js development. Visit
-the Intel® Developer Zone [IDE page](https://software.intel.com/iot/software/ide)
-for more information on how to get started.
-
-![Intel XDK](http://iotdk.intel.com/docs/master/upm/docs/icons/xdk.png)
-
 ### Building UPM
 See building documentation [here](https://github.com/intel-iot-devkit/upm/blob/master/docs/building.md).

--- a/doxy/index.rst
+++ b/doxy/index.rst
@ -23,15 +23,6 @@ repository.

 Individual sensor usage examples for Python are available `here <https://github.com/intel-iot-devkit/upm/tree/master/examples/python>`_.

-``IDE Compatibility``
-################
-
-While there is no official IDE provided with our Python libraries, we do recommend the web-based IDE Wyliodrin. It can be used with multiple programming
-languages, including Python. More information can be found on the Intel Developer Zone IDE page.
-
-.. image:: ../docs/icons/wyliodrin.png
-   :target: https://software.intel.com/iot/software/ide
-
 ``Making your own UPM Module``
 ##############################

--- a/doxy/node/generators/yuidoc/tmpl/layouts/main.handlebars
+++ b/doxy/node/generators/yuidoc/tmpl/layouts/main.handlebars
@ -18,7 +18,7 @@
          <p>
          The UPM API is a high level sensor library for IoT devices using MRAA. See examples <a href="https://github.com/intel-iot-devkit/upm/tree/master/examples/javascript">here</a>. 
          Back to <a href="http://iotdk.intel.com/docs/master/upm/node/"> index </a> page.
-          <br><em>SparkFun sensor images provided under <a href=https://creativecommons.org/licenses/by-nc-sa/3.0/>CC BY-NC-SA-3.0</a>.</em>
+          <br><em>SparkFun sensor images provided under <a href=https://creativecommons.org/licenses/by/2.0/>CC BY 2.0</a>.</em>
          </p>
        </div>
    </div>
--- a/doxy/node/generators/yuidoc/tmpl/partials/index.handlebars
+++ b/doxy/node/generators/yuidoc/tmpl/partials/index.handlebars
@ -36,19 +36,6 @@
         href="https://github.com/intel-iot-devkit/upm/tree/master/examples/javascript">here</a>.</p>
      
    </div>
-    <div class="section" id="ide"> 
-      <h3><tt class="docutils literal"><span class="pre">IDE Compatibility</span> 
-      <span class="pre">UPM</span></tt><a class="headerlink"
-                                          href="#ide"
-                                          title="Permalink to this headline">*</a></h3>
-      
-
-      <p>Intel&reg; XDK IoT Edition is the recommended IDE for Node.js development.
-      Visit the Intel&reg; Developer Zone IDE page for more information on how to get
-      started.<br>
-      <a href="https://software.intel.com/iot/software/ide"><img src="../docs/icons/xdk.png"/></a>
-      </p>
-    </div>
    <div class="section" id="building-upm"> 
      <h3><tt class="docutils literal"><span class="pre">Building</span> 
      <span class="pre">UPM</span></tt><a class="headerlink"
--- a/doxy/samples.mapping.txt
+++ b/doxy/samples.mapping.txt
@ -1,79 +1,82 @@
 # 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
-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
-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
-lcd-ssd1308-oled.cxx	SSD1308_oledSample.java	ssd1308-oled.js	ssd1308-oled.py
-lcd-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
+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
+bh1749.cxx BH1749_Example.java bh1749.js bh1749.py
+bh1750.cxx BH1750_Example.java bh1750.js bh1750.py
+bh1792.cxx BH1792_Example.java bh1792.js bh1792.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 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 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
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@ -120,7 +120,7 @@ if(BUILDEXAMPLES)

    # Add all examples as an install component (if building examples)
    install (DIRECTORY ${PROJECT_SOURCE_DIR}/examples
-        DESTINATION ${CMAKE_INSTALL_DATADIR}/upm/
+        DESTINATION ${CMAKE_INSTALL_DATADIR}/upm
        COMPONENT ${CMAKE_PROJECT_NAME}-examples
        FILES_MATCHING
            PATTERN "*.c"
--- a/examples/c++/2jciebu01_ble.cxx
+++ b/examples/c++/2jciebu01_ble.cxx
@ -0,0 +1,528 @@
+/*
+* Author: Hiroyuki Mino <omronsupportupm@omron.com>
+* Copyright (c) 2019 Omron Electronic Components - Americas
+*
+* This program and the accompanying materials are made available under the
+* terms of the The MIT License which is available at
+* https://opensource.org/licenses/MIT.
+*
+* SPDX-License-Identifier: MIT
+*/
+
+/* standard headers */
+#include <iostream>
+#include <signal.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+
+/* omron sensor headers */
+#include "2jciebu01_ble.hpp"
+
+using namespace std;
+using namespace upm;
+
+#define PREVIOUS_MENU_CHOICE           8
+
+volatile sig_atomic_t flag = 1;
+
+
+upm::OM2JCIEBU_BLE::om2jciebuData_t om2jciebuSensorData;
+
+void
+sig_handler(int signum)
+{
+    if(signum == SIGABRT) {
+        std::cout << "Exiting..." << std::endl;
+    }
+    if(signum == SIGINT) {
+        flag = 0;
+    }
+}
+
+
+void getSensorData(OM2JCIEBU_BLE *p_om2jcieble)
+{
+
+    if(p_om2jcieble == NULL) {
+        std::cout << "Null pointer received..." << std::endl;
+        return;
+    }
+    uint16_t parameterChoice = 0;
+    int displayDelay = 0;
+    uint16_t sensorParamData = 0;
+    uint32_t pressureData = 0;
+    bool seconds_validate = false;
+
+    p_om2jcieble->getDiscoveredServices(OM2JCIEBU_BLE::ALL_PARAM);
+    while(true) {
+        printf("************************************************************\r\n");
+        printf("Please select sensor attribute for display\r\n");
+        printf("0) All parameter\r\n");
+        printf("1) Temperature data\r\n");
+        printf("2) Relative humidity data\r\n");
+        printf("3) Ambient light data\r\n");
+        printf("4) Barometric pressure data\r\n");
+        printf("5) Sound noise data\r\n");
+        printf("6) eTVOC data\r\n");
+        printf("7) eCO2 data\r\n");
+        printf("8) Return to main menu\r\n");
+        printf("Note :: Press Ctrl+C for sensor attribute display menu\r\n");
+        printf("************************************************************\r\n");
+        while(!(std::cin >> parameterChoice)) {
+            std::cin.clear(); //clear bad input flag
+            std::cin.ignore(std::numeric_limits<std::streamsize>::max(), '\n'); //discard input
+            std::cout << "Invalid input; please re-enter.\n";
+        }
+        if(parameterChoice >= OM2JCIEBU_BLE::ALL_PARAM && parameterChoice <= OM2JCIEBU_BLE::ECO2) {
+            flag = 1;
+            printf("Please enter time interval (in Seconds), for display sensor data\r\n");
+            while(!seconds_validate) {
+                cin >> displayDelay;
+                if(!cin.fail() && (cin.peek() == EOF || cin.peek() == '\n') && (displayDelay >= 1 && displayDelay <= 10)) {
+                    seconds_validate = true;
+                } else {
+                    cin.clear();
+                    cin.ignore();
+                    cout << "Error, enter an second between 1 to 10!" << endl;
+                }
+            }
+            while(flag) {
+                switch(parameterChoice) {
+                    case OM2JCIEBU_BLE::ALL_PARAM:
+                        if(p_om2jcieble->getSensorData(OM2JCIEBU_BLE::ALL_PARAM, &om2jciebuSensorData) == OM2JCIEBU_BLE::SUCCESS) {
+                            printf("**************  Sensor Attribute Values ***************\r\n");
+                            printf("Sequence Number     :: %d \r\n", om2jciebuSensorData.sequence_number);
+                            printf("Temperature         :: %d degC\r\n", om2jciebuSensorData.temperature);
+                            printf("Relative humidity   :: %d RH\r\n", om2jciebuSensorData.relative_humidity);
+                            printf("Ambient light       :: %d lx\r\n", om2jciebuSensorData.ambient_light);
+                            printf("Barometric pressure :: %d hPa\r\n", om2jciebuSensorData.pressure);
+                            printf("Sound noise         :: %d dB\r\n", om2jciebuSensorData.noise);
+                            printf("eTVOC               :: %d ppb\r\n", om2jciebuSensorData.eTVOC);
+                            printf("eCO2                :: %d ppm\r\n", om2jciebuSensorData.eCO2);
+                            printf("**********************************************************\r\n");
+                            memset(&om2jciebuSensorData, 0, sizeof(om2jciebuSensorData));
+                        } else {
+                            flag = 0;
+                        }
+                        break;
+                    case OM2JCIEBU_BLE::TEMP:
+                        if(p_om2jcieble->getSensorData(OM2JCIEBU_BLE::TEMP, &sensorParamData) == OM2JCIEBU_BLE::SUCCESS) {
+                            printf("**************  Temperature Attribute Values ***************\r\n");
+                            printf("Temperature         :: %d degC\r\n", sensorParamData);
+                            printf("************************************************************\r\n");
+                        } else {
+                            flag = 0;
+                        }
+                        break;
+                    case OM2JCIEBU_BLE::HUMIDITY:
+                        if(p_om2jcieble->getSensorData(OM2JCIEBU_BLE::HUMIDITY, &sensorParamData) == OM2JCIEBU_BLE::SUCCESS) {
+                            printf("**************  Relative humidity Attribute Values ***************\r\n");
+                            printf("Relative humidity   :: %d RH\r\n", sensorParamData);
+                            printf("******************************************************************\r\n");
+                        } else {
+                            flag = 0;
+                        }
+                        break;
+                    case OM2JCIEBU_BLE::AMBIENT_LIGHT:
+                        if(p_om2jcieble->getSensorData(OM2JCIEBU_BLE::AMBIENT_LIGHT, &sensorParamData) == OM2JCIEBU_BLE::SUCCESS) {
+                            printf("**************  Ambient light Attribute Values ***************\r\n");
+                            printf("Ambient light       :: %d lx\r\n", sensorParamData);
+                            printf("***************************************************************\r\n");
+                        } else {
+                            flag = 0;
+                        }
+                        break;
+                    case OM2JCIEBU_BLE::PRESSURE:
+                        if(p_om2jcieble->getSensorData(OM2JCIEBU_BLE::PRESSURE, &pressureData) == OM2JCIEBU_BLE::SUCCESS) {
+                            printf("**************  Barometric pressure Attribute Values ***************\r\n");
+                            printf("Barometric pressure :: %d hPa\r\n", pressureData);
+                            printf("********************************************************************\r\n");
+                        }
+                        break;
+
+                    case OM2JCIEBU_BLE::NOISE:
+                        if(p_om2jcieble->getSensorData(OM2JCIEBU_BLE::NOISE, &sensorParamData) == OM2JCIEBU_BLE::SUCCESS) {
+                            printf("**************  Sound noise Attribute Values ***************\r\n");
+                            printf("Sound noise         :: %d dB\r\n", sensorParamData);
+                            printf("*************************************************************\r\n");
+                        } else {
+                            flag = 0;
+                        }
+                        break;
+
+                    case OM2JCIEBU_BLE::ETVOC:
+                        if(p_om2jcieble->getSensorData(OM2JCIEBU_BLE::ETVOC, &sensorParamData) == OM2JCIEBU_BLE::SUCCESS) {
+                            printf("**************  eTVOC Attribute Values ***************\r\n");
+                            printf("eTVOC               :: %d ppb\r\n", sensorParamData);
+                            printf("*******************************************************\r\n");
+                        } else {
+                            flag = 0;
+                        }
+                        break;
+                    case OM2JCIEBU_BLE::ECO2:
+                        if(p_om2jcieble->getSensorData(OM2JCIEBU_BLE::ECO2, &sensorParamData) == OM2JCIEBU_BLE::SUCCESS) {
+                            printf("**************  eCO2 Attribute Values ***************\r\n");
+                            printf("eCO2                :: %d ppm\r\n\r\n", sensorParamData);
+                            printf("******************************************************\r\n");
+                        } else {
+                            flag = 0;
+                        }
+                        break;
+                }
+                printf("\r\n");
+                p_om2jcieble->delay(displayDelay);
+            }
+        } else if(parameterChoice == PREVIOUS_MENU_CHOICE) {
+            break;
+        } else {
+            printf("Invalid choice\r\n");
+        }
+        seconds_validate = false;
+    }
+}
+
+void getAdvSensorData(OM2JCIEBU_BLE *p_om2jcieble)
+{
+    if(p_om2jcieble == NULL) {
+        std::cout << "Null pointer received..." << std::endl;
+        return;
+    }
+
+    uint16_t parameterChoice = 0, sensorParamData = 0;
+    int displayDelay = 0;
+    uint32_t pressureData = 0;
+    bool seconds_validate = false;
+
+    while(true) {
+        printf("************************************************************\r\n");
+        printf("Please select sensor attribute for display\r\n");
+        printf("0) All parameter\r\n");
+        printf("1) Temperature data\r\n");
+        printf("2) Relative humidity data\r\n");
+        printf("3) Ambient light data\r\n");
+        printf("4) Barometric pressure data\r\n");
+        printf("5) Sound noise data\r\n");
+        printf("6) eTVOC data\r\n");
+        printf("7) eCO2 data\r\n");
+        printf("8) Return to main menu\r\n");
+        printf("Note :: Press Ctrl+C for sensor attribute display menu\r\n");
+        printf("************************************************************\r\n");
+        while(!(std::cin >> parameterChoice)) {
+            std::cin.clear(); //clear bad input flag
+            std::cin.ignore(std::numeric_limits<std::streamsize>::max(), '\n'); //discard input
+            std::cout << "Invalid input; please re-enter.\n";
+        }
+        if(parameterChoice >= OM2JCIEBU_BLE::ALL_PARAM && parameterChoice <= OM2JCIEBU_BLE::ECO2) {
+            flag = 1;
+            printf("Please enter time interval (in Seconds), for display sensor data\r\n");
+            while(!seconds_validate) {
+                cin >> displayDelay;
+                if(!cin.fail() && (cin.peek() == EOF || cin.peek() == '\n') && (displayDelay >= 1 && displayDelay <= 10)) {
+                    seconds_validate = true;
+                } else {
+                    cin.clear();
+                    cin.ignore();
+                    cout << "Error, enter an second between 1 and 10!" << endl;
+                }
+            }
+            while(flag) {
+                switch(parameterChoice) {
+                    case OM2JCIEBU_BLE::ALL_PARAM:
+                        if(p_om2jcieble->getAdvSensorData(OM2JCIEBU_BLE::ALL_PARAM, &om2jciebuSensorData) == OM2JCIEBU_BLE::SUCCESS) {
+                            printf("**************  Advertisement Sensor Attribute Values ***************\r\n");
+                            printf("Sequence Number     :: %d \r\n", om2jciebuSensorData.sequence_number);
+                            printf("Temperature         :: %d degC\r\n", om2jciebuSensorData.temperature);
+                            printf("Relative humidity   :: %d RH\r\n", om2jciebuSensorData.relative_humidity);
+                            printf("Ambient light       :: %d lx\r\n", om2jciebuSensorData.ambient_light);
+                            printf("Barometric pressure :: %d hPa\r\n", om2jciebuSensorData.pressure);
+                            printf("Sound noise         :: %d dB\r\n", om2jciebuSensorData.noise);
+                            printf("eTVOC               :: %d ppb\r\n", om2jciebuSensorData.eTVOC);
+                            printf("eCO2                :: %d ppm\r\n", om2jciebuSensorData.eCO2);
+                            printf("*********************************************************************\r\n");
+                            memset(&om2jciebuSensorData, 0, sizeof(om2jciebuSensorData));
+                        } else {
+                            flag = 0;
+                        }
+                        break;
+                    case OM2JCIEBU_BLE::TEMP:
+                        if(p_om2jcieble->getAdvSensorData(OM2JCIEBU_BLE::TEMP, &sensorParamData) == OM2JCIEBU_BLE::SUCCESS) {
+                            printf("**************  Advertisement Temperature Attribute Values ***************\r\n");
+                            printf("Temperature         :: %d degC\r\n", sensorParamData);
+                            printf("**************************************************************************\r\n");
+                        } else {
+                            flag = 0;
+                        }
+                        break;
+                    case OM2JCIEBU_BLE::HUMIDITY:
+                        if(p_om2jcieble->getAdvSensorData(OM2JCIEBU_BLE::HUMIDITY, &sensorParamData) == OM2JCIEBU_BLE::SUCCESS) {
+                            printf("**************  Advertisement Relative humidity Attribute Values ***************\r\n");
+                            printf("Relative humidity   :: %d RH\r\n", sensorParamData);
+                            printf("********************************************************************************\r\n");
+                        } else {
+                            flag = 0;
+                        }
+                        break;
+                    case OM2JCIEBU_BLE::AMBIENT_LIGHT:
+                        if(p_om2jcieble->getAdvSensorData(OM2JCIEBU_BLE::AMBIENT_LIGHT, &sensorParamData) == OM2JCIEBU_BLE::SUCCESS) {
+                            printf("************** Advertisement Ambient light Attribute Values ***************\r\n");
+                            printf("Ambient light       :: %d lx\r\n", sensorParamData);
+                            printf("***************************************************************************\r\n");
+                        } else {
+                            flag = 0;
+                        }
+                        break;
+                    case OM2JCIEBU_BLE::PRESSURE:
+                        if(p_om2jcieble->getAdvSensorData(OM2JCIEBU_BLE::PRESSURE, &pressureData) == OM2JCIEBU_BLE::SUCCESS) {
+                            printf("************** Advertisement Barometric pressure Attribute Values ***************\r\n");
+                            printf("Barometric pressure :: %d hPa\r\n", pressureData);
+                            printf("*********************************************************************************\r\n");
+                        } else {
+                            flag = 0;
+                        }
+                        break;
+
+                    case OM2JCIEBU_BLE::NOISE:
+                        if(p_om2jcieble->getAdvSensorData(OM2JCIEBU_BLE::NOISE, &sensorParamData) == OM2JCIEBU_BLE::SUCCESS) {
+                            printf("************** Advertisement Sound noise Attribute Values ***************\r\n");
+                            printf("Sound noise         :: %d dB\r\n", sensorParamData);
+                            printf("*************************************************************************\r\n");
+                        } else {
+                            flag = 0;
+                        }
+                        break;
+
+                    case OM2JCIEBU_BLE::ETVOC:
+                        if(p_om2jcieble->getAdvSensorData(OM2JCIEBU_BLE::ETVOC, &sensorParamData) == OM2JCIEBU_BLE::SUCCESS) {
+                            printf("**************** Advertisement eTVOC Attribute Values ******************\r\n");
+                            printf("eTVOC               :: %d ppb\r\n", sensorParamData);
+                            printf("************************************************************************\r\n");
+                        } else {
+                            flag = 0;
+                        }
+                        break;
+                    case OM2JCIEBU_BLE::ECO2:
+                        if(p_om2jcieble->getAdvSensorData(OM2JCIEBU_BLE::ECO2, &sensorParamData) == OM2JCIEBU_BLE::SUCCESS) {
+                            printf("************** Advertisement eCO2 Attribute Values ***************\r\n");
+                            printf("eCO2                :: %d ppm\r\n\r\n", sensorParamData);
+                            printf("******************************************************************\r\n");
+                        } else {
+                            flag = 0;
+                        }
+                        break;
+                }
+                printf("\r\n");
+                p_om2jcieble->delay(displayDelay);
+            }
+        } else if(parameterChoice == PREVIOUS_MENU_CHOICE) {
+            break;
+        } else {
+            printf("Invalid choice\r\n");
+        }
+        seconds_validate = false;
+    }
+}
+
+void configureLEDSetting(OM2JCIEBU_BLE *p_om2jcieble)
+{
+    if(p_om2jcieble == NULL) {
+        std::cout << "Null pointer received..." << std::endl;
+        return;
+    }
+    int led_choice = 0;
+    unsigned short int red_scale = 0, green_scale = 0, blue_scale = 0;
+    bool red_scale_validate = false, green_scale_validate = false, blue_scale_validate = false;
+    printf("**************  Sensor LED Configuration ***************\r\n");
+    printf("Please select a operation for LED\r\n");
+    printf("0) Normally OFF\r\n");
+    printf("1) Normally ON\r\n");
+    printf("2) Temperature value scales\r\n");
+    printf("3) Relative humidity value scales\r\n");
+    printf("4) Ambient light value scales\r\n");
+    printf("5) Barometric pressure value scales\r\n");
+    printf("6) Sound noise value scales\r\n");
+    printf("7) eTVOC value scales\r\n");
+    printf("8) SI vale scales\r\n");
+    printf("9) PGA value scales\r\n");
+    printf("**********************************************************\r\n");
+    while(!(std::cin >> led_choice)) {
+        std::cin.clear(); //clear bad input flag
+        std::cin.ignore(std::numeric_limits<std::streamsize>::max(), '\n'); //discard input
+        std::cout << "Invalid input; please re-enter.\n";
+    }
+
+    if(led_choice == OM2JCIEBU_BLE::NORMALLY_ON) {
+        printf("Please select a LED color scale\r\n");
+        printf("Please enter Red Color scale (scale range 0 to 255)\r\n");
+        while(!red_scale_validate) {
+            cin >> red_scale;
+            if(!cin.fail() && (cin.peek() == EOF || cin.peek() == '\n') && (red_scale >= 0 && red_scale <= 255)) {
+                red_scale_validate = true;
+            } else {
+                cin.clear();
+                cin.ignore();
+                cout << "Error, enter an red color scale between 0 and 255!" << endl;
+            }
+        }
+        printf("Please enter Green Color scale(scale range 0 to 255)\r\n");
+        while(!green_scale_validate) {
+            cin >> green_scale;
+            if(!cin.fail() && (cin.peek() == EOF || cin.peek() == '\n') && (green_scale >= 0 && green_scale <= 255)) {
+                green_scale_validate = true;
+            } else {
+                cin.clear();
+                cin.ignore();
+                cout << "Error, enter an green color scale between 0 and 255!" << endl;
+            }
+        }
+        printf("Please enter Blue Color scale(scale range 0 to 255)\r\n");
+        while(!blue_scale_validate) {
+            cin >> blue_scale;
+            if(!cin.fail() && (cin.peek() == EOF || cin.peek() == '\n') && (blue_scale >= 0 && blue_scale <= 255)) {
+                blue_scale_validate = true;
+            } else {
+                cin.clear();
+                cin.ignore();
+                cout << "Error, enter an blue color scale between 0 and 255!" << endl;
+            }
+        }
+        p_om2jcieble->configureSensorLedState(OM2JCIEBU_BLE::NORMALLY_ON, red_scale, green_scale, blue_scale);
+    } else {
+        switch(led_choice) {
+            case OM2JCIEBU_BLE::NORMALLY_OFF:
+                p_om2jcieble->configureSensorLedState(OM2JCIEBU_BLE::NORMALLY_OFF, 0, 0, 0);
+                break;
+            case OM2JCIEBU_BLE::TEMP_SACLE:
+                p_om2jcieble->configureSensorLedState(OM2JCIEBU_BLE::TEMP_SACLE, 0, 0, 0);
+                break;
+            case OM2JCIEBU_BLE::HUMIDITY_SCALE:
+                p_om2jcieble->configureSensorLedState(OM2JCIEBU_BLE::HUMIDITY_SCALE, 0, 0, 0);
+                break;
+            case OM2JCIEBU_BLE::AMBIENT_LIGHT_SCALE:
+                p_om2jcieble->configureSensorLedState(OM2JCIEBU_BLE::AMBIENT_LIGHT_SCALE, 0, 0, 0);
+                break;
+            case OM2JCIEBU_BLE::PRESSURE_SCALE:
+                p_om2jcieble->configureSensorLedState(OM2JCIEBU_BLE::PRESSURE_SCALE, 0, 0, 0);
+                break;
+            case OM2JCIEBU_BLE::NOISE_SCALE:
+                p_om2jcieble->configureSensorLedState(OM2JCIEBU_BLE::NOISE_SCALE, 0, 0, 0);
+                break;
+            case OM2JCIEBU_BLE::ETVOC_SCALE:
+                p_om2jcieble->configureSensorLedState(OM2JCIEBU_BLE::ETVOC_SCALE, 0, 0, 0);
+                break;
+            case OM2JCIEBU_BLE::SI_SCALE:
+                p_om2jcieble->configureSensorLedState(OM2JCIEBU_BLE::SI_SCALE, 0, 0, 0);
+                break;
+            case OM2JCIEBU_BLE::PGA_SCALE:
+                p_om2jcieble->configureSensorLedState(OM2JCIEBU_BLE::PGA_SCALE, 0, 0, 0);
+                break;
+            default:
+                std::cout << "Wrong LED scale choice please try again" << std::endl;
+        }
+    }
+}
+
+void configureAdvInterval(OM2JCIEBU_BLE *p_om2jcieble)
+{
+    if(p_om2jcieble == NULL) {
+        std::cout << "Null pointer received..." << std::endl;
+        return;
+    }
+    uint16_t millisecond = 0;
+    bool milisecond_validate = false;
+    int advertising_mode = 0;
+    printf("**************  Sensor Advertise Configuration ***************\r\n");
+    printf("Please enter time interval (in Milliseconds), for changing Advertise interval, between 100 to 10240 milliseconds\r\n");
+    while(!milisecond_validate) {
+        cin >> millisecond;
+        if(!cin.fail() && (cin.peek() == EOF || cin.peek() == '\n') && (millisecond >= 100 && millisecond <= 10240)) {
+            milisecond_validate = true;
+        } else {
+            cin.clear();
+            cin.ignore();
+            cout << "Error, enter an millisecond between 100 and 10240!" << endl;
+        }
+    }
+    printf("Please select an Advertise mode with the selected Advertise interval \r\n");
+    printf("1) Sensor data\r\n");
+    printf("2) Calculation data\r\n");
+    printf("3) Sensor data and Calculation data\r\n");
+    printf("4) Sensor flag and Calculation flag\r\n");
+    printf("5) Serial number\r\n");
+    while(!(std::cin >> advertising_mode)) {
+        std::cin.clear(); //clear bad input flag
+        std::cin.ignore(std::numeric_limits<std::streamsize>::max(), '\n'); //discard input
+        std::cout << "Invalid input; please re-enter.\n";
+    }
+    switch(advertising_mode) {
+        case OM2JCIEBU_BLE::SENSOR_DATA:
+            p_om2jcieble->configureSensorAdvSetting(millisecond, OM2JCIEBU_BLE::SENSOR_DATA);
+            break;
+        case OM2JCIEBU_BLE::ACCELERATION_DATA:
+            p_om2jcieble->configureSensorAdvSetting(millisecond, OM2JCIEBU_BLE::ACCELERATION_DATA);
+            break;
+        case OM2JCIEBU_BLE::ACCELERATION_SENSOR_DATA:
+            p_om2jcieble->configureSensorAdvSetting(millisecond, OM2JCIEBU_BLE::ACCELERATION_SENSOR_DATA);
+            break;
+        case OM2JCIEBU_BLE::ACCELERATION_SENSOR_FLAG:
+            p_om2jcieble->configureSensorAdvSetting(millisecond, OM2JCIEBU_BLE::ACCELERATION_SENSOR_FLAG);
+            break;
+        case OM2JCIEBU_BLE::SERIAL_NUMBER:
+            p_om2jcieble->configureSensorAdvSetting(millisecond, OM2JCIEBU_BLE::SERIAL_NUMBER);
+            break;
+        default:
+            std::cout << "Invalid choice\n";
+    }
+    printf("**************************************************************\r\n");
+}
+
+int
+main(int argc, char *argv[])
+{
+    int operation_choice = 0;
+    if(argc <= 1) {
+        std::cout << "usage ./a.out xx:xx:xx:xx:xx:xx" << std::endl;
+        return 0;
+    }
+    signal(SIGABRT, sig_handler);
+    signal(SIGINT, sig_handler);
+    upm::OM2JCIEBU_BLE om2jciebu_ble(argv[1]);
+    while(true) {
+        std::cout << "*************************************************************" << std::endl;
+        std::cout << "Please choose one option for Omron sensor operation" << std::endl;
+        std::cout << "1) Display Advertisement Sensor attriutes" << std::endl;
+        std::cout << "2) Display Sensor attriutes" << std::endl;
+        std::cout << "3) Configure LED setting " << std::endl;
+        std::cout << "4) Configure advertise setting" << std::endl;
+        std::cout << "5) Exit" << std::endl;
+        std::cout << "*************************************************************" << std::endl;
+        while(!(std::cin >> operation_choice)) {
+            std::cin.clear(); //clear bad input flag
+            std::cin.ignore(std::numeric_limits<std::streamsize>::max(), '\n'); //discard input
+            std::cout << "Invalid input; please re-enter.\n";
+        }
+
+        switch(operation_choice) {
+            case 1:
+                getAdvSensorData(&om2jciebu_ble);
+                break;
+            case 2:
+                getSensorData(&om2jciebu_ble);
+                break;
+            case 3:
+                configureLEDSetting(&om2jciebu_ble);
+                break;
+            case 4:
+                configureAdvInterval(&om2jciebu_ble);
+                break;
+            case 5:
+                std::cout << "Application Exited" << std::endl;
+                om2jciebu_ble.removeBleDevice();
+                exit(0);
+                break;
+            default:
+                std::cout << "Invalid choice" << std::endl;
+                break;
+        }
+    }
+}
--- a/examples/c++/2jciebu01_usb.cxx
+++ b/examples/c++/2jciebu01_usb.cxx
@ -0,0 +1,403 @@
+/*
+* Author: Hiroyuki Mino <omronsupportupm@omron.com>
+* Copyright (c) 2019 Omron Electronic Components - Americas
+*
+* This program and the accompanying materials are made available under the
+* terms of the The MIT License which is available at
+* https://opensource.org/licenses/MIT.
+*
+* SPDX-License-Identifier: MIT
+*/
+
+/* standard headers */
+#include <iostream>
+#include <signal.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+
+/* omron sensor headers */
+#include "2jciebu01_usb.hpp"
+
+using namespace std;
+using namespace upm;
+
+volatile sig_atomic_t flag = 1;
+#define PREVIOUS_MENU_CHOICE           10
+
+upm::OM2JCIEBU_UART::om2jciebuData_t om2jciebuSensorData;
+
+void
+sig_handler(int signum)
+{
+    if(signum == SIGABRT) { //check for Abort signal
+        std::cout << "Exiting..." << std::endl;
+    }
+    if(signum == SIGINT) { //check for Interrupt signal
+		std::cout << "Exiting..." << std::endl;
+        flag = 0;
+    }
+}
+
+
+void getSensorData(OM2JCIEBU_UART *p_om2jcieuart)
+{
+    if(p_om2jcieuart == NULL) {
+        std::cout << "Null pointer received..." << std::endl;
+        return;
+    }
+    uint16_t parameterChoice = 0;
+    int displayDelay = 0;
+    bool seconds_validate = false;
+    uint16_t sensorParamData = 0;
+    uint32_t pressureData = 0;
+
+    while(true) {
+        printf("************************************************************\r\n");
+        printf("Please select sensor attribute for display\r\n");
+        printf("0)  All parameter\r\n");
+        printf("1)  Temperature data\r\n");
+        printf("2)  Relative humidity data\r\n");
+        printf("3)  Ambient light data\r\n");
+        printf("4)  Barometric pressure data\r\n");
+        printf("5)  Sound noise data\r\n");
+        printf("6)  eTVOC data\r\n");
+        printf("7)  eCO2 data\r\n");
+        printf("8)  Discomfort index data\r\n");
+        printf("9)  Heat stroke data\r\n");
+        printf("10) Return to main menu\r\n");
+        printf("Note :: Press Ctrl+C for sensor attribute display menu\r\n");
+        printf("************************************************************\r\n");
+        while(!(std::cin >> parameterChoice)) {
+            std::cin.clear(); //clear bad input flag
+            std::cin.ignore(std::numeric_limits<std::streamsize>::max(), '\n'); //discard input
+            std::cout << "Invalid input; please re-enter.\n";
+        }
+        if(parameterChoice >= OM2JCIEBU_UART::ALL_PARAM && parameterChoice <= OM2JCIEBU_UART::HEAT_STROKE) {
+            flag = 1;
+            printf("Please enter time interval (in Seconds), for display sensor data\r\n");
+            while(!seconds_validate) { //validate user input values
+                cin >> displayDelay;
+                if(!cin.fail() && (cin.peek() == EOF || cin.peek() == '\n') && (displayDelay >= 1 && displayDelay <= 10)) {
+                    seconds_validate = true;
+                } else {
+                    cin.clear();
+                    cin.ignore();
+                    cout << "Error, enter an second between 1 to 10!" << endl;
+                }
+            }
+            while(flag) {
+                switch(parameterChoice) {
+                    case OM2JCIEBU_UART::ALL_PARAM:
+                        if(p_om2jcieuart->getSensorData(OM2JCIEBU_UART::ALL_PARAM, &om2jciebuSensorData) == OM2JCIEBU_UART::SUCCESS) {
+                            printf("**************  Sensor Attribute Values ***************\r\n");
+                            printf("Sequence Number     :: %d \r\n", om2jciebuSensorData.sequence_number);
+                            printf("Temperature         :: %d degC\r\n", om2jciebuSensorData.temperature);
+                            printf("Relative humidity   :: %d RH\r\n", om2jciebuSensorData.relative_humidity);
+                            printf("Ambient light       :: %d lx\r\n", om2jciebuSensorData.ambient_light);
+                            printf("Barometric pressure :: %d hPa\r\n", om2jciebuSensorData.pressure);
+                            printf("Sound noise         :: %d dB\r\n", om2jciebuSensorData.noise);
+                            printf("eTVOC               :: %d ppb\r\n", om2jciebuSensorData.eTVOC);
+                            printf("eCO2                :: %d ppm\r\n", om2jciebuSensorData.eCO2);
+                            printf("Discomfort index    :: %d \r\n", om2jciebuSensorData.discomfort_index);
+                            printf("Heat stroke         :: %d degC\r\n", om2jciebuSensorData.heat_stroke);
+                            printf("**********************************************************\r\n");
+                            memset(&om2jciebuSensorData, 0, sizeof(om2jciebuSensorData));
+                        } else {
+                            flag = 0;
+                        }
+                        break;
+                    case OM2JCIEBU_UART::TEMP:
+                        if(p_om2jcieuart->getSensorData(OM2JCIEBU_UART::TEMP, &sensorParamData) == OM2JCIEBU_UART::SUCCESS) {
+                            printf("**************  Temperature Attribute Values ***************\r\n");
+                            printf("Temperature         :: %d degC\r\n", sensorParamData);
+                            printf("************************************************************\r\n");
+                        } else {
+                            flag = 0;
+                        }
+                        break;
+                    case OM2JCIEBU_UART::HUMIDITY:
+                        if(p_om2jcieuart->getSensorData(OM2JCIEBU_UART::HUMIDITY, &sensorParamData) == OM2JCIEBU_UART::SUCCESS) {
+                            printf("**************  Relative humidity Attribute Values ***************\r\n");
+                            printf("Relative humidity   :: %d RH\r\n", sensorParamData);
+                            printf("******************************************************************\r\n");
+                        } else {
+                            flag = 0;
+                        }
+                        break;
+                    case OM2JCIEBU_UART::AMBIENT_LIGHT:
+                        if(p_om2jcieuart->getSensorData(OM2JCIEBU_UART::AMBIENT_LIGHT, &sensorParamData) == OM2JCIEBU_UART::SUCCESS) {
+                            printf("**************  Ambient light Attribute Values ***************\r\n");
+                            printf("Ambient light       :: %d lx\r\n", sensorParamData);
+                            printf("**************************************************************\r\n");
+                        } else {
+                            flag = 0;
+                        }
+                        break;
+                    case OM2JCIEBU_UART::PRESSURE:
+                        if(p_om2jcieuart->getSensorData(OM2JCIEBU_UART::PRESSURE, &pressureData) == OM2JCIEBU_UART::SUCCESS) {
+                            printf("**************  Barometric pressure Attribute Values ***************\r\n");
+                            printf("Barometric pressure :: %d hPa\r\n", pressureData);
+                            printf("********************************************************************\r\n");
+                        } else {
+                            flag = 0;
+                        }
+                        break;
+
+                    case OM2JCIEBU_UART::NOISE:
+                        if(p_om2jcieuart->getSensorData(OM2JCIEBU_UART::NOISE, &sensorParamData) == OM2JCIEBU_UART::SUCCESS) {
+                            printf("**************  Sound noise Attribute Values ***************\r\n");
+                            printf("Sound noise         :: %d dB\r\n", sensorParamData);
+                            printf("************************************************************\r\n");
+                        } else {
+                            flag = 0;
+                        }
+                        break;
+
+                    case OM2JCIEBU_UART::ETVOC:
+                        if(p_om2jcieuart->getSensorData(OM2JCIEBU_UART::ETVOC, &sensorParamData) == OM2JCIEBU_UART::SUCCESS) {
+                            printf("**************  eTVOC Attribute Values ***************\r\n");
+                            printf("eTVOC               :: %d ppb\r\n", sensorParamData);
+                            printf("******************************************************\r\n");
+                        } else {
+                            flag = 0;
+                        }
+                        break;
+                    case OM2JCIEBU_UART::ECO2:
+                        if(p_om2jcieuart->getSensorData(OM2JCIEBU_UART::ECO2, &sensorParamData) == OM2JCIEBU_UART::SUCCESS) {
+                            printf("**************  eCO2 Attribute Values ***************\r\n");
+                            printf("eCO2                :: %d ppm\r\n\r\n", sensorParamData);
+                            printf("******************************************************\r\n");
+                        } else {
+                            flag = 0;
+                        }
+                        break;
+                    case OM2JCIEBU_UART::DISCOMFORT_INDEX:
+                        if(p_om2jcieuart->getSensorData(OM2JCIEBU_UART::DISCOMFORT_INDEX, &sensorParamData) == OM2JCIEBU_UART::SUCCESS) {
+                            printf("**************  eCO2 Attribute Values ***************\r\n");
+                            printf("Discomfort index                :: %d \r\n\r\n", sensorParamData);
+                            printf("******************************************************\r\n");
+                        } else {
+                            flag = 0;
+                        }
+                        break;
+                    case OM2JCIEBU_UART::HEAT_STROKE:
+                        if(p_om2jcieuart->getSensorData(OM2JCIEBU_UART::HEAT_STROKE, &sensorParamData) == OM2JCIEBU_UART::SUCCESS) {
+                            printf("**************  eCO2 Attribute Values ***************\r\n");
+                            printf("Heat stroke                :: %d degC\r\n\r\n", sensorParamData);
+                            printf("******************************************************\r\n");
+                        } else {
+                            flag = 0;
+                        }
+                        break;
+                }
+                printf("\r\n");
+                p_om2jcieuart->delay(displayDelay);
+            }
+        } else if(parameterChoice == PREVIOUS_MENU_CHOICE) {
+            break;
+        } else {
+            printf("Invalid choice\r\n");
+        }
+        seconds_validate = false;
+    }
+}
+
+void configureLEDSetting(OM2JCIEBU_UART *p_om2jcieuart)
+{
+    if(p_om2jcieuart == NULL) {
+        std::cout << "Null pointer received..." << std::endl;
+        return;
+    }
+    int led_choice = 0;
+    bool red_scale_validate = false, green_scale_validate = false, blue_scale_validate = false;
+    unsigned short int red_scale = 0, green_scale = 0, blue_scale = 0;
+    printf("**************  Sensor LED Configuration ***************\r\n");
+    printf("Please select a operation for LED\r\n");
+    printf("0) Normally OFF\r\n");
+    printf("1) Normally ON\r\n");
+    printf("2) Temperature value scales\r\n");
+    printf("3) Relative humidity value scales\r\n");
+    printf("4) Ambient light value scales\r\n");
+    printf("5) Barometric pressure value scales\r\n");
+    printf("6) Sound noise value scales\r\n");
+    printf("7) eTVOC value scales\r\n");
+    printf("8) SI vale scales\r\n");
+    printf("9) PGA value scales\r\n");
+    printf("**********************************************************\r\n");
+    while(!(std::cin >> led_choice)) {
+        std::cin.clear(); //clear bad input flag
+        std::cin.ignore(std::numeric_limits<std::streamsize>::max(), '\n'); //discard input
+        std::cout << "Invalid input; please re-enter.\n";
+    }
+
+    if(led_choice == OM2JCIEBU_UART::NORMALLY_ON) {
+        printf("Please Select a LED color scale\r\n");
+        printf("Please enter Red Color scale (scale range 0 to 255)\r\n");
+        while(!red_scale_validate) {
+            cin >> red_scale;
+            if(!cin.fail() && (cin.peek() == EOF || cin.peek() == '\n') && (red_scale >= 0 && red_scale <= 255)) {
+                red_scale_validate = true;
+            } else {
+                cin.clear();
+                cin.ignore();
+                cout << "Error, enter an red color scale between 0 and 255!" << endl;
+            }
+        }
+        printf("Please enter Green Color scale(scale range 0 to 255)\r\n");
+        while(!green_scale_validate) {
+            cin >> green_scale;
+            if(!cin.fail() && (cin.peek() == EOF || cin.peek() == '\n') && (green_scale >= 0 && green_scale <= 255)) {
+                green_scale_validate = true;
+            } else {
+                cin.clear();
+                cin.ignore();
+                cout << "Error, enter an green color scale between 0 and 255!" << endl;
+            }
+        }
+        printf("Please enter Blue Color scale(scale range 0 to 255)\r\n");
+        while(!blue_scale_validate) {
+            cin >> blue_scale;
+            if(!cin.fail() && (cin.peek() == EOF || cin.peek() == '\n') && (blue_scale >= 0 && blue_scale <= 255)) {
+                blue_scale_validate = true;
+            } else {
+                cin.clear();
+                cin.ignore();
+                cout << "Error, enter an blue color scale between 0 and 255!" << endl;
+            }
+        }
+        p_om2jcieuart->configureSensorLedState(OM2JCIEBU_UART::NORMALLY_ON, red_scale, green_scale, blue_scale);
+    } else {
+        switch(led_choice) {
+            case OM2JCIEBU_UART::NORMALLY_OFF:
+                p_om2jcieuart->configureSensorLedState(OM2JCIEBU_UART::NORMALLY_OFF, 0, 0, 0);
+                break;
+            case OM2JCIEBU_UART::TEMP_SACLE:
+                p_om2jcieuart->configureSensorLedState(OM2JCIEBU_UART::TEMP_SACLE, 0, 0, 0);
+                break;
+            case OM2JCIEBU_UART::HUMIDITY_SCALE:
+                p_om2jcieuart->configureSensorLedState(OM2JCIEBU_UART::HUMIDITY_SCALE, 0, 0, 0);
+                break;
+            case OM2JCIEBU_UART::AMBIENT_LIGHT_SCALE:
+                p_om2jcieuart->configureSensorLedState(OM2JCIEBU_UART::AMBIENT_LIGHT_SCALE, 0, 0, 0);
+                break;
+            case OM2JCIEBU_UART::PRESSURE_SCALE:
+                p_om2jcieuart->configureSensorLedState(OM2JCIEBU_UART::PRESSURE_SCALE, 0, 0, 0);
+                break;
+            case OM2JCIEBU_UART::NOISE_SCALE:
+                p_om2jcieuart->configureSensorLedState(OM2JCIEBU_UART::NOISE_SCALE, 0, 0, 0);
+                break;
+            case OM2JCIEBU_UART::ETVOC_SCALE:
+                p_om2jcieuart->configureSensorLedState(OM2JCIEBU_UART::ETVOC_SCALE, 0, 0, 0);
+                break;
+            case OM2JCIEBU_UART::SI_SCALE:
+                p_om2jcieuart->configureSensorLedState(OM2JCIEBU_UART::SI_SCALE, 0, 0, 0);
+                break;
+            case OM2JCIEBU_UART::PGA_SCALE:
+                p_om2jcieuart->configureSensorLedState(OM2JCIEBU_UART::PGA_SCALE, 0, 0, 0);
+                break;
+            default:
+                std::cout << "Wrong LED scale choice please try again" << std::endl;
+        }
+    }
+}
+
+void configureAdvInterval(OM2JCIEBU_UART *p_om2jcieuart)
+{
+    if(p_om2jcieuart == NULL) {
+        std::cout << "Null pointer received..." << std::endl;
+        return;
+    }
+    bool millisecond_validate = false;
+    uint16_t millisecond = 0;
+    int advertising_mode = 0;
+    printf("**************  Sensor Advertise Configuration ***************\r\n");
+    printf("Please enter time interval (in Milliseconds), for changing Advertise interval, between 100 to 10240 milliseconds\r\n");
+    while(!millisecond_validate) {//validate millisecond
+        cin >> millisecond;
+        if(!cin.fail() && (cin.peek() == EOF || cin.peek() == '\n') && (millisecond >= 100 && millisecond <= 10240)) {
+            millisecond_validate = true;
+        } else {
+            cin.clear();
+            cin.ignore();
+            cout << "Error, enter an milisecond between 100 and 10240!" << endl;
+        }
+    }
+    printf("Please select an Advertise mode with the selected Advertise interval \r\n");
+    printf("1) Sensor data\r\n");
+    printf("2) Calculation data\r\n");
+    printf("3) Sensor data and Calculation data\r\n");
+    printf("4) Sensor flag and Calculation flag\r\n");
+    printf("5) Serial number\r\n");
+    while(!(std::cin >> advertising_mode)) {
+        std::cin.clear(); //clear bad input flag
+        std::cin.ignore(std::numeric_limits<std::streamsize>::max(), '\n'); //discard input
+        std::cout << "Invalid input; please re-enter.\n";
+    }
+    switch(advertising_mode) {
+        case OM2JCIEBU_UART::SENSOR_DATA:
+            p_om2jcieuart->configureSensorAdvSetting(millisecond, OM2JCIEBU_UART::SENSOR_DATA);
+            break;
+        case OM2JCIEBU_UART::ACCELERATION_DATA:
+            p_om2jcieuart->configureSensorAdvSetting(millisecond, OM2JCIEBU_UART::ACCELERATION_DATA);
+            break;
+        case OM2JCIEBU_UART::ACCELERATION_SENSOR_DATA:
+            p_om2jcieuart->configureSensorAdvSetting(millisecond, OM2JCIEBU_UART::ACCELERATION_SENSOR_DATA);
+            break;
+        case OM2JCIEBU_UART::ACCELERATION_SENSOR_FLAG:
+            p_om2jcieuart->configureSensorAdvSetting(millisecond, OM2JCIEBU_UART::ACCELERATION_SENSOR_FLAG);
+            break;
+        case OM2JCIEBU_UART::SERIAL_NUMBER:
+            p_om2jcieuart->configureSensorAdvSetting(millisecond, OM2JCIEBU_UART::SERIAL_NUMBER);
+            break;
+        default:
+            std::cout << "Invalid choice\n";
+    }
+    printf("**************************************************************\r\n");
+}
+
+int
+main(int argc, char *argv[])
+{
+    int operation_choice = 0;
+    if(argc <= 1) {
+        std::cout << "usage ./a.out /dev/ttyUSB*" << std::endl;
+        return 0;
+    }
+    signal(SIGABRT, sig_handler);
+    signal(SIGINT, sig_handler);
+    upm::OM2JCIEBU_UART om2jciebu_uart(argv[1], 115200);
+    om2jciebu_uart.setMode(8, mraa::UART_PARITY_NONE, 1);
+    om2jciebu_uart.setFlowControl(false, false);
+    while(true) {
+        std::cout << "*************************************************************" << std::endl;
+        std::cout << "Please choose one option for Omron sensor operation" << std::endl;
+        std::cout << "1) Display Sensor attriutes" << std::endl;
+        std::cout << "2) Configure LED setting " << std::endl;
+        std::cout << "3) Configure advertise setting" << std::endl;
+        std::cout << "4) Exit" << std::endl;
+        std::cout << "*************************************************************" << std::endl;
+        while(!(std::cin >> operation_choice)) { //validate operation choice from user input
+            std::cin.clear(); //clear bad input flag
+            std::cin.ignore(std::numeric_limits<std::streamsize>::max(), '\n'); //discard input
+            std::cout << "Invalid input; please re-enter.\n";
+        }
+        switch(operation_choice) {
+            case 1:
+                getSensorData(&om2jciebu_uart);
+                break;
+            case 2:
+                configureLEDSetting(&om2jciebu_uart);
+                break;
+            case 3:
+                configureAdvInterval(&om2jciebu_uart);
+                break;
+            case 4:
+                std::cout << "Application Exited" << std::endl;
+                exit(0);
+                break;
+            default:
+                std::cout << "Invalid choice" << std::endl;
+        }
+    }
+}
--- a/examples/c++/CMakeLists.txt
+++ b/examples/c++/CMakeLists.txt
@ -3,16 +3,10 @@ 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)
-# Test pressure interface for 2 sensor libraries
-add_example(interfaces-pressuresensor.cxx TARGETS bmp280 bmpx8x)
-# Test temperature interface for 3 sensor libraries
-add_example(interfaces-temperaturesensor.cxx TARGETS bmp280 bmpx8x si7005)
-# Test light interface for 2 sensor libraries
-add_example(interfaces-lightsensor.cxx TARGETS si1132 max44009)
-# Test light controller interface for 3 sensor libraries
-add_example(interfaces-lightcontroller.cxx TARGETS lp8860 ds1808lc hlg150h)
+# Test temperature interface for 2 sensor libraries
+add_example(iTemperature_sample.cxx TARGETS interfaces lm35 abp)
+# Test light interface for 3 sensor libraries
+add_example(iLight_sample.cxx TARGETS interfaces apds9002 bh1750 max44009)

 # - Create an executable for all other src files in this directory -------------
 foreach (_example_src ${example_src_list})
--- a/examples/c++/a110x-intr.cxx
+++ b/examples/c++/a110x-intr.cxx
@ -2,24 +2,11 @@
 * Author: Jon Trulson <jtrulson@ics.com>
 * Copyright (c) 2015 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:
+ * This program and the accompanying materials are made available under the
+ * terms of the The MIT License which is available at
+ * https://opensource.org/licenses/MIT.
 *
- * 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.
+ * SPDX-License-Identifier: MIT
 */

 #include <iostream>
--- a/examples/c++/a110x.cxx
+++ b/examples/c++/a110x.cxx
@ -2,24 +2,11 @@
 * Author: Jon Trulson <jtrulson@ics.com>
 * Copyright (c) 2014 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:
+ * This program and the accompanying materials are made available under the
+ * terms of the The MIT License which is available at
+ * https://opensource.org/licenses/MIT.
 *
- * 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.
+ * SPDX-License-Identifier: MIT
 */

 #include <iostream>
--- a/examples/c++/abp.cxx
+++ b/examples/c++/abp.cxx
@ -2,24 +2,11 @@
 * Author: Abhishek Malik <abhishek.malik@intel.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:
+ * This program and the accompanying materials are made available under the
+ * terms of the The MIT License which is available at
+ * https://opensource.org/licenses/MIT.
 *
- * 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.
+ * SPDX-License-Identifier: MIT
 */

 #include <iostream>
--- a/examples/c++/ad8232.cxx
+++ b/examples/c++/ad8232.cxx
@ -2,24 +2,11 @@
 * Author: Jon Trulson <jtrulson@ics.com>
 * Copyright (c) 2015 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:
+ * This program and the accompanying materials are made available under the
+ * terms of the The MIT License which is available at
+ * https://opensource.org/licenses/MIT.
 *
- * 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.
+ * SPDX-License-Identifier: MIT
 */

 #include <iostream>
--- a/examples/c++/adafruitms1438-stepper.cxx
+++ b/examples/c++/adafruitms1438-stepper.cxx
@ -2,24 +2,11 @@
 * Author: Jon Trulson <jtrulson@ics.com>
 * Copyright (c) 2015 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:
+ * This program and the accompanying materials are made available under the
+ * terms of the The MIT License which is available at
+ * https://opensource.org/licenses/MIT.
 *
- * 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.
+ * SPDX-License-Identifier: MIT
 */

 #include <iostream>
--- a/examples/c++/adafruitms1438.cxx
+++ b/examples/c++/adafruitms1438.cxx
@ -2,24 +2,11 @@
 * Author: Jon Trulson <jtrulson@ics.com>
 * Copyright (c) 2015 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:
+ * This program and the accompanying materials are made available under the
+ * terms of the The MIT License which is available at
+ * https://opensource.org/licenses/MIT.
 *
- * 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.
+ * SPDX-License-Identifier: MIT
 */

 #include <iostream>
--- a/examples/c++/adafruitss.cxx
+++ b/examples/c++/adafruitss.cxx
@ -2,24 +2,11 @@
 * Author: Stan Gifford <stan@gifford.id.au>
 * Copyright (c) 2015 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:
+ * This program and the accompanying materials are made available under the
+ * terms of the The MIT License which is available at
+ * https://opensource.org/licenses/MIT.
 *
- * 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.
+ * SPDX-License-Identifier: MIT
 */

 /**
--- a/examples/c++/adc121c021.cxx
+++ b/examples/c++/adc121c021.cxx
@ -2,24 +2,11 @@
 * Author: Jon Trulson <jtrulson@ics.com>
 * Copyright (c) 2014 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:
+ * This program and the accompanying materials are made available under the
+ * terms of the The MIT License which is available at
+ * https://opensource.org/licenses/MIT.
 *
- * 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.
+ * SPDX-License-Identifier: MIT
 */

 #include <iostream>
--- a/examples/c++/ads1x15-adc-sensor.cxx
+++ b/examples/c++/ads1x15-adc-sensor.cxx
@ -2,24 +2,11 @@
 * Author: Henry Bruce <henry.bruce@intel.com>
 * Copyright (c) 2015 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:
+ * This program and the accompanying materials are made available under the
+ * terms of the The MIT License which is available at
+ * https://opensource.org/licenses/MIT.
 *
- * 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.
+ * SPDX-License-Identifier: MIT
 */

 #include <exception>
@ -27,7 +14,6 @@
 #include <stddef.h>

 #include "ads1015.hpp"
-#include "iADC.hpp"
 #include "mraa/gpio.hpp"
 #include "upm_utilities.h"

@ -39,24 +25,21 @@ int
 main()
 {
    /* Create an instance of the ADS1015 sensor */
-    upm::ADS1015 sensor(EDISON_I2C_BUS);
+    upm::ADS1015 adc(EDISON_I2C_BUS);
    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);
-
-    if (adc == NULL) {
-        std::cout << "ADC not detected" << std::endl;
-        return 1;
-    }
-    std::cout << "ADC " << adc->getModuleName() << " detected. ";
-    std::cout << adc->getNumInputs() << " inputs available" << std::endl;
+    // if (adc == NULL) {
+    //     std::cout << "ADC not detected" << std::endl;
+    //     return 1;
+    // }
+    std::cout << "ADC " << adc.getModuleName() << " detected. ";
+    std::cout << adc.getNumInputs() << " inputs available" << std::endl;
    while (true) {
-        for (unsigned int i = 0; i < adc->getNumInputs(); ++i) {
+        for (unsigned int i = 0; i < adc.getNumInputs(); ++i) {
            std::cout << "Input " << i;
            try {
-                float voltage = adc->getVoltage(i);
+                float voltage = adc.getVoltage(i);
                std::cout << ": Voltage = " << voltage << "V" << std::endl;
            } catch (std::exception& e) {
                std::cerr << e.what() << std::endl;
--- a/examples/c++/ads1x15-ads1015.cxx
+++ b/examples/c++/ads1x15-ads1015.cxx
@ -2,24 +2,11 @@
 * Author: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
 * Copyright (c) 2016 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:
+ * This program and the accompanying materials are made available under the
+ * terms of the The MIT License which is available at
+ * https://opensource.org/licenses/MIT.
 *
- * 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.
+ * SPDX-License-Identifier: MIT
 */

 /* This example demonstrates how to use one the ADS1015 ADC on the Grove Joule
--- a/examples/c++/ads1x15-ads1115.cxx
+++ b/examples/c++/ads1x15-ads1115.cxx
@ -2,24 +2,11 @@
 * Author: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
 * Copyright (c) 2016 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:
+ * This program and the accompanying materials are made available under the
+ * terms of the The MIT License which is available at
+ * https://opensource.org/licenses/MIT.
 *
- * 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.
+ * SPDX-License-Identifier: MIT
 */

 /* This example demonstrates how to use one of the ADS1115 ADCs on the
--- a/examples/c++/ads1x15.cxx
+++ b/examples/c++/ads1x15.cxx
@ -2,24 +2,11 @@
 * Author: Marc Graham <marc@m2ag.net>
 * Copyright (c) 2015 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:
+ * This program and the accompanying materials are made available under the
+ * terms of the The MIT License which is available at
+ * https://opensource.org/licenses/MIT.
 *
- * 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.
+ * SPDX-License-Identifier: MIT
 */

 #include <iostream>
--- a/examples/c++/adxl335.cxx
+++ b/examples/c++/adxl335.cxx
@ -2,24 +2,11 @@
 * Author: Jon Trulson <jtrulson@ics.com>
 * Copyright (c) 2015 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:
+ * This program and the accompanying materials are made available under the
+ * terms of the The MIT License which is available at
+ * https://opensource.org/licenses/MIT.
 *
- * 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.
+ * SPDX-License-Identifier: MIT
 */

 #include <iostream>
--- a/examples/c++/adxl345.cxx
+++ b/examples/c++/adxl345.cxx
@ -2,24 +2,11 @@
 * Author: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
 * Copyright (c) 2014 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:
+ * This program and the accompanying materials are made available under the
+ * terms of the The MIT License which is available at
+ * https://opensource.org/licenses/MIT.
 *
- * 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.
+ * SPDX-License-Identifier: MIT
 */

 #include <stdio.h>
--- a/examples/c++/adxrs610.cxx
+++ b/examples/c++/adxrs610.cxx
@ -2,24 +2,11 @@
 * Author: Jon Trulson <jtrulson@ics.com>
 * Copyright (c) 2015 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:
+ * This program and the accompanying materials are made available under the
+ * terms of the The MIT License which is available at
+ * https://opensource.org/licenses/MIT.
 *
- * 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.
+ * SPDX-License-Identifier: MIT
 */

 #include <iostream>
--- a/examples/c++/am2315.cxx
+++ b/examples/c++/am2315.cxx
@ -2,24 +2,11 @@
 * Author: William Penner <william.penner@intel.com>
 * Copyright (c) 2014 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:
+ * This program and the accompanying materials are made available under the
+ * terms of the The MIT License which is available at
+ * https://opensource.org/licenses/MIT.
 *
- * 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.
+ * SPDX-License-Identifier: MIT
 */

 #include <iostream>
--- a/examples/c++/apa102.cxx
+++ b/examples/c++/apa102.cxx
@ -2,24 +2,11 @@
 * Author: Yannick Adam <yannick.adam@gmail.com>
 * Copyright (c) 2016 Yannick Adam
 *
- * 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:
+ * This program and the accompanying materials are made available under the
+ * terms of the The MIT License which is available at
+ * https://opensource.org/licenses/MIT.
 *
- * 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.
+ * SPDX-License-Identifier: MIT
 */

 #include "apa102.hpp"
--- a/examples/c++/apds9002.cxx
+++ b/examples/c++/apds9002.cxx
@ -2,24 +2,11 @@
 * Author: Zion Orent <zorent@ics.com>
 * Copyright (c) 2015 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:
+ * This program and the accompanying materials are made available under the
+ * terms of the The MIT License which is available at
+ * https://opensource.org/licenses/MIT.
 *
- * 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.
+ * SPDX-License-Identifier: MIT
 */

 #include <iostream>
--- a/examples/c++/apds9930.cxx
+++ b/examples/c++/apds9930.cxx
@ -2,24 +2,11 @@
 * Author: Lay, Kuan Loon <kuan.loon.lay@intel.com>
 * Copyright (c) 2016 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:
+ * This program and the accompanying materials are made available under the
+ * terms of the The MIT License which is available at
+ * https://opensource.org/licenses/MIT.
 *
- * 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.
+ * SPDX-License-Identifier: MIT
 */

 #include <iostream>
--- a/examples/c++/at42qt1070.cxx
+++ b/examples/c++/at42qt1070.cxx
@ -2,24 +2,11 @@
 * Author: Jon Trulson <jtrulson@ics.com>
 * Copyright (c) 2015 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:
+ * This program and the accompanying materials are made available under the
+ * terms of the The MIT License which is available at
+ * https://opensource.org/licenses/MIT.
 *
- * 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.
+ * SPDX-License-Identifier: MIT
 */

 #include <iostream>
--- a/examples/c++/bh1749.cxx
+++ b/examples/c++/bh1749.cxx
@ -0,0 +1,60 @@
+/*
+* The MIT License (MIT)
+*
+* Author: Assam Boudjelthia
+* Copyright (c) 2018 Rohm Semiconductor.
+*
+* This program and the accompanying materials are made available under the
+* terms of the The MIT License which is available at
+* https://opensource.org/licenses/MIT.
+*
+* SPDX-License-Identifier: MIT
+*/
+
+#include <iostream>
+#include <unistd.h>
+#include <stdexcept>
+#include <signal.h>
+#include <vector>
+#include "bh1749.hpp"
+#include "upm_utilities.h"
+
+bool isStopped;
+upm::BH1749 dev;
+
+void signal_int_handler(int signo)
+{
+    if (signo == SIGINT)
+        isStopped = true;
+}
+
+//! [Interesting]
+void PrintData(void *args)
+{
+    std::vector<uint16_t> result = dev.GetMeasurements();
+    std::cout << "R: " << result.at(0) <<
+                ", G: " << result.at(1) <<
+                ", B: " << result.at(2) <<
+                ", IR: " << result.at(3) <<
+                ", G2: " << result.at(4) << std::endl;
+    dev.ResetInterrupt();
+}
+
+int main(int argc, char **argv)
+{
+    signal(SIGINT, signal_int_handler);
+    dev.SoftReset();
+    dev.SensorInit(INT_JUDGE_1, MEAS_240MS, RGB_GAIN_1X, IR_GAIN_1X, RED);
+    dev.SetThresholdHigh(511);
+    std::cout << "Installing ISR" << std::endl;
+    dev.InstallISR(MRAA_GPIO_EDGE_FALLING, 33, &PrintData, NULL);
+    dev.EnableInterrupt();
+    dev.Enable();
+
+    while(!isStopped) {
+        upm_delay_ms(1000);
+    }
+
+    return 0;
+}
+//! [Interesting]
--- a/examples/c++/bh1750.cxx
+++ b/examples/c++/bh1750.cxx
@ -2,24 +2,11 @@
 * Author: Jon Trulson <jtrulson@ics.com>
 * Copyright (c) 2015 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:
+ * This program and the accompanying materials are made available under the
+ * terms of the The MIT License which is available at
+ * https://opensource.org/licenses/MIT.
 *
- * 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.
+ * SPDX-License-Identifier: MIT
 */

 #include <iostream>
--- a/examples/c++/bh1792.cxx
+++ b/examples/c++/bh1792.cxx
@ -0,0 +1,70 @@
+/*
+* The MIT License (MIT)
+*
+* Author: Assam Boudjelthia
+* Copyright (c) 2018 Rohm Semiconductor.
+*
+* This program and the accompanying materials are made available under the
+* terms of the The MIT License which is available at
+* https://opensource.org/licenses/MIT.
+*
+* SPDX-License-Identifier: MIT
+*/
+
+#include <iostream>
+#include <signal.h>
+#include  <sys/time.h>
+#include "bh1792.hpp"
+#include "upm_utilities.h"
+
+bool isStopped;
+upm::BH1792 dev;
+
+void signal_int_handler(int signo)
+{
+    if (signo == SIGINT)
+        isStopped = true;
+}
+
+//! [Interesting]
+void PrintData(void *args)
+{
+    std::vector<std::vector<int>> fifo;
+    struct timespec now;
+
+    clock_gettime(CLOCK_MONOTONIC_RAW, &now);
+    try {
+        fifo = dev.GetFifoData();
+
+        std::cout << "\nHeart beat sensor FIFO data:" << std::endl;
+        for(int i = 0; i < 32; i++)
+            std::cout << i << ": off: " << fifo.at(i).at(0) << ", on: " <<
+                        fifo.at(i).at(1) << std::endl;
+
+        std::cout << "timestamp " << now.tv_sec << " sec, " << now.tv_nsec <<
+                    " nsec" << std::endl;
+    } catch (std::exception& e) {
+        std::cout << "Failed to read FIFO data" << std::endl;
+        throw;
+    }
+}
+
+int main(int argc, char **argv)
+{
+    float measTime;
+
+    signal(SIGINT, signal_int_handler);
+    dev.SoftReset();
+    dev.EnableSyncMode(256, 32);
+    std::cout << "Installing ISR" << std::endl;
+    dev.InstallISR(MRAA_GPIO_EDGE_FALLING, 33, &PrintData, NULL);
+    measTime = dev.GetMeasurementTimeMS();
+    dev.StartMeasurement();
+
+    while(!isStopped) {
+        usleep(measTime * 1000);
+    }
+
+    return 0;
+}
+//! [Interesting]
--- a/examples/c++/biss0001.cxx
+++ b/examples/c++/biss0001.cxx
@ -2,24 +2,11 @@
 * Author: Zion Orent <zorent@ics.com>
 * Copyright (c) 2014 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:
+ * This program and the accompanying materials are made available under the
+ * terms of the The MIT License which is available at
+ * https://opensource.org/licenses/MIT.
 *
- * 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.
+ * SPDX-License-Identifier: MIT
 */

 #include <iostream>
--- a/examples/c++/bma220.cxx
+++ b/examples/c++/bma220.cxx
@ -2,24 +2,11 @@
 * Author: Jon Trulson <jtrulson@ics.com>
 * Copyright (c) 2015 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:
+ * This program and the accompanying materials are made available under the
+ * terms of the The MIT License which is available at
+ * https://opensource.org/licenses/MIT.
 *
- * 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.
+ * SPDX-License-Identifier: MIT
 */

 #include <iostream>
--- a/examples/c++/bma250e.cxx
+++ b/examples/c++/bma250e.cxx
@ -2,24 +2,11 @@
 * Author: Jon Trulson <jtrulson@ics.com>
 * Copyright (c) 2016 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:
+ * This program and the accompanying materials are made available under the
+ * terms of the The MIT License which is available at
+ * https://opensource.org/licenses/MIT.
 *
- * 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.
+ * SPDX-License-Identifier: MIT
 */

 #include <iostream>
--- a/examples/c++/bmg160.cxx
+++ b/examples/c++/bmg160.cxx
@ -2,24 +2,11 @@
 * Author: Jon Trulson <jtrulson@ics.com>
 * Copyright (c) 2016 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:
+ * This program and the accompanying materials are made available under the
+ * terms of the The MIT License which is available at
+ * https://opensource.org/licenses/MIT.
 *
- * 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.
+ * SPDX-License-Identifier: MIT
 */

 #include <iostream>
--- a/examples/c++/bmi160.cxx
+++ b/examples/c++/bmi160.cxx
@ -2,24 +2,11 @@
 * Author: Jon Trulson <jtrulson@ics.com>
 * Copyright (c) 2016 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:
+ * This program and the accompanying materials are made available under the
+ * terms of the The MIT License which is available at
+ * https://opensource.org/licenses/MIT.
 *
- * 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.
+ * SPDX-License-Identifier: MIT
 */

 #include <iostream>
--- a/examples/c++/bmm150.cxx
+++ b/examples/c++/bmm150.cxx
@ -2,24 +2,11 @@
 * Author: Jon Trulson <jtrulson@ics.com>
 * Copyright (c) 2016 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:
+ * This program and the accompanying materials are made available under the
+ * terms of the The MIT License which is available at
+ * https://opensource.org/licenses/MIT.
 *
- * 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.
+ * SPDX-License-Identifier: MIT
 */

 #include <iostream>
--- a/examples/c++/bmp280-bme280.cxx
+++ b/examples/c++/bmp280-bme280.cxx
@ -2,24 +2,11 @@
 * Author: Jon Trulson <jtrulson@ics.com>
 * Copyright (c) 2016 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:
+ * This program and the accompanying materials are made available under the
+ * terms of the The MIT License which is available at
+ * https://opensource.org/licenses/MIT.
 *
- * 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.
+ * SPDX-License-Identifier: MIT
 */

 #include <iostream>
--- a/examples/c++/bmp280.cxx
+++ b/examples/c++/bmp280.cxx
@ -4,24 +4,11 @@
 *
 * 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:
+ * This program and the accompanying materials are made available under the
+ * terms of the The MIT License which is available at
+ * https://opensource.org/licenses/MIT.
 *
- * 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.
+ * SPDX-License-Identifier: MIT
 */

 #include <iostream>
--- a/examples/c++/bmpx8x.cxx
+++ b/examples/c++/bmpx8x.cxx
@ -7,24 +7,11 @@
 *
 * 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:
+ * This program and the accompanying materials are made available under the
+ * terms of the The MIT License which is available at
+ * https://opensource.org/licenses/MIT.
 *
- * 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.
+ * SPDX-License-Identifier: MIT
 */

 #include <iostream>
--- a/examples/c++/bmx055-bmc150.cxx
+++ b/examples/c++/bmx055-bmc150.cxx
@ -2,24 +2,11 @@
 * Author: Jon Trulson <jtrulson@ics.com>
 * Copyright (c) 2016 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:
+ * This program and the accompanying materials are made available under the
+ * terms of the The MIT License which is available at
+ * https://opensource.org/licenses/MIT.
 *
- * 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.
+ * SPDX-License-Identifier: MIT
 */

 #include <iostream>
--- a/examples/c++/bmx055-bmi055.cxx
+++ b/examples/c++/bmx055-bmi055.cxx
@ -2,24 +2,11 @@
 * Author: Jon Trulson <jtrulson@ics.com>
 * Copyright (c) 2016 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:
+ * This program and the accompanying materials are made available under the
+ * terms of the The MIT License which is available at
+ * https://opensource.org/licenses/MIT.
 *
- * 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.
+ * SPDX-License-Identifier: MIT
 */

 #include <iostream>
--- a/examples/c++/bmx055.cxx
+++ b/examples/c++/bmx055.cxx
@ -2,24 +2,11 @@
 * Author: Jon Trulson <jtrulson@ics.com>
 * Copyright (c) 2016 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:
+ * This program and the accompanying materials are made available under the
+ * terms of the The MIT License which is available at
+ * https://opensource.org/licenses/MIT.
 *
- * 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.
+ * SPDX-License-Identifier: MIT
 */

 #include <iostream>
--- a/examples/c++/bno055.cxx
+++ b/examples/c++/bno055.cxx
@ -2,24 +2,11 @@
 * Author: Jon Trulson <jtrulson@ics.com>
 * Copyright (c) 2016 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:
+ * This program and the accompanying materials are made available under the
+ * terms of the The MIT License which is available at
+ * https://opensource.org/licenses/MIT.
 *
- * 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.
+ * SPDX-License-Identifier: MIT
 */

 #include <iostream>
--- a/examples/c++/button.cxx
+++ b/examples/c++/button.cxx
@ -2,24 +2,11 @@
 * Author: Sarah Knepper <sarah.knepper@intel.com>
 * Copyright (c) 2014 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:
+ * This program and the accompanying materials are made available under the
+ * terms of the The MIT License which is available at
+ * https://opensource.org/licenses/MIT.
 *
- * 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.
+ * SPDX-License-Identifier: MIT
 */

 #include <iostream>
--- a/examples/c++/buzzer-initio.cxx
+++ b/examples/c++/buzzer-initio.cxx
@ -0,0 +1,12 @@
+#include <iostream>
+
+#include "buzzer.hpp"
+#include "buzzer_tones.h"
+#include "upm_utilities.h"
+
+int
+main(int argc, char** argv)
+{
+  upm::Buzzer buzzer("p:32,vol:0.01,play:3800:500000");
+  return 0;
+}
--- a/examples/c++/buzzer.cxx
+++ b/examples/c++/buzzer.cxx
@ -2,24 +2,11 @@
 * Author: Yevgeniy Kiveisha <yevgeniy.kiveisha@intel.com>
 * Copyright (c) 2014 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:
+ * This program and the accompanying materials are made available under the
+ * terms of the The MIT License which is available at
+ * https://opensource.org/licenses/MIT.
 *
- * 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.
+ * SPDX-License-Identifier: MIT
 */

 #include <iostream>
@ -35,7 +22,7 @@ main(int argc, char** argv)
    int chord[] = { BUZZER_DO, BUZZER_RE, BUZZER_MI, BUZZER_FA, BUZZER_SOL, BUZZER_LA, BUZZER_SI };

    // create Buzzer instance
-    upm::Buzzer sound(5);
+    upm::Buzzer sound(32);
    // print sensor name
    std::cout << sound.name() << std::endl;

--- a/examples/c++/cjq4435.cxx
+++ b/examples/c++/cjq4435.cxx
@ -2,24 +2,11 @@
 * Author: Jon Trulson <jtrulson@ics.com>
 * Copyright (c) 2015 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:
+ * This program and the accompanying materials are made available under the
+ * terms of the The MIT License which is available at
+ * https://opensource.org/licenses/MIT.
 *
- * 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.
+ * SPDX-License-Identifier: MIT
 */

 #include <iostream>
--- a/examples/c++/collision.cxx
+++ b/examples/c++/collision.cxx
@ -2,24 +2,11 @@
 * Author: Zion Orent <zorent@ics.com>
 * Copyright (c) 2015 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:
+* This program and the accompanying materials are made available under the
+* terms of the The MIT License which is available at
+* https://opensource.org/licenses/MIT.
 *
-* 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.
+* SPDX-License-Identifier: MIT
 */
 #include <iostream>
 #include <signal.h>
--- a/examples/c++/curieimu.cxx
+++ b/examples/c++/curieimu.cxx
@ -4,24 +4,11 @@
 * Author: Justin Zemlyansky (@JustInDevelopment)
 * Copyright (c) 2016 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:
+ * This program and the accompanying materials are made available under the
+ * terms of the The MIT License which is available at
+ * https://opensource.org/licenses/MIT.
 *
- * 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.
+ * SPDX-License-Identifier: MIT
 */

 #include "curieimu.hpp"
--- a/examples/c++/cwlsxxa.cxx
+++ b/examples/c++/cwlsxxa.cxx
@ -2,24 +2,11 @@
 * Author: Jon Trulson <jtrulson@ics.com>
 * Copyright (c) 2016 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:
+ * This program and the accompanying materials are made available under the
+ * terms of the The MIT License which is available at
+ * https://opensource.org/licenses/MIT.
 *
- * 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.
+ * SPDX-License-Identifier: MIT
 */

 #include <iostream>
--- a/examples/c++/dfrec.cxx
+++ b/examples/c++/dfrec.cxx
@ -2,24 +2,11 @@
 * Author: Jon Trulson <jtrulson@ics.com>
 * Copyright (c) 2016 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:
+ * This program and the accompanying materials are made available under the
+ * terms of the The MIT License which is available at
+ * https://opensource.org/licenses/MIT.
 *
- * 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.
+ * SPDX-License-Identifier: MIT
 */

 #include <iostream>
--- a/examples/c++/dfrorp.cxx
+++ b/examples/c++/dfrorp.cxx
@ -2,24 +2,11 @@
 * Author: Jon Trulson <jtrulson@ics.com>
 * Copyright (c) 2016 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:
+ * This program and the accompanying materials are made available under the
+ * terms of the The MIT License which is available at
+ * https://opensource.org/licenses/MIT.
 *
- * 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.
+ * SPDX-License-Identifier: MIT
 */

 #include <iostream>
--- a/examples/c++/dfrph.cxx
+++ b/examples/c++/dfrph.cxx
@ -2,24 +2,11 @@
 * Author: Jon Trulson <jtrulson@ics.com>
 * Copyright (c) 2015 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:
+ * This program and the accompanying materials are made available under the
+ * terms of the The MIT License which is available at
+ * https://opensource.org/licenses/MIT.
 *
- * 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.
+ * SPDX-License-Identifier: MIT
 */

 #include <iostream>
--- a/Show More
+++ b/Show More