Examples: make Thermometer example output consistent

rwaldron · Sep 10, 2019 · 9dccdc3 · 9dccdc3
1 parent 4af585a
commit 9dccdc3
Show file tree

Hide file tree

Showing 20 changed files with 140 additions and 85 deletions.
diff --git a/eg/temperature-BMP180.js b/eg/temperature-BMP180.js
@@ -8,10 +8,11 @@ board.on("ready", () => {
   });
 
   thermometer.on("change", () => {
-    console.log(`Thermometer
-  celsius      : ${thermometer.celsius}
-  fahrenheit   : ${thermometer.fahrenheit}
-  kelvin       : ${thermometer.kelvin}
---------------------------------------`);
+    const {celsius, fahrenheit, kelvin} = thermometer;
+    console.log("Thermometer");
+    console.log("  celsius      : ", celsius);
+    console.log("  fahrenheit   : ", fahrenheit);
+    console.log("  kelvin       : ", kelvin);
+    console.log("--------------------------------------");
   });
 });
diff --git a/eg/temperature-DHT11_I2C_NANO_BACKPACK.js b/eg/temperature-DHT11_I2C_NANO_BACKPACK.js
@@ -7,11 +7,12 @@ board.on("ready", () => {
   });
 
   thermometer.on("change", () => {
-    console.log(`Thermometer
-  celsius           : ${thermometer.celsius}
-  fahrenheit        : ${thermometer.fahrenheit}
-  kelvin            : ${thermometer.kelvin}
---------------------------------------`);
+    const {celsius, fahrenheit, kelvin} = thermometer;
+    console.log("Thermometer");
+    console.log("  celsius      : ", celsius);
+    console.log("  fahrenheit   : ", fahrenheit);
+    console.log("  kelvin       : ", kelvin);
+    console.log("--------------------------------------");
   });
 });
 
diff --git a/eg/temperature-DHT21_I2C_NANO_BACKPACK.js b/eg/temperature-DHT21_I2C_NANO_BACKPACK.js
@@ -7,11 +7,12 @@ board.on("ready", () => {
   });
 
   thermometer.on("change", () => {
-    console.log(`Thermometer");
-  celsius           : ${thermometer.celsius}
-  fahrenheit        : ${thermometer.fahrenheit}
-  kelvin            : ${thermometer.kelvin}
---------------------------------------`);
+    const {celsius, fahrenheit, kelvin} = thermometer;
+    console.log("Thermometer");
+    console.log("  celsius      : ", celsius);
+    console.log("  fahrenheit   : ", fahrenheit);
+    console.log("  kelvin       : ", kelvin);
+    console.log("--------------------------------------");
   });
 });
 
diff --git a/eg/temperature-DHT22_I2C_NANO_BACKPACK.js b/eg/temperature-DHT22_I2C_NANO_BACKPACK.js
@@ -7,11 +7,12 @@ board.on("ready", () => {
   });
 
   thermometer.on("change", () => {
-    console.log(`Thermometer
-  celsius           : ${thermometer.celsius}
-  fahrenheit        : ${thermometer.fahrenheit}
-  kelvin            : ${thermometer.kelvin}
---------------------------------------`);
+    const {celsius, fahrenheit, kelvin} = thermometer;
+    console.log("Thermometer");
+    console.log("  celsius      : ", celsius);
+    console.log("  fahrenheit   : ", fahrenheit);
+    console.log("  kelvin       : ", kelvin);
+    console.log("--------------------------------------");
   });
 });
 
diff --git a/eg/temperature-HIH6130.js b/eg/temperature-HIH6130.js
@@ -7,11 +7,12 @@ board.on("ready", () => {
   });
 
   thermometer.on("change", () => {
-    console.log(`Thermometer
-  celsius           : ${thermometer.celsius}
-  fahrenheit        : ${thermometer.fahrenheit}
-  kelvin            : ${thermometer.kelvin}
---------------------------------------`);
+    const {celsius, fahrenheit, kelvin} = thermometer;
+    console.log("Thermometer");
+    console.log("  celsius      : ", celsius);
+    console.log("  fahrenheit   : ", fahrenheit);
+    console.log("  kelvin       : ", kelvin);
+    console.log("--------------------------------------");
   });
 });
 
