cmake: disable TGZ from builds when IPK used

Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>

.travis.yml

@@ -1,46 +1,37 @@
 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
+  - CC=gcc CXX=gcc
+  - CC=clang CXX=clang++
   - NODE4=true
   - NODE5=true
-compiler:
-  - clang
-  - gcc
+  - NODE012=true
 install:
-  - sudo add-apt-repository --yes ppa:fenics-packages/fenics-dev/swig
+  - if [ "${NODE4}" ]; then export CC=gcc-4.8 CXX=g++-4.8; fi
+  - 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 --force-yes -qq swig3.0 git
+  - sudo apt-get install -y -qq swig3.0 python git cmake
   - sudo ln -s /usr/bin/swig3.0 /usr/bin/swig
   - sudo update-java-alternatives -s java-8-oracle
 before_script:
-  # 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
+  - export NODE_ROOT_DIR="/home/travis/.nvm/v0.10.36"
+  - if [ "$CC" = "gcc" ]; then export BUILDJAVA=ON; else export BUILDJAVA=OFF; fi
+  - export JAVA_HOME=/usr/lib/jvm/java-8-oracle
+  - if [ "${NODE4}" ]; then nvm install 4.1; export CC=gcc-4.8; export CXX=g++-4.8; export NODE_ROOT_DIR="/home/travis/.nvm/versions/node/`nvm version`"; fi
+  - if [ "${NODE5}" ]; then nvm install 5; export CC=gcc-4.8; export CXX=g++-4.8; export NODE_ROOT_DIR="/home/travis/.nvm/versions/node/`nvm version`"; fi
+  - if [ "${NODE012}" ]; then nvm install 0.12; export NODE_ROOT_DIR="/home/travis/.nvm/versions/node/`nvm version`"; fi
 script:
-  - 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
+  - git clone --branch=firmata https://github.com/intel-iot-devkit/mraa.git
+  - cd mraa && mkdir build && cd build && cmake -DBUILDSWIGJAVA=$BUILDJAVA -DBUILDSWIGNODE=OFF -DBUILDSWIGPYTHON=OFF -DFIRMATA=ON -DENABLEEXAMPLES=OFF -DCMAKE_INSTALL_PREFIX:PATH=. .. && 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 -DNODE_ROOT_DIR:PATH="${NODE_ROOT_DIR}" -DBUILDSWIGJAVA=$BUILDJAVA -DBUILDEXAMPLES=ON -DBUILDJAVAEXAMPLES=$BUILDJAVA .. && make
 addons:
   apt:
     sources:
+      - llvm-toolchain-precise-3.6
       - ubuntu-toolchain-r-test
-      - george-edison55-precise-backports
     packages:
-      - cmake
-      - cmake-data
+      - clang-3.6
       - 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>=1.1.1)
+pkg_check_modules (MRAA REQUIRED mraa>=0.9.1)
 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 CMAKE_INSTALL_LIBDIR if not defined
-include(GNUInstallDirs)
 set (LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}" CACHE PATH "Installation path for libraries")
 
+# Set CMAKE_LIB_INSTALL_DIR if not defined
+include(GNUInstallDirs)
+
 # 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.7.3-dirty")
+  set (VERSION "v0.5.1-dirty")
 endif ()
 
 message (INFO " - UPM Version ${VERSION}")
@@ -49,19 +49,19 @@ set (upm_VERSION_STRING ${upm_VERSION_MAJOR}.${upm_VERSION_MINOR}.${upm_VERSION_
 set (CMAKE_SWIG_FLAGS "")
 
 option (BUILDDOC "Build all doc." OFF)
+option (BUILDSWIG "Build swig modules." ON)
 option (BUILDSWIGPYTHON "Build swig python modules." ON)
-option (BUILDSWIGNODE "Build swig node modules." ON)
-option (BUILDSWIGJAVA "Build swig java modules" OFF)
 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" ON)
-option (ENABLECXX11 "Enable C++11 standards support" ON)
+option (BUILDTESTS "Generate check-ups for upm" OFF)
 
 # Find swig
-if (BUILDSWIGPYTHON OR BUILDSWIGNODE OR BUILDSWIGJAVA)
+if (BUILDSWIG)
     if (BUILDSWIGNODE)
         find_package (SWIG 3.0.5 REQUIRED)
     else ()
@@ -77,32 +77,6 @@ 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)
@@ -124,12 +98,13 @@ if (BUILDDOC)
   endif (DOXYGEN_FOUND)
   # Check if Sphinx is installed and add target to generate API documentation
   find_package (Sphinx)
-  if(SPHINX_FOUND AND BUILDSWIGPYTHON)
+  if(SPHINX_FOUND AND BUILDSWIG AND BUILDSWIGPYTHON)
     # Python required for Sphinx build
-    find_package (PythonLibs ${PYTHONBUILD_VERSION} REQUIRED)
+    find_package (PythonLibs)
     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
@@ -156,9 +131,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 ${NODEJS_EXECUTABLE} docgen -m upm -i xml -t ${CMAKE_CURRENT_SOURCE_DIR}/src -g ../../
+      COMMAND ${NODE_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 ${NODEJS_EXECUTABLE} tolower -i html/node
+      COMMAND ${NODE_EXECUTABLE} tolower -i html/node
       DEPENDS doc
       WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
       COMMENT "Generating API documentation with Yuidoc" VERBATIM
@@ -208,37 +183,26 @@ if (RPM)
   message (INFO " - RPM packaging enabled for ${DETECTED_ARCH}")
   set(CPACK_PACKAGE_VERSION ${VERSION})
   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_NAME "libupm${upm_VERSION_MAJOR}")
+  set(CPACK_PACKAGE_RELEASE 1)
   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}.${DIST_TAG}.${DETECTED_ARCH}")
