More precise temp conversions as rounding errors made granular thermo…

…stat controls difficult. Bump version in prep of new package
imbrianj · Jan 10, 2018 · 0448208 · 0448208
1 parent 4e6556c
commit 0448208
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/cache/version.txt b/cache/version.txt
@@ -1 +1 @@
-1515464995205
+1515546199655
diff --git a/js/combo.min.js b/js/combo.min.js
diff --git a/lib/sharedUtil.js b/lib/sharedUtil.js
@@ -231,14 +231,14 @@
      * Accept a temperature in fahrenheit and convert it to celsius.
      */
     fToC : function (f) {
-      return Math.round((f - 32) / 1.8);
+      return Math.round(10 * ((f - 32) / 1.8)) / 10;
     },
 
     /**
      * Accept a temperature in celsius and convert it to fahrenheit.
      */
     cToF : function (c) {
-      return Math.round((c * 1.8) + 32);
+      return Math.round(10 * ((c * 1.8) + 32)) / 10;
     },
   };
 })(typeof exports === 'undefined' ? this.SB : exports);
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "switchboard-automation",
   "description": "Universal Remote Controller powered by Node.js",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "author": "Brian J.",
   "contributors": [
     "Akshay Patel"
@@ -15,7 +15,7 @@
     "switchBoard": "bin/switchBoard"
   },
   "engines": {
-    "node": ">=0.9.0"
+    "node": ">=0.10.0"
   },
   "preferGlobal": true,
   "dependencies": {

diff --git a/tests/unit/devices/monoPrice3dPrinter/controller.js b/tests/unit/devices/monoPrice3dPrinter/controller.js
@@ -63,7 +63,7 @@ exports.monoPrice3dPrinterControllerTest = {
                                                }, 'Parse through printer data response');
    test.deepEqual(testMonoPrice3dPrinterFData, { extruderTemp   : 374,
                                                  extruderTarget : 383,
-                                                 bedTemp        : 84,
+                                                 bedTemp        : 84.2,
                                                  bedTarget      : 0,
                                                  percent        : 7
                                                }, 'Parse through printer data response');

diff --git a/tests/unit/devices/weather/controller.js b/tests/unit/devices/weather/controller.js
@@ -91,10 +91,10 @@ exports.weatherControllerTest = {
     test.strictEqual(results[1].high, 55);
     test.strictEqual(results[1].low,  40);
 
-    test.strictEqual(metricResults[0].high, 14);
-    test.strictEqual(metricResults[0].low,  7);
-    test.strictEqual(metricResults[1].high, 13);
-    test.strictEqual(metricResults[1].low,  4);
+    test.strictEqual(metricResults[0].high, 14.4);
+    test.strictEqual(metricResults[0].low,  6.7);
+    test.strictEqual(metricResults[1].high, 12.8);
+    test.strictEqual(metricResults[1].low,  4.4);
 
     test.done();
   }

diff --git a/tests/unit/lib/sharedUtil.js b/tests/unit/lib/sharedUtil.js
@@ -137,9 +137,9 @@ exports.sharedUtilTest = {
 
     var util = require(__dirname + '/../../../lib/sharedUtil').util;
 
-    test.strictEqual(util.cToF(0),   32,  'Freezing point');
-    test.strictEqual(util.cToF(100), 212, 'Boiling point');
-    test.strictEqual(util.cToF(24),  75,  'A nice day');
+    test.strictEqual(util.cToF(0),   32,   'Freezing point');
+    test.strictEqual(util.cToF(100), 212,  'Boiling point');
+    test.strictEqual(util.cToF(24),  75.2, 'A nice day');
 
     test.done();
   },