Skip to content

Commit

Permalink
README & Examples: update to modern JS, migrate "this" to "board"
Browse files Browse the repository at this point in the history
  • Loading branch information
@rwaldron
rwaldron committed Sep 21, 2018
1 parent e262139 commit 2e99fc4
Show file tree
Hide file tree
Showing 19 changed files with 170 additions and 170 deletions.
26 changes: 13 additions & 13 deletions examples/adxl345.js
View file
@@ -1,24 +1,24 @@
var Board = require("../");
const Board = require("../");

Board.requestPort(function(error, port) {
Board.requestPort((error, port) => {
if (error) {
console.log(error);
return;
}

var register = {
const register = {
POWER: 0x2D,
RANGE: 0x31,
READ: 0xB2,
};

var board = new Board(port.comName);
const board = new Board(port.comName);

board.on("ready", function() {
console.log("Ready");

var adxl345 = 0x53;
var sensitivity = 0.00390625;
const adxl345 = 0x53;
const sensitivity = 0.00390625;

// Enable I2C
this.i2cConfig();
Expand All @@ -31,15 +31,15 @@ Board.requestPort(function(error, port) {
this.i2cWrite(adxl345, register.RANGE, 8);

// Set register to READ position and request 6 bytes
this.i2cRead(adxl345, register.READ, 6, function(data) {
var x = (data[1] << 8) | data[0];
var y = (data[3] << 8) | data[2];
var z = (data[5] << 8) | data[4];
this.i2cRead(adxl345, register.READ, 6, data => {
const x = (data[1] << 8) | data[0];
const y = (data[3] << 8) | data[2];
const z = (data[5] << 8) | data[4];

// Wrap and clamp 16 bits;
var X = (x >> 15 ? ((x ^ 0xFFFF) + 1) * -1 : x) * sensitivity;
var Y = (y >> 15 ? ((y ^ 0xFFFF) + 1) * -1 : y) * sensitivity;
var Z = (z >> 15 ? ((z ^ 0xFFFF) + 1) * -1 : z) * sensitivity;
const X = (x >> 15 ? ((x ^ 0xFFFF) + 1) * -1 : x) * sensitivity;
const Y = (y >> 15 ? ((y ^ 0xFFFF) + 1) * -1 : y) * sensitivity;
const Z = (z >> 15 ? ((z ^ 0xFFFF) + 1) * -1 : z) * sensitivity;

console.log("X: ", X);
console.log("Y: ", Y);
Expand Down
14 changes: 7 additions & 7 deletions examples/blink.js
View file
@@ -1,20 +1,20 @@
var Board = require("../");
const Board = require("../");

Board.requestPort(function(error, port) {
Board.requestPort((error, port) => {
if (error) {
console.log(error);
return;
}

var board = new Board(port.comName);
const board = new Board(port.comName);

board.on("ready", function() {
var pin = 13;
var state = 1;
board.on("ready", () => {
const pin = 13;
let state = 1;

board.pinMode(pin, board.MODES.OUTPUT);

setInterval(function() {
setInterval(() => {
board.digitalWrite(pin, (state ^= 1));
}, 500);
});
Expand Down
8 changes: 4 additions & 4 deletions examples/close-events.js
View file
@@ -1,14 +1,14 @@
var Board = require("../");
const Board = require("../");

Board.requestPort(function(error, port) {
Board.requestPort((error, port) => {
if (error) {
console.log(error);
return;
}

var board = new Board(port.comName);
const board = new Board(port.comName);

board.on("close", function() {
board.on("close", () => {
// Unplug the board to see this event!
console.log("Closed!");
});
Expand Down
22 changes: 11 additions & 11 deletions examples/hw-serial-read-gps.js
View file
@@ -1,37 +1,37 @@
var Board = require("../");
const Board = require("../");

Board.requestPort(function(error, port) {
Board.requestPort((error, port) => {
if (error) {
console.log(error);
return;
}

var board = new Board(port.comName);
const board = new Board(port.comName);

board.on("ready", function() {
board.on("ready", () => {
console.log("READY");

var HW_SERIAL1 = board.SERIAL_PORT_IDs.HW_SERIAL1;
const HW_SERIAL1 = board.SERIAL_PORT_IDs.HW_SERIAL1;

board.serialConfig({
portId: HW_SERIAL1,
baud: 9600
});

board.serialRead(HW_SERIAL1, function(data) {
board.serialRead(HW_SERIAL1, data => {
console.log(new Buffer(data).toString("ascii"));
});

board.on("string", function (message) {
board.on("string", message => {
console.log(message);
});

// log serial pin numbers
for (var pin in board.pins) {
var modes = board.pins[pin].supportedModes;
for (var mode in modes) {
for (const pin in board.pins) {
const modes = board.pins[pin].supportedModes;
for (const mode in modes) {
if (modes[mode] === board.MODES.SERIAL) {
console.log("serial pin: " + pin);
console.log(`serial pin: ${pin}`);
}
}
}
Expand Down
16 changes: 8 additions & 8 deletions examples/johnny-five-io-plugin.js
View file
@@ -1,9 +1,9 @@
var SerialPort = require("serialport");
var five = require("johnny-five");
var Firmata = require("../");
const SerialPort = require("serialport");
const five = require("johnny-five");
const Firmata = require("../");

SerialPort.list(function(error, list) {
var device = list.reduce(function(accum, item) {
SerialPort.list((error, list) => {
const device = list.reduce((accum, item) => {
if (item.manufacturer.indexOf("Arduino") === 0) {
return item;
}
Expand All @@ -16,12 +16,12 @@ SerialPort.list(function(error, list) {
as an IO Plugin for Johnny-Five
*/

var board = new five.Board({
const board = new five.Board({
io: new Firmata(device.comName)
});

board.on("ready", function() {
var led = new five.Led(13);
board.on("ready", () => {
const led = new five.Led(13);
led.blink(500);
});
});
Expand Down
18 changes: 9 additions & 9 deletions examples/k22.js
View file
Expand Up @@ -3,28 +3,28 @@
* http://www.co2meter.com/collections/co2-sensors/products/k-22-oc-co2-sensor-module
*/

var Board = require("../");
const Board = require("../");

Board.requestPort(function(error, port) {
Board.requestPort((error, port) => {
if (error) {
console.log(error);
return;
}
var board = new Board(port.comName);
const board = new Board(port.comName);

board.on("ready", function() {
var k22 = 0x68;
board.on("ready", () => {
const k22 = 0x68;

board.i2cConfig();
board.i2cWrite(k22, [0x22, 0x00, 0x08, 0x2A]);
board.i2cRead(k22, 4, function(data) {
var ppms = 0;
board.i2cRead(k22, 4, data => {
let ppms = 0;
ppms |= data[1] & 0xFF;
ppms = ppms << 8;
ppms |= data[2] & 0xFF;
var checksum = data[0] + data[1] + data[2];
const checksum = data[0] + data[1] + data[2];
if (checksum === data[3]) {
console.log("Current PPMs: " + ppms);
console.log(`Current PPMs: ${ppms}`);
} else {
console.log("Checksum failure");
}
Expand Down
40 changes: 20 additions & 20 deletions examples/mma8452.js
View file
@@ -1,26 +1,26 @@
var Board = require("../");
const Board = require("../");

Board.requestPort(function(error, port) {
Board.requestPort((error, port) => {
if (error) {
console.log(error);
return;
}

var register = {
const register = {
CTRL_REG1: 0x2A,
XYZ_DATA_CFG: 0x0E,
READ_X_MSB: 0x01,
};

var board = new Board(port.comName);
const board = new Board(port.comName);
// var board = new Board("/dev/cu.usbmodem1411");

board.on("ready", function() {
console.log("Ready");

var mma8452 = 0x1D;
var scale = 2; // 2G
var options = {
const mma8452 = 0x1D;
const scale = 2; // 2G
const options = {
address: mma8452,
settings: {
stopTX: false,
Expand All @@ -30,8 +30,8 @@ Board.requestPort(function(error, port) {
this.i2cConfig(options);

function mode(which, callback) {
board.i2cReadOnce(mma8452, register.CTRL_REG1, 1, function(data) {
var value = data[0];
board.i2cReadOnce(mma8452, register.CTRL_REG1, 1, data => {
let value = data[0];
if (which === "standby") {
// Clear the first bit
value &= ~1;
Expand All @@ -46,13 +46,13 @@ Board.requestPort(function(error, port) {
});
}

new Promise(function(resolve) {
mode("standby", function() {
new Promise(resolve => {
mode("standby", () => {

// 00: 2G (0b00000000)
// 01: 4G (0b00000001)
// 10: 8G (0b00000010)
var fsr = scale >> 2; // 2G (0b00000000)
const fsr = scale >> 2; // 2G (0b00000000)
board.i2cWrite(mma8452, register.XYZ_DATA_CFG, fsr);

// 0: 800 Hz
Expand All @@ -63,21 +63,21 @@ Board.requestPort(function(error, port) {
// 5: 12.5 Hz
// 6: 6.25 Hz
// 7: 1.56 Hz
var ctrlreg1 = 0b00000101 << 3; // 5 0b00[101]000
const ctrlreg1 = 0b00000101 << 3; // 5 0b00[101]000
board.i2cWrite(mma8452, register.CTRL_REG1, ctrlreg1);

mode("active", resolve);
});
}).then(function() {
}).then(() => {

board.i2cRead(mma8452, 0x00, 1, function(data) {
var available = data[0];
board.i2cRead(mma8452, 0x00, 1, data => {
const available = data[0];

if ((available & 0x08) >> 3) {
board.i2cReadOnce(mma8452, register.READ_X_MSB, 6, function(data) {
var x = (data[0] << 8 | data[1]) >> 4;
var y = (data[2] << 8 | data[3]) >> 4;
var z = (data[4] << 8 | data[5]) >> 4;
board.i2cReadOnce(mma8452, register.READ_X_MSB, 6, data => {
let x = (data[0] << 8 | data[1]) >> 4;
let y = (data[2] << 8 | data[3]) >> 4;
let z = (data[4] << 8 | data[5]) >> 4;

if (data[0] > 0x7F) {
x = -(1 + 0xFFF - x);
Expand Down
14 changes: 7 additions & 7 deletions examples/reporting.js
View file
@@ -1,22 +1,22 @@
var Board = require("../");
const Board = require("../");

Board.requestPort(function(error, port) {
Board.requestPort((error, port) => {
if (error) {
console.log(error);
return;
}
var board = new Board(port.comName);
const board = new Board(port.comName);

board.on("ready", function() {
var a = 6;
var b = 7;
const a = 6;
const b = 7;

console.log("Ready.");

this.pinMode(a, this.MODES.PWM);
this.pinMode(b, this.MODES.OUTPUT);

var states = {
const states = {
5: 0,
8: 0
};
Expand All @@ -34,7 +34,7 @@ Board.requestPort(function(error, port) {
}, this);

// var analogs = [0, 1, 2, 3, 4, 5];
var analogs = [3];
const analogs = [3];

analogs.forEach(function(pin) {
pin = +pin;
Expand Down
12 changes: 6 additions & 6 deletions examples/servo-config.js
View file
@@ -1,15 +1,15 @@
var Board = require("../lib/firmata").Board;
var board = new Board("/dev/tty.usbmodem1421");
const Board = require("../");
const board = new Board("/dev/tty.usbmodem1421");

board.on("ready", function() {
var degrees = 10;
var incrementer = 10;
board.on("ready", () => {
let degrees = 10;
let incrementer = 10;

// This will map 0-180 to 1000-1500
board.servoConfig(9, 1000, 1500);
board.servoWrite(9, 0);

setInterval(function() {
setInterval(() => {
if (degrees >= 180 || degrees === 0) {
incrementer *= -1;
}
Expand Down
14 changes: 7 additions & 7 deletions examples/servosweep.js
View file
@@ -1,18 +1,18 @@
var Board = require("../");
const Board = require("../");

Board.requestPort(function(error, port) {
Board.requestPort((error, port) => {
if (error) {
console.log(error);
return;
}
var board = new Board(port.comName);
const board = new Board(port.comName);

board.on("ready", function() {
var degrees = 10;
var incrementer = 10;
board.on("ready", () => {
let degrees = 10;
let incrementer = 10;
board.pinMode(9, board.MODES.SERVO);
board.servoWrite(9, 0);
setInterval(function() {
setInterval(() => {
if (degrees >= 180 || degrees === 0) {
incrementer *= -1;
}
Expand Down

0 comments on commit 2e99fc4

Please sign in to comment.