From b3991979adce1e67ce0165533b3aad21484a10f9 Mon Sep 17 00:00:00 2001 From: Suyash Lakhotia Date: Thu, 3 Nov 2016 10:49:13 +0800 Subject: [PATCH] examples: Changed Node.js module from jsupm_grove Signed-off-by: Suyash Lakhotia Signed-off-by: Mihai Tudor Panu --- examples/javascript/button.js | 6 +++--- examples/javascript/relay.js | 33 ++++++++++++++++----------------- examples/javascript/rotary.js | 23 +++++++++++------------ 3 files changed, 30 insertions(+), 32 deletions(-) diff --git a/examples/javascript/button.js b/examples/javascript/button.js index 0ddeb837..f0e8ad6f 100644 --- a/examples/javascript/button.js +++ b/examples/javascript/button.js @@ -22,11 +22,11 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -// Load Grove module -var groveSensor = require('jsupm_grove'); +// Load UPM module +var upm = require('jsupm_button'); // Create the button object using GPIO pin 0 -var button = new groveSensor.Button(0); +var button = new upm.Button(0); // Read the input and print, waiting one second between readings function readButtonValue() { diff --git a/examples/javascript/relay.js b/examples/javascript/relay.js index d9d8b4aa..d89b236d 100644 --- a/examples/javascript/relay.js +++ b/examples/javascript/relay.js @@ -22,28 +22,27 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -// Load Grove module -var groveSensor = require('jsupm_grove'); +// Load UPM module +var upm = require('jsupm_relay'); // Create the relay switch object using GPIO pin 0 -var relay = new groveSensor.Relay(0); +var relay = new upm.Relay(0); // Close and then open the relay switch 3 times, -// waiting one second each time. The LED on the relay switch +// waiting one second each time. The LED on the relay switch // will light up when the switch is on (closed). // The switch will also make a noise between transitions. var i = 0; var waiting = setInterval(function() { - if ( i % 2 == 0 ) { - relay.on(); - if ( relay.isOn() ) - console.log(relay.name() + " is on"); - } else { - relay.off(); - if ( relay.isOff() ) - console.log(relay.name() + " is off"); - } - i++; - if ( i == 6) clearInterval(waiting); - }, 1000); - + if (i % 2 == 0) { + relay.on(); + if (relay.isOn()) + console.log(relay.name() + " is on"); + } else { + relay.off(); + if (relay.isOff()) + console.log(relay.name() + " is off"); + } + i++; + if (i == 6) clearInterval(waiting); +}, 1000); diff --git a/examples/javascript/rotary.js b/examples/javascript/rotary.js index c26f20dc..6a0e5fe1 100644 --- a/examples/javascript/rotary.js +++ b/examples/javascript/rotary.js @@ -22,28 +22,27 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -//setup/Initialization -var upm_grove = require('jsupm_grove'); +//initialization +var upm = require('jsupm_rotary'); //setup access analog input Analog pin #0 (A0) -var groveRotary = new upm_grove.Rotary(0); +var rotary = new upm.Rotary(0); loop(); -function loop() -{ - var abs = groveRotary.abs_value(); - var absdeg = groveRotary.abs_deg(); - var absrad = groveRotary.abs_rad(); +function loop() { + var abs = rotary.abs_value(); + var absdeg = rotary.abs_deg(); + var absrad = rotary.abs_rad(); - var rel = groveRotary.rel_value(); - var reldeg = groveRotary.rel_deg(); - var relrad = groveRotary.rel_rad(); + var rel = rotary.rel_value(); + var reldeg = rotary.rel_deg(); + var relrad = rotary.rel_rad(); //write the knob value to the console in different formats console.log("Abs: " + abs + " " + Math.round(parseInt(absdeg)) + " " + absrad.toFixed(3)); console.log("Rel: " + rel + " " + Math.round(parseInt(reldeg)) + " " + relrad.toFixed(3)); - //wait 2 s and call function again + //wait 2s and call function again setTimeout(loop, 2000); }