Skip to content

Commit 781a816

Browse files
rwaldronrwaldron
committed
Examples: make Accelerometer example output consistent
1 parent 54a2489 commit 781a816

7 files changed

+80
-73
lines changed

‎eg/accelerometer-LIS3DH.js

+17-16
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,31 @@
1-
var five = require("../lib/johnny-five.js");
2-
var board = new five.Board();
1+
const {Accelerometer, Board} = require("../lib/johnny-five.js");
2+
const board = new Board();
33

4-
board.on("ready", function() {
5-
var accelerometer = new five.Accelerometer({
4+
board.on("ready", () => {
5+
const accelerometer = new Accelerometer({
66
controller: "LIS3DH",
77
// Optionally set the range to one of
88
// 2, 4, 8, 16 (±g)
99
// Defaults to ±2g
1010
// range: ...
1111
});
1212

13-
accelerometer.on("change", function() {
14-
console.log("accelerometer");
15-
console.log(" x : ", this.x);
16-
console.log(" y : ", this.y);
17-
console.log(" z : ", this.z);
18-
// console.log(" pitch : ", this.pitch);
19-
// console.log(" roll : ", this.roll);
20-
// console.log(" acceleration : ", this.acceleration);
21-
// console.log(" inclination : ", this.inclination);
22-
// console.log(" orientation : ", this.orientation);
13+
accelerometer.on("change", () => {
14+
const {acceleration, inclination, orientation, pitch, roll, x, y, z} = accelerometer;
15+
console.log("Accelerometer:");
16+
console.log(" x : ", x);
17+
console.log(" y : ", y);
18+
console.log(" z : ", z);
19+
console.log(" pitch : ", pitch);
20+
console.log(" roll : ", roll);
21+
console.log(" acceleration : ", acceleration);
22+
console.log(" inclination : ", inclination);
23+
console.log(" orientation : ", orientation);
2324
console.log("--------------------------------------");
2425
});
2526

26-
["tap", "tap:single", "tap:double"].forEach(function(event) {
27-
accelerometer.on(event, function() {
27+
["tap", "tap:single", "tap:double"].forEach((event) => {
28+
accelerometer.on(event, () => {
2829
console.log(event);
2930
});
3031
});

‎eg/accelerometer-MMA8452.js

+13-12
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,19 @@ board.on("ready", () => {
66
controller: "MMA8452"
77
});
88

9-
// accelerometer.on("change", () => {
10-
// console.log("accelerometer");
11-
// console.log(" x : ", this.x);
12-
// console.log(" y : ", this.y);
13-
// console.log(" z : ", this.z);
14-
// console.log(" pitch : ", this.pitch);
15-
// console.log(" roll : ", this.roll);
16-
// console.log(" acceleration : ", this.acceleration);
17-
// console.log(" inclination : ", this.inclination);
18-
// console.log(" orientation : ", this.orientation);
19-
// console.log("--------------------------------------");
20-
// });
9+
accelerometer.on("change", () => {
10+
const {acceleration, inclination, orientation, pitch, roll, x, y, z} = accelerometer;
11+
console.log("Accelerometer:");
12+
console.log(" x : ", x);
13+
console.log(" y : ", y);
14+
console.log(" z : ", z);
15+
console.log(" pitch : ", pitch);
16+
console.log(" roll : ", roll);
17+
console.log(" acceleration : ", acceleration);
18+
console.log(" inclination : ", inclination);
19+
console.log(" orientation : ", orientation);
20+
console.log("--------------------------------------");
21+
});
2122

2223
["tap", "tap:single", "tap:double"].forEach((event) => {
2324
accelerometer.on(event, () => console.log(event));

‎eg/accelerometer-adxl335.js

+10-9
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,16 @@ board.on("ready", () => {
88
});
99

1010
accelerometer.on("change", () => {
11-
console.log("accelerometer");
12-
console.log(" x : ", accelerometer.x);
13-
console.log(" y : ", accelerometer.y);
14-
console.log(" z : ", accelerometer.z);
15-
console.log(" pitch : ", accelerometer.pitch);
16-
console.log(" roll : ", accelerometer.roll);
17-
console.log(" acceleration : ", accelerometer.acceleration);
18-
console.log(" inclination : ", accelerometer.inclination);
19-
console.log(" orientation : ", accelerometer.orientation);
11+
const {acceleration, inclination, orientation, pitch, roll, x, y, z} = accelerometer;
12+
console.log("Accelerometer:");
13+
console.log(" x : ", x);
14+
console.log(" y : ", y);
15+
console.log(" z : ", z);
16+
console.log(" pitch : ", pitch);
17+
console.log(" roll : ", roll);
18+
console.log(" acceleration : ", acceleration);
19+
console.log(" inclination : ", inclination);
20+
console.log(" orientation : ", orientation);
2021
console.log("--------------------------------------");
2122
});
2223
});

‎eg/accelerometer-adxl345.js

+10-9
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,16 @@ board.on("ready", () => {
1111
});
1212

1313
accelerometer.on("change", () => {
14-
console.log("accelerometer");
15-
console.log(" x : ", accelerometer.x);
16-
console.log(" y : ", accelerometer.y);
17-
console.log(" z : ", accelerometer.z);
18-
console.log(" pitch : ", accelerometer.pitch);
19-
console.log(" roll : ", accelerometer.roll);
20-
console.log(" acceleration : ", accelerometer.acceleration);
21-
console.log(" inclination : ", accelerometer.inclination);
22-
console.log(" orientation : ", accelerometer.orientation);
14+
const {acceleration, inclination, orientation, pitch, roll, x, y, z} = accelerometer;
15+
console.log("Accelerometer:");
16+
console.log(" x : ", x);
17+
console.log(" y : ", y);
18+
console.log(" z : ", z);
19+
console.log(" pitch : ", pitch);
20+
console.log(" roll : ", roll);
21+
console.log(" acceleration : ", acceleration);
22+
console.log(" inclination : ", inclination);
23+
console.log(" orientation : ", orientation);
2324
console.log("--------------------------------------");
2425
});
2526
});

‎eg/accelerometer-mma7361.js

+10-9
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,16 @@ board.on("ready", () => {
2222
});
2323

2424
accelerometer.on("change", () => {
25-
console.log("accelerometer");
26-
console.log(" x : ", accelerometer.x);
27-
console.log(" y : ", accelerometer.y);
28-
console.log(" z : ", accelerometer.z);
29-
console.log(" pitch : ", accelerometer.pitch);
30-
console.log(" roll : ", accelerometer.roll);
31-
console.log(" acceleration : ", accelerometer.acceleration);
32-
console.log(" inclination : ", accelerometer.inclination);
33-
console.log(" orientation : ", accelerometer.orientation);
25+
const {acceleration, inclination, orientation, pitch, roll, x, y, z} = accelerometer;
26+
console.log("Accelerometer:");
27+
console.log(" x : ", x);
28+
console.log(" y : ", y);
29+
console.log(" z : ", z);
30+
console.log(" pitch : ", pitch);
31+
console.log(" roll : ", roll);
32+
console.log(" acceleration : ", acceleration);
33+
console.log(" inclination : ", inclination);
34+
console.log(" orientation : ", orientation);
3435
console.log("--------------------------------------");
3536
});
3637
});

‎eg/accelerometer-mpu6050.js

+10-9
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,16 @@ board.on("ready", () => {
77
});
88

99
accelerometer.on("change", () => {
10-
console.log("accelerometer");
11-
console.log(" x : ", accelerometer.x);
12-
console.log(" y : ", accelerometer.y);
13-
console.log(" z : ", accelerometer.z);
14-
console.log(" pitch : ", accelerometer.pitch);
15-
console.log(" roll : ", accelerometer.roll);
16-
console.log(" acceleration : ", accelerometer.acceleration);
17-
console.log(" inclination : ", accelerometer.inclination);
18-
console.log(" orientation : ", accelerometer.orientation);
10+
const {acceleration, inclination, orientation, pitch, roll, x, y, z} = accelerometer;
11+
console.log("Accelerometer:");
12+
console.log(" x : ", x);
13+
console.log(" y : ", y);
14+
console.log(" z : ", z);
15+
console.log(" pitch : ", pitch);
16+
console.log(" roll : ", roll);
17+
console.log(" acceleration : ", acceleration);
18+
console.log(" inclination : ", inclination);
19+
console.log(" orientation : ", orientation);
1920
console.log("--------------------------------------");
2021
});
2122
});

‎eg/accelerometer.js

+10-9
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,16 @@ board.on("ready", () => {
1414
});
1515

1616
accelerometer.on("change", () => {
17-
console.log("accelerometer");
18-
console.log(" x : ", accelerometer.x);
19-
console.log(" y : ", accelerometer.y);
20-
console.log(" z : ", accelerometer.z);
21-
console.log(" pitch : ", accelerometer.pitch);
22-
console.log(" roll : ", accelerometer.roll);
23-
console.log(" acceleration : ", accelerometer.acceleration);
24-
console.log(" inclination : ", accelerometer.inclination);
25-
console.log(" orientation : ", accelerometer.orientation);
17+
const {acceleration, inclination, orientation, pitch, roll, x, y, z} = accelerometer;
18+
console.log("Accelerometer:");
19+
console.log(" x : ", x);
20+
console.log(" y : ", y);
21+
console.log(" z : ", z);
22+
console.log(" pitch : ", pitch);
23+
console.log(" roll : ", roll);
24+
console.log(" acceleration : ", acceleration);
25+
console.log(" inclination : ", inclination);
26+
console.log(" orientation : ", orientation);
2627
console.log("--------------------------------------");
2728
});
2829
});

0 commit comments

Comments
 (0)