upm: v0.7.0

Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>

.travis.yml

@@ -1,21 +1,46 @@
 language: cpp
+env:
+  global:
+    - MRAA_ROOT=/tmp/mraa
+    - MRAA_BUILD=$MRAA_ROOT/build
+    - MRAA_INSTALL=$MRAA_ROOT/install
+    - UPM_ROOT=$TRAVIS_BUILD_DIR
+    - UPM_BUILD=$UPM_ROOT/build
+    - UPM_INSTALL=$UPM_ROOT/install
+    - JAVA_HOME=/usr/lib/jvm/java-8-oracle
+  matrix:
+    - NODE010=true
+    - NODE012=true
+    - NODE4=true
+    - NODE5=true
 compiler:
-  - gcc
   - clang
+  - gcc
 install:
-  - sudo add-apt-repository --yes ppa:kalakris/cmake
   - sudo add-apt-repository --yes ppa:fenics-packages/fenics-exp/swig
   - sudo apt-get update -qq
-  - sudo apt-get install -y -qq swig3.0 python git cmake
+  - sudo apt-get install -y -qq swig3.0 git
   - sudo ln -s /usr/bin/swig3.0 /usr/bin/swig
   - sudo update-java-alternatives -s java-8-oracle
 before_script:
-  - if [ "$CC" = "gcc" ]; then export BUILDJAVA=ON; else export BUILDJAVA=OFF; fi
-  - export JAVA_HOME=/usr/lib/jvm/java-8-oracle
+  # Turn off JAVA SWIG for clang++, use 4.8 for all g++ builds
+  - if [ "$CC" == "gcc" ]; then export BUILDJAVA=ON; export CC=gcc-4.8; export CXX=g++-4.8; else export BUILDJAVA=OFF; fi
+  - if [ "${NODE012}" ]; then nvm install 0.12; fi
+  - if [ "${NODE4}" ]; then nvm install 4.1; fi
+  - if [ "${NODE5}" ]; then nvm install 5; fi
+  # Handle 0.10 NODE_ROOT_DIR differently than other versions
+  - if [ -z ${NODE010} ]; then export NODE_ROOT_DIR="/home/travis/.nvm/versions/node/`nvm version`"; else export NODE_ROOT_DIR=/home/travis/.nvm/v0.10.36; fi
 script:
-  - git clone --branch=master https://github.com/intel-iot-devkit/mraa.git
-  - cd mraa && mkdir build && cd build && cmake -DBUILDSWIGJAVA=$BUILDJAVA -DENABLEEXAMPLES=OFF -DCMAKE_INSTALL_PREFIX:PATH=. -DNODE_ROOT_DIR:PATH=/home/travis/.nvm/v0.10.36/include .. && make && make install
-  - export PKG_CONFIG_PATH=$PWD/lib/pkgconfig:$PWD/lib/x86_64-linux-gnu/pkgconfig
-  - export CPLUS_INCLUDE_PATH=$PWD/include
-  - export LIBRARY_PATH=$PWD/lib:$PWD/lib/x86_64-linux-gnu
-  - cd ../.. && mkdir build && cd build && cmake -DBUILDSWIGJAVA=$BUILDJAVA -DNODE_ROOT_DIR:PATH=/home/travis/.nvm/v0.10.36/include -DBUILDEXAMPLES=ON -DBUILDJAVAEXAMPLES=$BUILDJAVA .. && make
+  - echo "CC=$CC BUILDJAVA=$BUILDJAVA NODE010=$NODE010 NODE012=$NODE012 NODE4=$NODE4 NODE5=$NODE5 NODE_ROOT_DIR=$NODE_ROOT_DIR"
+  - git clone https://github.com/intel-iot-devkit/mraa.git $MRAA_ROOT
+  - mkdir -p $MRAA_BUILD && cd $_ && cmake -DBUILDSWIGJAVA=$BUILDJAVA -DBUILDSWIGNODE=OFF -DBUILDSWIGPYTHON=OFF -DFIRMATA=ON -DENABLEEXAMPLES=OFF -DCMAKE_INSTALL_PREFIX:PATH=$MRAA_INSTALL $MRAA_ROOT && make install
+  - cd $UPM_ROOT && mkdir $UPM_BUILD && cd $_ && PKG_CONFIG_PATH=$MRAA_INSTALL/lib/pkgconfig cmake -DNODE_ROOT_DIR:PATH="${NODE_ROOT_DIR}" -DBUILDSWIGJAVA=$BUILDJAVA -DBUILDEXAMPLES=ON -DBUILDJAVAEXAMPLES=$BUILDJAVA -DCMAKE_INSTALL_PREFIX:PATH=$UPM_INSTALL .. && make install
+addons:
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+      - george-edison55-precise-backports
+    packages:
+      - cmake
+      - cmake-data
+      - g++-4.8

CMakeLists.txt

@@ -10,22 +10,22 @@ find_package (PkgConfig REQUIRED)
 
 # Force a libmraa search and minimum required version every time a config is generated
 unset(MRAA_FOUND CACHE)
-pkg_check_modules (MRAA REQUIRED mraa>=0.9.0)
+pkg_check_modules (MRAA REQUIRED mraa>=1.0.0)
 message (INFO " found mraa version: ${MRAA_VERSION}")
 
 # Appends the cmake/modules path to MAKE_MODULE_PATH variable.
 set (CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
-set (LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}" CACHE PATH "Installation path for libraries")
 
-# Set CMAKE_LIB_INSTALL_DIR if not defined
+# Set CMAKE_INSTALL_LIBDIR if not defined
 include(GNUInstallDirs)
+set (LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}" CACHE PATH "Installation path for libraries")
 
 # Make a version file containing the current version from git.
 include (GetGitRevisionDescription)
 git_describe (VERSION "--tags")
 if ("x_${VERSION}" STREQUAL "x_GIT-NOTFOUND" OR "x_${VERSION}" STREQUAL "x_-128-NOTFOUND")
   message (WARNING " - Install git to compile a production UPM!")
-  set (VERSION "v0.5.0-dirty")
+  set (VERSION "v0.7.0-dirty")
 endif ()
 
 message (INFO " - UPM Version ${VERSION}")
@@ -51,13 +51,15 @@ set (CMAKE_SWIG_FLAGS "")
 option (BUILDDOC "Build all doc." OFF)
 option (BUILDSWIG "Build swig modules." ON)
 option (BUILDSWIGPYTHON "Build swig python modules." ON)
+option (BUILDPYTHON3 "Use python3 for building/installing/testing" OFF)
 option (BUILDSWIGNODE "Build swig node modules." ON)
 option (BUILDEXAMPLES "Build C++ example binaries" OFF)
 option (BUILDJAVAEXAMPLES "Build java example jars" OFF)
 option (BUILDSWIGJAVA "Build swig java modules" OFF)
 option (IPK "Generate IPK using CPack" OFF)
 option (RPM "Generate RPM using CPack" OFF)
-option (BUILDTESTS "Generate check-ups for upm" OFF)
+option (BUILDTESTS "Generate check-ups for upm" ON)
+option (ENABLECXX11 "Enable C++11 standards support" ON)
 
 # Find swig
 if (BUILDSWIG)
@@ -76,6 +78,32 @@ include (TargetArch)
 target_architecture (DETECTED_ARCH)
 message( INFO " - Target arch is ${DETECTED_ARCH}")
 
+#-march=native for ARM when not defined/forced
+if (DETECTED_ARCH MATCHES "arm.*" AND NOT CMAKE_CXX_FLAGS MATCHES "-march")
+  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
+endif()
+
+# enable c++11 standards support
+if (ENABLECXX11)
+  include(CheckCXXCompilerFlag)
+  if (CMAKE_VERSION VERSION_LESS "3.1")
+    CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
+    CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
+    if (COMPILER_SUPPORTS_CXX11)
+      set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+    elseif (COMPILER_SUPPORTS_CXX0X)
+      set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+    else()
+      message(WARNING "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please update your C++ compiler.")
+    endif()
+  else()
+    # 3.1+ uses this generic method to enable c++11
+    set (CMAKE_CXX_STANDARD 11)
+  endif()
+else()
+  message(WARNING "Some modules require C++11 support, and may not build without it.")
+endif()
+
 if (BUILDDOC)
   # Add a target to generate API documentation with Doxygen
   find_package (Doxygen)
@@ -99,11 +127,10 @@ if (BUILDDOC)
   find_package (Sphinx)
   if(SPHINX_FOUND AND BUILDSWIG AND BUILDSWIGPYTHON)
     # Python required for Sphinx build
-    find_package (PythonLibs)
+    find_package (PythonLibs ${PYTHONBUILD_VERSION} REQUIRED)
     string (REPLACE "." ";" PYTHON_VERSION_LIST ${PYTHONLIBS_VERSION_STRING})
     list (GET PYTHON_VERSION_LIST 0 PYTHON_VERSION_MAJOR)
     list (GET PYTHON_VERSION_LIST 1 PYTHON_VERSION_MINOR)
-    set (SITE_PACKAGES ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages)
     configure_file (${CMAKE_CURRENT_SOURCE_DIR}/doxy/conf.py.in ${CMAKE_CURRENT_BINARY_DIR}/pydoc/conf.py @ONLY)
     configure_file (${CMAKE_CURRENT_SOURCE_DIR}/doxy/index.rst ${CMAKE_CURRENT_BINARY_DIR}/pydoc/index.rst COPYONLY)
     add_custom_target (pydoc ALL
@@ -130,9 +157,9 @@ if (BUILDDOC)
       configure_file(${CMAKE_CURRENT_SOURCE_DIR}/doxy/node/${JSDOC_FILE} ${CMAKE_CURRENT_BINARY_DIR}/${JSDOC_FILE} COPYONLY)
     endforeach()
     add_custom_target(jsdoc ALL
-      COMMAND ${NODE_EXECUTABLE} docgen -m upm -i xml -t ${CMAKE_CURRENT_SOURCE_DIR}/src -g ../../
+      COMMAND ${NODEJS_EXECUTABLE} docgen -m upm -i xml -t ${CMAKE_CURRENT_SOURCE_DIR}/src -g ../../
       COMMAND ${YUIDOC_EXECUTABLE} -C --no-sort --helpers generators/yuidoc/helper.js --themedir generators/yuidoc/tmpl -o html/node jsdoc/yuidoc/upm
-      COMMAND ${NODE_EXECUTABLE} tolower -i html/node
+      COMMAND ${NODEJS_EXECUTABLE} tolower -i html/node
       DEPENDS doc
       WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
       COMMENT "Generating API documentation with Yuidoc" VERBATIM
@@ -156,7 +183,7 @@ if (IPK)
   endif ()
   message (INFO " - Package arch is ${TARGET_ARCH}")
 
-  set(CPACK_GENERATOR "DEB" "TGZ")
+  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
@@ -182,21 +209,25 @@ if (RPM)
   message (INFO " - RPM packaging enabled for ${DETECTED_ARCH}")
   set(CPACK_PACKAGE_VERSION ${VERSION})
   set(CPACK_GENERATOR "RPM")
-  set(CPACK_PACKAGE_NAME "libupm${upm_VERSION_MAJOR}")
-  set(CPACK_PACKAGE_RELEASE 1)
+  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}")
+      "${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}-${CPACK_PACKAGE_RELEASE}.${DIST_TAG}.${DETECTED_ARCH}")
+  set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}.${DIST_TAG}.${DETECTED_ARCH}")
   include(CPack)
 endif()
 
