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
2044 changed files with 16918 additions and 40500 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -12,7 +12,7 @@ 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
@ -87,9 +87,5 @@ 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
@ -10,8 +10,6 @@ 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)
@ -91,13 +89,16 @@ endfunction ()

 # Compiler flags common to both C and CXX
 # Enable -Wall
-# GCC-6 added -Wmisleading-indentation to -Wall, skip these for now
 set (C_CXX_WARNING_FLAGS -Wall
-    -Wno-misleading-indentation
    -Wno-strict-aliasing
    -Wno-deprecated-declarations # Temp fix for MRAA deprecated methods
    )

+# GCC-6 added -Wmisleading-indentation to -Wall, skip these for now
+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)
  list (APPEND C_CXX_WARNING_FLAGS -Werror)
@ -130,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})
@ -150,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)

@ -229,7 +235,7 @@ include (GetGitRevisionDescription)
 git_describe (VERSION "--tags")
 # If git_describe fails, use a dirty version
 if (${VERSION} MATCHES -NOTFOUND)
-  set (VERSION "v1.7.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 ()
@ -252,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")
@ -417,68 +418,6 @@ function (CreateDocumentationTargets)
  endif(BUILDSWIGNODE)
 endfunction()

-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()
-
 # UPM common headers
 set (UPM_COMMON_HEADER_DIRS ${CMAKE_HOME_DIRECTORY}/include)

--- 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/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
@ -56,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:
@ -78,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
--- a/docs/apichanges.md
+++ b/docs/apichanges.md
@ -4,6 +4,13 @@ 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,
--- a/docs/changelog.md
+++ b/docs/changelog.md
@ -4,6 +4,27 @@ 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
--- 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/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/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/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/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/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
@ -4,22 +4,11 @@
 * Author: Assam Boudjelthia
 * Copyright (c) 2018 Rohm Semiconductor.
 *
-* Permission is hereby granted, free of charge, to any person obtaining a copy of
-* this software and associated documentation files (the "Software"), to deal in
-* the Software without restriction, including without limitation the rights to
-* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-* the Software, and to permit persons to whom the Software is furnished to do so,
-* subject to the following conditions:
+* 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++/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
@ -4,22 +4,11 @@
 * Author: Assam Boudjelthia
 * Copyright (c) 2018 Rohm Semiconductor.
 *
-* Permission is hereby granted, free of charge, to any person obtaining a copy of
-* this software and associated documentation files (the "Software"), to deal in
-* the Software without restriction, including without limitation the rights to
-* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-* the Software, and to permit persons to whom the Software is furnished to do so,
-* subject to the following conditions:
+* 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++/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/examples/c++/ds1307.cxx
+++ b/examples/c++/ds1307.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++/ds1808lc.cxx
+++ b/examples/c++/ds1808lc.cxx
@ -8,7 +8,7 @@
 #define DS1808_GPIO_PWR 15 // Edison GP165

 void
-printState(upm::ILightController& lightController)
+printState(upm::DS1808LC& lightController)
 {
    if (lightController.isPowered()) {
        std::cout << "Light is powered, brightness = " << lightController.getBrightness()
--- a/examples/c++/ds18b20.cxx
+++ b/examples/c++/ds18b20.cxx
@ -2,24 +2,11 @@
 * Author: Jon Trulson <jtrulson@ics.com>
 * Copyright (c) 2016-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++/ds2413.cxx
+++ b/examples/c++/ds2413.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++/e50hx.cxx
+++ b/examples/c++/e50hx.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++/ecezo.cxx
+++ b/examples/c++/ecezo.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 <ecezo.hpp>
--- a/examples/c++/ecs1030.cxx
+++ b/examples/c++/ecs1030.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>
--- a/examples/c++/ehr.cxx
+++ b/examples/c++/ehr.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++/eldriver.cxx
+++ b/examples/c++/eldriver.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++/electromagnet.cxx
+++ b/examples/c++/electromagnet.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++/emg.cxx
+++ b/examples/c++/emg.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++/enc03r.cxx
+++ b/examples/c++/enc03r.cxx
@ -2,24 +2,11 @@
 * Author: Jon Trulson <jtrulson@ics.com>
 * Copyright (c) 2014-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++/flex.cxx
+++ b/examples/c++/flex.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++/gas-mq2.cxx
+++ b/examples/c++/gas-mq2.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>
--- a/Show More
+++ b/Show More