+  set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_PACKAGE_RELEASE}.${DIST_TAG}.${DETECTED_ARCH}")
   include(CPack)
 endif()
 
-if (BUILDSWIGPYTHON OR BUILDTESTS)
-  if (BUILDPYTHON3)
-    set (PYTHONBUILD_VERSION 3)
-  else ()
-    set (PYTHONBUILD_VERSION 2.7)
-  endif ()
-endif ()
-
 add_subdirectory (src)
+
 if(BUILDEXAMPLES)
   add_subdirectory (examples/c++)
 endif()
@@ -247,9 +211,18 @@ if(BUILDJAVAEXAMPLES)
   add_subdirectory (examples/java)
 endif()
 
+if (BUILDSWIGPYTHON OR BUILDTESTS)
+  if (BUILDPYTHON3)
+    set (PYTHONBUILD_VERSION 3)
+  else ()
+    set (PYTHONBUILD_VERSION 2.7)
+  endif ()
+  find_package (PythonInterp ${PYTHONBUILD_VERSION} REQUIRED)
+  find_package (PythonLibs ${PYTHONBUILD_VERSION} REQUIRED)
+  include_directories(${PYTHON_INCLUDE_PATH})
+endif ()
 
 if (BUILDTESTS)
-  find_package (PythonInterp ${PYTHONBUILD_VERSION} REQUIRED)
   enable_testing ()
   add_subdirectory (tests)
 endif()

README.md

@@ -1,29 +1,16 @@
 UPM (Useful Packages & Modules) Sensor/Actuator repository for MRAA
 ==============
 
