diff -Nru upm-1.6.0/cmake/modules/FindUpmCordovaGenerator.cmake upm-1.7.1/cmake/modules/FindUpmCordovaGenerator.cmake
--- upm-1.6.0/cmake/modules/FindUpmCordovaGenerator.cmake 1970-01-01 00:00:00.000000000 +0000
+++ upm-1.7.1/cmake/modules/FindUpmCordovaGenerator.cmake 2018-10-12 04:47:41.000000000 +0000
@@ -0,0 +1,20 @@
+find_program (UPM_CORDOVA_BINDING NAMES upm-cordova-binding
+ DOC "UPM Cordova binding generator")
+
+include (FindPackageHandleStandardArgs)
+
+# Get version
+if (UPM_CORDOVA_BINDING)
+ execute_process(COMMAND ${NPM_EXECUTABLE} info upm-cordova-binding version
+ OUTPUT_VARIABLE UPM_CORDOVA_BINDING_VERSION
+ ERROR_VARIABLE UPM_CORDOVA_BINDING_VERSION
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ ERROR_STRIP_TRAILING_WHITESPACE)
+endif()
+
+find_package_handle_standard_args(UpmCordovaGenerator
+ REQUIRED_VARS UPM_CORDOVA_BINDING
+ VERSION_VAR UPM_CORDOVA_BINDING_VERSION
+ FAIL_MESSAGE "Unable to find the npm package for generating UPM Cordova bindings. The generator can be installed via: 'npm install -g upm-cordova-binding'")
+
+mark_as_advanced (UPM_CORDOVA_BINDING UPM_CORDOVA_BINDING_VERSION)
diff -Nru upm-1.6.0/CMakeLists.txt upm-1.7.1/CMakeLists.txt
--- upm-1.6.0/CMakeLists.txt 2018-02-20 15:45:15.000000000 +0000
+++ upm-1.7.1/CMakeLists.txt 2018-10-12 04:47:41.000000000 +0000
@@ -8,6 +8,7 @@
option (BUILDSWIGPYTHON "Build swig python modules" ON)
option (BUILDSWIGNODE "Build swig node modules" ON)
option (BUILDSWIGJAVA "Build swig java modules" OFF)
+option (BUILDCORDOVA "Build cordova bindings" OFF)
option (BUILDEXAMPLES "Build C/C++/JAVA examples" OFF)
option (IPK "Generate IPK using CPack" OFF)
option (RPM "Generate RPM using CPack" OFF)
@@ -91,7 +92,11 @@
# Compiler flags common to both C and CXX
# Enable -Wall
# GCC-6 added -Wmisleading-indentation to -Wall, skip these for now
-set (C_CXX_WARNING_FLAGS -Wall -Wno-misleading-indentation -Wno-strict-aliasing)
+set (C_CXX_WARNING_FLAGS -Wall
+ -Wno-misleading-indentation
+ -Wno-strict-aliasing
+ -Wno-deprecated-declarations # Temp fix for MRAA deprecated methods
+ )
# Warnings as errors?
if (WERROR)
@@ -125,7 +130,7 @@
# Force a libmraa search and minimum required version every time a config is generated
unset(MRAA_FOUND CACHE)
-set(MRAA_MINIMUM 1.9.0)
+set(MRAA_MINIMUM 2.0.0)
pkg_check_modules (MRAA REQUIRED mraa>=${MRAA_MINIMUM})
# Also, get full path to the mraa library
find_library(MRAA_LIBRARY NAMES mraa HINTS ${MRAA_LIBDIR})
@@ -165,6 +170,17 @@
find_library(MRAAJAVA_LIBRARY NAMES mraajava HINTS ${MRAA_LIBDIR})
endif (BUILDSWIGJAVA)
+# Cordova binding
+if (BUILDCORDOVA)
+ if (NOT BUILDSWIGJAVA)
+ message(FATAL_ERROR "Cordova bindings require JAVA packages, please enable BUILDSWIGJAVA (-DBUILDSWIGJAVA=on).")
+ endif()
+
+ find_package (Node REQUIRED)
+ find_package (Npm REQUIRED)
+ find_package (UpmCordovaGenerator 0.2.1 REQUIRED)
+endif (BUILDCORDOVA)
+
# Find swig if any wrapper is enabled
if (BUILDSWIGPYTHON OR BUILDSWIGNODE OR BUILDSWIGJAVA)
find_package (SWIG 3.0.5 REQUIRED)
@@ -213,7 +229,7 @@
git_describe (VERSION "--tags")
# If git_describe fails, use a dirty version
if (${VERSION} MATCHES -NOTFOUND)
- set (VERSION "v1.6.0")
+ set (VERSION "v1.7.1")
message (WARNING "Failed to retrieve UPM version with 'git describe' (using "
"${VERSION}). Check that git is installed and this is a valid git repo.")
endif ()
@@ -275,37 +291,36 @@
set (C_EXTENSIONS OFF)
endif()
-# The doc target depends on each sensor target
+# The doc target depends on the C/C++ source and all libraries
#
# doc
+# ├──> src
+# ├──> include
# ├──> libupm_sensor0
# ├──> libupm_sensor1
-# ├──> libupm_sensor2
+# ├──> ...
# └──> libupm_sensor_n
#
# The pydoc target builds documentation with sphinx via inspection by loading
-# each python module. Those modules must include the CXX documentation via
+# each python2 module. Those modules must include the CXX documentation via
# a monolithic swig file generated by doxy2swig
#
# pydoc
# └──> _pyupm_sensor0_python2
-# ├──────> libupm_sensor0
-# └──────> doxy2swig
+# ├──> libupm_sensor0
+# └──> doxy2swig
#
# The doxy2swig target is dependent upon the doc target IF BUILDDOC=ON,
-# otherwise doxy2swig uses an empty file. Doxy2swig also depends on each
-# sensor target
#
# doxy2swig
-# ├──> BUILDDOC=ON───> doc
-# └──> libupm_sensor0
+# └──> BUILDDOC=ON───> doc
#
# The jsdoc target builds js documentation via yuidoc and only requires
# the doc target
#
# jsdoc ─> doc
#
-if (BUILDDOC)
+function (CreateDocumentationTargets)
# Add a target to generate API documentation with Doxygen
find_package (Doxygen 1.8 REQUIRED)
if (DOXYGEN_FOUND AND DOXYGEN_VERSION VERSION_GREATER "1.8")
@@ -317,12 +332,17 @@
foreach(PNG_FILE ${PNG_FILES})
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/docs/${PNG_FILE} ${CMAKE_CURRENT_BINARY_DIR}/html/docs/${PNG_FILE} COPYONLY)
endforeach()
- add_custom_target (doc
- ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
+
+ # Custom command to run doxygen (note depends on ALL UPM C++ targets)
+ add_custom_command (
+ OUTPUT ${CMAKE_BINARY_DIR}/xml/index.xml
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile ${UPM_TARGETS_CXX}
+ COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
COMMAND tar -czf html/xml.tar.gz -C xml .
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMENT "Generating C/C++ API documentation with Doxygen" VERBATIM
- )
+ COMMENT "Generating C/C++ API documentation with Doxygen"
+ VERBATIM)
+ add_custom_target(doc DEPENDS ${CMAKE_BINARY_DIR}/xml/index.xml)
else ()
message (SEND_ERROR "ERROR - Failed to find a compatible version of Doxygen. API doc will not be generated")
endif (DOXYGEN_FOUND AND DOXYGEN_VERSION VERSION_GREATER "1.8")
@@ -335,11 +355,28 @@
# the sphinx tools, explicitly run from the python2 interpreter (tested with the sphinx
# 1.3.6 python2 and python3 modules).
if(BUILDSWIGPYTHON)
+ # Generate python module documentation from doxygen collateral
+ #
+ # doxygen index.xml -> doxy2swig.py -> pyupm_doxy2swig.i
+ add_custom_command (
+ OUTPUT ${CMAKE_BINARY_DIR}/src/pyupm_doxy2swig.i
+ COMMAND ${PYTHON2_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/doxy2swig.py
+ ${CMAKE_BINARY_DIR}/xml/index.xml --quiet
+ ${CMAKE_BINARY_DIR}/src/pyupm_doxy2swig.i
+ COMMENT "Generating pyupm_doxy2swig.i from Doxygen output for use by SWIG"
+ DEPENDS doc
+ VERBATIM)
+ add_custom_target(pyupm_doxy2swig DEPENDS ${CMAKE_BINARY_DIR}/src/pyupm_doxy2swig.i)
+ foreach (_python2_target ${UPM_TARGETS_PYTHON2})
+ add_dependencies(${_python2_target} pyupm_doxy2swig)
+ endforeach()
+
find_package (Sphinx 1.3 REQUIRED)
if (SPHINX_FOUND AND SPHINX_VERSION VERSION_GREATER "1.3")
configure_file (${CMAKE_CURRENT_SOURCE_DIR}/doxy/conf.py.in ${CMAKE_CURRENT_BINARY_DIR}/pydoc/conf.py @ONLY)
configure_file (${CMAKE_CURRENT_SOURCE_DIR}/doxy/index.rst ${CMAKE_CURRENT_BINARY_DIR}/pydoc/index.rst COPYONLY)
- add_custom_target (pydoc ALL
+ add_custom_command (
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pydoc.stamp
COMMAND rm -r -f ${CMAKE_BINARY_DIR}/pyupm && mkdir -p ${CMAKE_BINARY_DIR}/pyupm
COMMAND find ${CMAKE_BINARY_DIR}/src -path "*python${MIN_VER_PYTHON2}/_pyupm_*.so" -exec cp {} ${CMAKE_BINARY_DIR}/pyupm \;
COMMAND find ${CMAKE_BINARY_DIR}/src -path "*python${MIN_VER_PYTHON2}/pyupm_*.py" -exec cp {} ${CMAKE_BINARY_DIR}/pyupm \;
@@ -348,10 +385,12 @@
COMMAND ${PYTHON2_EXECUTABLE} ${SPHINX_EXECUTABLE} -b html pydoc html/python
COMMAND sed -i.bak s|\">pyupm_|\">|g html/python/index.html html/python/modules.html
COMMAND sed -i.bak s|[[:space:]][mM]odule||g html/python/index.html html/python/modules.html
- DEPENDS doc
+ COMMAND cmake -E touch ${CMAKE_CURRENT_BINARY_DIR}/pydoc.stamp
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMENT "Generating Python API documentation with Sphinx" VERBATIM
- )
+ COMMENT "Generating Python API documentation with Sphinx"
+ DEPENDS doc ${UPM_TARGETS_PYTHON2}
+ VERBATIM)
+ add_custom_target(pydoc DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/pydoc.stamp)
else ()
message (SEND_ERROR "ERROR - Failed to find a compatible version of Sphinx. Python API doc will not be generated")
endif ()
@@ -361,19 +400,22 @@
if(BUILDSWIGNODE)
find_package (Yuidoc 0.10 REQUIRED)
if (YUIDOC_FOUND AND YUIDOC_VERSION VERSION_GREATER "0.10")
- add_custom_target (jsdoc ALL
+ add_custom_command (
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/jsdoc/jsdoc.stamp
COMMAND ${CMAKE_SOURCE_DIR}/doxy/doxygen2jsdoc/docgen.js -m upm -i xml -o jsdoc -t ${CMAKE_CURRENT_SOURCE_DIR}/src -g ../../
COMMAND ${YUIDOC_EXECUTABLE} -C --no-sort --helpers ${CMAKE_SOURCE_DIR}/doxy/node/generators/yuidoc/helper.js --themedir ${CMAKE_SOURCE_DIR}/doxy/node/generators/yuidoc/tmpl -o html/node jsdoc/yuidoc/upm
COMMAND ${CMAKE_SOURCE_DIR}/doxy/doxygen2jsdoc/tolower.js -i html/node
- DEPENDS doc
+ COMMAND cmake -E touch ${CMAKE_CURRENT_BINARY_DIR}/jsdoc/jsdoc.stamp
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMENT "Generating Javascript API documentation with Yuidoc" VERBATIM
- )
+ COMMENT "Generating Javascript API documentation with Yuidoc"
+ DEPENDS doc
+ VERBATIM)
+ add_custom_target(jsdoc DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/jsdoc/jsdoc.stamp)
else ()
message (SEND_ERROR "ERROR - Failed to find a compatible version of Yuidoc. Node.js API doc will not be generated")
endif ()
endif(BUILDSWIGNODE)
-endif (BUILDDOC)
+endfunction()
if (IPK)
# Get target package arch from Yocto ADT sysroot if set or host OS, mapping to Ubuntu name if necessary
@@ -455,7 +497,12 @@
add_subdirectory (tests)
endif()
+# Setup documentation AFTER all source targets have been added
+if (BUILDDOC)
+ CreateDocumentationTargets()
+endif()
+
# Install C headers
install(DIRECTORY include/ DESTINATION include/upm
COMPONENT ${CMAKE_PROJECT_NAME}-dev
- FILES_MATCHING PATTERN "*.h")
+ FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp")
diff -Nru upm-1.6.0/debian/changelog upm-1.7.1/debian/changelog
--- upm-1.6.0/debian/changelog 2018-02-20 16:37:24.000000000 +0000
+++ upm-1.7.1/debian/changelog 2018-10-18 15:17:10.000000000 +0000
@@ -1,3 +1,9 @@
+upm (1.7.1-1~ubuntu18.04) bionic; urgency=medium
+
+ * Update to upm 1.7.1
+
+ -- Tom Ingleby Thu, 18 Oct 2018 15:16:39 +0000
+
upm (1.6.0-1~ubuntu18.04) bionic; urgency=medium
* Upgrade to upm 1.6.0
diff -Nru upm-1.6.0/debian/patches/make-yuidoc-optional.patch upm-1.7.1/debian/patches/make-yuidoc-optional.patch
--- upm-1.6.0/debian/patches/make-yuidoc-optional.patch 2018-02-20 16:47:49.000000000 +0000
+++ upm-1.7.1/debian/patches/make-yuidoc-optional.patch 2018-10-18 15:38:03.000000000 +0000
@@ -1,20 +1,20 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -359,7 +359,7 @@
+@@ -398,7 +398,7 @@
# Check if Yuidoc is installed and add target for API documentation
if(BUILDSWIGNODE)
- find_package (Yuidoc 0.10 REQUIRED)
+ find_package (Yuidoc 0.10)
if (YUIDOC_FOUND AND YUIDOC_VERSION VERSION_GREATER "0.10")
- add_custom_target (jsdoc ALL
- COMMAND ${CMAKE_SOURCE_DIR}/doxy/doxygen2jsdoc/docgen.js -m upm -i xml -o jsdoc -t ${CMAKE_CURRENT_SOURCE_DIR}/src -g ../../
-@@ -370,7 +370,7 @@
- COMMENT "Generating Javascript API documentation with Yuidoc" VERBATIM
- )
+ add_custom_command (
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/jsdoc/jsdoc.stamp
+@@ -412,7 +412,7 @@
+ VERBATIM)
+ add_custom_target(jsdoc DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/jsdoc/jsdoc.stamp)
else ()
- message (SEND_ERROR "ERROR - Failed to find a compatible version of Yuidoc. Node.js API doc will not be generated")
+ message (INFO "ERROR - Failed to find a compatible version of Yuidoc. Node.js API doc will not be generated")
endif ()
endif(BUILDSWIGNODE)
- endif (BUILDDOC)
+ endfunction()
diff -Nru upm-1.6.0/docker-compose.yaml upm-1.7.1/docker-compose.yaml
--- upm-1.6.0/docker-compose.yaml 2018-02-20 15:45:15.000000000 +0000
+++ upm-1.7.1/docker-compose.yaml 2018-10-12 04:47:41.000000000 +0000
@@ -13,8 +13,10 @@
- BUILDFTI=${BUILDFTI:-ON}
- BUILDSWIGPYTHON=${BUILDSWIGPYTHON:-OFF}
- BUILDSWIGJAVA=${BUILDSWIGJAVA:-OFF}
+ - BUILDCORDOVA=${BUILDCORDOVA:-OFF}
- BUILDSWIGNODE=${BUILDSWIGNODE:-OFF}
- BUILDEXAMPLES=${BUILDEXAMPLES:-OFF}
+ - CMAKE_BUILD_TYPE
- IPK=${IPK:-OFF}
- RPM=${RPM:-OFF}
- NPM=${NPM:-OFF}
@@ -30,6 +32,12 @@
extends: base
image: inteliotdevkit/upm-all
+ minimal:
+ extends: base
+ environment:
+ - BUILDFTI=OFF
+ command: bash -c "./scripts/run-cmake.sh && cd build && make && ctest -R unit --output-on-failure"
+
doc:
extends: all
environment:
@@ -107,6 +115,13 @@
- BUILDTESTS=OFF
command: bash -c "./scripts/build-android.sh"
+ cordova:
+ extends: all
+ environment:
+ - BUILDSWIGJAVA=ON
+ - BUILDCORDOVA=ON
+ command: bash -c "./scripts/run-cmake.sh && cd build && make -j8 && make -j8"
+
node4:
extends: base
image: inteliotdevkit/upm-node4
diff -Nru upm-1.6.0/docs/apichanges.md upm-1.7.1/docs/apichanges.md
--- upm-1.6.0/docs/apichanges.md 2018-02-20 15:45:15.000000000 +0000
+++ upm-1.7.1/docs/apichanges.md 2018-10-12 04:47:41.000000000 +0000
@@ -4,6 +4,18 @@
Here's a list of other API changes made to the library that break source/binary
compatibility between releases:
+# v1.7.0
+ * The interface of **kx122** has been modified to return values instead
+ of receiving pointers. This applies to member functions: getWhoAmI,
+ getInterruptSource, getBufferStatus, getRawBufferSamples, and
+ getBufferSamples.
+ * The **tm1637** constructor has been updated and the fast GPIO parameter
+ has been removed with the deprecation of supporting MRAA functions. The
+ GPIO lines will initialize by default in fast mode when available.
+ * The generic **nmea_gps** library for GPS devices has been greatly enhanced
+ with new APIs to offer better control over acquisition intervals and simplify
+ parsing of the returned data.
+
# v1.6.0
* Several C libraries had their init function pin type modified from uint8_t
diff -Nru upm-1.6.0/docs/building.md upm-1.7.1/docs/building.md
--- upm-1.6.0/docs/building.md 2018-02-20 15:45:15.000000000 +0000
+++ upm-1.7.1/docs/building.md 2018-10-12 04:47:41.000000000 +0000
@@ -96,13 +96,16 @@
headers and library files respectively with *make install*. Further, you may
choose to generate these only for a specific sensor you modified, and this can
be achieved by building from the individual makefile of the sensor. Assuming
-you're in the build directory, to make the lcd module you would:
+you're in the build directory, to build/install the lcd module you would:
~~~~~~~~~~~~~
cd src/lcd
make install
~~~~~~~~~~~~~
+Note: 'make install' under src/lcd will build all targets (and dependencies)
+for the lcd but will NOT install dependencies.
+
Often developers are only interested in building one module or even just the
python/node module to do some quick testing using scripting. In order to do
this you need to use the target name for the python or node module you want to
diff -Nru upm-1.6.0/docs/changelog.md upm-1.7.1/docs/changelog.md
--- upm-1.6.0/docs/changelog.md 2018-02-20 15:45:15.000000000 +0000
+++ upm-1.7.1/docs/changelog.md 2018-10-12 04:47:41.000000000 +0000
@@ -4,6 +4,22 @@
Here's a list summarizing some of the key undergoing changes to our library
from earlier versions:
+### v1.7.1
+
+ * Bumped library compatibility to new MRAA 2.0 APIs
+ * Added installation details for Fedora
+ * Minor fixes based on static analysis vulnerability report
+
+### v1.7.0
+
+ * Added Cordova bindings based on Java packages
+ * Complete rework of the nmea_gps library giving more control over data
+ acquisition and parsing
+ * Added GTest support for unit tests
+ * Removed calls to deprecated MRAA fast GPIO functions
+ * Several bug fixes and improvements around SWIG type maps and gcc8 support
+ * New sensors: kx122, kxtj3, bh1792, bh1749
+
### v1.6.0
* Extended LED library to support the new MRAA gpio-leds APIs
diff -Nru upm-1.6.0/docs/creating_java_bindings.md upm-1.7.1/docs/creating_java_bindings.md
--- upm-1.6.0/docs/creating_java_bindings.md 2018-02-20 15:45:15.000000000 +0000
+++ upm-1.7.1/docs/creating_java_bindings.md 2018-10-12 04:47:41.000000000 +0000
@@ -259,7 +259,7 @@
Java callbacks are added at the SWIG interface level. For ease-of-use, a collection of macros are available in src/_upm.i.
-src/a110x/javaupm_a110x.i:
+src/a110x/a110x.i:
```c++
JAVA_ADD_INSTALLISR(upm::A110X)
```
Binary files /tmp/tmpkLMFjy/Z8hOxu4eBa/upm-1.6.0/docs/icons/allides.png and /tmp/tmpkLMFjy/8mUJE6mPoN/upm-1.7.1/docs/icons/allides.png differ
Binary files /tmp/tmpkLMFjy/Z8hOxu4eBa/upm-1.6.0/docs/icons/wyliodrin.png and /tmp/tmpkLMFjy/8mUJE6mPoN/upm-1.7.1/docs/icons/wyliodrin.png differ
Binary files /tmp/tmpkLMFjy/Z8hOxu4eBa/upm-1.6.0/docs/icons/xdk.png and /tmp/tmpkLMFjy/8mUJE6mPoN/upm-1.7.1/docs/icons/xdk.png differ
Binary files /tmp/tmpkLMFjy/Z8hOxu4eBa/upm-1.6.0/docs/images/kxtj3.png and /tmp/tmpkLMFjy/8mUJE6mPoN/upm-1.7.1/docs/images/kxtj3.png differ
diff -Nru upm-1.6.0/docs/images/LICENSE_CC_3_0.txt upm-1.7.1/docs/images/LICENSE_CC_3_0.txt
--- upm-1.6.0/docs/images/LICENSE_CC_3_0.txt 2018-02-20 15:45:15.000000000 +0000
+++ upm-1.7.1/docs/images/LICENSE_CC_3_0.txt 1970-01-01 00:00:00.000000000 +0000
@@ -1,361 +0,0 @@
-Creative Commons Legal Code
-
-Attribution-NonCommercial-ShareAlike 3.0 Unported
-
- CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
- LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN
- ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
- INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
- REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR
- DAMAGES RESULTING FROM ITS USE.
-
-License
-
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
-COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
-COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
-AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
-
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
-TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY
-BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
-CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
-CONDITIONS.
-
-1. Definitions
-
- a. "Adaptation" means a work based upon the Work, or upon the Work and
- other pre-existing works, such as a translation, adaptation,
- derivative work, arrangement of music or other alterations of a
- literary or artistic work, or phonogram or performance and includes
- cinematographic adaptations or any other form in which the Work may be
- recast, transformed, or adapted including in any form recognizably
- derived from the original, except that a work that constitutes a
- Collection will not be considered an Adaptation for the purpose of
- this License. For the avoidance of doubt, where the Work is a musical
- work, performance or phonogram, the synchronization of the Work in
- timed-relation with a moving image ("synching") will be considered an
- Adaptation for the purpose of this License.
- b. "Collection" means a collection of literary or artistic works, such as
- encyclopedias and anthologies, or performances, phonograms or
- broadcasts, or other works or subject matter other than works listed
- in Section 1(g) below, which, by reason of the selection and
- arrangement of their contents, constitute intellectual creations, in
- which the Work is included in its entirety in unmodified form along
- with one or more other contributions, each constituting separate and
- independent works in themselves, which together are assembled into a
- collective whole. A work that constitutes a Collection will not be
- considered an Adaptation (as defined above) for the purposes of this
- License.
- c. "Distribute" means to make available to the public the original and
- copies of the Work or Adaptation, as appropriate, through sale or
- other transfer of ownership.
- d. "License Elements" means the following high-level license attributes
- as selected by Licensor and indicated in the title of this License:
- Attribution, Noncommercial, ShareAlike.
- e. "Licensor" means the individual, individuals, entity or entities that
- offer(s) the Work under the terms of this License.
- f. "Original Author" means, in the case of a literary or artistic work,
- the individual, individuals, entity or entities who created the Work
- or if no individual or entity can be identified, the publisher; and in
- addition (i) in the case of a performance the actors, singers,
- musicians, dancers, and other persons who act, sing, deliver, declaim,
- play in, interpret or otherwise perform literary or artistic works or
- expressions of folklore; (ii) in the case of a phonogram the producer
- being the person or legal entity who first fixes the sounds of a
- performance or other sounds; and, (iii) in the case of broadcasts, the
- organization that transmits the broadcast.
- g. "Work" means the literary and/or artistic work offered under the terms
- of this License including without limitation any production in the
- literary, scientific and artistic domain, whatever may be the mode or
- form of its expression including digital form, such as a book,
- pamphlet and other writing; a lecture, address, sermon or other work
- of the same nature; a dramatic or dramatico-musical work; a
- choreographic work or entertainment in dumb show; a musical
- composition with or without words; a cinematographic work to which are
- assimilated works expressed by a process analogous to cinematography;
- a work of drawing, painting, architecture, sculpture, engraving or
- lithography; a photographic work to which are assimilated works
- expressed by a process analogous to photography; a work of applied
- art; an illustration, map, plan, sketch or three-dimensional work
- relative to geography, topography, architecture or science; a
- performance; a broadcast; a phonogram; a compilation of data to the
- extent it is protected as a copyrightable work; or a work performed by
- a variety or circus performer to the extent it is not otherwise
- considered a literary or artistic work.
- h. "You" means an individual or entity exercising rights under this
- License who has not previously violated the terms of this License with
- respect to the Work, or who has received express permission from the
- Licensor to exercise rights under this License despite a previous
- violation.
- i. "Publicly Perform" means to perform public recitations of the Work and
- to communicate to the public those public recitations, by any means or
- process, including by wire or wireless means or public digital
- performances; to make available to the public Works in such a way that
- members of the public may access these Works from a place and at a
- place individually chosen by them; to perform the Work to the public
- by any means or process and the communication to the public of the
- performances of the Work, including by public digital performance; to
- broadcast and rebroadcast the Work by any means including signs,
- sounds or images.
- j. "Reproduce" means to make copies of the Work by any means including
- without limitation by sound or visual recordings and the right of
- fixation and reproducing fixations of the Work, including storage of a
- protected performance or phonogram in digital form or other electronic
- medium.
-
-2. Fair Dealing Rights. Nothing in this License is intended to reduce,
-limit, or restrict any uses free from copyright or rights arising from
-limitations or exceptions that are provided for in connection with the
-copyright protection under copyright law or other applicable laws.
-
-3. License Grant. Subject to the terms and conditions of this License,
-Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
-perpetual (for the duration of the applicable copyright) license to
-exercise the rights in the Work as stated below:
-
- a. to Reproduce the Work, to incorporate the Work into one or more
- Collections, and to Reproduce the Work as incorporated in the
- Collections;
- b. to create and Reproduce Adaptations provided that any such Adaptation,
- including any translation in any medium, takes reasonable steps to
- clearly label, demarcate or otherwise identify that changes were made
- to the original Work. For example, a translation could be marked "The
- original work was translated from English to Spanish," or a
- modification could indicate "The original work has been modified.";
- c. to Distribute and Publicly Perform the Work including as incorporated
- in Collections; and,
- d. to Distribute and Publicly Perform Adaptations.
-
-The above rights may be exercised in all media and formats whether now
-known or hereafter devised. The above rights include the right to make
-such modifications as are technically necessary to exercise the rights in
-other media and formats. Subject to Section 8(f), all rights not expressly
-granted by Licensor are hereby reserved, including but not limited to the
-rights described in Section 4(e).
-
-4. Restrictions. The license granted in Section 3 above is expressly made
-subject to and limited by the following restrictions:
-
- a. You may Distribute or Publicly Perform the Work only under the terms
- of this License. You must include a copy of, or the Uniform Resource
- Identifier (URI) for, this License with every copy of the Work You
- Distribute or Publicly Perform. You may not offer or impose any terms
- on the Work that restrict the terms of this License or the ability of
- the recipient of the Work to exercise the rights granted to that
- recipient under the terms of the License. You may not sublicense the
- Work. You must keep intact all notices that refer to this License and
- to the disclaimer of warranties with every copy of the Work You
- Distribute or Publicly Perform. When You Distribute or Publicly
- Perform the Work, You may not impose any effective technological
- measures on the Work that restrict the ability of a recipient of the
- Work from You to exercise the rights granted to that recipient under
- the terms of the License. This Section 4(a) applies to the Work as
- incorporated in a Collection, but this does not require the Collection
- apart from the Work itself to be made subject to the terms of this
- License. If You create a Collection, upon notice from any Licensor You
- must, to the extent practicable, remove from the Collection any credit
- as required by Section 4(d), as requested. If You create an
- Adaptation, upon notice from any Licensor You must, to the extent
- practicable, remove from the Adaptation any credit as required by
- Section 4(d), as requested.
- b. You may Distribute or Publicly Perform an Adaptation only under: (i)
- the terms of this License; (ii) a later version of this License with
- the same License Elements as this License; (iii) a Creative Commons
- jurisdiction license (either this or a later license version) that
- contains the same License Elements as this License (e.g.,
- Attribution-NonCommercial-ShareAlike 3.0 US) ("Applicable License").
- You must include a copy of, or the URI, for Applicable License with
- every copy of each Adaptation You Distribute or Publicly Perform. You
- may not offer or impose any terms on the Adaptation that restrict the
- terms of the Applicable License or the ability of the recipient of the
- Adaptation to exercise the rights granted to that recipient under the
- terms of the Applicable License. You must keep intact all notices that
- refer to the Applicable License and to the disclaimer of warranties
- with every copy of the Work as included in the Adaptation You
- Distribute or Publicly Perform. When You Distribute or Publicly
- Perform the Adaptation, You may not impose any effective technological
- measures on the Adaptation that restrict the ability of a recipient of
- the Adaptation from You to exercise the rights granted to that
- recipient under the terms of the Applicable License. This Section 4(b)
- applies to the Adaptation as incorporated in a Collection, but this
- does not require the Collection apart from the Adaptation itself to be
- made subject to the terms of the Applicable License.
- c. You may not exercise any of the rights granted to You in Section 3
- above in any manner that is primarily intended for or directed toward
- commercial advantage or private monetary compensation. The exchange of
- the Work for other copyrighted works by means of digital file-sharing
- or otherwise shall not be considered to be intended for or directed
- toward commercial advantage or private monetary compensation, provided
- there is no payment of any monetary compensation in con-nection with
- the exchange of copyrighted works.
- d. If You Distribute, or Publicly Perform the Work or any Adaptations or
- Collections, You must, unless a request has been made pursuant to
- Section 4(a), keep intact all copyright notices for the Work and
- provide, reasonable to the medium or means You are utilizing: (i) the
- name of the Original Author (or pseudonym, if applicable) if supplied,
- and/or if the Original Author and/or Licensor designate another party
- or parties (e.g., a sponsor institute, publishing entity, journal) for
- attribution ("Attribution Parties") in Licensor's copyright notice,
- terms of service or by other reasonable means, the name of such party
- or parties; (ii) the title of the Work if supplied; (iii) to the
- extent reasonably practicable, the URI, if any, that Licensor
- specifies to be associated with the Work, unless such URI does not
- refer to the copyright notice or licensing information for the Work;
- and, (iv) consistent with Section 3(b), in the case of an Adaptation,
- a credit identifying the use of the Work in the Adaptation (e.g.,
- "French translation of the Work by Original Author," or "Screenplay
- based on original Work by Original Author"). The credit required by
- this Section 4(d) may be implemented in any reasonable manner;
- provided, however, that in the case of a Adaptation or Collection, at
- a minimum such credit will appear, if a credit for all contributing
- authors of the Adaptation or Collection appears, then as part of these
- credits and in a manner at least as prominent as the credits for the
- other contributing authors. For the avoidance of doubt, You may only
- use the credit required by this Section for the purpose of attribution
- in the manner set out above and, by exercising Your rights under this
- License, You may not implicitly or explicitly assert or imply any
- connection with, sponsorship or endorsement by the Original Author,
- Licensor and/or Attribution Parties, as appropriate, of You or Your
- use of the Work, without the separate, express prior written
- permission of the Original Author, Licensor and/or Attribution
- Parties.
- e. For the avoidance of doubt:
-
- i. Non-waivable Compulsory License Schemes. In those jurisdictions in
- which the right to collect royalties through any statutory or
- compulsory licensing scheme cannot be waived, the Licensor
- reserves the exclusive right to collect such royalties for any
- exercise by You of the rights granted under this License;
- ii. Waivable Compulsory License Schemes. In those jurisdictions in
- which the right to collect royalties through any statutory or
- compulsory licensing scheme can be waived, the Licensor reserves
- the exclusive right to collect such royalties for any exercise by
- You of the rights granted under this License if Your exercise of
- such rights is for a purpose or use which is otherwise than
- noncommercial as permitted under Section 4(c) and otherwise waives
- the right to collect royalties through any statutory or compulsory
- licensing scheme; and,
- iii. Voluntary License Schemes. The Licensor reserves the right to
- collect royalties, whether individually or, in the event that the
- Licensor is a member of a collecting society that administers
- voluntary licensing schemes, via that society, from any exercise
- by You of the rights granted under this License that is for a
- purpose or use which is otherwise than noncommercial as permitted
- under Section 4(c).
- f. Except as otherwise agreed in writing by the Licensor or as may be
- otherwise permitted by applicable law, if You Reproduce, Distribute or
- Publicly Perform the Work either by itself or as part of any
- Adaptations or Collections, You must not distort, mutilate, modify or
- take other derogatory action in relation to the Work which would be
- prejudicial to the Original Author's honor or reputation. Licensor
- agrees that in those jurisdictions (e.g. Japan), in which any exercise
- of the right granted in Section 3(b) of this License (the right to
- make Adaptations) would be deemed to be a distortion, mutilation,
- modification or other derogatory action prejudicial to the Original
- Author's honor and reputation, the Licensor will waive or not assert,
- as appropriate, this Section, to the fullest extent permitted by the
- applicable national law, to enable You to reasonably exercise Your
- right under Section 3(b) of this License (right to make Adaptations)
- but not otherwise.
-
-5. Representations, Warranties and Disclaimer
-
-UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING AND TO THE
-FULLEST EXTENT PERMITTED BY APPLICABLE LAW, LICENSOR OFFERS THE WORK AS-IS
-AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE
-WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT
-LIMITATION, WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
-PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS,
-ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT
-DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED
-WARRANTIES, SO THIS EXCLUSION MAY NOT APPLY TO YOU.
-
-6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE
-LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR
-ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES
-ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS
-BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. Termination
-
- a. This License and the rights granted hereunder will terminate
- automatically upon any breach by You of the terms of this License.
- Individuals or entities who have received Adaptations or Collections
- from You under this License, however, will not have their licenses
- terminated provided such individuals or entities remain in full
- compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will
- survive any termination of this License.
- b. Subject to the above terms and conditions, the license granted here is
- perpetual (for the duration of the applicable copyright in the Work).
- Notwithstanding the above, Licensor reserves the right to release the
- Work under different license terms or to stop distributing the Work at
- any time; provided, however that any such election will not serve to
- withdraw this License (or any other license that has been, or is
- required to be, granted under the terms of this License), and this
- License will continue in full force and effect unless terminated as
- stated above.
-
-8. Miscellaneous
-
- a. Each time You Distribute or Publicly Perform the Work or a Collection,
- the Licensor offers to the recipient a license to the Work on the same
- terms and conditions as the license granted to You under this License.
- b. Each time You Distribute or Publicly Perform an Adaptation, Licensor
- offers to the recipient a license to the original Work on the same
- terms and conditions as the license granted to You under this License.
- c. If any provision of this License is invalid or unenforceable under
- applicable law, it shall not affect the validity or enforceability of
- the remainder of the terms of this License, and without further action
- by the parties to this agreement, such provision shall be reformed to
- the minimum extent necessary to make such provision valid and
- enforceable.
- d. No term or provision of this License shall be deemed waived and no
- breach consented to unless such waiver or consent shall be in writing
- and signed by the party to be charged with such waiver or consent.
- e. This License constitutes the entire agreement between the parties with
- respect to the Work licensed here. There are no understandings,
- agreements or representations with respect to the Work not specified
- here. Licensor shall not be bound by any additional provisions that
- may appear in any communication from You. This License may not be
- modified without the mutual written agreement of the Licensor and You.
- f. The rights granted under, and the subject matter referenced, in this
- License were drafted utilizing the terminology of the Berne Convention
- for the Protection of Literary and Artistic Works (as amended on
- September 28, 1979), the Rome Convention of 1961, the WIPO Copyright
- Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996
- and the Universal Copyright Convention (as revised on July 24, 1971).
- These rights and subject matter take effect in the relevant
- jurisdiction in which the License terms are sought to be enforced
- according to the corresponding provisions of the implementation of
- those treaty provisions in the applicable national law. If the
- standard suite of rights granted under applicable copyright law
- includes additional rights not granted under this License, such
- additional rights are deemed to be included in the License; this
- License is not intended to restrict the license of any rights under
- applicable law.
-
-
-Creative Commons Notice
-
- Creative Commons is not a party to this License, and makes no warranty
- whatsoever in connection with the Work. Creative Commons will not be
- liable to You or any party on any legal theory for any damages
- whatsoever, including without limitation any general, special,
- incidental or consequential damages arising in connection to this
- license. Notwithstanding the foregoing two (2) sentences, if Creative
- Commons has expressly identified itself as the Licensor hereunder, it
- shall have all rights and obligations of Licensor.
-
- Except for the limited purpose of indicating to the public that the
- Work is licensed under the CCPL, Creative Commons does not authorize
- the use by either party of the trademark "Creative Commons" or any
- related trademark or logo of Creative Commons without the prior
- written consent of Creative Commons. Any permitted use will be in
- compliance with Creative Commons' then-current trademark usage
- guidelines, as may be published on its website or otherwise made
- available upon request from time to time. For the avoidance of doubt,
- this trademark restriction does not form part of this License.
-
- Creative Commons may be contacted at https://creativecommons.org/.
-
diff -Nru upm-1.6.0/docs/installing.md upm-1.7.1/docs/installing.md
--- upm-1.6.0/docs/installing.md 2018-02-20 15:45:15.000000000 +0000
+++ upm-1.7.1/docs/installing.md 2018-10-12 04:47:41.000000000 +0000
@@ -54,6 +54,18 @@
Running UPM applications on Ubuntu systems requires elevated permissions
(e.g. run with `sudo`).
+### Fedora Linux
+
+MRAA and UPM are available through the default package repositories on Fedora and can be
+installed in the standard method using dnf.
+
+To install:
+
+```bash
+sudo dnf install upm
+sudo dnf install paython3-upm nodejs-upm upm-examples
+```
+
### Node.js bindings only (NPM)
This option allows compiling MRAA/UPM on any system with npm and node-gyp.
diff -Nru upm-1.6.0/docs/max31855.md upm-1.7.1/docs/max31855.md
--- upm-1.6.0/docs/max31855.md 2018-02-20 15:45:15.000000000 +0000
+++ upm-1.7.1/docs/max31855.md 2018-10-12 04:47:41.000000000 +0000
@@ -14,8 +14,7 @@
* max31855.cxx
* max31855.hpp
-* jsupm_max31855.i
-* pyupm_max31855.i
+* max31855.i
* CMakeLists.txt
And then an example file to use & test our lib with in upm/examples/max31855.cxx.
diff -Nru upm-1.6.0/doxy/index.rst upm-1.7.1/doxy/index.rst
--- upm-1.6.0/doxy/index.rst 2018-02-20 15:45:15.000000000 +0000
+++ upm-1.7.1/doxy/index.rst 2018-10-12 04:47:41.000000000 +0000
@@ -23,15 +23,6 @@
Individual sensor usage examples for Python are available `here `_.
-``IDE Compatibility``
-################
-
-While there is no official IDE provided with our Python libraries, we do recommend the web-based IDE Wyliodrin. It can be used with multiple programming
-languages, including Python. More information can be found on the Intel Developer Zone IDE page.
-
-.. image:: ../docs/icons/wyliodrin.png
- :target: https://software.intel.com/iot/software/ide
-
``Making your own UPM Module``
##############################
diff -Nru upm-1.6.0/doxy/node/generators/yuidoc/tmpl/partials/index.handlebars upm-1.7.1/doxy/node/generators/yuidoc/tmpl/partials/index.handlebars
--- upm-1.6.0/doxy/node/generators/yuidoc/tmpl/partials/index.handlebars 2018-02-20 15:45:15.000000000 +0000
+++ upm-1.7.1/doxy/node/generators/yuidoc/tmpl/partials/index.handlebars 2018-10-12 04:47:41.000000000 +0000
@@ -36,19 +36,6 @@
href="https://github.com/intel-iot-devkit/upm/tree/master/examples/javascript">here.
-
-
IDE Compatibility
- UPM
-
-
-
Intel® XDK IoT Edition is the recommended IDE for Node.js development.
- Visit the Intel® Developer Zone IDE page for more information on how to get
- started.
-
-
-
Building
UPM