Skip to content

Commit

Permalink
Examples: make Accelerometer example output consistent
Browse files Browse the repository at this point in the history
  • Loading branch information
@rwaldron
rwaldron committed Sep 10, 2019
1 parent 54a2489 commit 781a816
Show file tree
Hide file tree
Showing 7 changed files with 80 additions and 73 deletions.
33 changes: 17 additions & 16 deletions eg/accelerometer-LIS3DH.js
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,31 @@
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)
// Defaults to ±2g
// 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);
});
});
Expand Down
25 changes: 13 additions & 12 deletions eg/accelerometer-MMA8452.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
19 changes: 10 additions & 9 deletions eg/accelerometer-adxl335.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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("--------------------------------------");
});
});
19 changes: 10 additions & 9 deletions eg/accelerometer-adxl345.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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("--------------------------------------");
});
});
19 changes: 10 additions & 9 deletions eg/accelerometer-mma7361.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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("--------------------------------------");
});
});
19 changes: 10 additions & 9 deletions eg/accelerometer-mpu6050.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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("--------------------------------------");
});
});
19 changes: 10 additions & 9 deletions eg/accelerometer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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("--------------------------------------");
});
});
Expand Down

0 comments on commit 781a816

Please sign in to comment.