mirror of
https://github.com/eclipse/upm.git
synced 2025-03-15 04:57:30 +03:00
d345006c03
This commit attempts to use a more cmake-friendly approach when
handling inter-target dependencies. A combination of macros and
include_directories usage provided overzealous compile -I/blah
entries which equates to large catch-all build commands. For
example, the last CXX target contains include directories for nearly
all preceeding targets (~190). Library dependencies were also often
wrong or missing.
* Removed nearly all used of include_directories (swig cmake
commands still appear to need these for generating the swig
command line)
* Updated usage of target_link_libraries in upm_module_init,
also changed to using target_include_directories per target.
This greatly simplifies upm/mixed_module_init usage for libraries
which depend on other libraries (in this project).
example (src/tb7300/CMakeLists.txt)
old:
# upm-libbacnetmstp will bring in libbacnet, I hope
set (reqlibname "upm-bacnetmstp")
include_directories(${BACNET_INCLUDE_DIRS})
include_directories("../bacnetmstp")
upm_module_init()
upm_target_link_libraries(${libname} bacnetmstp)
new:
upm_module_init(bacnetmstp)
The reason here, is that tb7300 depends on bacnetmstp, which
depends on BACNET includes/libs, so tb7300 gets the headers and
libraries transitively via its dependency on bacnetmstp.
* Updated pkg-config .pc file generation flow to reflect changes
with dependencies.
* Create a real target for the interfaces (CXX abstract sensor
classes). Renamed the directory from 'upm/src/upm' to
'upm/src/interfaces' Also changed the install location of the
interface headers to include/upm/interfaces. Updated interface
header usage to reflect this.
* Updated a few sensor libs to use fwd declarations for mraa.
Ideally the UPM libs would do more of this which eases the
burden on anyone building on top of the sensor libraries since
they would not need to know about mraa headers.
* Fixed examples which use symbols not defined in local includes
Signed-off-by: Noel Eck <noel.eck@intel.com>
79 lines
2.3 KiB
C++
79 lines
2.3 KiB
C++
/*
|
|
* Author: Marc Graham <marc@m2ag.net>
|
|
* Copyright (c) 2015 Intel Corporation.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining
|
|
* a copy of this software and associated documentation files (the
|
|
* "Software"), to deal in the Software without restriction, including
|
|
* without limitation the rights to use, copy, modify, merge, publish,
|
|
* distribute, sublicense, and/or sell copies of the Software, and to
|
|
* permit persons to whom the Software is furnished to do so, subject to
|
|
* the following conditions:
|
|
*
|
|
* 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 <iostream>
|
|
#include <unistd.h>
|
|
#include <signal.h>
|
|
#include "micsv89.hpp"
|
|
|
|
/*
|
|
* An example for using the MICSV89 sensor library.
|
|
* The MICSV89 comes in 4 variants, PWM and I2c
|
|
* in 3.3 volts and 5 volts. This library only implements
|
|
* the I2c version of the device.
|
|
*
|
|
* Device output is not valid until a warm up of 15 minutes
|
|
* of operation.
|
|
*
|
|
* Additional linker flags: -lupm-micsv89
|
|
*/
|
|
|
|
using namespace std;
|
|
|
|
volatile int running = 1;
|
|
|
|
void
|
|
sig_handler(int signo)
|
|
{
|
|
if (signo == SIGINT) {
|
|
cout << "Exiting program." << endl;
|
|
running = 0;
|
|
}
|
|
}
|
|
|
|
int main()
|
|
{
|
|
signal(SIGINT, sig_handler);
|
|
|
|
//! [Interesting]
|
|
upm::MICSV89 *sensor = new upm::MICSV89(6);
|
|
|
|
while(running)
|
|
{
|
|
sensor->update();
|
|
while(!sensor->valid());
|
|
cout << "co2: " << sensor->co2equ() << endl;
|
|
cout << "short: " << sensor->vocshort() << endl;
|
|
cout << "tvoc: " << sensor->tvoc() << endl;
|
|
cout << "resistor: " << sensor->resistor() << endl;
|
|
cout << "****************************" << endl;
|
|
sleep(5);
|
|
}
|
|
|
|
delete sensor;
|
|
//! [Interesting]
|
|
|
|
return 0;
|
|
}
|