ANDROID: CMake/src changes to build on android-24

* Updated pom file generation: Generate pom files after all sensor
      library targets have been created - allows for dependencies
    * Changes for compiling on Android
    * Check for mraa build options: Look at symbols in mraa library to
      determine UPM build options (example: mraa_iio_init, mraa_firmata_init)
    * Add per target summary for C/C++/java/nodejs/python
    * Added hierarchy to fti include directory...
        old: #include "upm_voltage.h"
        new: #include "fti/upm_voltage.h"
    * Removed unimplemented methods from mpu9150 library and java example
    * Add utilities-c target for all c examples.  Most of the C examples
      rely on the upm_delay methods.  Add a dependency on the utilities-c
      target for all c examples.
    * Updated the examples/CMakeLists.txt to add dependencies passed via
      TARGETS to the target name parsed from the example name.  Also updated
      the interface example names to start with 'interfaces'.
    * Updated src/examples/CMakeLists.txt to ALWAYS remove examples from the
      example_src_list (moved this from end of function to beginning).

Signed-off-by: Noel Eck <noel.eck@intel.com>
This commit is contained in:
Noel Eck
2017-02-07 17:00:29 -08:00
parent b2aa2515b0
commit 0bd68e4e2b
93 changed files with 525 additions and 326 deletions

View File

@ -1,5 +1,7 @@
set (libname "l3gd20")
set (libdescription "Tri-axis Digital Gyroscope")
set (module_src ${libname}.cxx)
set (module_hpp ${libname}.hpp)
upm_module_init(mraa)
if (MRAA_IIO_FOUND)
set (libname "l3gd20")
set (libdescription "Tri-axis Digital Gyroscope")
set (module_src ${libname}.cxx)
set (module_hpp ${libname}.hpp)
upm_module_init(mraa)
endif (MRAA_IIO_FOUND)

View File

@ -138,11 +138,11 @@ L3GD20::L3GD20(int bus, int addr)
{
throw std::runtime_error(std::string(__FUNCTION__) +
": Invalid Chip ID: expected "
+ std::to_string(L3GD20_DEFAULT_CHIP_ID)
+ to_string(L3GD20_DEFAULT_CHIP_ID)
+ " or "
+ std::to_string(L3GD20H_DEFAULT_CHIP_ID)
+ to_string(L3GD20H_DEFAULT_CHIP_ID)
+ ", got "
+ std::to_string(int(cid)));
+ to_string(int(cid)));
return;
}
@ -282,7 +282,7 @@ void L3GD20::update()
{
throw std::runtime_error(std::string(__FUNCTION__)
+ ": readRegs() failed to read "
+ std::to_string(bufLen)
+ to_string(bufLen)
+ " bytes");
}