@@ -210,10 +241,16 @@ if(BUILDJAVAEXAMPLES)
   add_subdirectory (examples/java)
 endif()
 
-if(BUILDTESTS)
-    find_package (PythonInterp REQUIRED)
-    if (${PYTHONINTERP_FOUND})
-        enable_testing ()
-        add_subdirectory (tests)
-    endif ()
+if (BUILDSWIGPYTHON OR BUILDTESTS)
+  if (BUILDPYTHON3)
+    set (PYTHONBUILD_VERSION 3)
+  else ()
+    set (PYTHONBUILD_VERSION 2.7)
+  endif ()
+endif ()
+
+if (BUILDTESTS)
+  find_package (PythonInterp ${PYTHONBUILD_VERSION} REQUIRED)
+  enable_testing ()
+  add_subdirectory (tests)
 endif()

README.md

@@ -1,16 +1,29 @@
 UPM (Useful Packages & Modules) Sensor/Actuator repository for MRAA
 ==============
 
-UPM is a high level repository for sensors that use MRAA. Each sensor links
-to MRAA and are not meant to be interlinked although some groups of sensors
-may be. Each sensor contains a header which allows to interface with it.
-Typically a sensor is represented as a class and instantiated.
+The 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](github.com/intel-iot-devkit/mraa) APIs.
 
-The constructor is expected to initialise the sensor and parameters may be used
-to provide identification/pin location on the board.
+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.
 
-Typically an update() function will be called in order to get new data from the
-sensor in order to reduce load when doing multiple reads to sensor data.
+C++ interfaces have been defined for the following sensor/actuator types, but
+they are subject to change:
+
+* Light controller 
+* Light sensor
+* Temperature sensor
+* Humidity sensor
+* Pressure sensor
+* Gas sensor
+* Analog to digital converter
+
+The developer community is encouraged to help expand the list of supported
+sensors and actuators and provide feedback on interface design.
 
 ### Example
 
@@ -51,10 +64,6 @@ A sensor/actuator is expected to work as such (here is the MMA7660 accelerometer
     }
 ```
 
-However implementation and API design is completely up to the developer, some
-enumerable sensors for example may provide much clever instantiation. Displays
-may also create more complex structures in order to interface with them.
-
 Browse through the list of all [examples](https://github.com/intel-iot-devkit/upm/tree/master/examples).
 
 Multi-sensor samples for the starter and specialized kits can be found in the
@@ -81,7 +90,7 @@ See building documentation [here](docs/building.md).
 
 Porting [link](docs/porting.md) has more information on making new UPM modules.
 
-There is also an example available for max31855 [sensor](docs/max31855.md).
+There is also an example available gfor max31855 [sensor](docs/max31855.md).
 
 Guide on creating Java [bindings](docs/creating_java_bindings.md).
 
@@ -105,6 +114,14 @@ API Documentation
 <a href="http://iotdk.intel.com/docs/master/upm/python"><img src="docs/icons/python.png"/></a>
 <a href="http://iotdk.intel.com/docs/master/upm/node"><img src="docs/icons/node.png"/></a>
 
+### API Compatibility
+Even if we try our best not to, every once in a while we are forced to modify
+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** - Our **C++ header files** changed extension from *.h* to *.hpp*!
+
 ### Changelog
 Version changelog [here](docs/changelog.md).
 

cmake/modules/FindNode.cmake

@@ -1,4 +1,12 @@
-find_program (NODE_EXECUTABLE NAMES node
+ # Macro to add directory to NODEJS_INCLUDE_DIRS if it exists and is not /usr/include
+ macro(add_include_dir dir)
+    if (IS_DIRECTORY ${dir} AND NOT ${dir} STREQUAL "/usr/include")
+      set(NODEJS_INCLUDE_DIRS ${NODEJS_INCLUDE_DIRS} ${dir})
+    endif()
+endmacro()
+
+
+find_program (NODEJS_EXECUTABLE NAMES node nodejs
     HINTS
     $ENV{NODE_DIR}
     PATH_SUFFIXES bin
@@ -7,26 +15,50 @@ find_program (NODE_EXECUTABLE NAMES node
 
 include (FindPackageHandleStandardArgs)
 
-find_path (NODE_ROOT_DIR "node/node.h" "src/node.h"
-  PATHS /usr/include/nodejs /usr/local/include/nodejs)
+# If compat-libuv package exists, it must be at start of include path
+find_path (UV_ROOT_DIR "uv.h" PATHS /usr/include/compat-libuv010 NO_DEFAULT_PATH)
+if (UV_ROOT_DIR)
+  # set (NODEJS_INCLUDE_DIRS ${UV_ROOT_DIR})
+  add_include_dir(${UV_ROOT_DIR})
+endif()
 
-set (NODE_INCLUDE_DIRS
-  ${NODE_ROOT_DIR}/src
-  ${NODE_ROOT_DIR}/node
-  ${NODE_ROOT_DIR}/deps/v8/include
-  ${NODE_ROOT_DIR}/deps/uv/include
+# Now look for node. Flag an error if not found
+find_path (NODE_ROOT_DIR "include/node/node.h" "include/src/node.h"
+  PATHS /usr/include/nodejs /usr/local/include/nodejs /usr/local/include)
+if (NODE_ROOT_DIR)
+  add_include_dir(${NODE_ROOT_DIR}/include/src)
+  add_include_dir(${NODE_ROOT_DIR}/include/node)
+  add_include_dir(${NODE_ROOT_DIR}/include/deps/v8/include)
+  add_include_dir(${NODE_ROOT_DIR}/include/deps/uv/include)
+else()
+  unset(NODEJS_INCLUDE_DIRS)
+  message(ERROR " - node.h not found")
+endif()
+
+# Check that v8.h is in NODEJS_INCLUDE_DIRS
+find_path (V8_ROOT_DIR "v8.h" PATHS ${NODEJS_INCLUDE_DIRS})
+if (NOT V8_ROOT_DIR)
+  unset(NODEJS_INCLUDE_DIRS)
+  message(ERROR " - v8.h not found")
+endif()
+
+# Check that uv.h is in NODEJS_INCLUDE_DIRS
+find_path (UV_ROOT_DIR "uv.h" PATHS ${NODEJS_INCLUDE_DIRS})
+if (NOT UV_ROOT_DIR)
+  unset(NODEJS_INCLUDE_DIRS)
+  message(ERROR " - uv.h not found")
+endif()
+
+find_package_handle_standard_args (Nodejs DEFAULT_MSG
+    NODEJS_EXECUTABLE
+    NODEJS_INCLUDE_DIRS
 )
 
-find_package_handle_standard_args (Node DEFAULT_MSG
-    NODE_EXECUTABLE
-    NODE_INCLUDE_DIRS
-)
-
-if (NODE_EXECUTABLE)
-    execute_process(COMMAND ${NODE_EXECUTABLE} --version
+if (NODEJS_EXECUTABLE)
+    execute_process(COMMAND ${NODEJS_EXECUTABLE} --version
                     OUTPUT_VARIABLE _VERSION
                     RESULT_VARIABLE _NODE_VERSION_RESULT)
-    execute_process(COMMAND ${NODE_EXECUTABLE} -e "console.log(process.versions.v8)"
+    execute_process(COMMAND ${NODEJS_EXECUTABLE} -e "console.log(process.versions.v8)"
                     OUTPUT_VARIABLE _V8_VERSION
                     RESULT_VARIABLE _V8_RESULT)
     if (NOT _NODE_VERSION_RESULT AND NOT _V8_RESULT)
@@ -55,7 +87,11 @@ if (NODE_EXECUTABLE)
         set (V8_VERSION_STRING "3.28.72")
         message ("defaulted to node 0.10.30")
     endif ()
-    message ("INFO - Node version is " ${NODE_VERSION_STRING} "INFO - Node using v8 " ${V8_VERSION_STRING})
+    string (REGEX REPLACE "\n" "" NODE_VERSION_STRING ${NODE_VERSION_STRING})
+    string (REGEX REPLACE "\n" "" V8_VERSION_STRING ${V8_VERSION_STRING})
+    message ("INFO - Node version is " ${NODE_VERSION_STRING})
+    message ("INFO - Node using v8 " ${V8_VERSION_STRING})
+    mark_as_advanced (NODEJS_EXECUTABLE)
 endif ()
 
-mark_as_advanced (NODE_EXECUTABLE)
+mark_as_advanced (NODEJS_EXECUTABLE)

docs/apichanges.md

@@ -0,0 +1,15 @@
+API Changes                       {#apichanges}
+===============
+
+Here's a list of other API changes made to the library that break source/binary
+compatibility between releases:
+
+ * Our **C++ header files** changed their extension from *.h* to *.hpp* in
+ version 0.7.0, Intel provided examples and code samples also reflect this
+ change but you will need to modify your `#include` directives in existing code
+ * **my9221**, **groveledbar** and **grovecircularled** are now all part of the
+ same library (my9221) and new functionality was added going to v.0.5.1
+ * **stepmotor** driver API was changed significantly from v.0.4.1 to v.0.5.0
+ * **eboled** library was greatly improved in version 0.4.0 and the `draw()`
+ function was removed in favor of a more complete GFX library implementation
+ 

