bug fixes

Author: tagyoureit

.snyk

@@ -123,6 +123,9 @@ ignore:
     - snyk-go-plugin > graphlib > lodash:
         reason: None given
         expires: '2018-05-27T15:05:54.491Z'
+      request-promise > request-promise-core > lodash:
+        reason: None given
+        expires: '2018-07-03T23:22:22.863Z'
     - node-ssdp > async > lodash:
         reason: None given
         expires: '2018-04-01T03:18:10.568Z'

README.md

@@ -1,13 +1,12 @@
 
-# nodejs-poolController - Version 5.0.1
+# nodejs-poolController - Version 5.1.1
 
 
 [![Join the chat at https://gitter.im/nodejs-poolController/Lobby](https://badges.gitter.im/nodejs-poolController/Lobby.svg)](https://gitter.im/nodejs-poolController/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Build Status](https://travis-ci.org/tagyoureit/nodejs-poolController.svg?branch=master)](https://travis-ci.org/tagyoureit/nodejs-poolController) [![Coverage Status](https://coveralls.io/repos/github/tagyoureit/nodejs-poolController/badge.svg?branch=master)](https://coveralls.io/github/tagyoureit/nodejs-poolController?branch=master) [![Known Vulnerabilities](https://snyk.io/test/github/tagyoureit/nodejs-poolcontroller/badge.svg)](https://snyk.io/test/github/tagyoureit/nodejs-poolcontroller)
 
-#### 5.0.1
-1. Fixed Influx error on startup #90
-1. Fixed bad characters in custom names
-
+5.1.1
+1.  Renamed all 'valves' items to valve to be in line with singular renaming of items
+1.  InfluxDB - moved some items that were in tag fields to field keys; added valves
 
 #### 5.1.0 Highlights
 1. Intellibrite support - API's, Sockets and a WebUI
@@ -21,6 +20,13 @@ See the constants.js file and the sections:
   strIntellibriteModes (for modes)
   lightColors (for setColor)
 
+
+#### 5.0.1
+1. Fixed Influx error on startup #90
+1. Fixed bad characters in custom names
+
+
+
 #### 5.0.0 Highlights
 
 Make sure to run `npm upgrade`.  There are many package updates and changes.

package.json

@@ -76,4 +76,4 @@
     "snyk": "^1.80.1"
   },
   "snyk": true
-}
+}

specs/assets/config/config.json

@@ -149,4 +149,4 @@
         }
     },
     "integrations": {}
-}
+}

specs/helpers/initialize.js

@@ -40,7 +40,7 @@ initAllAsync = function(configLocation, sysDefaultLocation) {
             bottle.container.intellitouch.init() // synchronous
             bottle.container.temperatures.init() // synchronous
             bottle.container.UOM.init() // synchronous
-            bottle.container.valves.init() // synchronous
+            bottle.container.valve.init() // synchronous
             bottle.container.queuePacket.init() // synchronous
             bottle.container.writePacket.init() // synchronous
             bottle.container.intellitouch.init() // synchronous

specs/index.spec.js

@@ -85,7 +85,7 @@ describe('nodejs-poolController', function () {
         //                 bottle.container.intellitouch.init()
         //                 bottle.container.temperatures.init()
         //                 bottle.container.UOM.init()
-        //                 bottle.container.valves.init()
+        //                 bottle.container.valve.init()
         //             })
         //             .then(resolve)
         //             .catch(function (err) {

src/etc/constants.js

@@ -36,7 +36,7 @@ module.exports = function(container) {
         EQUIP2: 9,
         EQUIP3: 10,
         UOM: 15, //Celsius (4) or Farenheit (0); Also Service/Timeout.  See strRunMode below.
-        VALVES: 16,
+        VALVE: 16,
         DELAY: 18,  //64==??; 65-135 (for 50 circuits) is the circuit that is currently delayed.
         UNKNOWN: 19, //Something to do with heat.
         POOL_TEMP: 20,
@@ -337,7 +337,7 @@ module.exports = function(container) {
         10: 'SAL Light',
         11: 'Photon Gen',
         12: 'Color Wheel',
-        13: 'Valves',
+        13: 'Valve',
         14: 'Spillway',
         15: 'Floor Cleaner',
         16: 'Intellibrite',
@@ -390,7 +390,7 @@ module.exports = function(container) {
         25: 'IntelliChlor Status',
         27: 'Pump Config (Extended)',
         29: 'Valve Status',
-        30: 'High Speed Circuits for Valves',
+        30: 'High Speed Circuits for Valve',
         32: 'is4/is10 Settings',
         33: 'Intelliflo Spa Side Remote settings',
         34: 'Solar/Heat Pump Status',
@@ -515,7 +515,7 @@ module.exports = function(container) {
     }
 
 
-    var strValves = {
+    var strValve = {
         3: 'Pool',
         15: 'Spa',
         48: 'Heater',
@@ -661,7 +661,7 @@ module.exports = function(container) {
         strChlorinatorActions: strChlorinatorActions,
         strControllerActions: strControllerActions,
         strRunMode: strRunMode,
-        strValves: strValves,
+        strValve: strValve,
         heatModeStr: heatModeStr,
         heatMode: heatMode,
         ctrl: ctrl,

src/lib/app.js

@@ -170,7 +170,7 @@ bottle.factory('circuit', require(__dirname + '/equipment/circuit.js'))
 bottle.factory('temperatures', require(__dirname + '/equipment/temperatures.js'))
 bottle.factory('time', require(__dirname + '/equipment/time.js'))
 bottle.factory('UOM', require(__dirname + '/equipment/UOM.js'))
-bottle.factory('valves', require(__dirname + '/equipment/valves.js'))
+bottle.factory('valve', require(__dirname + '/equipment/valve.js'))
 bottle.factory('customNames', require(__dirname + '/equipment/customnames.js'))
 bottle.factory('schedule', require(__dirname + '/equipment/schedule.js'))
 bottle.factory('intellitouch', require(__dirname + '/equipment/intellitouch.js'))
@@ -220,7 +220,7 @@ var initAsync = exports.initAsync = function() {
             bottle.container.intellitouch.init()
             bottle.container.temperatures.init()
             bottle.container.UOM.init()
-            bottle.container.valves.init()
+            bottle.container.valve.init()
             bottle.container.intellichem.init()
 
             // bottle.container.logger.info('Intro: ', bottle.container.settings.displayIntroMsg())

src/lib/comms/inbound/controller/2.js

@@ -50,7 +50,7 @@ module.exports = function(container) {
 
                                                               //mask the data[6] with 0011                            shift right two places for 1100 mask (11xx-->11)
                   container.heat.setHeatModeFromController(data[c.controllerStatusPacketFields.HEATER_MODE]&3, data[c.controllerStatusPacketFields.HEATER_MODE] >> 2)
-                  container.valves.setValves(data)
+                  container.valve.setValve(data)
 
                   status.runmode = c.strRunMode[data[c.controllerStatusPacketFields.UOM] & 129]; // more here?
                   container.UOM.setUOM((data[c.controllerStatusPacketFields.UOM] & 4) >> 3)

src/lib/comms/inbound/controller/29.js

@@ -33,7 +33,7 @@ module.exports = function(container) {
 
 
     if (container.settings.get('logMessageDecoding'))
-      container.logger.debug('Msg#: %s  Valves status.  Valve B --> %s (%s)  Full packet: %s', counter, valveBFriendlyName, valveBName, data);
+      container.logger.debug('Msg#: %s  Valve status.  Valve B --> %s (%s)  Full packet: %s', counter, valveBFriendlyName, valveBName, data);
 
     return true
   }