diff --git a/eg/temperature-MCP9808.js b/eg/temperature-MCP9808.js
@@ -7,10 +7,11 @@ board.on("ready", () => {
   });
 
   thermometer.on("change", () => {
-    console.log(`Thermometer
-  celsius      : ${thermometer.celsius}
-  fahrenheit   : ${thermometer.fahrenheit}
-  kelvin       : ${thermometer.kelvin}
---------------------------------------`);
+    const {celsius, fahrenheit, kelvin} = thermometer;
+    console.log("Thermometer");
+    console.log("  celsius      : ", celsius);
+    console.log("  fahrenheit   : ", fahrenheit);
+    console.log("  kelvin       : ", kelvin);
+    console.log("--------------------------------------");
   });
 });
diff --git a/eg/temperature-MS5611.js b/eg/temperature-MS5611.js
@@ -7,10 +7,11 @@ board.on("ready", () => {
   });
 
   thermometer.on("change", () => {
-    console.log(`Thermometer
-  celsius      : ${thermometer.celsius}
-  fahrenheit   : ${thermometer.fahrenheit}
-  kelvin       : ${thermometer.kelvin}
---------------------------------------`);
+    const {celsius, fahrenheit, kelvin} = thermometer;
+    console.log("Thermometer");
+    console.log("  celsius      : ", celsius);
+    console.log("  fahrenheit   : ", fahrenheit);
+    console.log("  kelvin       : ", kelvin);
+    console.log("--------------------------------------");
   });
 });