docs/changelog.md

@@ -4,18 +4,70 @@ Changelog                         {#changelog}
 Here's a list summarizing some of the key undergoing changes to our library
 from earlier versions:
 
+### v0.7.0
+
+ * C++ header files have been renamed from *.h to *.hpp along with all Intel
+ provided examples and code samples to allow for native C drivers
+ * Updated driver compatibility to new MRAA 1.0 API
+ * First sensor implementations for our newly added Dallas One Wire support
+ * Several fixes based on issues reported on Github
+ * Changed SWIG linking strategy, more robust Travis CI build checks
+ * New sensors: ds2413, ds18b20, bmp280, bno055, l3gd20
+
+### v0.6.2
+
+ * Added a generic driver for taking snapshots from an USB camera device
+ * New API changes section in documentation to let users know when the UPM API
+ gets modified
+ * Fixed some spelling errors and improved JavaScript documentation builds with
+ newer versions of YUI and Node
+ * Enhanced Cmake scripts and the build process
+ * New sensors: vcap, e50hx
+
+### v0.6.1
+
+ * Fixed library build process for different configurations across multiple
+ environments reported by users.
+ * Fixed multiple GFX library header clash and improved SSD1351 compatibility
+ by changing SPI mode
+ * Added Node and Python array typemaps for nrf24l01
+ * Added 2 new JAVA examples
+
+### v0.6.0
+
+ * Introduced C++ Interfaces for several sensor categories that will help
+ consolidate the sensor APIs with uniform function names upon implementation
+ * Greatly improved Node.js detection and handling during build and install,
+ and should be now compatible with all major versions
+ * Added a driver for the Curie IMU (accelerometer + gyroscope) that works with
+ the new Firmata support implemented by MRAA
+ * Continued to provide several JAVA fixes and examples
+ * Many new industrial and maker sensors: cwlsxxa, teams, tex00, h803x, apa102,
+ smartdrive, bmi160, bme280, ds1808lc, hlg150, lp8860, max44009, si1132, t6713,
+ si7005, ssd1351
+
+### v0.5.1
+
+ * Updated the API and added new functionality for the MY9221 class and derived
+ sensors: grovecircularled and groveledbar, along with new code samples that
+ show these changes
+ * Provided a fix for one JAVA example that uses interrupts and updated library
+ install paths
+ * Several documentation improvements and pictures were added for new sensors
+ * A few other sensors received minor patches
+
 ### v0.5.0
 
  * First implementations for industrial grade Modbus sensors, along with first
- sensor examples that use the new iio system driver in MRAA.
+ sensor examples that use the new iio system driver in MRAA
  * Significant improvements to the stepmotor driver that will now allow precise
- control using any GPIO pin and extended the API with new functionality.
+ control using any GPIO pin and extended the API with new functionality
  * Further improved JAVA bindings and sensor ISRs have been modified to
- implement Runnable objects.
+ implement Runnable objects
  * Improved Python typemaps and error checking, documentation now includes
- detailed function descriptions.
+ detailed function descriptions
  * Simplified the build process by eliminating the need to define redundant
- MRAA related environment variables.
+ MRAA related environment variables
  * New sensors: nlgpio16, ads1x15, t3311, hdxxvxta, hwxpxx, rhusb, ili9341,
  apds9930, kxcjk1013
 
@@ -55,7 +107,7 @@ from earlier versions:
  includes last remaining images and grouping sensors by kits
  * Added support for Sparkfun Sensor Blocks (OLED & IMU)
  * Fully reworked API for at42qt1070, mpu9150 and lcd classes, while
- maintaining backwards compatibility for existing lcd displays.
+ maintaining backwards compatibility for existing lcd displays
  * Extended doxygen tags for better integration with automated documentation
  generators
  * New sensors: rgbringcoder, hp20x, pn532, sainsmartks, lsm9ds0, eboled

docs/creating_java_bindings.md

@@ -253,61 +253,29 @@ __SWIG:__
 
 
 ###Implementing callbacks in Java
-Method calls from the Java instance are passed to the C++ instance transparently via C wrapper functions. In the default usage of SWIG, this arrangement is asymmetric in the sense that no corresponding mechanism exists to pass method calls down the inheritance chain from C++ to Java. To address this problem, SWIG introduces new classes called directors at the bottom of the C++ inheritance chain. The job of the directors is to route method calls correctly, either to C++ implementations higher in the inheritance chain or to Java implementations lower in the inheritance chain. The upshot is that C++ classes can be extended in Java and from C++ these extensions look exactly like native C++ classes. For more on Java directors, read the ["Cross language polymorphism using directors"](http://www.swig.org/Doc3.0/SWIGDocumentation.html#Java_directors) chapter of the SWIG documentation.
-To enable directors, add the "directors" option to the %module directive, and use the %feature("director") directive to tell SWIG which classes and methods should get directors. If only a class is specified, the %feature is applied to all virtual methods in that class. If no class or method is specified, the %feature is applied globally to all virtual methods.
-
-```
-%module(directors="1") modulename
-%feature("director") IsrCallback;
-```
+Callbacks in the UPM Java library (as well as the MRAA Java library) make use of the _void mraa\_java\_isr\_callback(void\* data\)_ method from MRAA.  
 
 __Callbacks in the UPM Java library are implemented as follows (we use the a110x Hall Effect sensors as example):__
 
-We create a new C++ class, that will be wrapped by SWIG, called _IsrCallback_; and a method _generic\_callback\_isr(void\* data)_ that takes an instance of IsrCallback as argument.
+We extend the sensor class with another method, _installISR\(jobject runnable\)_, which is a wrapper over the original _installISR\(void \(\*isr\)\(void \*\), void \*arg\)_ method. This will install the _mraa\_java\_isr\_callback\(\)_ method as the interrupt service routine \(ISR\) to be called, with _jobject runnable_ as argument.
+
+SWIGJAVA is a symbol that is always defined by SWIG when using Java. We enclose the _installISR\(jobject runnable\)_ method in a _\#if defined(SWIGJAVA)_ check, to ensure the code only exists when creating a wrapper for Java.
 
 ```c++
 #if defined(SWIGJAVA)
-class IsrCallback
+void A110X::installISR(jobject runnable)
 {
-    public:
-        virtual ~IsrCallback()
-        {
-        }
-        virtual void run()
-        { /* empty, overridden in Java*/
-        }
-
-    private:
-};
-
-static void generic_callback_isr (void* data)
-{
-    IsrCallback* callback = (IsrCallback*) data;
-    if (callback == NULL)
-        return;
-    callback->run();
+    installISR(mraa_java_isr_callback, runnable);
 }
 #endif
 ```
 
-SWIGJAVA is a symbol that is always defined by SWIG when using Java. We enclose the _IsrCallback_ class and _generic\_callback\_isr()_ in a _\#if defined(SWIGJAVA)_ check, to ensure the code only exists when creating a wrapper for Java.
-We extend the sensor class with another method, _installISR\(IsrCallback \*cb\)_, which is a wrapper over the original _installISR\(void \(\*isr\)\(void \*\), void \*arg\)_ method. This will install the _generic\_callback\_isr\(\)_ method as the interrupt service routine \(ISR\) to be called, with the _IsrCallback_ object (referenced by *cb) as argument.
-
-```c++
-#if defined(SWIGJAVA)
-void A110X::installISR( IsrCallback *cb)
-{
-    installISR(generic_callback_isr, cb);
-}
-#endif
-```
-
-We hide the underlying method, _installISR\(void \(\*isr\)\(void \*\), void \*arg\)_ , and expose only the _installISR\(IsrCallback \*cb\)_ to SWIG, through the use of the SWIGJAVA symbol. When SWIGJAVA is defined, we change the access modifier of the underlying method to private.
+We hide the underlying method, _installISR\(void \(\*isr\)\(void \*\), void \*arg\)_ , and expose only the _installISR\(jobject runnable\)_ to SWIG, through the use of the SWIGJAVA symbol. When SWIGJAVA is defined, we change the access modifier of the underlying method to private.
 
 ```c++
 public:
 #if defined(SWIGJAVA)
-    void installISR(IsrCallback *cb);
+    void installISR(jobject runnable);
 #else
     void installISR(void (*isr)(void *), void *arg);
 #endif
@@ -317,7 +285,7 @@ private:
 #endif
 ```
 
-To use callback in java, we create a ISR class, which extends the new IsrCallback class created by SWIG, and we override the _run\(\)_ method with the code to be executed when the interrupt is received. An example for the a110x Hall sensor that increments a counter each time an interrupt is received:
+To use callback in java, we create a ISR class, which implements the Java Runnable interface, and we override the _run\(\)_ method with the code to be executed when the interrupt is received. An example for the a110x Hall sensor that increments a counter each time an interrupt is received:
 
 ```java
 public class A110X_intrSample {
@@ -326,7 +294,7 @@ public class A110X_intrSample {
     public static void main(String[] args) throws InterruptedException {
         upm_a110x.A110X hall = new upm_a110x.A110X(2);
 
-        IsrCallback callback = new A110XISR();
+        A110XISR callback = new A110XISR();
         hall.installISR(callback);
         
         while(true){
@@ -336,7 +304,7 @@ public class A110X_intrSample {
     }
 }
 
-class A110XISR extends IsrCallback {
+class A110XISR implements Runnable {
     public A110XISR(){
         super();
     }
@@ -383,18 +351,3 @@ by
 #if defined(SWIGJAVA) || defined(JAVACALLBACK)
 ```
 
-__Use GlobalRef instead of WeakRef__
-
-By default, SWIG uses WeakRef to the Java objects handled by a director. Once Java objects run out of scope they can get cleaned up. In many cases WeakRef is undesirable as we may still want to be able to run methods or access fields in the objects passed to the JNI layer (e.g. we want to pass a runnable-like object which should be called when something happens). To use GlobalRefs instead, the following line must be added after the director declaration:
-
-```
-SWIG_DIRECTOR_OWNED(module)
-```
-
-For, example, in case of a module called IsrCallback (used for interrupts in MRAA and UPM), we would declare said module as such:
-
-```
-%feature ("director") IsrCallback;
-SWIG_DIRECTOR_OWNED(IsrCallback)
-```
-

docs/max31855.md

@@ -13,7 +13,7 @@ This is a spi module so we will use the mraa spi functions to build our module.
 First thing to do is to create a tree structure like this in upm/src/max31855:
 
 * max31855.cxx
-* max31855.h
+* max31855.hpp
 * jsupm_max31855.i
 * pyupm_max31855.i
 * CMakeLists.txt
@@ -36,11 +36,11 @@ used swig wrappers for UPM sensors, it's not obligatory but recommended.
 
 ### API
 
-Then we create the header (max31855.h) , a very simple header in our case we
+Then we create the header (max31855.hpp) , a very simple header in our case we
 will have only a very basic api. We provide a getTemp() function which will
 return the same type as in the arduino library, a double.
 
-@snippet max31855.h Interesting
+@snippet max31855.hpp Interesting
 
 Note that the header contains both the io that we will use, the gpio is in this
 case used as the chip select pin.

docs/porting.md

@@ -14,16 +14,16 @@ example is explained in detail on @ref max31855
 
 ### CmakeLists.txt
 
-By default you need a header called modulename.h and a C++ file called
+By default you need a header called modulename.hpp and a C++ file called
 modulename.cxx. You can have multiple headers and source files. Only public
-headers need to be added to module_h and all source files need to be in
+headers need to be added to module_hpp and all source files need to be in
 module_src.
 
 ~~~~~~~~~~~
 set (libname "modulename")
 set (libdescription "Module Description")
 set (module_src ${libname}.cxx)
-set (module_h ${libname}.h)
+set (module_hpp ${libname}.hpp)
 upm_module_init()
 ~~~~~~~~~~~
 

doxy/Doxyfile.in

@@ -859,7 +859,10 @@ EXCLUDE_SYMLINKS       = NO
 # Note that the wildcards are matched against the file with absolute path, so to
 # exclude all test directories for example use the pattern */test/*
 
-EXCLUDE_PATTERNS       =
+# bmi160 driver contains code provided by bosch.  This source contains
+# tags which are picked up by doxygen (namely \mainpage) and
+# incorrectly get added to docs.
+EXCLUDE_PATTERNS       = bosch_*
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
 # (namespaces, classes, functions, etc.) that should be excluded from the

doxy/samples.mapping.txt

@@ -48,7 +48,7 @@ mpu9150.cxx	MPU9150Sample.java
 mq2.cxx	MQ2Sample.java
 mq303a.cxx	MQ303ASample.java
 mq5.cxx	MQ5Sample.java
-my9221-ledbar.cxx	MY9221_ledbarSample.java
+groveledbar	GroveLEDBar
 nrf24l01-receiver.cxx	NRF24L01_receiverSample.java
 nrf24l01-transmitter.cxx	NRF24L01_transmitterSample.java
 nunchuck.cxx	NUNCHUCKSample.java

examples/c++/CMakeLists.txt

@@ -10,7 +10,7 @@ macro(get_module_name example_name module_name)
   elseif ((${example_name} MATCHES "^mq" AND ${length} EQUAL 3) OR ${example_name} STREQUAL "tp401")
     set (${module_name} "gas")
   else()
-    set(${module_name} ${example_name}) 
+    set(${module_name} ${example_name})
   endif()
 endmacro()
 
@@ -25,25 +25,25 @@ macro(add_custom_example example_bin example_src example_module_list)
     if (MODULE_LIST)
       list(FIND MODULE_LIST ${module} index)
       if (${index} EQUAL -1)
-        set(found_all_modules FALSE)      	
+        set(found_all_modules FALSE)
       endif()
     endif()
   endforeach()
   if (found_all_modules)
     add_executable (${example_bin} ${example_src})
-    target_link_libraries (${example_bin} ${CMAKE_THREAD_LIBS_INIT})  
+    target_link_libraries (${example_bin} ${CMAKE_THREAD_LIBS_INIT})
     foreach (module ${example_module_list})
       set(module_dir "${PROJECT_SOURCE_DIR}/src/${module}")
       include_directories (${module_dir})
       if (${module} STREQUAL "lcd")
-      	set(module "i2clcd")
+        set(module "i2clcd")
       endif()
-      target_link_libraries (${example_bin} ${module})    
+      target_link_libraries (${example_bin} ${module})
     endforeach()
   else()
    MESSAGE(INFO " Ignored ${example_bin}")
    set (example_bin "")
-  endif()  	
+  endif()
 endmacro()
 
 
@@ -56,13 +56,13 @@ macro(add_example example_name)
   set(module_dir "${PROJECT_SOURCE_DIR}/src/${module_name}")
   if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${example_src}"
      AND EXISTS ${module_dir}
-     AND IS_DIRECTORY ${module_dir})  
+     AND IS_DIRECTORY ${module_dir})
     add_custom_example(${example_bin} ${example_src} ${module_name})
     if ((NOT ${example_bin} STREQUAL "") AND (${module_name} STREQUAL "grove"))
       set(grove_module_path "${PROJECT_SOURCE_DIR}/src/${example_name}")
       if (EXISTS ${grove_module_path})
         include_directories(${grove_module_path})
