[samples] Remove dependency on a101/k64f pins modules

grgustaf · grgustaf · commit 132ee43d5165 · 2017-12-15T12:54:35.000-08:00
Signed-off-by: Geoff Gustafson &lt;geoff@linux.intel.com&gt;
diff --git a/samples/AmbientLight.js b/samples/AmbientLight.js
@@ -26,12 +26,10 @@
 // 10,000 - 25,000 lux          Full daylight (not direct sun)
 // 32,000 - 130,000 lux         Direct sunlight
 
-var pins = require("arduino101_pins");
-
 console.log("Ambient light test...");
 
 var sensor = new AmbientLightSensor({
-    pin: pins.A2
+    pin: 'A2'
 });
 
 sensor.onchange = function() {
diff --git a/samples/AudioLevel.js b/samples/AudioLevel.js
@@ -6,7 +6,6 @@
 
 console.log("Audio Level sample...");
 
-var pins = require("arduino101_pins");
 var aio = require("aio");
 var lcd = require("grove_lcd");
 
@@ -30,7 +29,7 @@ glcd.print('|');
 var lastlevel = 0;
 var lastbright = 0;
 
-var knob = aio.open({ device: 0, pin: pins.A1 });
+var knob = aio.open('A1');
 setInterval(function () {
     var value = 4096.0 - knob.read();
     var level = (value / 256.0) | 0;
diff --git a/samples/HeartRateDemo.js b/samples/HeartRateDemo.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2016, Intel Corporation.
+// Copyright (c) 2016-2017, Intel Corporation.
 
 // This implementation includes the source code from PulseSensor.com,
 // which is licensed under MIT license.
@@ -33,7 +33,6 @@
 var aio = require("aio");
 var ble = require("ble");
 var grove_lcd = require("grove_lcd");
-var pins = require("arduino101_pins");
 
 // heart rate calculation
 var IBI = 600;               // value holds the time interval between beats! Must be seeded!
@@ -63,7 +62,7 @@ var checkTime = 2000;
 var colorIndex = 0;
 
 // pins
-var pin = aio.open({ device: 0, pin: pins.A1 });
+var pin = aio.open('A1');
 
 // Bluetooth LE
 var deviceName = 'Zephyr Heartrate Monitor';
diff --git a/samples/OcfMultiSensor.js b/samples/OcfMultiSensor.js
@@ -4,10 +4,9 @@ var ocf = require('ocf');
 var server = ocf.server;
 
 var aio = require('aio');
-var pins = require("arduino101_pins");
 
-var light = aio.open({ device: 0, pin: pins.A0 });
-var temp = aio.open({ device: 0, pin: pins.A1 });
+var light = aio.open('A0');
+var temp = aio.open('A1');
 
 console.log("Started OCF server");
 
diff --git a/samples/OcfSensorServer.js b/samples/OcfSensorServer.js
@@ -8,10 +8,9 @@ var server = ocf.server;
 
 var aio = require('aio');
 var gpio = require('gpio');
-var pins = require('arduino101_pins');
 
 var led = gpio.open({pin: 'LED2', activeLow: true});
-var pinA = aio.open({ device: 0, pin: pins.A0 });
+var pinA = aio.open('A0');
 
 console.log('Started OCF server');
 
diff --git a/samples/WebBluetoothDemo.js b/samples/WebBluetoothDemo.js
@@ -19,7 +19,6 @@
 var aio = require("aio");
 var ble = require("ble");
 var pwm = require("pwm");
-var pins = require("arduino101_pins");
 
 var DEVICE_NAME = 'Arduino101';
 
@@ -37,7 +36,7 @@ var TemperatureCharacteristic = new ble.Characteristic({
 TemperatureCharacteristic._lastValue = undefined;
 TemperatureCharacteristic._onChange = null;
 
-var tmp36 = aio.open({ pin: pins.A0 });
+var tmp36 = aio.open('A0');
 
 TemperatureCharacteristic.onReadRequest = function(offset, callback) {
     if (!this._lastValue) {
diff --git a/samples/WebBluetoothGroveLcdDemo.js b/samples/WebBluetoothGroveLcdDemo.js
@@ -25,7 +25,6 @@
 var aio = require("aio");
 var ble = require("ble");
 var grove_lcd = require("grove_lcd");
-var pins = require("arduino101_pins");
 
 try {
     var perf = require("performance");
@@ -64,7 +63,7 @@ var TemperatureCharacteristic = new ble.Characteristic({
 TemperatureCharacteristic._lastValue = undefined;
 TemperatureCharacteristic._onChange = null;
 
-var tmp36 = aio.open({ pin: pins.A0 });
+var tmp36 = aio.open('A0');
 
 TemperatureCharacteristic.onReadRequest = function(offset, callback) {
     if (!this._lastValue) {
diff --git a/samples/arduino/basics/AnalogReadSerial.js b/samples/arduino/basics/AnalogReadSerial.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2016, Intel Corporation.
+// Copyright (c) 2016-2017, Intel Corporation.
 
 // Reimplementation of Arduino - Basics - AnaloglReadSerial example
 //   - Reads analog input on pin A0, reports value on serial console
@@ -14,12 +14,8 @@
 console.log("Starting AnalogReadSerial example...");
 
 var aio = require("aio");
-var pins = require("arduino101_pins");
 
-var pin = aio.open({
-    device: 0,
-    pin: pins.A0
-});
+var pin = aio.open('A0');
 
 // schedule a function to run every 1s (1000)
 setInterval(function () {
diff --git a/samples/arduino/basics/ReadAnalogVoltage.js b/samples/arduino/basics/ReadAnalogVoltage.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2016, Intel Corporation.
+// Copyright (c) 2016-2017, Intel Corporation.
 
 // Reimplementation of Arduino - Basics - ReadAnaloglVoltage example
 //   - Reads analog input, convert to voltage, and report on serial console
@@ -13,12 +13,8 @@
 console.log("Starting ReadAnalogVoltage example...");
 
 var aio = require("aio");
-var pins = require("arduino101_pins");
 
-var pin = aio.open({
-    device: 0,
-    pin: pins.A0
-});
+var pin = aio.open('A0');
 
 // schedule a function to run every 1s (1000)
 setInterval(function () {
diff --git a/samples/arduino/starterkit/ColorMixingLamp.js b/samples/arduino/starterkit/ColorMixingLamp.js
@@ -16,26 +16,16 @@
 
 var pwm = require('pwm');
 var aio = require('aio');
-var pins = require('arduino101_pins');
 
 // set up the PWM pins
 var redLED = pwm.open('IO3');
 var greenLED = pwm.open('IO5');
 var blueLED = pwm.open('IO6');
 
 // set up the AIO pins
-var redSensor = aio.open({
-    device: 0,
-    pin: pins.A0
-});
-var greenSensor = aio.open({
-    device: 0,
-    pin: pins.A1
-});
-var blueSensor = aio.open({
-    device: 0,
-    pin: pins.A2
-});
+var redSensor = aio.open('A0');
+var greenSensor = aio.open('A1');
+var blueSensor = aio.open('A2');
 
 setInterval(function () {
     var redValue = redSensor.read();
diff --git a/samples/arduino/starterkit/Love-o-Meter.js b/samples/arduino/starterkit/Love-o-Meter.js
@@ -13,10 +13,9 @@
 
 var gpio = require('gpio');
 var aio = require('aio');
-var pins = require('arduino101_pins');
 
 // set up the GPIO pins
-var sensor = aio.open({device: 0, pin: pins.A0});
+var sensor = aio.open('A0');
 var led1 = gpio.open(4);
 var led2 = gpio.open(7);
 var led3 = gpio.open(8);
diff --git a/tests/test-aio.js b/tests/test-aio.js
@@ -9,11 +9,9 @@ var assert = require("Assert.js");
 var board = require("board");
 if (board.name === "arduino_101") {
     console.log("Wire IO4 to A0!");
-    var pins = require("arduino101_pins");
     var pinB = gpio.open({pin: "IO4", mode: "out"});
 } else {
     console.log("Wire D3 to A0!");
-    var pins = require("k64f_pins");
     var pinB = gpio.open({pin: "D3", mode: "out"});
 }
 
@@ -22,7 +20,7 @@ assert.throws(function() {
     aio.open({pin: 1024});
 }, "open: undefined pin");
 
-var pinA = aio.open({pin: pins.A0});
+var pinA = aio.open('A0');
 assert(pinA !== null && typeof pinA === "object", "open: defined pin");
 
 var readFlag = 0;
@@ -79,7 +77,7 @@ var onInterval = setInterval(function () {
         readCount = 0;
 
         // reopen AIOPin after closed
-        pinA = aio.open({pin: pins.A0});
+        pinA = aio.open('A0');
 
         pinA.on("change", valueChanged);
 
@@ -94,7 +92,7 @@ var onInterval = setInterval(function () {
     // test AIOPin readAsync
     if (readTimes === 10) {
         // reopen AIOPin for init
-        pinA = aio.open({pin: pins.A0});
+        pinA = aio.open('A0');
 
         pinA.readAsync(function (rawValue) {
             if (rawValue >= 4000) {
diff --git a/tests/test-ambientlight.js b/tests/test-ambientlight.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2016, Intel Corporation.
+// Copyright (c) 2016-2017, Intel Corporation.
 
 // Hardware Requirements:
 //   - A Grove Light sensor
@@ -10,10 +10,9 @@
 console.log("Testing ambientlight APIs");
 
 var genericSensor = require("GenericSensor.js");
-var pins = require("arduino101_pins");
 
 var sensor = new AmbientLightSensor({
-    pin: pins.A2,
+    pin: 'A2',
     frequency: 50
 });
 
