From 781a816ccef39c620306c006e0c50d192bdeefd3 Mon Sep 17 00:00:00 2001 From: Rick Waldron Date: Tue, 10 Sep 2019 11:00:58 -0400 Subject: [PATCH] Examples: make Accelerometer example output consistent --- eg/accelerometer-LIS3DH.js | 33 +++++++++++++++++---------------- eg/accelerometer-MMA8452.js | 25 +++++++++++++------------ eg/accelerometer-adxl335.js | 19 ++++++++++--------- eg/accelerometer-adxl345.js | 19 ++++++++++--------- eg/accelerometer-mma7361.js | 19 ++++++++++--------- eg/accelerometer-mpu6050.js | 19 ++++++++++--------- eg/accelerometer.js | 19 ++++++++++--------- 7 files changed, 80 insertions(+), 73 deletions(-) diff --git a/eg/accelerometer-LIS3DH.js b/eg/accelerometer-LIS3DH.js index 9326e2c8f..b9b0abe3a 100644 --- a/eg/accelerometer-LIS3DH.js +++ b/eg/accelerometer-LIS3DH.js @@ -1,8 +1,8 @@ -var five = require("../lib/johnny-five.js"); -var board = new five.Board(); +const {Accelerometer, Board} = require("../lib/johnny-five.js"); +const board = new Board(); -board.on("ready", function() { - var accelerometer = new five.Accelerometer({ +board.on("ready", () => { + const accelerometer = new Accelerometer({ controller: "LIS3DH", // Optionally set the range to one of // 2, 4, 8, 16 (±g) @@ -10,21 +10,22 @@ board.on("ready", function() { // range: ... }); - accelerometer.on("change", function() { - console.log("accelerometer"); - console.log(" x : ", this.x); - console.log(" y : ", this.y); - console.log(" z : ", this.z); - // console.log(" pitch : ", this.pitch); - // console.log(" roll : ", this.roll); - // console.log(" acceleration : ", this.acceleration); - // console.log(" inclination : ", this.inclination); - // console.log(" orientation : ", this.orientation); + accelerometer.on("change", () => { + const {acceleration, inclination, orientation, pitch, roll, x, y, z} = accelerometer; + console.log("Accelerometer:"); + console.log(" x : ", x); + console.log(" y : ", y); + console.log(" z : ", z); + console.log(" pitch : ", pitch); + console.log(" roll : ", roll); + console.log(" acceleration : ", acceleration); + console.log(" inclination : ", inclination); + console.log(" orientation : ", orientation); console.log("--------------------------------------"); }); - ["tap", "tap:single", "tap:double"].forEach(function(event) { - accelerometer.on(event, function() { + ["tap", "tap:single", "tap:double"].forEach((event) => { + accelerometer.on(event, () => { console.log(event); }); }); diff --git a/eg/accelerometer-MMA8452.js b/eg/accelerometer-MMA8452.js index 5bc6130b2..df438e368 100644 --- a/eg/accelerometer-MMA8452.js +++ b/eg/accelerometer-MMA8452.js @@ -6,18 +6,19 @@ board.on("ready", () => { controller: "MMA8452" }); - // accelerometer.on("change", () => { - // console.log("accelerometer"); - // console.log(" x : ", this.x); - // console.log(" y : ", this.y); - // console.log(" z : ", this.z); - // console.log(" pitch : ", this.pitch); - // console.log(" roll : ", this.roll); - // console.log(" acceleration : ", this.acceleration); - // console.log(" inclination : ", this.inclination); - // console.log(" orientation : ", this.orientation); - // console.log("--------------------------------------"); - // }); + accelerometer.on("change", () => { + const {acceleration, inclination, orientation, pitch, roll, x, y, z} = accelerometer; + console.log("Accelerometer:"); + console.log(" x : ", x); + console.log(" y : ", y); + console.log(" z : ", z); + console.log(" pitch : ", pitch); + console.log(" roll : ", roll); + console.log(" acceleration : ", acceleration); + console.log(" inclination : ", inclination); + console.log(" orientation : ", orientation); + console.log("--------------------------------------"); + }); ["tap", "tap:single", "tap:double"].forEach((event) => { accelerometer.on(event, () => console.log(event)); diff --git a/eg/accelerometer-adxl335.js b/eg/accelerometer-adxl335.js index 03bf09eb9..5e9636ce5 100644 --- a/eg/accelerometer-adxl335.js +++ b/eg/accelerometer-adxl335.js @@ -8,15 +8,16 @@ board.on("ready", () => { }); accelerometer.on("change", () => { - console.log("accelerometer"); - console.log(" x : ", accelerometer.x); - console.log(" y : ", accelerometer.y); - console.log(" z : ", accelerometer.z); - console.log(" pitch : ", accelerometer.pitch); - console.log(" roll : ", accelerometer.roll); - console.log(" acceleration : ", accelerometer.acceleration); - console.log(" inclination : ", accelerometer.inclination); - console.log(" orientation : ", accelerometer.orientation); + const {acceleration, inclination, orientation, pitch, roll, x, y, z} = accelerometer; + console.log("Accelerometer:"); + console.log(" x : ", x); + console.log(" y : ", y); + console.log(" z : ", z); + console.log(" pitch : ", pitch); + console.log(" roll : ", roll); + console.log(" acceleration : ", acceleration); + console.log(" inclination : ", inclination); + console.log(" orientation : ", orientation); console.log("--------------------------------------"); }); }); diff --git a/eg/accelerometer-adxl345.js b/eg/accelerometer-adxl345.js index 884d156ff..977382f53 100644 --- a/eg/accelerometer-adxl345.js +++ b/eg/accelerometer-adxl345.js @@ -11,15 +11,16 @@ board.on("ready", () => { }); accelerometer.on("change", () => { - console.log("accelerometer"); - console.log(" x : ", accelerometer.x); - console.log(" y : ", accelerometer.y); - console.log(" z : ", accelerometer.z); - console.log(" pitch : ", accelerometer.pitch); - console.log(" roll : ", accelerometer.roll); - console.log(" acceleration : ", accelerometer.acceleration); - console.log(" inclination : ", accelerometer.inclination); - console.log(" orientation : ", accelerometer.orientation); + const {acceleration, inclination, orientation, pitch, roll, x, y, z} = accelerometer; + console.log("Accelerometer:"); + console.log(" x : ", x); + console.log(" y : ", y); + console.log(" z : ", z); + console.log(" pitch : ", pitch); + console.log(" roll : ", roll); + console.log(" acceleration : ", acceleration); + console.log(" inclination : ", inclination); + console.log(" orientation : ", orientation); console.log("--------------------------------------"); }); }); diff --git a/eg/accelerometer-mma7361.js b/eg/accelerometer-mma7361.js index 26dca9960..82559ae9f 100644 --- a/eg/accelerometer-mma7361.js +++ b/eg/accelerometer-mma7361.js @@ -22,15 +22,16 @@ board.on("ready", () => { }); accelerometer.on("change", () => { - console.log("accelerometer"); - console.log(" x : ", accelerometer.x); - console.log(" y : ", accelerometer.y); - console.log(" z : ", accelerometer.z); - console.log(" pitch : ", accelerometer.pitch); - console.log(" roll : ", accelerometer.roll); - console.log(" acceleration : ", accelerometer.acceleration); - console.log(" inclination : ", accelerometer.inclination); - console.log(" orientation : ", accelerometer.orientation); + const {acceleration, inclination, orientation, pitch, roll, x, y, z} = accelerometer; + console.log("Accelerometer:"); + console.log(" x : ", x); + console.log(" y : ", y); + console.log(" z : ", z); + console.log(" pitch : ", pitch); + console.log(" roll : ", roll); + console.log(" acceleration : ", acceleration); + console.log(" inclination : ", inclination); + console.log(" orientation : ", orientation); console.log("--------------------------------------"); }); }); diff --git a/eg/accelerometer-mpu6050.js b/eg/accelerometer-mpu6050.js index 5d98db79f..eaaf3d6cf 100644 --- a/eg/accelerometer-mpu6050.js +++ b/eg/accelerometer-mpu6050.js @@ -7,15 +7,16 @@ board.on("ready", () => { }); accelerometer.on("change", () => { - console.log("accelerometer"); - console.log(" x : ", accelerometer.x); - console.log(" y : ", accelerometer.y); - console.log(" z : ", accelerometer.z); - console.log(" pitch : ", accelerometer.pitch); - console.log(" roll : ", accelerometer.roll); - console.log(" acceleration : ", accelerometer.acceleration); - console.log(" inclination : ", accelerometer.inclination); - console.log(" orientation : ", accelerometer.orientation); + const {acceleration, inclination, orientation, pitch, roll, x, y, z} = accelerometer; + console.log("Accelerometer:"); + console.log(" x : ", x); + console.log(" y : ", y); + console.log(" z : ", z); + console.log(" pitch : ", pitch); + console.log(" roll : ", roll); + console.log(" acceleration : ", acceleration); + console.log(" inclination : ", inclination); + console.log(" orientation : ", orientation); console.log("--------------------------------------"); }); }); diff --git a/eg/accelerometer.js b/eg/accelerometer.js index 783079768..8f761bdf2 100644 --- a/eg/accelerometer.js +++ b/eg/accelerometer.js @@ -14,15 +14,16 @@ board.on("ready", () => { }); accelerometer.on("change", () => { - console.log("accelerometer"); - console.log(" x : ", accelerometer.x); - console.log(" y : ", accelerometer.y); - console.log(" z : ", accelerometer.z); - console.log(" pitch : ", accelerometer.pitch); - console.log(" roll : ", accelerometer.roll); - console.log(" acceleration : ", accelerometer.acceleration); - console.log(" inclination : ", accelerometer.inclination); - console.log(" orientation : ", accelerometer.orientation); + const {acceleration, inclination, orientation, pitch, roll, x, y, z} = accelerometer; + console.log("Accelerometer:"); + console.log(" x : ", x); + console.log(" y : ", y); + console.log(" z : ", z); + console.log(" pitch : ", pitch); + console.log(" roll : ", roll); + console.log(" acceleration : ", acceleration); + console.log(" inclination : ", inclination); + console.log(" orientation : ", orientation); console.log("--------------------------------------"); }); });