-        target_link_libraries (${example_bin} ${example_name})  
+        target_link_libraries (${example_bin} ${example_name})
       endif()
     endif()
   else()
@@ -91,8 +91,6 @@ add_example (grovebutton)
 add_example (groverotary)
 add_example (groveslide)
 add_example (buzzer-sound)
-add_example (my9221-ledbar)
-add_example (my9221-updown)
 add_example (nrf24l01-transmitter)
 add_example (nrf24l01-receiver)
 add_example (nrf24l01-broadcast)
@@ -203,7 +201,6 @@ add_example (h3lis331dl)
 add_example (ad8232)
 add_example (grovescam)
 add_example (m24lr64e)
-add_example (grovecircularled)
 add_example (rgbringcoder)
 add_example (hp20x)
 add_example (pn532)
@@ -237,11 +234,41 @@ if (MODBUS_FOUND)
   include_directories(${MODBUS_INCLUDE_DIRS})
   add_example (t3311)
   add_example (hwxpxx)
+  add_example (h803x)
 endif()
 add_example (hdxxvxta)
 add_example (rhusb)
 add_example (apds9930)
 add_example (kxcjk1013)
+add_example (ssd1351)
+add_example (ds1808lc)
+add_example (hlg150h)
+add_example (lp8860)
+add_example (max44009)
+add_example (si1132)
+add_example (si7005)
+add_example (t6713)
+add_example (cwlsxxa)
+add_example (teams)
+add_example (apa102)
+add_example (tex00)
+add_example (bmi160)
+add_example (smartdrive)
+if (HAVE_FIRMATA)
+  add_example (curieimu)
+endif ()
+if (BACNET_FOUND)
+  include_directories(${BACNET_INCLUDE_DIRS})
+  # we need access to bacnetmstp headers too
+  include_directories(${PROJECT_SOURCE_DIR}/src/bacnetmstp)
+  add_example (e50hx)
+endif()
+add_example (vcap)
+add_example (ds2413)
+add_example (ds18b20)
+add_example (bmp280)
+add_example (bno055)
+add_example (l3gd20)
 
 # These are special cases where you specify example binary, source file and module(s)
 include_directories (${PROJECT_SOURCE_DIR}/src)
@@ -258,3 +285,13 @@ add_custom_example (eboled-example eboled.cxx lcd)
 add_custom_example (mpu60x0-example mpu60x0.cxx mpu9150)
 add_custom_example (ak8975-example ak8975.cxx mpu9150)
 add_custom_example (mpu9250-example mpu9250.cxx mpu9150)