-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](https://github.com/intel-iot-devkit/mraa) APIs.
+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.
 
-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.
+The constructor is expected to initialise the sensor and parameters may be used
+to provide identification/pin location on the board.
 
-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.
+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.
 
 ### Example
 
@@ -64,6 +51,10 @@ 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
@@ -90,7 +81,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 gfor max31855 [sensor](docs/max31855.md).
+There is also an example available for max31855 [sensor](docs/max31855.md).
 
 Guide on creating Java [bindings](docs/creating_java_bindings.md).
 
@@ -114,14 +105,6 @@ 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

@@ -94,4 +94,4 @@ if (NODEJS_EXECUTABLE)
     mark_as_advanced (NODEJS_EXECUTABLE)
 endif ()
 
-mark_as_advanced (NODEJS_EXECUTABLE)
+mark_as_advanced (NODE_EXECUTABLE)

docs/apichanges.md

@@ -1,18 +0,0 @@
-API Changes                       {#apichanges}
-===============
-
-Here's a list of other API changes made to the library that break source/binary
-compatibility between releases:
-
- * There were frequent misspellings of the word *Celsius* in the UPM
- code.  In some cases, these were in method names, which will cause
- some API compatibility issues.  These have all been corrected for UPM
- versions after v.0.7.2.
- * 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,72 +4,6 @@ Changelog                         {#changelog}
 Here's a list summarizing some of the key undergoing changes to our library
 from earlier versions:
 
-### v0.7.3
-
- * Fixed several existing drivers and updated Grove Temperature sensor to use
- new formula for v1.1+ by default
- * Separated codebase for upm_grove module that bundles some of the starter kit
- sensors into individual source files
- * Documentation and doxygen tag updates with correct spelling for Celsius in
- several places, this also affects API compatibility
- * Removed superfluous BUILDSWIG option, some build recipes might be impacted
- * New sensor: ms5611
-
-### v0.7.2
-
- * Mraa 1.1.1 required changes to UPM drivers and examples for IIO core
- kernel support
- * Rev'ed libmraa requirement to 1.1.1
-
-### v0.7.1
-
- * Fix for building python2 vs python3 bindings
- * Fixes for jhd1313m1 row/font size and reset
- * Added bacnet utility class
- * New sensors: bmx055, bmi055, bmc160, bma250e, bmg150, bmm150, t8100, tb7300
-
-### 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

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.hpp
+* max31855.h
 * 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.hpp) , a very simple header in our case we
+Then we create the header (max31855.h) , 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.hpp Interesting
+@snippet max31855.h 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.hpp and a C++ file called
+By default you need a header called modulename.h and a C++ file called
 modulename.cxx. You can have multiple headers and source files. Only public
-headers need to be added to module_hpp and all source files need to be in
+headers need to be added to module_h and all source files need to be in
 module_src.
 
 ~~~~~~~~~~~
 set (libname "modulename")
 set (libdescription "Module Description")
 set (module_src ${libname}.cxx)
-set (module_hpp ${libname}.hpp)
+set (module_h ${libname}.h)
 upm_module_init()
 ~~~~~~~~~~~
 

doxy/Doxyfile.in

@@ -859,10 +859,7 @@ 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/*
 
-# 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_*
+EXCLUDE_PATTERNS       =
 
 # 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
-groveledbar	GroveLEDBar
+my9221-ledbar.cxx	MY9221_ledbarSample.java
 nrf24l01-receiver.cxx	NRF24L01_receiverSample.java
 nrf24l01-transmitter.cxx	NRF24L01_transmitterSample.java
 nunchuck.cxx	NUNCHUCKSample.java

examples/c++/CMakeLists.txt

@@ -224,51 +224,25 @@ add_example (groveultrasonic)
 add_example (sx1276-lora)
 add_example (sx1276-fsk)
 add_example (ili9341)
+if (OPENZWAVE_FOUND)
+  include_directories(${OPENZWAVE_INCLUDE_DIRS})
+  add_example (ozw)
+endif()
 add_example (nlgpio16)
 add_example (ads1x15)
 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)
-  add_example (t8100)
-  add_example (tb7300)
-endif()
-add_example (vcap)
-add_example (ds2413)
-add_example (ds18b20)
-add_example (bmp280)
-add_example (bno055)
-add_example (l3gd20)
-add_example (bmx055)
-add_example (ms5611)
 
 # These are special cases where you specify example binary, source file and module(s)
 include_directories (${PROJECT_SOURCE_DIR}/src)
@@ -287,26 +261,3 @@ 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;bmp280")
-add_custom_example (humidity-sensor-example humidity-sensor.cxx "si7005;bmp280")
-add_custom_example (pressure-sensor-example pressure-sensor.cxx "bmpx8x;bmp280")
-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)
-add_custom_example (bma250e-example bma250e.cxx bmx055)
-add_custom_example (bmg160-example bmg160.cxx bmx055)
-add_custom_example (bmm150-example bmm150.cxx bmx055)
-add_custom_example (bmc150-example bmc150.cxx bmx055)
-add_custom_example (bmi055-example bmi055.cxx bmx055)
-if (OPENZWAVE_FOUND)
-  include_directories(${OPENZWAVE_INCLUDE_DIRS})
-
-  add_custom_example (ozwdump-example ozwdump.cxx ozw)
-  add_custom_example (aeotecss6-example aeotecss6.cxx ozw)
-  add_custom_example (aeotecsdg2-example aeotecsdg2.cxx ozw)
-  add_custom_example (aeotecdw2e-example aeotecdw2e.cxx ozw)
-  add_custom_example (aeotecdsb09104-example aeotecdsb09104.cxx ozw)
-  add_custom_example (tzemt400-example tzemt400.cxx ozw)
-endif()

examples/c++/a110x-intr.cxx

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

examples/c++/a110x.cxx

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

examples/c++/ad8232.cxx

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

examples/c++/adafruitms1438-stepper.cxx

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

examples/c++/adafruitms1438.cxx

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

examples/c++/adafruitss.cxx

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

examples/c++/adc-sensor.cxx

@@ -1,80 +0,0 @@
-/*
- * 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.hpp"
+#include "adc121c021.h"
 
 using namespace std;
 

examples/c++/ads1x15.cxx

@@ -26,8 +26,8 @@
 
 #include <iostream>
 #include <unistd.h>
-#include "ads1015.hpp"
-#include "ads1115.hpp"
+#include "ads1015.h"
+#include "ads1115.h"
 
 
 
@@ -286,7 +286,7 @@ int main()
                 else ads->setCompMode();
                break;
           case 18:
-               cout << ads->getCompLatch() << endl;
+               cout << ads->getCompLatch() << cout;
                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() << endl;
+               cout << ads->getContinuous() << cout;
                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.hpp"
+#include "adxl335.h"
 
 using namespace std;
 

examples/c++/adxl345.cxx

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

examples/c++/adxrs610.cxx

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

examples/c++/aeotecdsb09104.cxx

@@ -1,123 +0,0 @@
-/*
- * 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 "aeotecdsb09104.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]
-
-  string defaultDev = "/dev/ttyACM0";
-
-  // if an argument was specified, use it as the device instead
-  if (argc > 1)
-    defaultDev = string(argv[1]);
-
-  // Instantiate an Aeotec DSB09104 instance, on device node 12.  You
-  // will almost certainly need to change this to reflect your own
-  // network.  Use the ozwdump example to see what nodes are
-  // available.
-  upm::AeotecDSB09104 *sensor = new upm::AeotecDSB09104(12);
-
-  // The first thing to do is create options, then lock them when done.
-  sensor->optionsCreate();
-  sensor->optionsLock();
-
-  // Next, initialize it.
-  cout << "Initializing, this may take awhile depending on your ZWave network"
-       << endl;
-
-  sensor->init(defaultDev);
-  cout << "Initialization complete" << endl;
-
-  cout << "Querying data..." << endl;
-  while (shouldRun)
-    {
-      sensor->update();
-
-      cout << "Watts, Channel 1: "
-           << sensor->getWattsC1()
-           << " W"
-           << endl;
-
-      cout << "Watts, Channel 2: "
-           << sensor->getWattsC2()
-           << " W"
-           << endl;
-
-      cout << "Watts, Channel 3: "
-           << sensor->getWattsC3()
-           << " W"
-           << endl;
-
-      cout << "Energy, Channel 1: "
-           << sensor->getEnergyC1()
-           << " kWh"
-           << endl;
-
-      cout << "Energy, Channel 2: "
-           << sensor->getEnergyC2()
-           << " kWh"
-           << endl;
-
-      cout << "Energy, Channel 3: "
-           << sensor->getEnergyC3()
-           << " kWh"
-           << endl;
-
-      cout << "Battery Level: "
-           << sensor->getBatteryLevel()
-           << "%"
-           << endl;
-
-      cout << endl;
-
-      sleep(3);
-    }
-
-
-  //  sensor->dumpNodes(true);
-  cout << "Exiting..." << endl;
-
-  delete sensor;
-
-  return 0;
-}

examples/c++/aeotecdw2e.cxx

@@ -1,109 +0,0 @@
-/*
- * 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 "aeotecdw2e.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]
-
-  string defaultDev = "/dev/ttyACM0";
-
-  // if an argument was specified, use it as the device instead
-  if (argc > 1)
-    defaultDev = string(argv[1]);
-
-  // Instantiate an Aeotec Door/Window 2nd Edition sensor instance, on
-  // device node 10.  You will almost certainly need to change this to
-  // reflect your own network.  Use the ozwdump example to see what
-  // nodes are available.
-  upm::AeotecDW2E *sensor = new upm::AeotecDW2E(10);
-
-  // The first thing to do is create options, then lock them when done.
-  sensor->optionsCreate();
-  sensor->optionsLock();
-
-  // Next, initialize it.
-  cout << "Initializing, this may take awhile depending on your ZWave network"
-       << endl;
-
-  sensor->init(defaultDev);
-  cout << "Initialization complete" << endl;
-
-  cout << "Querying data..." << endl;
-  while (shouldRun)
-    {
-      if (sensor->isDeviceAvailable())
-        {
-          cout << "Alarm status: "
-               << sensor->isAlarmTripped()
-               << endl;
-
-          cout << "Tamper Switch status: "
-               << sensor->isTamperTripped()
-               << endl;
-
-          cout << "Battery Level: "
-               << sensor->getBatteryLevel()
-               << "%"
-               << endl;
-          cout << endl;
-        }
-      else
-        {
-          cout << "Device has not yet responded to probe."
-               << endl;
-
-          cout << "Try waking it, or wait until it wakes itself if configured"
-               << " to do so."
-               << endl;
-          cout << endl;
-        }
-
-      sleep(1);
-    }
-
-  cout << "Exiting..." << endl;
-
-  delete sensor;
-
-  return 0;
-}

examples/c++/aeotecsdg2.cxx

@@ -1,127 +0,0 @@
-/*
- * 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 "aeotecsdg2.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]
-
-  string defaultDev = "/dev/ttyACM0";
-
-  // if an argument was specified, use it as the device instead
-  if (argc > 1)
-    defaultDev = string(argv[1]);
-
-  // Instantiate an Aeotec Smart Dimmer Gen2 instance, on device node
-  // 9.  You will almost certainly need to change this to reflect your
-  // own network.  Use the ozwdump example to see what nodes are
-  // available.
-  upm::AeotecSDG2 *sensor = new upm::AeotecSDG2(9);
-
-  // The first thing to do is create options, then lock them when done.
-  sensor->optionsCreate();
-  sensor->optionsLock();
-
-  // Next, initialize it.
-  cout << "Initializing, this may take awhile depending on your ZWave network"
-       << endl;
-
-  sensor->init(defaultDev);
-  cout << "Initialization complete" << endl;
-
-  // turn light on
-  cout << "Turning switch on, then sleeping for 5 secs" << endl;
-  sensor->on();
-  sleep(5);
-
-  cout << "Querying data..." << endl;
-  bool dim = false;
-  while (shouldRun)
-    {
-      // put on a light show...
-      if (dim)
-        sensor->setLevel(25);
-      else
-        sensor->on();
-
-      dim = !dim;
-
-      sensor->update();
-
-      cout << "Current Level: "
-           << sensor->getLevel()
-           << endl;
-
-      cout << "Volts: "
-           << sensor->getVolts()
-           << " volts"
-           << endl;
-
-      cout << "Energy Consumption: "
-           << sensor->getEnergy()
-           << " kWh"
-           << endl;
-
-      cout << "Watts: "
-           << sensor->getWatts()
-           << endl;
-
-      cout << "Current: "
-           << sensor->getCurrent()
-           << " amps"
-           << endl;
-
-      cout << endl;
-
-      sleep(5);
-    }
-
-  cout << "Turning switch off and sleeping for 5 seconds..." << endl;
-  sensor->off();
-  sleep(5);
-
-  cout << "Exiting..." << endl;
-
-  delete sensor;
-
-  return 0;
-}

examples/c++/aeotecss6.cxx

@@ -1,117 +0,0 @@
-/*
- * 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 "aeotecss6.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]
-
-  string defaultDev = "/dev/ttyACM0";
-
-  // if an argument was specified, use it as the device instead
-  if (argc > 1)
-    defaultDev = string(argv[1]);
-
-  // Instantiate an Aeotec SS6 instance, on device node 11.  You will
-  // almost certainly need to change this to reflect your own network.
-  // Use the ozwdump example to see what nodes are available.
-  upm::AeotecSS6 *sensor = new upm::AeotecSS6(11);
-
-  // The first thing to do is create options, then lock them when done.
-  sensor->optionsCreate();
-  sensor->optionsLock();
-
-  // Next, initialize it.
-  cout << "Initializing, this may take awhile depending on your ZWave network"
-       << endl;
-
-  sensor->init(defaultDev);
-  cout << "Initialization complete" << endl;
-
-  // turn light on
-  cout << "Turning switch on, then sleeping for 5 secs" << endl;
-  sensor->on();
-  sleep(5);
-
-  cout << "Querying data..." << endl;
-  while (shouldRun)
-    {
-      sensor->update();
-
-      cout << "Switch status: "
-           << sensor->isOn()
-           << endl;
-
-      cout << "Volts: "
-           << sensor->getVolts()
-           << " volts"
-           << endl;
-
-      cout << "Energy Consumption: "
-           << sensor->getEnergy()
-           << " kWh"
-           << endl;
-
-      cout << "Watts: "
-           << sensor->getWatts()
-           << endl;
-
-      cout << "Current: "
-           << sensor->getCurrent()
-           << " amps"
-           << endl;
-
-      cout << endl;
-
-      sleep(3);
-    }
-
-  cout << "Turning switch off and sleeping for 5 seconds..." << endl;
-  sensor->off();
-  sleep(5);
-
-  cout << "Exiting..." << endl;
-
-  delete sensor;
-
-  return 0;
-}

examples/c++/ak8975.cxx

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

examples/c++/am2315.cxx

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

examples/c++/apa102.cxx

@@ -1,51 +0,0 @@
-/*
- * 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:
- *
- * 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 "apa102.hpp"
-#include <iostream>
-#include <signal.h>
-#include <unistd.h>
-
-using namespace std;
-
-int
-main(int argc, char** argv)
-{
-    //! [Interesting]
-    // Instantiate a strip of 30 LEDs on SPI bus 0
-    upm::APA102* ledStrip = new upm::APA102(800, 0);
-
-    // Set all LEDs to Red
-    ledStrip->setAllLeds(31, 255, 0, 0);
-
-    // 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]
-    return 0;
-}

examples/c++/apds9002.cxx

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

examples/c++/apds9930.cxx

@@ -1,6 +1,6 @@
 /*
  * Author: Lay, Kuan Loon <kuan.loon.lay@intel.com>
- * Copyright (c) 2016 Intel Corporation.
+ * 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
@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <iostream>
 #include <signal.h>
-#include "apds9930.hpp"
+#include "apds9930.h"
 
 using namespace std;
 
@@ -46,15 +46,6 @@ main()
     // Instantiate a Digital Proximity and Ambient Light sensor on iio device 4
     upm::APDS9930* light_proximity = new upm::APDS9930(4);
 
-    // Kernel driver implement sleep 5000-5100us after enable illuminance sensor
-    light_proximity->enableIlluminance(true);
-
-    // Kernel driver implement sleep 5000-5100us after enable proximity sensor
-    light_proximity->enableProximity(true);
-
-    // Tested this value works. Please change it on your platform
-    usleep(120000);
-
     while (shouldRun) {
         float lux = light_proximity->getAmbient();
         cout << "Luminance value is " << lux << endl;
@@ -62,8 +53,6 @@ main()
         cout << "Proximity value is " << proximity << endl;
         sleep(1);
     }
-    light_proximity->enableProximity(false);
-    light_proximity->enableIlluminance(false);
     //! [Interesting]
 
     cout << "Exiting" << endl;

examples/c++/at42qt1070.cxx

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

examples/c++/biss0001.cxx

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

examples/c++/bma220.cxx

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

examples/c++/bma250e.cxx

@@ -1,83 +0,0 @@
-/*
- * 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 "bma250e.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 BMA250E using default I2C parameters
-  upm::BMA250E *sensor = new upm::BMA250E();
-
-  // For SPI, bus 0, you would pass -1 as the address, and a valid pin
-  // for CS: BMA250E(0, -1, 10);
-
-  // now output data every 250 milliseconds
-  while (shouldRun)
-    {
-      float x, y, z;
-
-      sensor->update();
-
-      sensor->getAccelerometer(&x, &y, &z);
-      cout << "Accelerometer x: " << x
-           << " y: " << y
-           << " z: " << z
-           << " g"
-           << endl;
-
-      // we show both C and F for temperature
-      cout << "Compensation Temperature: " << sensor->getTemperature()
-           << " C / " << sensor->getTemperature(true) << " F"
-           << endl;
-
-      cout << endl;
-
-      usleep(250000);
-    }
-
-//! [Interesting]
-
-  cout << "Exiting..." << endl;
-
-  delete sensor;
-
-  return 0;
-}

examples/c++/bmc150.cxx

@@ -1,82 +0,0 @@
-/*
- * 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 "bmc150.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 BMC150 using default I2C parameters
-  upm::BMC150 *sensor = new upm::BMC150();
-
-  // now output data every 250 milliseconds
-  while (shouldRun)
-    {
-      float x, y, z;
-
-      sensor->update();
-
-      sensor->getAccelerometer(&x, &y, &z);
-      cout << "Accelerometer x: " << x
-           << " y: " << y
-           << " z: " << z
-           << " g"
-           << endl;
-
-      sensor->getMagnetometer(&x, &y, &z);
-      cout << "Magnetometer x: " << x
-           << " y: " << y
-           << " z: " << z
-           << " uT"
-           << endl;
-
-      cout << endl;
-
-      usleep(250000);
-    }
-
-//! [Interesting]
-
-  cout << "Exiting..." << endl;
-
-  delete sensor;
-
-  return 0;
-}

examples/c++/bme280.cxx

@@ -1,78 +0,0 @@
-/*
- * 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++/bmg160.cxx

@@ -1,83 +0,0 @@
-/*
- * 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 "bmg160.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 BMG160 using default I2C parameters
-  upm::BMG160 *sensor = new upm::BMG160();
-
-  // For SPI, bus 0, you would pass -1 as the address, and a valid pin
-  // for CS: BMG160(0, -1, 10);
-
-  // now output data every 250 milliseconds
-  while (shouldRun)
-    {
-      float x, y, z;
-
-      sensor->update();
-
-      sensor->getGyroscope(&x, &y, &z);
-      cout << "Gyroscope x: " << x
-           << " y: " << y
-           << " z: " << z
-           << " degrees/s"
-           << endl;
-
-      // we show both C and F for temperature
-      cout << "Compensation Temperature: " << sensor->getTemperature()
-           << " C / " << sensor->getTemperature(true) << " F"
-           << endl;
-
-      cout << endl;
-
-      usleep(250000);
-    }
-
-//! [Interesting]
-
-  cout << "Exiting..." << endl;
-
-  delete sensor;
-
-  return 0;
-}

examples/c++/bmi055.cxx

@@ -1,82 +0,0 @@
-/*
- * 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 "bmi055.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 BMI055 using default I2C parameters
-  upm::BMI055 *sensor = new upm::BMI055();
-
-  // now output data every 250 milliseconds
-  while (shouldRun)
-    {
-      float x, y, z;
-
-      sensor->update();
-
-      sensor->getAccelerometer(&x, &y, &z);
-      cout << "Accelerometer x: " << x
-           << " y: " << y
-           << " z: " << z
-           << " g"
-           << endl;
-
-      sensor->getGyroscope(&x, &y, &z);
-      cout << "Gyroscope x: " << x
-           << " y: " << y
-           << " z: " << z
-           << " degrees/s"
-           << endl;
-
-      cout << endl;
-
-      usleep(250000);
-    }
-
-//! [Interesting]
-
-  cout << "Exiting..." << endl;
-
-  delete sensor;
-
-  return 0;
-}

examples/c++/bmi160.cxx

@@ -1,82 +0,0 @@
-/*
- * 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++/bmm150.cxx

@@ -1,78 +0,0 @@
-/*
- * 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 "bmm150.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 BMM150 using default I2C parameters
-  upm::BMM150 *sensor = new upm::BMM150();
-
-  // For SPI, bus 0, you would pass -1 as the address, and a valid pin
-  // for CS: BMM150(0, -1, 10);
-
-  // now output data every 250 milliseconds
-  while (shouldRun)
-    {
-      float x, y, z;
-
-      sensor->update();
-
-      sensor->getMagnetometer(&x, &y, &z);
-      cout << "Magnetometer x: " << x
-           << " y: " << y
-           << " z: " << z
-           << " uT"
-           << endl;
-
-      cout << endl;
-
-      usleep(250000);
-    }
-
-//! [Interesting]
-
-  cout << "Exiting..." << endl;
-
-  delete sensor;
-
-  return 0;
-}

examples/c++/bmp280.cxx

@@ -1,77 +0,0 @@
-/*
- * 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.hpp"
+#include "bmpx8x.h"
 #include <signal.h>
 
 int doWork = 0;

examples/c++/bmx055.cxx

@@ -1,89 +0,0 @@
-/*
- * 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 "bmx055.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 BMX055 using default I2C parameters
-  upm::BMX055 *sensor = new upm::BMX055();
-
-  // now output data every 250 milliseconds
-  while (shouldRun)
-    {
-      float x, y, z;
-
-      sensor->update();
-
-      sensor->getAccelerometer(&x, &y, &z);
-      cout << "Accelerometer x: " << x
-           << " y: " << y
-           << " z: " << z
-           << " g"
-           << endl;
-
-      sensor->getGyroscope(&x, &y, &z);
-      cout << "Gyroscope x: " << x
-           << " y: " << y
-           << " z: " << z
-           << " degrees/s"
-           << endl;
-
-      sensor->getMagnetometer(&x, &y, &z);
-      cout << "Magnetometer x: " << x
-           << " y: " << y
-           << " z: " << z
-           << " uT"
-           << endl;
-
-      cout << endl;
-
-      usleep(250000);
-    }
-
-//! [Interesting]
-
-  cout << "Exiting..." << endl;
-
-  delete sensor;
-
-  return 0;
-}

examples/c++/bno055.cxx

@@ -1,129 +0,0 @@
-/*
- * 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.hpp"
+#include "buzzer.h"
 
 
 int

examples/c++/cjq4435.cxx

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

examples/c++/co2-sensor.cxx

@@ -1,71 +0,0 @@
-/*
- * 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++/cwlsxxa.cxx

@@ -1,82 +0,0 @@
-/*
- * 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.hpp"
+#include "dfrph.h"
 
 using namespace std;
 

examples/c++/ds1307.cxx

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

examples/c++/ds1808lc.cxx

@@ -1,51 +0,0 @@
-#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

@@ -1,81 +0,0 @@
-/*
- * 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

@@ -1,59 +0,0 @@
-/*
- * 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

@@ -1,112 +0,0 @@
-/*
- * 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->getDeviceDescription() << endl;
-  cout << "Device Location: " << sensor->getDeviceLocation() << 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.hpp"
+#include "eboled.h"
 
 using namespace std;
 

examples/c++/ecs1030.cxx

@@ -26,7 +26,7 @@
 #include <iostream>
 #include <signal.h>
 #include <stdlib.h>
-#include "ecs1030.hpp"
+#include "ecs1030.h"
 
 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.hpp"
+#include "enc03r.h"
 
 using namespace std;
 

examples/c++/es08a.cxx

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

examples/c++/flex.cxx

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

examples/c++/gp2y0a.cxx

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

examples/c++/grovebutton.cxx

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

examples/c++/grovecircularled.cxx

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

examples/c++/grovecollision.cxx

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

examples/c++/groveehr.cxx

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

examples/c++/groveeldriver.cxx

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

examples/c++/groveelectromagnet.cxx

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

examples/c++/groveemg.cxx

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

examples/c++/grovegprs.cxx

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

examples/c++/grovegsr.cxx

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

examples/c++/groveled-multi.cxx

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

examples/c++/groveled.cxx

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

examples/c++/groveledbar.cxx

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

examples/c++/grovelight.cxx

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

examples/c++/grovelinefinder.cxx

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

examples/c++/grovemd-stepper.cxx

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

examples/c++/grovemd.cxx

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

examples/c++/grovemoisture.cxx

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

examples/c++/groveo2.cxx

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

examples/c++/groverelay.cxx

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

examples/c++/groverotary.cxx

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

examples/c++/grovescam.cxx

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

examples/c++/groveslide.cxx

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

examples/c++/grovespeaker.cxx

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

examples/c++/grovetemp.cxx

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

examples/c++/groveultrasonic.cxx

@@ -26,7 +26,7 @@
 
 #include <unistd.h>
 #include <iostream>
-#include "groveultrasonic.hpp"
+#include "groveultrasonic.h"
 #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.hpp"
+#include "grovevdiv.h"
 
 using namespace std;
 

examples/c++/grovewater.cxx

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

examples/c++/grovewfs.cxx

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

examples/c++/guvas12d.cxx

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

examples/c++/h3lis331dl.cxx

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

examples/c++/h803x.cxx

@@ -1,149 +0,0 @@
-/*
- * 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 "h803x.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]
-
-  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 H803X instance, using MODBUS slave address 1, and
-  // default comm parameters (9600, 8, N, 2)
-  upm::H803X *sensor = new upm::H803X(defaultDev, 1);
-
-  // output the Slave ID string
-  cout << "Slave ID: " << sensor->getSlaveID() << endl;
-  cout << endl;
-
-  // update and print available values every second
-  while (shouldRun)
-    {
-      // update our values from the sensor
-      sensor->update();
-
-      // H8035 / H8036
-      cout << "Consumption (kWh): " << sensor->getConsumption() << endl;
-      cout << "Real Power (kW): " << sensor->getRealPower() << endl;
-
-      if (sensor->isH8036())
-        {
-          // The H8036 has much more data available...
-
-          cout << "Reactive Power (kVAR): " << sensor->getReactivePower() 
-               << endl;
-          cout << "Apparent Power (kVA): " << sensor->getApparentPower() 
-               << endl;
-          cout << "Power Factor: " << sensor->getPowerFactor() 
-               << endl;
-          cout << "Volts Line to Line: " << sensor->getVoltsLineToLine() 
-               << endl;
-          cout << "Volts Line to Neutral: " << sensor->getVoltsLineToNeutral() 
-               << endl;
-
-          cout << "Current: " << sensor->getCurrent() 
-               << endl;
-
-          cout << "Real Power Phase A (kW): " << sensor->getRealPowerPhaseA() 
-               << endl;
-          cout << "Real Power Phase B (kW): " << sensor->getRealPowerPhaseB() 
-               << endl;
-          cout << "Real Power Phase C (kW): " << sensor->getRealPowerPhaseC() 
-               << endl;
-
-          cout << "Power Factor Phase A: " << sensor->getPowerFactorPhaseA() 
-               << endl;
-          cout << "Power Factor Phase B: " << sensor->getPowerFactorPhaseB() 
-               << endl;
-          cout << "Power Factor Phase C: " << sensor->getPowerFactorPhaseC() 
-               << endl;
-
-          cout << "Volts Phase A to B: " << sensor->getVoltsPhaseAToB() 
-               << endl;
-          cout << "Volts Phase B to C: " << sensor->getVoltsPhaseBToC() 
-               << endl;
-          cout << "Volts Phase A to C: " << sensor->getVoltsPhaseAToC() 
-               << endl;
-          cout << "Volts Phase A to Neutral: "
-               << sensor->getVoltsPhaseAToNeutral() 
-               << endl;
-          cout << "Volts Phase B to Neutral: "
-               << sensor->getVoltsPhaseBToNeutral() 
-               << endl;
-          cout << "Volts Phase C to Neutral: "
-               << sensor->getVoltsPhaseCToNeutral() 
-               << endl;
-
-          cout << "Current Phase A: " << sensor->getCurrentPhaseA() 
-               << endl;
-          cout << "Current Phase B: " << sensor->getCurrentPhaseB() 
-               << endl;
-          cout << "Current Phase C: " << sensor->getCurrentPhaseC() 
-               << endl;
-
-          cout << "Avg Real Power (kW): " << sensor->getAvgRealPower() 
-               << endl;
-          cout << "Min Real Power (kW): " << sensor->getMinRealPower() 
-               << endl;
-          cout << "Max Real Power (kW): " << sensor->getMaxRealPower() 
-               << endl;
-        }
-
-      cout << endl;
-
-      sleep(2);
-    }
-
-  cout << "Exiting..." << endl;
-
-  delete sensor;
-
-//! [Interesting]
-
-  return 0;
-}

examples/c++/hcsr04.cxx

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

examples/c++/hdxxvxta.cxx

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

examples/c++/hlg150h.cxx

@@ -1,51 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <iostream>
-#include <string>
-#include "hlg150h.hpp"
-
-#define HLG150H_GPIO_RELAY 21
-#define HLG150H_GPIO_PWM 22
-
-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::HLG150H(HLG150H_GPIO_RELAY, HLG150H_GPIO_PWM);
-      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);
-      delete lightController;
-   } catch (std::exception& e) {
-      std::cout << "Error: " << e.what() << std::endl;
-      status = 1;
-   }
-
-   return status;
-}
-
-

examples/c++/hm11.cxx

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

examples/c++/hmc5883l.cxx

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

examples/c++/hmtrp.cxx

@@ -26,7 +26,7 @@
 #include <string.h>
 #include <iostream>
 #include <signal.h>
-#include "hmtrp.hpp"
+#include "hmtrp.h"
 
 using namespace std;
 
@@ -135,7 +135,7 @@ int main (int argc, char **argv)
               if (rv > 0)
                 cout << "Received: " << radioBuffer << endl;
               
-              if (rv < 0) // some sort of read error occurred
+              if (rv < 0) // some sort of read error occured
                 {
                   cerr << "Port read error." << endl;
                   break;