From 2ceee8bf264b37ce093f22ae2b6498a98f62b81f Mon Sep 17 00:00:00 2001 From: Zion Orent Date: Thu, 26 Mar 2015 09:58:41 -0400 Subject: [PATCH] grovevdiv: python example and js modification for grovevdiv voltage divider Signed-off-by: Zion Orent Signed-off-by: Mihai Tudor Panu --- examples/javascript/grovevdiv.js | 11 ++++--- examples/python/grovevdiv.py | 54 ++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 4 deletions(-) create mode 100644 examples/python/grovevdiv.py diff --git a/examples/javascript/grovevdiv.js b/examples/javascript/grovevdiv.js index b85e374d..4ff052ac 100644 --- a/examples/javascript/grovevdiv.js +++ b/examples/javascript/grovevdiv.js @@ -1,6 +1,5 @@ /*jslint node:true, vars:true, bitwise:true, unparam:true */ /*jshint unused:true */ -/*global */ /* * Author: Zion Orent * Copyright (c) 2014 Intel Corporation. @@ -31,11 +30,12 @@ var myVoltageDivider = new voltageDivider.GroveVDiv(0); // collect data and output measured voltage according to the setting // of the scaling switch (3 or 10) +var val, gain3val, gain10val; function getVoltageInfo() { - var val = myVoltageDivider.value(100); - var gain3val = myVoltageDivider.computedValue(3, val); - var gain10val = myVoltageDivider.computedValue(10, val); + val = myVoltageDivider.value(100); + gain3val = myVoltageDivider.computedValue(3, val); + gain10val = myVoltageDivider.computedValue(10, val); console.log("ADC value: " + val + " Gain 3: " + gain3val + "v Gain 10: " + gain10val + "v"); } @@ -45,6 +45,9 @@ setInterval(getVoltageInfo, 1000); // Print message when exiting process.on('SIGINT', function() { + myVoltageDivider = null; + voltageDivider.cleanUp(); + voltageDivider = null; console.log("Exiting..."); process.exit(0); }); diff --git a/examples/python/grovevdiv.py b/examples/python/grovevdiv.py new file mode 100644 index 00000000..7719277c --- /dev/null +++ b/examples/python/grovevdiv.py @@ -0,0 +1,54 @@ +#!/usr/bin/python +# Author: Zion Orent +# 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_grovevdiv as upmGrovevdiv + +# Instantiate a Grove Voltage Divider sensor on analog pin A0 +myVoltageDivider = upmGrovevdiv.GroveVDiv(0) + + +## Exit handlers ## +# This 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 myVoltageDivider +def exitHandler(): + print "Exiting" + sys.exit(0) + +# Register exit handlers +atexit.register(exitHandler) +signal.signal(signal.SIGINT, SIGINTHandler) + + +while(1): + val = myVoltageDivider.value(100) + gain3val = myVoltageDivider.computedValue(3, val) + gain10val = myVoltageDivider.computedValue(10, val) + print "ADC value: {0} Gain 3: {1}v Gain 10: {2}v".format( + val, gain3val, gain10val) + + time.sleep(1)