+add_custom_example (groveledbar-example groveledbar.cxx my9221)
+add_custom_example (grovecircularled-example grovecircularled.cxx my9221)
+add_custom_example (temperature-sensor-example temperature-sensor.cxx "si7005;bmpx8x;bme280")
+add_custom_example (humidity-sensor-example humidity-sensor.cxx "si7005;bme280")
+add_custom_example (pressure-sensor-example pressure-sensor.cxx "bmpx8x;bme280")
+add_custom_example (co2-sensor-example co2-sensor.cxx "t6713")
+add_custom_example (adc-example adc-sensor.cxx "ads1x15")
+add_custom_example (light-sensor-example light-sensor.cxx "si1132;max44009")
+add_custom_example (light-controller-example light-controller.cxx "lp8860;ds1808lc;hlg150h")
+add_custom_example (bme280-example bme280.cxx bmp280)

examples/c++/a110x-intr.cxx

@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <iostream>
 #include <signal.h>
-#include "a110x.h"
+#include "a110x.hpp"
 
 using namespace std;
 

examples/c++/a110x.cxx

@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <iostream>
 #include <signal.h>
-#include "a110x.h"
+#include "a110x.hpp"
 
 using namespace std;
 

examples/c++/ad8232.cxx

@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <iostream>
 #include <signal.h>
-#include "ad8232.h"
+#include "ad8232.hpp"
 
 using namespace std;
 

examples/c++/adafruitms1438-stepper.cxx

@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <signal.h>
 #include <iostream>
-#include "adafruitms1438.h"
+#include "adafruitms1438.hpp"
 
 using namespace std;
 using namespace upm;

examples/c++/adafruitms1438.cxx

@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <signal.h>
 #include <iostream>
-#include "adafruitms1438.h"
+#include "adafruitms1438.hpp"
 
 using namespace std;
 using namespace upm;

examples/c++/adafruitss.cxx

@@ -33,7 +33,7 @@
  */
 
 #include <iostream>
-#include "adafruitss.h"
+#include "adafruitss.hpp"
 #include <unistd.h>
 
 using namespace std;

examples/c++/adc-sensor.cxx

@@ -0,0 +1,80 @@
+/*
+ * 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:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <unistd.h>
+#include <iostream>
+#include "ads1015.hpp"
+#include "mraa/gpio.hpp"
+
+#define EDISON_I2C_BUS 1
+#define FT4222_I2C_BUS 0
+#define EDISON_GPIO_SI7005_CS 20
+
+
+//! [Interesting]
+// Simple example of using IADC to determine
+// which sensor is present and return its name.
+// IADC is then used to get readings from sensor
+
+
+upm::IADC* getADC()
+{
+   upm::IADC* adc = NULL;
+   try {
+      adc = new upm::ADS1015(EDISON_I2C_BUS);
+      mraa::Gpio gpio(EDISON_GPIO_SI7005_CS);
+      gpio.dir(mraa::DIR_OUT_HIGH);
+      return adc;
+   } catch (std::exception& e) {
+      std::cerr << "ADS1015: " << e.what() << std::endl;
+   }
+   return adc;
+}
+
+int main ()
+{
+   upm::IADC* adc = getADC();
+   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) {
+         std::cout << "Input " << i;
+         try {
+            float voltage = adc->getVoltage(i);
+            std::cout << ": Voltage = " << voltage << "V" << std::endl;
+         } catch (std::exception& e) {
+            std::cerr << e.what() << std::endl;
+         }
+      }
+      sleep(1);
+   }
+   delete adc;
+   return 0;
+}
+
+//! [Interesting]

examples/c++/adc121c021.cxx

@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <signal.h>
 #include <iostream>
-#include "adc121c021.h"
+#include "adc121c021.hpp"
 
 using namespace std;
 

examples/c++/ads1x15.cxx

@@ -26,8 +26,8 @@
 
 #include <iostream>
 #include <unistd.h>
-#include "ads1015.h"
-#include "ads1115.h"
+#include "ads1015.hpp"
+#include "ads1115.hpp"
 
 
 
@@ -286,7 +286,7 @@ int main()
                 else ads->setCompMode();
                break;
           case 18:
-               cout << ads->getCompLatch() << cout;
+               cout << ads->getCompLatch() << endl;
                break;
           case 19:
                cout << "select one of the following:" << endl;
@@ -296,7 +296,7 @@ int main()
                 else ads->setCompLatch();
                break;
           case 20:
-               cout << ads->getContinuous() << cout;
+               cout << ads->getContinuous() << endl;
                break;
           case 21:
                cout << "select one of the following:" << endl;

examples/c++/adxl335.cxx

@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <iostream>
 #include <signal.h>
-#include "adxl335.h"
+#include "adxl335.hpp"
 
 using namespace std;
 

examples/c++/adxl345.cxx

@@ -23,7 +23,7 @@
  */
 
 #include <unistd.h>
-#include "adxl345.h"
+#include "adxl345.hpp"
 
 int
 main(int argc, char **argv)

examples/c++/adxrs610.cxx

@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <iostream>
 #include <signal.h>
-#include "adxrs610.h"
+#include "adxrs610.hpp"
 
 using namespace std;
 

examples/c++/ak8975.cxx

@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <iostream>
 #include <signal.h>
-#include "mpu9150.h"
+#include "mpu9150.hpp"
 
 using namespace std;
 

examples/c++/am2315.cxx

@@ -26,7 +26,7 @@
 #include <iostream>
 #include <signal.h>
 
-#include "am2315.h"
+#include "am2315.hpp"
 
 volatile int doWork = 0;
 

examples/c++/apa102.cxx

