From: Kiveisha Yevgeniy Date: Tue, 26 Aug 2014 20:23:05 +0000 (+0000) Subject: mq2:: added new sensor X-Git-Url: http://review.tizen.org/git/?p=contrib%2Fupm.git;a=commitdiff_plain;h=30187ba5f94ffca3ffdc747964a33deeb4145123 mq2:: added new sensor Signed-off-by: Kiveisha Yevgeniy --- diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 2d165a2..f81907b 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -29,6 +29,7 @@ add_executable (nrf8001-helloworld-example nrf8001_helloworld.cxx) add_executable (lpd8806-example lpd8806-example.cxx) add_executable (mlx90614-example mlx90614-example.cxx) add_executable (ecs1030-example ecs1030-example.cxx) +add_executable (mq2-example mq2-example.cxx) add_executable (mq9-example mq9-example.cxx) include_directories (${PROJECT_SOURCE_DIR}/src/hmc5883l) @@ -89,4 +90,5 @@ target_link_libraries (nrf8001-helloworld-example nrf8001 ${CMAKE_THREAD_LIBS_IN target_link_libraries (lpd8806-example lpd8806 ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries (mlx90614-example mlx90614 ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries (ecs1030-example ecs1030 ${CMAKE_THREAD_LIBS_INIT}) +target_link_libraries (mq2-example gas ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries (mq9-example gas ${CMAKE_THREAD_LIBS_INIT}) diff --git a/examples/mq2-example.cxx b/examples/mq2-example.cxx new file mode 100644 index 0000000..defdf7a --- /dev/null +++ b/examples/mq2-example.cxx @@ -0,0 +1,74 @@ +/* + * Author: Yevgeniy Kiveisha + * Copyright (c) 2014 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 +#include +#include "mq2.h" +#include +#include +#include + +int is_running = 0; +uint16_t buffer [128]; +upm::MQ2 *sensor = NULL; + +void +sig_handler(int signo) +{ + printf("got signal\n"); + if (signo == SIGINT) { + is_running = 1; + } +} + +//! [Interesting] +int +main(int argc, char **argv) +{ + sensor = new upm::MQ2(0); + signal(SIGINT, sig_handler); + + thresholdContext ctx; + ctx.averageReading = 0; + ctx.runningAverage = 0; + ctx.averagedOver = 2; + + while (!is_running) { + int len = sensor->getSampledWindow (2, 128, buffer); + if (len) { + int thresh = sensor->findThreshold (&ctx, 30, buffer, len); + sensor->printGraph(&ctx, 5); + if (thresh) { + // do something .... + } + } + } + + std::cout << "exiting application" << std::endl; + + delete sensor; + + return 0; +} +//! [Interesting] diff --git a/src/gas/CMakeLists.txt b/src/gas/CMakeLists.txt index 0131dd5..2f2dc39 100644 --- a/src/gas/CMakeLists.txt +++ b/src/gas/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "gas") set (libdescription "Gas sensors") -set (module_src ${libname}.cxx mq9.cxx) -set (module_h ${libname}.h mq9.h) +set (module_src ${libname}.cxx mq2.cxx mq9.cxx) +set (module_h ${libname}.h mq2.h mq9.h) upm_module_init() diff --git a/src/gas/mq2.cxx b/src/gas/mq2.cxx new file mode 100644 index 0000000..d91dc35 --- /dev/null +++ b/src/gas/mq2.cxx @@ -0,0 +1,33 @@ +/* + * Author: Brendan Le Foll + * Copyright (c) 2014 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 "mq2.h" + +using namespace upm; + +MQ2::MQ2 (int gasPin) : Gas (gasPin) { +} + +MQ2::~MQ2 () { +} diff --git a/src/gas/mq2.h b/src/gas/mq2.h new file mode 100644 index 0000000..53683f8 --- /dev/null +++ b/src/gas/mq2.h @@ -0,0 +1,60 @@ +/* + * Author: Brendan Le Foll + * Copyright (c) 2014 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. + */ +#pragma once + +#include +#include +#include "gas.h" + +namespace upm { + /** + * @brief C++ API for MQ2 gas sensor + * + * @snippet mq2-example.cxx Interesting + */ + class MQ2 : public Gas { + public: + /** + * MQ2 constructor + * + * @param gasPin analog pin where sensor connected + */ + MQ2 (int gasPin); + + /** + * MQ2 destructor + */ + ~MQ2 (); + + /** + * Return name of the component + */ + std::string name() + { + return m_name; + } + private: + std::string m_name; + }; +}