diff --git a/eg/temperature-SI7020.js b/eg/temperature-SI7020.js
@@ -6,12 +6,18 @@ const board = new Board({
 });
 
 board.on("ready", () => {
-  const temp = new Thermometer({
+  const thermometer = new Thermometer({
     controller: "SI7020",
     port: "A"
   });
 
-  temp.on("change", () => {
-    console.log(`${temp.celsius}°C ${temp.fahrenheit}°F`);
+  thermometer.on("change", () => {
+    const {celsius, fahrenheit, kelvin} = thermometer;
+    console.log("Thermometer");
+    console.log("  celsius      : ", celsius);
+    console.log("  fahrenheit   : ", fahrenheit);
+    console.log("  kelvin       : ", kelvin);
+    console.log("--------------------------------------");
   });
 });
+
diff --git a/eg/temperature-SI7021.js b/eg/temperature-SI7021.js
@@ -6,12 +6,18 @@ const board = new Board({
 });
 
 board.on("ready", () => {
-  const temp = new Thermometer({
+  const thermometer = new Thermometer({
     controller: "SI7021",
     port: "A"
   });
 
-  temp.on("change", () => {
-    console.log(`${temp.celsius}°C ${temp.fahrenheit}°F`);
+  thermometer.on("change", () => {
+    const {celsius, fahrenheit, kelvin} = thermometer;
+    console.log("Thermometer");
+    console.log("  celsius      : ", celsius);
+    console.log("  fahrenheit   : ", fahrenheit);
+    console.log("  kelvin       : ", kelvin);
+    console.log("--------------------------------------");
   });
 });
+
diff --git a/eg/temperature-TH02.js b/eg/temperature-TH02.js
@@ -7,10 +7,12 @@ board.on("ready", () => {
   });
 
   thermometer.on("change", () => {
-    console.log(`Thermometer
-  celsius           : ${thermometer.celsius}
-  fahrenheit        : ${thermometer.fahrenheit}
-  kelvin            : ${thermometer.kelvin}
---------------------------------------`);
+    const {celsius, fahrenheit, kelvin} = thermometer;
+    console.log("Thermometer");
+    console.log("  celsius      : ", celsius);
+    console.log("  fahrenheit   : ", fahrenheit);
+    console.log("  kelvin       : ", kelvin);
+    console.log("--------------------------------------");
   });
 });
+
diff --git a/eg/temperature-bmp085.js b/eg/temperature-bmp085.js
@@ -2,15 +2,16 @@ const {Board, Thermometer} = require("../lib/johnny-five");
 const board = new Board();
 
 board.on("ready", () => {
-  const temp = new Thermometer({
+  const thermometer = new Thermometer({
     controller: "BMP085"
   });
 
-  temp.on("change", () => {
-    console.log(`Thermometer
-  celsius      : ${temp.celsius}
-  fahrenheit   : ${temp.fahrenheit}
-  kelvin       : ${temp.kelvin}
---------------------------------------`);
+  thermometer.on("change", () => {
+    const {celsius, fahrenheit, kelvin} = thermometer;
+    console.log("Thermometer");
+    console.log("  celsius      : ", celsius);
+    console.log("  fahrenheit   : ", fahrenheit);
+    console.log("  kelvin       : ", kelvin);
+    console.log("--------------------------------------");
   });
 });
diff --git a/eg/temperature-ds18b20.js b/eg/temperature-ds18b20.js
@@ -9,8 +9,12 @@ board.on("ready", () => {
   });
 
   thermometer.on("change", () => {
-    console.log(`${thermometer.celsius}°C`);
-    // console.log("0x" + this.address.toString(16));
+    const {address, celsius, fahrenheit, kelvin} = thermometer;
+    console.log(`Thermometer at address: 0x${address.toString(16)}`);
+    console.log("  celsius      : ", celsius);
+    console.log("  fahrenheit   : ", fahrenheit);
+    console.log("  kelvin       : ", kelvin);
+    console.log("--------------------------------------");
   });
 });
 

diff --git a/eg/temperature-dual-ds18b20.js b/eg/temperature-dual-ds18b20.js
@@ -17,13 +17,22 @@ board.on("ready", () => {
     address: 0x6893a41
   });
 
-
   thermometerA.on("change", () => {
-    console.log(`A ${thermometerA.celsius}°C`);
+    const {address, celsius, fahrenheit, kelvin} = thermometerA;
+    console.log(`Thermometer A at address: 0x${address.toString(16)}`);
+    console.log("  celsius      : ", celsius);
+    console.log("  fahrenheit   : ", fahrenheit);
+    console.log("  kelvin       : ", kelvin);
+    console.log("--------------------------------------");
   });
 
   thermometerB.on("change", () => {
-    console.log(`B ${thermometerB.celsius}°C`);
+    const {address, celsius, fahrenheit, kelvin} = thermometerB;
+    console.log(`Thermometer B at address: 0x${address.toString(16)}`);
+    console.log("  celsius      : ", celsius);
+    console.log("  fahrenheit   : ", fahrenheit);
+    console.log("  kelvin       : ", kelvin);
+    console.log("--------------------------------------");
   });
 });
 

diff --git a/eg/temperature-htu21d.js b/eg/temperature-htu21d.js
@@ -7,7 +7,12 @@ board.on("ready", () => {
   });
 
   thermometer.on("change", () => {
-    console.log(`${thermometer.celsius}°C ${thermometer.fahrenheit}°F`);
+    const {celsius, fahrenheit, kelvin} = thermometer;
+    console.log("Thermometer");
+    console.log("  celsius      : ", celsius);
+    console.log("  fahrenheit   : ", fahrenheit);
+    console.log("  kelvin       : ", kelvin);
+    console.log("--------------------------------------");
   });
 });
 

diff --git a/eg/temperature-lm335.js b/eg/temperature-lm335.js
@@ -8,7 +8,12 @@ board.on("ready", () => {
   });
 
   thermometer.on("change", () => {
-    console.log(`${thermometer.celsius}°C ${thermometer.fahrenheit}°F`);
+    const {celsius, fahrenheit, kelvin} = thermometer;
+    console.log("Thermometer");
+    console.log("  celsius      : ", celsius);
+    console.log("  fahrenheit   : ", fahrenheit);
+    console.log("  kelvin       : ", kelvin);
+    console.log("--------------------------------------");
   });
 });
 

diff --git a/eg/temperature-lm35.js b/eg/temperature-lm35.js
@@ -2,13 +2,18 @@ const {Board, Thermometer} = require("../lib/johnny-five");
 const board = new Board();
 
 board().on("ready", () => {
-  const temperature = new Thermometer({
+  const thermometer = new Thermometer({
     controller: "LM35",
     pin: "A0"
   });
 
-  temperature.on("change", () => {
-    console.log(`${temperature.celsius}°C ${temperature.fahrenheit}°F`);
+  thermometer.on("change", () => {
+    const {celsius, fahrenheit, kelvin} = thermometer;
+    console.log("Thermometer");
+    console.log("  celsius      : ", celsius);
+    console.log("  fahrenheit   : ", fahrenheit);
+    console.log("  kelvin       : ", kelvin);
+    console.log("--------------------------------------");
   });
 });
 

diff --git a/eg/temperature-max31850k.js b/eg/temperature-max31850k.js
@@ -3,17 +3,18 @@ const board = new Board();
 
 board.on("ready", () => {
   // This requires OneWire support using the ConfigurableFirmata
-  const temperature = new Thermometer({
+  const thermometer = new Thermometer({
     controller: "MAX31850K",
     pin: 2
   });
 
-  temperature.on("change", () => {
-    console.log(`temperature at address: 0x${temperature.address.toString(16)}
-  celsius      : ${temperature.celsius}
-  fahrenheit   : ${temperature.fahrenheit}
-  kelvin       : ${temperature.kelvin}
---------------------------------------`);
+  thermometer.on("change", () => {
+    const {address, celsius, fahrenheit, kelvin} = thermometer;
+    console.log(`Thermometer at address: 0x${address.toString(16)}`);
+    console.log("  celsius      : ", celsius);
+    console.log("  fahrenheit   : ", fahrenheit);
+    console.log("  kelvin       : ", kelvin);
+    console.log("--------------------------------------");
   });
 });
 

diff --git a/eg/temperature-mpl115a2.js b/eg/temperature-mpl115a2.js
@@ -7,14 +7,16 @@ board.on("ready", () => {
   });
 
   thermometer.on("change", () => {
-    console.log(`Thermometer
-  celsius      : ${thermometer.celsius}
-  fahrenheit   : ${thermometer.fahrenheit}
-  kelvin       : ${thermometer.kelvin}
---------------------------------------`);
+    const {celsius, fahrenheit, kelvin} = thermometer;
+    console.log("Thermometer");
+    console.log("  celsius      : ", celsius);
+    console.log("  fahrenheit   : ", fahrenheit);
+    console.log("  kelvin       : ", kelvin);
+    console.log("--------------------------------------");
   });
 });
 
+
 /* @markdown
 - [MPL115A2 - I2C Barometric Pressure/Temperature Sensor](https://www.adafruit.com/product/992)
 @markdown */
diff --git a/eg/temperature-mpl3115a2.js b/eg/temperature-mpl3115a2.js
@@ -7,11 +7,12 @@ board.on("ready", () => {
   });
 
   thermometer.on("change", () => {
-    console.log(`Thermometer
-  celsius      : ${thermometer.celsius}
-  fahrenheit   : ${thermometer.fahrenheit}
-  kelvin       : ${thermometer.kelvin}
---------------------------------------`);
+    const {celsius, fahrenheit, kelvin} = thermometer;
+    console.log("Thermometer");
+    console.log("  celsius      : ", celsius);
+    console.log("  fahrenheit   : ", fahrenheit);
+    console.log("  kelvin       : ", kelvin);
+    console.log("--------------------------------------");
   });
 });
 

diff --git a/eg/temperature-mpu6050.js b/eg/temperature-mpu6050.js
@@ -7,11 +7,12 @@ board.on("ready", () => {
   });
 
   thermometer.on("change", () => {
-    console.log(`Thermometer
-  celsius      : ${thermometer.celsius}
-  fahrenheit   : ${thermometer.fahrenheit}
-  kelvin       : ${thermometer.kelvin}
---------------------------------------`);
+    const {celsius, fahrenheit, kelvin} = thermometer;
+    console.log("Thermometer");
+    console.log("  celsius      : ", celsius);
+    console.log("  fahrenheit   : ", fahrenheit);
+    console.log("  kelvin       : ", kelvin);
+    console.log("--------------------------------------");
   });
 });