@@ -1,6 +1,6 @@
 /*
- * Author: Yevgeniy Kiveisha <yevgeniy.kiveisha@intel.com>
- * Copyright (c) 2014 Intel Corporation.
+ * 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
@@ -22,42 +22,30 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <unistd.h>
+#include "apa102.hpp"
 #include <iostream>
-#include "my9221.h"
 #include <signal.h>
+#include <unistd.h>
 
-int running = 0;
-
-void
-sig_handler(int signo)
-{
-    printf("got signal\n");
-    if (signo == SIGINT) {
-        printf("exiting application\n");
-        running = 1;
-    }
-}
+using namespace std;
 
 int
-main(int argc, char **argv)
+main(int argc, char** argv)
 {
     //! [Interesting]
-    upm::MY9221 *bar = new upm::MY9221(8, 9);
+    // Instantiate a strip of 30 LEDs on SPI bus 0
+    upm::APA102* ledStrip = new upm::APA102(800, 0);
 
-    signal(SIGINT, sig_handler);
+    // Set all LEDs to Red
+    ledStrip->setAllLeds(31, 255, 0, 0);
 
-    while (!running) {
-        for (int idx = 1; idx < 11; idx++) {
-            bar->setBarLevel (idx);
-            usleep(1000);
-        }
-    }
+    // Set a section (10 to 20) to blue
+    ledStrip->setLeds(10, 20, 31, 0, 0, 255);
+
+    // Set a single LED to green
+    ledStrip->setLed(15, 31, 0, 255, 0);
+
+    delete ledStrip;
     //! [Interesting]
-
-    std::cout << "exiting application" << std::endl;
-
-    delete bar;
-
     return 0;
 }

examples/c++/apds9002.cxx

@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <iostream>
 #include <signal.h>
-#include "apds9002.h"
+#include "apds9002.hpp"
 
 using namespace std;
 

examples/c++/apds9930.cxx

@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <iostream>
 #include <signal.h>
-#include "apds9930.h"
+#include "apds9930.hpp"
 
 using namespace std;
 

examples/c++/at42qt1070.cxx

@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <signal.h>
 #include <iostream>
-#include "at42qt1070.h"
+#include "at42qt1070.hpp"
 
 using namespace std;
 

examples/c++/biss0001.cxx

@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <iostream>
 #include <signal.h>
-#include "biss0001.h"
+#include "biss0001.hpp"
 
 using namespace std;
 

examples/c++/bma220.cxx

@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <iostream>
 #include <signal.h>
-#include "bma220.h"
+#include "bma220.hpp"
 
 using namespace std;
 

examples/c++/bme280.cxx

@@ -0,0 +1,78 @@
+/*
+ * 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:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <unistd.h>
+#include <iostream>
+#include <signal.h>
+
+#include "bme280.hpp"
+
+using namespace std;
+using namespace upm;
+
+int shouldRun = true;
+
+void sig_handler(int signo)
+{
+  if (signo == SIGINT)
+    shouldRun = false;
+}
+
+
+int main(int argc, char **argv)
+{
+  signal(SIGINT, sig_handler);
+//! [Interesting]
+
+  // Instantiate a BME280 instance using default i2c bus and address
+  upm::BME280 *sensor = new upm::BME280();
+
+  // For SPI, bus 0, you would pass -1 as the address, and a valid pin for CS:
+  // BME280(0, -1, 10);
+
+  while (shouldRun)
+    {
+      // update our values from the sensor
+      sensor->update();
+
+      // we show both C and F for temperature
+      cout << "Compensation Temperature: " << sensor->getTemperature()
+           << " C / " << sensor->getTemperature(true) << " F"
+           << endl;
+      cout << "Pressure: " << sensor->getPressure() << " Pa" << endl;
+      cout << "Computed Altitude: " << sensor->getAltitude() << " m" << endl;
+      cout << "Humidity: " << sensor->getHumidity() << " %RH" << endl;
+
+      cout << endl;
+
+      sleep(1);
+    }
+//! [Interesting]
+
+  cout << "Exiting..." << endl;
+
+  delete sensor;
+
+  return 0;
+}

examples/c++/bmi160.cxx

@@ -0,0 +1,82 @@
+/*
+ * 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:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <unistd.h>
+#include <iostream>
+#include <signal.h>
+#include "bmi160.hpp"
+
+using namespace std;
+
+int shouldRun = true;
+
+void sig_handler(int signo)
+{
+  if (signo == SIGINT)
+    shouldRun = false;
+}
+
+
+int main(int argc, char **argv)
+{
+  signal(SIGINT, sig_handler);
+//! [Interesting]
+
+  // Instantiate a BMI160 instance using default i2c bus and address
+  upm::BMI160 *sensor = new upm::BMI160();
+
+  while (shouldRun)
+    {
+      // update our values from the sensor
+      sensor->update();
+
+      float dataX, dataY, dataZ;
+
+      sensor->getAccelerometer(&dataX, &dataY, &dataZ);
+      cout << "Accelerometer: ";
+      cout << "AX: " << dataX << " AY: " << dataY << " AZ: "
+           << dataZ << endl;
+
+      sensor->getGyroscope(&dataX, &dataY, &dataZ);
+      cout << "Gryoscope:     ";
+      cout << "GX: " << dataX << " GY: " << dataY << " GZ: "
+           << dataZ << endl;
+
+      sensor->getMagnetometer(&dataX, &dataY, &dataZ);
+      cout << "Magnetometer:  ";
+      cout << "MX: " << dataX << " MY: " << dataY << " MZ: "
+           << dataZ << endl;
+
+      cout << endl;
+
+      usleep(500000);
+    }
+//! [Interesting]
+
+  cout << "Exiting..." << endl;
+
+  delete sensor;
+
+  return 0;
+}

examples/c++/bmp280.cxx

@@ -0,0 +1,77 @@
+/*
+ * 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:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <unistd.h>
+#include <iostream>
+#include <signal.h>
+
+#include "bmp280.hpp"
+
+using namespace std;
+using namespace upm;
+
+int shouldRun = true;
+
+void sig_handler(int signo)
+{
+  if (signo == SIGINT)
+    shouldRun = false;
+}
+
+
+int main(int argc, char **argv)
+{
+  signal(SIGINT, sig_handler);
+//! [Interesting]
+
+  // Instantiate a BMP280 instance using default i2c bus and address
+  upm::BMP280 *sensor = new upm::BMP280();
+
+  // For SPI, bus 0, you would pass -1 as the address, and a valid pin for CS:
+  // BMP280(0, -1, 10);
+
+  while (shouldRun)
+    {
+      // update our values from the sensor
+      sensor->update();
+
+      // we show both C and F for temperature
+      cout << "Compensation Temperature: " << sensor->getTemperature()
+           << " C / " << sensor->getTemperature(true) << " F"
+           << endl;
+      cout << "Pressure: " << sensor->getPressure() << " Pa" << endl;
+      cout << "Computed Altitude: " << sensor->getAltitude() << " m" << endl;
+
+      cout << endl;
+
+      sleep(1);
+    }
+//! [Interesting]
+
+  cout << "Exiting..." << endl;
+
+  delete sensor;
+
+  return 0;
+}

examples/c++/bmpx8x.cxx

@@ -24,7 +24,7 @@
 
 #include <unistd.h>
 #include <iostream>
-#include "bmpx8x.h"
+#include "bmpx8x.hpp"
 #include <signal.h>
 
 int doWork = 0;

examples/c++/bno055.cxx

@@ -0,0 +1,129 @@
+/*
+ * 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:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <unistd.h>
+#include <iostream>
+#include <signal.h>
+#include "bno055.hpp"
+
+using namespace std;
+
+int shouldRun = true;
+
+void sig_handler(int signo)
+{
+  if (signo == SIGINT)
+    shouldRun = false;
+}
+
+
+int main(int argc, char **argv)
+{
+  signal(SIGINT, sig_handler);
+//! [Interesting]
+
+  // Instantiate an BNO055 using default parameters (bus 0, addr
+  // 0x28).  The default running mode is NDOF absolute orientation
+  // mode.
+  upm::BNO055 *sensor = new upm::BNO055();
+
+  // First we need to calibrate....
+  cout << "First we need to calibrate.  4 numbers will be output every"
+       << endl;
+  cout << "second for each sensor.  0 means uncalibrated, and 3 means"
+       << endl;
+  cout << "fully calibrated."
+       << endl;
+  cout << "See the UPM documentation on this sensor for instructions on"
+       << endl;
+  cout << "what actions are required to calibrate."
+       << endl;
+  cout << endl;
+
+  // do the calibration...
+  while (shouldRun && !sensor->isFullyCalibrated())
+    {
+      int mag, acc, gyr, sys;
+      sensor->getCalibrationStatus(&mag, &acc, &gyr, &sys);
+
+      cout << "Magnetometer: " << mag
+           << " Accelerometer: " << acc
+           << " Gyroscope: " << gyr
+           << " System: " << sys
+           << endl;
+
+      sleep(1);
+    }
+
+  cout << endl;
+  cout << "Calibration complete." << endl;
+  cout << endl;
+
+  // now output various fusion data every 250 milliseconds
+  while (shouldRun)
+    {
+      float w, x, y, z;
+
+      sensor->update();
+
+      sensor->getEulerAngles(&x, &y, &z);
+      cout << "Euler: Heading: " << x
+           << " Roll: " << y
+           << " Pitch: " << z
+           << " degrees"
+           << endl;
+
+      sensor->getQuaternions(&w, &x, &y, &z);
+      cout << "Quaternion: W: " << w
+           << " X: " << x
+           << " Y: " << y
+           << " Z: " << z
+           << endl;
+
+      sensor->getLinearAcceleration(&x, &y, &z);
+      cout << "Linear Acceleration: X: " << x
+           << " Y: " << y
+           << " Z: " << z
+           << " m/s^2"
+           << endl;
+
+      sensor->getGravityVectors(&x, &y, &z);
+      cout << "Gravity Vector: X: " << x
+           << " Y: " << y
+           << " Z: " << z
+           << " m/s^2"
+           << endl;
+
+      cout << endl;
+      usleep(250000);
+    }
+
+//! [Interesting]
+
+  cout << "Exiting..." << endl;
+
+  delete sensor;
+
+  return 0;
+}

examples/c++/buzzer-sound.cxx

@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <iostream>
 #include <signal.h>
-#include "buzzer.h"
+#include "buzzer.hpp"
 
 
 int

examples/c++/cjq4435.cxx

@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <iostream>
 #include <signal.h>
-#include "cjq4435.h"
+#include "cjq4435.hpp"
 
 using namespace std;
 

examples/c++/co2-sensor.cxx

@@ -0,0 +1,71 @@
+/*
+ * 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:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <unistd.h>
+#include <iostream>
+#include "t6713.hpp"
+
+#define EDISON_I2C_BUS 1 
+#define FT4222_I2C_BUS 0
+
+//! [Interesting]
+// Simple example of using ICO2Sensor to determine 
+// which sensor is present and return its name.
+// ICO2Sensor is then used to get readings from sensor
+
+
+upm::ICO2Sensor* getCO2Sensor()
+{
+   upm::ICO2Sensor* cO2Sensor = NULL;
+   try {
+      cO2Sensor = new upm::T6713(mraa_get_sub_platform_id(FT4222_I2C_BUS));
+      return cO2Sensor;
+   } catch (std::exception& e) {
+      std::cerr << "T6713: " << e.what() << std::endl;      
+   }
+   return cO2Sensor;   
+}
+
+int main ()
+{
+   upm::ICO2Sensor* cO2Sensor = getCO2Sensor();
+   if (cO2Sensor == NULL) {
+      std::cout << "CO2 sensor not detected" << std::endl;                        
+      return 1;
+   }
+   std::cout << "CO2 sensor " << cO2Sensor->getModuleName() << " detected" << std::endl;
+   while (true) {
+      try {
+         uint16_t value = cO2Sensor->getPpm();
+         std::cout << "CO2 level = " << value << " ppm" << std::endl;
+      } catch (std::exception& e) {
+         std::cerr << e.what() << std::endl;
+      }
+      sleep(1);         
+   }
+   delete cO2Sensor;
+   return 0;
+}
+
+//! [Interesting]      

examples/c++/curieimu.cxx

@@ -0,0 +1,81 @@
+/*
+ * Author: Brendan Le Foll <brendan.le.foll@intel.com>
+ * Author: Ron Evans (@deadprogram)
+ * 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:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <unistd.h>
+#include <iostream>
+#include "curieimu.hpp"
+#include "mraa.h"
+#include "mraa/firmata.h"
+#include <math.h>
+
+int
+main(int argc, char **argv)
+{
+    //! [Interesting]
+    mraa_init();
+    mraa_add_subplatform(MRAA_GENERIC_FIRMATA, "/dev/ttyACM0");
+
+    upm::CurieImu* sensor = new upm::CurieImu();
+
+    std::cout << "temperature is: " << (sensor->getTemperature() * pow(0.5, 9) + 23) << std::endl;
+
+    sensor->updateAccel();
+    int x = sensor->getAccelX(),
+        y = sensor->getAccelY(),
+        z = sensor->getAccelZ();
+    printf("accelerometer is: %d, %d, %d\n", x, y, z);
+
+    sensor->updateGyro();
+    int a = sensor->getGyroX(),
+        b = sensor->getGyroY(),
+        c = sensor->getGyroZ();
+    printf("gyroscope is: %d, %d, %d\n", a, b, c);
+
+    int axis, direction;
+    sensor->enableShockDetection(true);
+    for(int i=0; i<300; i++) {
+      if (sensor->isShockDetected()) {
+        sensor->getNextShock();
+        axis = sensor->getAxis();
+        direction = sensor->getDirection();
+        printf("shock data is: %d, %d\n", axis, direction);
+      }
+      usleep(10000);
+    }
+
+    sensor->updateMotion();
+    int m = sensor->getAccelX(),
+        n = sensor->getAccelY(),
+        o = sensor->getAccelZ(),
+        p = sensor->getGyroX(),
+        q = sensor->getGyroY(),
+        r = sensor->getGyroZ();
+    printf("motion is: %d, %d, %d, %d, %d, %d\n", m, n, o, p, q, r);
+
+    delete sensor;
+
+    return 0;
+}

examples/c++/cwlsxxa.cxx

@@ -0,0 +1,82 @@
+/*
+ * 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:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <unistd.h>
+#include <iostream>
+#include <signal.h>
+
+#include "cwlsxxa.hpp"
+
+using namespace std;
+
+bool shouldRun = true;
+
+void sig_handler(int signo)
+{
+  if (signo == SIGINT)
+    shouldRun = false;
+}
+
+int main(int argc, char **argv)
+{
+  signal(SIGINT, sig_handler);
+
+//! [Interesting]
+
+  cout << "Initializing..." << endl;
+
+  // Instantiate an CWLSXXA instance, using A0 for CO2, A1 for
+  // humidity and A2 for temperature
+  upm::CWLSXXA *sensor = new upm::CWLSXXA(0, 1, 2);
+
+  // update and print available values every second
+  while (shouldRun)
+    {
+      // update our values from the sensor
+      sensor->update();
+
+      // we show both C and F for temperature
+      cout << "Temperature: " << sensor->getTemperature()
+           << " C / " << sensor->getTemperature(true) << " F"
+           << endl;
+
+      cout << "Humidity: " << sensor->getHumidity()
+           << " %" << endl;
+
+      cout << "CO2: " << sensor->getCO2()
+           << " ppm" << endl;
+
+      cout << endl;
+
+      sleep(1);
+    }
+
+  cout << "Exiting..." << endl;
+
+  delete sensor;
+
+//! [Interesting]
+
+  return 0;
+}

examples/c++/dfrph.cxx

@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <iostream>
 #include <signal.h>
-#include "dfrph.h"
+#include "dfrph.hpp"
 
 using namespace std;
 

examples/c++/ds1307.cxx

@@ -24,7 +24,7 @@
 
 #include <unistd.h>
 #include <iostream>
-#include "ds1307.h"
+#include "ds1307.hpp"
 
 using namespace std;
 

examples/c++/ds1808lc.cxx

@@ -0,0 +1,51 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <iostream>
+#include <string>
+#include "ds1808lc.hpp"
+
+#define EDISON_I2C_BUS 1            // Edison I2C-1
+#define DS1808_GPIO_PWR 15          // Edison GP165
+
+void printState(upm::ILightController *lightController)
+{
+   if (lightController->isPowered())
+   {
+      std::cout << "Light is powered, brightness = " << lightController->getBrightness() << std::endl;
+   }
+   else
+   {
+      std::cout << "Light is not powered." << std::endl;
+   }
+}
+
+int main( int argc, char **argv )
+{
+   int status = 0;
+   upm::ILightController* lightController;
+
+   try {
+      lightController = new upm::DS1808LC(DS1808_GPIO_PWR, EDISON_I2C_BUS);
+      std::cout <<  "Existing state: "; printState(lightController);
+      if (argc == 2)
+      {
+         std::string arg = argv[1];
+         int brightness = ::atoi(argv[1]);
+         if (brightness > 0) {
+            lightController->setPowerOn();
+            lightController->setBrightness(brightness);
+         } else
+            lightController->setPowerOff();
+      }
+      std::cout <<  "Now: ";printState(lightController);
+   } catch (std::exception& e) {
+      std::cout << "Error: " << e.what() << std::endl;
+      status = 1;
+   }
+
+   delete lightController;
+   return status;
+}
+
+

examples/c++/ds18b20.cxx

@@ -0,0 +1,81 @@
+/*
+ * 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:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <unistd.h>
+#include <iostream>
+#include <signal.h>
+
+#include "ds18b20.hpp"
+
+using namespace std;
+
+bool shouldRun = true;
+
+void sig_handler(int signo)
+{
+  if (signo == SIGINT)
+    shouldRun = false;
+}
+
+int main(int argc, char **argv)
+{
+  signal(SIGINT, sig_handler);
+
+//! [Interesting]
+
+  cout << "Initializing..." << endl;
+
+  // Instantiate an DS18B20 instance using the default values (uart 0)
+  upm::DS18B20 sensor;
+
+  // locate and setup our devices
+  sensor.init();
+
+  cout << "Found " << sensor.devicesFound() << " device(s)" << endl;
+  cout << endl;
+
+  // bail if we didn't find anything
+  if (!sensor.devicesFound())
+    return 1;
+
+  // update and print available values every second
+  while (shouldRun)
+    {
+      // update our values for the first sensor
+      sensor.update(0);
+
+      // we show both C and F for temperature for the first sensor
+      cout << "Temperature: " << sensor.getTemperature(0)
+           << " C / " << sensor.getTemperature(0, true) << " F"
+           << endl;
+
+      sleep(1);
+    }
+
+  cout << "Exiting..." << endl;
+
+//! [Interesting]
+
+  return 0;
+}

examples/c++/ds2413.cxx

@@ -0,0 +1,59 @@
+/*
+ * 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:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <unistd.h>
+#include <iostream>
+#include <stdio.h>
+#include "ds2413.hpp"
+
+using namespace std;
+using namespace upm;
+
+int main(int argc, char **argv)
+{
+//! [Interesting]
+  // Instantiate a DS2413 Module on a Dallas 1-wire bus connected to UART 0
+  upm::DS2413* sensor = new upm::DS2413(0);
+
+  // find all of the DS2413 devices present on the bus
+  sensor->init();
+
+  // how many devices were found?
+  cout << "Found "<< sensor->devicesFound() << " device(s)" << endl;
+
+  // read the gpio and latch values from the first device
+  // the lower 4 bits are of the form:
+  // <gpioB latch> <gpioB value> <gpioA latch> <gpioA value>
+  cout << "GPIO device 0 values: " << sensor->readGpios(0) << endl;
+
+  // set the gpio latch values of the first device
+  cout << "Setting GPIO latches to on" << endl;
+  sensor->writeGpios(0, 0x03);
+
+  cout << "Exiting..." << endl;
+
+  delete sensor;
+//! [Interesting]
+  return 0;
+}

examples/c++/e50hx.cxx

@@ -0,0 +1,112 @@
+/*
+ * 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:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <unistd.h>
+#include <iostream>
+#include <signal.h>
+
+#include "e50hx.hpp"
+
+using namespace std;
+using namespace upm;
+
+bool shouldRun = true;
+
+void sig_handler(int signo)
+{
+  if (signo == SIGINT)
+    shouldRun = false;
+}
+
+int main(int argc, char **argv)
+{
+  signal(SIGINT, sig_handler);
+
+//! [Interesting]
+  // You will need to edit this example to conform to your site and your
+  // devices, specifically the Device Object Instance ID passed to the
+  // constructor, and the arguments to initMaster() that are
+  // appropriate for your BACnet network.
+
+  string defaultDev = "/dev/ttyUSB0";
+
+  // if an argument was specified, use it as the device instead
+  if (argc > 1)
+    defaultDev = string(argv[1]);
+
+  cout << "Using device " << defaultDev << endl;
+  cout << "Initializing..." << endl;
+
+  // Instantiate an E50HX object for an E50HX device that has 1075425
+  // as it's unique Device Object Instance ID.  NOTE: You will
+  // certainly want to change this to the correct value for your
+  // device(s).
+  E50HX *sensor = new E50HX(1075425);
+
+  // Initialize our BACnet master, if it has not already been
+  // initialized, with the device and baudrate, choosing 1000001 as
+  // our unique Device Object Instance ID, 2 as our MAC address and
+  // using default values for maxMaster and maxInfoFrames
+  sensor->initMaster(defaultDev, 38400, 1000001, 2);
+
+  // Uncomment to enable debugging output
+  // sensor->setDebug(true);
+
+  cout << endl;
+  cout << "Device Description: " << sensor->getDescription() << endl;
+  cout << "Device Location: " << sensor->getLocation() << endl;
+  cout << endl;
+
+  // update and print a few values every 5 seconds
+  while (shouldRun)
+    {
+      cout << "System Voltage: "
+           << sensor->getAnalogValue(E50HX::AV_System_Voltage)
+           << " " << sensor->getAnalogValueUnits(E50HX::AV_System_Voltage)
+           << endl;
+
+      cout << "System Type: "
+           << sensor->getAnalogValue(E50HX::AV_System_Type)
+           << endl;
+
+      cout << "Energy Consumption: " << sensor->getAnalogInput(E50HX::AI_Energy)
+           << " " << sensor->getAnalogInputUnits(E50HX::AI_Energy)
+           << endl;
+
+      cout << "Power Up Counter: "
+           << sensor->getAnalogInput(E50HX::AI_Power_Up_Count)
+           << endl;
+
+      cout << endl;
+      sleep(5);
+    }
+
+  cout << "Exiting..." << endl;
+
+  delete sensor;
+
+//! [Interesting]
+
+  return 0;
+}

examples/c++/eboled.cxx

@@ -23,7 +23,7 @@
  */
 
 #include <iostream>
