diff --git a/examples/c++/CMakeLists.txt b/examples/c++/CMakeLists.txt index 2c64780b..4be8c4fe 100644 --- a/examples/c++/CMakeLists.txt +++ b/examples/c++/CMakeLists.txt @@ -42,6 +42,7 @@ add_executable (ecs1030-example ecs1030.cxx) add_executable (mq2-example mq2.cxx) add_executable (mq3-example mq3.cxx) add_executable (mq5-example mq5.cxx) +add_executable (mq7-example mq7.cxx) add_executable (mq9-example mq9.cxx) add_executable (tp401-example tp401.cxx) add_executable (tcs3414cs-example tcs3414cs.cxx) @@ -297,6 +298,7 @@ target_link_libraries (ecs1030-example ecs1030 ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries (mq2-example gas ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries (mq3-example gas ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries (mq5-example gas ${CMAKE_THREAD_LIBS_INIT}) +target_link_libraries (mq7-example gas ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries (mq9-example gas ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries (tp401-example gas ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries (tcs3414cs-example tcs3414cs ${CMAKE_THREAD_LIBS_INIT}) diff --git a/examples/c++/mq7.cxx b/examples/c++/mq7.cxx new file mode 100644 index 00000000..a6279f1a --- /dev/null +++ b/examples/c++/mq7.cxx @@ -0,0 +1,81 @@ +/* + * Author: Jon Trulson + * 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 +#include +#include "mq7.h" +#include +#include +#include + +bool shouldRun = true; + +using namespace std; + +void +sig_handler(int signo) +{ + if (signo == SIGINT) + { + shouldRun = false; + } +} + +//! [Interesting] +int main(int argc, char **argv) +{ + // Attach gas sensor to Analog A0 + upm::MQ7 *sensor = new upm::MQ7(0); + signal(SIGINT, sig_handler); + + uint16_t buffer [128]; + + thresholdContext ctx; + ctx.averageReading = 0; + ctx.runningAverage = 0; + ctx.averagedOver = 2; + + // Infinite loop, ends when script is cancelled + // Repeatedly, take a sample every 2 microseconds; + // find the average of 128 samples; and + // print a running graph of asteriskss as averages + while (shouldRun) + { + 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 .... + } + } + } + + cout << "Exiting" << endl; + + delete sensor; + + return 0; +} +//! [Interesting] diff --git a/examples/javascript/mq7.js b/examples/javascript/mq7.js new file mode 100644 index 00000000..6d305b14 --- /dev/null +++ b/examples/javascript/mq7.js @@ -0,0 +1,60 @@ +/*jslint node:true, vars:true, bitwise:true, unparam:true */ +/*jshint unused:true */ +/* + * Author: Jon Trulson + * 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. + */ + +var upmGAS = require("jsupm_gas"); + +// Attach gas sensor to Analog A0 +var sensor = new upmGAS.MQ7(0); + +var threshContext = new upmGAS.thresholdContext; +threshContext.averageReading = 0; +threshContext.runningAverage = 0; +threshContext.averagedOver = 2; + +// Infinite loop, ends when script is cancelled +// Repeatedly, take a sample every 2 microseconds; +// find the average of 128 samples; and +// print a running graph of asteriskss as averages + +while(1) +{ + var buffer = new upmGAS.uint16Array(128); + var len = sensor.getSampledWindow(2, 128, buffer); + if (len) + { + var thresh = sensor.findThreshold(threshContext, 30, buffer, len); + sensor.printGraph(threshContext, 5); + //if (thresh) + // console.log("Threshold is " + thresh); + } +} + +// Print message when exiting +process.on('SIGINT', function() +{ + console.log("Exiting..."); + process.exit(0); +}); diff --git a/examples/python/mq7.py b/examples/python/mq7.py new file mode 100644 index 00000000..62a90565 --- /dev/null +++ b/examples/python/mq7.py @@ -0,0 +1,62 @@ +#!/usr/bin/python +# Author: Jon Trulson +# 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. + +import time, sys, signal, atexit +import pyupm_gas as upmGAS + +# Attach gas sensor to Analog A0 +sensor = upmGAS.MQ7(0) + + +## Exit handlers ## +# This function stops python from printing a stacktrace when you hit control-C +def SIGINTHandler(signum, frame): + raise SystemExit + +# This function lets you run code on exit, including functions from sensor +def exitHandler(): + print "Exiting" + sys.exit(0) + +# Register exit handlers +atexit.register(exitHandler) +signal.signal(signal.SIGINT, SIGINTHandler) + + +threshContext = upmGAS.thresholdContext() +threshContext.averageReading = 0 +threshContext.runningAverage = 0 +threshContext.averagedOver = 2 + +# Infinite loop, ends when script is cancelled +# Repeatedly, take a sample every 2 microseconds; +# find the average of 128 samples; and +# print a running graph of asteriskss as averages +mybuffer = upmGAS.uint16Array(128) +while(1): + samplelen = sensor.getSampledWindow(2, 128, mybuffer) + if samplelen: + thresh = sensor.findThreshold(threshContext, 30, mybuffer, samplelen) + sensor.printGraph(threshContext, 5) +# if(thresh): +# print "Threshold is ", thresh diff --git a/src/gas/CMakeLists.txt b/src/gas/CMakeLists.txt index 1795d927..4dbbb63b 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 mq2.cxx mq3.cxx mq5.cxx mq9.cxx tp401.cxx) -set (module_h ${libname}.h mq2.h mq3.h mq5.h mq9.h tp401.h) +set (module_src ${libname}.cxx mq2.cxx mq3.cxx mq5.cxx mq7.cxx mq9.cxx tp401.cxx) +set (module_h ${libname}.h mq2.h mq3.h mq5.h mq7.h mq9.h tp401.h) upm_module_init() diff --git a/src/gas/javaupm_gas.i b/src/gas/javaupm_gas.i index 78d38727..ee393bad 100644 --- a/src/gas/javaupm_gas.i +++ b/src/gas/javaupm_gas.i @@ -7,6 +7,7 @@ #include "mq2.h" #include "mq3.h" #include "mq5.h" + #include "mq7.h" #include "mq9.h" #include "tp401.h" %} @@ -45,5 +46,6 @@ %include "mq2.h" %include "mq3.h" %include "mq5.h" +%include "mq7.h" %include "mq9.h" %include "tp401.h" diff --git a/src/gas/jsupm_gas.i b/src/gas/jsupm_gas.i index 28a06a68..58d66bb0 100644 --- a/src/gas/jsupm_gas.i +++ b/src/gas/jsupm_gas.i @@ -28,6 +28,11 @@ #include "mq5.h" %} +%include "mq7.h" +%{ + #include "mq7.h" +%} + %include "mq9.h" %{ #include "mq9.h" diff --git a/src/gas/mq7.cxx b/src/gas/mq7.cxx new file mode 100644 index 00000000..76201a49 --- /dev/null +++ b/src/gas/mq7.cxx @@ -0,0 +1,35 @@ +/* + * Author: Jon Trulson + * 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 "mq7.h" + +using namespace upm; + +MQ7::MQ7 (int gasPin) : Gas (gasPin) +{ +} + +MQ7::~MQ7 () +{ +} diff --git a/src/gas/mq7.h b/src/gas/mq7.h new file mode 100644 index 00000000..1550a3e0 --- /dev/null +++ b/src/gas/mq7.h @@ -0,0 +1,75 @@ +/* + * Author: Jon Trulson + * 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. + */ +#pragma once + +#include +#include +#include "gas.h" + +namespace upm { + /** + * @library gas + * @sensor mq7 + * @comname DFRobot MQ7 CO Gas Sensor + * @type gaseous + * @man dfrobot + * @con analog + * + * @brief API for the DFRobot MQ7 CO Gas Sensor + * + * The Grove MQ7 Gas Sensor module is useful for detecting Carbon + * Monoxide (CO) concentrations in the air. It has a detection + * range of 20-2000 ppm. + * + * For optimum use, it requires calibration after a pre-heat time of + * 48 hours. See the datasheet for details. + * + * @image html mq3-9.jpeg + * @snippet mq7.cxx Interesting + */ + class MQ7 : public Gas { + public: + /** + * MQ7 constructor + * + * @param gasPin Analog pin where the sensor is connected + */ + MQ7 (int gasPin); + + /** + * MQ7 destructor + */ + ~MQ7 (); + + /** + * Returns the name of the sensor + */ + std::string name() + { + return m_name; + } + private: + std::string m_name; + }; +} diff --git a/src/gas/pyupm_gas.i b/src/gas/pyupm_gas.i index 41826c67..8b4190ab 100644 --- a/src/gas/pyupm_gas.i +++ b/src/gas/pyupm_gas.i @@ -30,6 +30,11 @@ #include "mq5.h" %} +%include "mq7.h" +%{ + #include "mq7.h" +%} + %include "mq9.h" %{ #include "mq9.h"