-#include "eboled.h"
+#include "eboled.hpp"
 
 using namespace std;
 

examples/c++/ecs1030.cxx

@@ -26,7 +26,7 @@
 #include <iostream>
 #include <signal.h>
 #include <stdlib.h>
-#include "ecs1030.h"
+#include "ecs1030.hpp"
 
 int is_running = 0;
 upm::ECS1030 *sensor = NULL;

examples/c++/enc03r.cxx

@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <iostream>
 #include <signal.h>
-#include "enc03r.h"
+#include "enc03r.hpp"
 
 using namespace std;
 

examples/c++/es08a.cxx

@@ -24,7 +24,7 @@
 
 #include <unistd.h>
 #include <iostream>
-#include "es08a.h"
+#include "es08a.hpp"
 #include <signal.h>
 #include <stdlib.h>
 

examples/c++/flex.cxx

@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <iostream>
 #include <signal.h>
-#include "flex.h"
+#include "flex.hpp"
 
 using namespace std;
 

examples/c++/gp2y0a.cxx

@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <iostream>
 #include <signal.h>
-#include "gp2y0a.h"
+#include "gp2y0a.hpp"
 
 using namespace std;
 

examples/c++/grovebutton.cxx

@@ -24,7 +24,7 @@
 
 #include <unistd.h>
 #include <iostream>
-#include "grove.h"
+#include "grove.hpp"
 
 int
 main(int argc, char **argv)

examples/c++/grovecircularled.cxx

@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <iostream>
 #include <signal.h>
-#include "grovecircularled.h"
+#include "grovecircularled.hpp"
 
 using namespace std;
 
@@ -43,9 +43,9 @@ int main()
   
 //! [Interesting]
   
-  // Instantiate a Grove Circular LED on gpio pins 5 and 4
+  // Instantiate a Grove Circular LED on D9 for data, D8 for clock
   
-  upm::GroveCircularLED *circle = new upm::GroveCircularLED(5, 4);
+  upm::GroveCircularLED *circle = new upm::GroveCircularLED(9, 8);
   
   int level = 0;
   while (shouldRun)
@@ -54,6 +54,7 @@ int main()
       level = (level + 1) % 24;
       usleep(100000);
     }
+
 //! [Interesting]
 
   cout << "Exiting" << endl;

examples/c++/grovecollision.cxx

@@ -24,7 +24,7 @@
 #include <iostream>
 #include <unistd.h>
 #include <signal.h>
-#include "grovecollision.h"
+#include "grovecollision.hpp"
 
 using namespace std;
 

examples/c++/groveehr.cxx

@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <iostream>
 #include <signal.h>
-#include "groveehr.h"
+#include "groveehr.hpp"
 
 using namespace std;
 

examples/c++/groveeldriver.cxx

@@ -24,7 +24,7 @@
 #include <iostream>
 #include <unistd.h>
 #include <signal.h>
-#include "groveeldriver.h"
+#include "groveeldriver.hpp"
 
 using namespace std;
 

examples/c++/groveelectromagnet.cxx

@@ -24,7 +24,7 @@
 #include <iostream>
 #include <time.h>
 #include <signal.h>
-#include "groveelectromagnet.h"
+#include "groveelectromagnet.hpp"
 
 using namespace std;
 

examples/c++/groveemg.cxx

@@ -24,7 +24,7 @@
 #include <unistd.h>
 #include <iostream>
 #include <signal.h>
-#include "groveemg.h"
+#include "groveemg.hpp"
 
 using namespace std;
 

examples/c++/grovegprs.cxx

@@ -26,7 +26,7 @@
 #include <iostream>
 #include <signal.h>
 #include <stdio.h>
-#include "grovegprs.h"
+#include "grovegprs.hpp"
 
 using namespace std;
 using namespace upm;

examples/c++/grovegsr.cxx

@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <iostream>
 #include <signal.h>
-#include "grovegsr.h"
+#include "grovegsr.hpp"
 
 using namespace std;
 

examples/c++/groveled-multi.cxx

@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <iostream>
 #include <signal.h>
-#include "grove.h"
+#include "grove.hpp"
 
 using namespace std;
 

examples/c++/groveled.cxx

@@ -25,7 +25,7 @@
 
 #include <unistd.h>
 #include <iostream>
-#include "grove.h"
+#include "grove.hpp"
 
 int
 main(int argc, char **argv)

examples/c++/groveledbar.cxx

@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <iostream>
 #include <signal.h>
-#include "my9221.h"
+#include "groveledbar.hpp"
 
 using namespace std;
 
@@ -42,28 +42,27 @@ int main ()
 {
   signal(SIGINT, sig_handler);
 
-//! [Interesting] 
+//! [Interesting]
 
-  // Instantiate a MY9221, we use D2 for the data, and D3 for the
-  // data clock.  This was tested with a Grove LED bar.
+  // Instantiate a GroveLEDBar, we use D8 for the data, and D9 for the
+  // clock.  This was tested with a Grove LED bar.
+  upm::GroveLEDBar* bar = new upm::GroveLEDBar(8, 9);
 
-  upm::MY9221* bar = new upm::MY9221(2, 3);
-  
   while (shouldRun)
     {
       // count up from green to red
-      for (int i=1; i<=10; i++)
+      for (int i=0; i<=10; i++)
         {
           bar->setBarLevel(i, true);
-          usleep(50000);
+          usleep(100000);
         }
       sleep(1);
 
       // count down from red to green
-      for (int i=1; i<=10; i++)
+      for (int i=0; i<=10; i++)
         {
           bar->setBarLevel(i, false);
-          usleep(50000);
+          usleep(100000);
         }
       sleep(1);
     }
@@ -71,7 +70,7 @@ int main ()
 
   cout << "Exiting..." << endl;
   // turn off the LED's
-  bar->setBarLevel(0, true);
+  bar->setBarLevel(0);
 
   delete bar;
   return 0;

examples/c++/grovelight.cxx

@@ -25,7 +25,7 @@
 
 #include <unistd.h>
 #include <iostream>
-#include "grove.h"
+#include "grove.hpp"
 
 int
 main(int argc, char **argv)

examples/c++/grovelinefinder.cxx

@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <iostream>
 #include <signal.h>
-#include "grovelinefinder.h"
+#include "grovelinefinder.hpp"
 
 using namespace std;
 

examples/c++/grovemd-stepper.cxx

@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <signal.h>
 #include <iostream>
-#include "grovemd.h"
+#include "grovemd.hpp"
 
 using namespace std;
 

examples/c++/grovemd.cxx

@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <signal.h>
 #include <iostream>
-#include "grovemd.h"
+#include "grovemd.hpp"
 
 using namespace std;
 

examples/c++/grovemoisture.cxx

@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <iostream>
 #include <signal.h>
-#include "grovemoisture.h"
+#include "grovemoisture.hpp"
 
 using namespace std;
 

examples/c++/groveo2.cxx

@@ -24,7 +24,7 @@
 #include <unistd.h>
 #include <iostream>
 #include <signal.h>
-#include "groveo2.h"
+#include "groveo2.hpp"
 
 using namespace std;
 

examples/c++/groverelay.cxx

@@ -24,7 +24,7 @@
 
 #include <unistd.h>
 #include <iostream>
-#include "grove.h"
+#include "grove.hpp"
 
 int
 main(int argc, char **argv)

examples/c++/groverotary.cxx

@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <iostream>
 #include <iomanip>
-#include "grove.h"
+#include "grove.hpp"
 
 using namespace std;
 

examples/c++/grovescam.cxx

@@ -26,7 +26,7 @@
 #include <iostream>
 #include <signal.h>
 #include <stdio.h>
-#include "grovescam.h"
+#include "grovescam.hpp"
 
 using namespace std;
 using namespace upm;

examples/c++/groveslide.cxx

@@ -26,7 +26,7 @@
 #include <unistd.h>
 #include <iostream>
 #include <iomanip>
-#include "grove.h"
+#include "grove.hpp"
 
 using namespace std;
 

examples/c++/grovespeaker.cxx

@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <iostream>
 #include <signal.h>
-#include "grovespeaker.h"
+#include "grovespeaker.hpp"
 
 using namespace std;
 

examples/c++/grovetemp.cxx

@@ -26,7 +26,7 @@
 #include <unistd.h>
 #include <iostream>
 #include <iomanip>
-#include "grove.h"
+#include "grove.hpp"
 
 int
 main(int argc, char **argv)

examples/c++/groveultrasonic.cxx

@@ -26,7 +26,7 @@
 
 #include <unistd.h>
 #include <iostream>
-#include "groveultrasonic.h"
+#include "groveultrasonic.hpp"
 #include <signal.h>
 #include <stdlib.h>
 #include <sys/time.h>

examples/c++/grovevdiv.cxx

@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <iostream>
 #include <signal.h>
-#include "grovevdiv.h"
+#include "grovevdiv.hpp"
 
 using namespace std;
 

examples/c++/grovewater.cxx

@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <iostream>
 #include <signal.h>
-#include "grovewater.h"
+#include "grovewater.hpp"
 
 using namespace std;
 

examples/c++/grovewfs.cxx

@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <iostream>
 #include <signal.h>
-#include "grovewfs.h"
+#include "grovewfs.hpp"
 
 using namespace std;
 

examples/c++/guvas12d.cxx

@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <iostream>
 #include <signal.h>
-#include "guvas12d.h"
+#include "guvas12d.hpp"
 
 using namespace std;