nodejs-poolcontroller 7.7.0 → 8.0.1

package/web/bindings/homeassistant.json

@@ -0,0 +1,437 @@
+{
+  "context": {
+    "name": "Home Assistant",
+    "type":  "mqtt",
+    "options": {
+      "formatter": [
+        {
+          "transform": ".toLowerCase()"
+        },
+        {
+          "regexkey": "\\s",
+          "replace": "",
+          "description": "Remove whitespace"
+        },
+        {
+          "regexkey": "\\/",
+          "replace": "",
+          "description": "Remove /"
+        },
+        {
+          "regexkey": "\\+",
+          "replace": "",
+          "description": "Remove +"
+        },
+        {
+          "regexkey": "\\$",
+          "replace": "",
+          "description": "Remove $"
+        },
+        {
+          "regexkey": "\\#",
+          "replace": "",
+          "description": "Remove #"
+        }
+      ],
+      "rootTopic-DIRECTIONS": "rootTopic in config.json is ingored. Instead set the two topic variables in the vars section",
+      "_rootTopic": "@bind=(state.equipment.model).replace(' ','-').replace(' / ','').toLowerCase();",
+      "clientId": "@bind=`hass_njsPC_${webApp.mac().replace(/:/g, '_'}-${webApp.httpPort()}`;"
+    }
+  },
+  "events": [
+    {
+      "name": "circuit",
+      "description": "Populate the circuits topics",
+      "topics": [
+        {
+          "topic": "@bind=vars.hassTopic;/switch/@bind=vars.mqttTopic;/@bind=vars.mqttTopic;-@bind=data.id;-@bind=data.name;/config",
+          "useRootTopic": false,
+          "processor": [
+            "let device_id = {",
+            " name: 'Pool Controller - njsPC',",
+            " ids: [`${ctx.vars.mqttTopic}`],",
+            " suggested_area : 'Pool'};",
+            "let icontype='mdi:toggle-switch-variant';",
+            "if (data.type.val==1) {icontype='mdi:hot-tub'};",
+            "if (data.type.val==2) {icontype='mdi:pool'};",
+            "return JSON.stringify({ name: data.name,",
+            "unique_id: `poolController-${data.id}-${data.name.replace(/\\s+/g, '').toLowerCase()}`,",
+            "availability_topic: `${ctx.vars.mqttTopic}/state/status`,",
+            "availability_template: \"{{'online' if value_json.name == 'ready' else 'offline'}}\",",
+            "state_topic: `${ctx.vars.mqttTopic}/state/circuits/${data.id}/${data.name.replace(/\\s+/g, '').toLowerCase()}`,",
+            "command_topic: `${ctx.vars.mqttTopic}/state/circuits/setState`,",
+            "payload_on: `{\"id\": ${data.id}, \"isOn\": true}`,",
+            "payload_off: `{\"id\": ${data.id}, \"isOn\": false}`,",
+            "state_on: `on`,",
+            "state_off: `off`,",
+            "device: device_id,",
+            "device_class: 'switch',",
+            "icon: icontype,",
+            "value_template:'{{value_json.isOn}}'});"
+          ],
+          "filter": "@bind=data.showInFeatures; === true && @bind=data.type.isLight; !== true"
+        },
+        {
+            "topic": "@bind=vars.hassTopic;/light/@bind=vars.mqttTopic;/@bind=vars.mqttTopic;-@bind=data.id;-@bind=data.name;/config",
+            "useRootTopic": false,
+            "processor": [
+              "let device_id = {",
+              " name : 'Pool Controller - njsPC',",
+              " ids: [`${ctx.vars.mqttTopic}`],",
+              " suggested_area : 'Pool'};",
+              "return JSON.stringify({ name: `Pool ${data.name}`,",
+              "unique_id: `poolController-${data.id}-pool${data.name.replace(/\\s+/g, '').toLowerCase()}`,",
+              "availability_topic: `${ctx.vars.mqttTopic}/state/status`,",
+              "availability_template: \"{{'online' if value_json.name == 'ready' else 'offline'}}\",",
+              "schema: 'template',",
+              "command_topic: `${ctx.vars.mqttTopic}/state/circuits/setState`,",
+              "state_topic: `${ctx.vars.mqttTopic}/state/circuits/${data.id}/${data.name.replace(/\\s+/g, '').toLowerCase()}`,",
+              "device: device_id,",
+              "command_on_template: `{\"id\": ${data.id}, \"isOn\": true}`,",
+              "command_off_template: `{\"id\": ${data.id}, \"isOn\": false}`,",
+              "state_template: '{{value_json.isOn}}'});"
+            ],
+            "filter": "@bind=data.showInFeatures; === true && @bind=data.type.isLight; === true"
+          }
+      ]
+    },
+    {
+      "name": "pump",
+      "description": "Populate the pumps topics",
+      "topics": [
+        {
+          "topic": "@bind=vars.hassTopic;/sensor/@bind=vars.mqttTopic;/@bind=vars.mqttTopic;-@bind=data.id;-@bind=data.name;-rpm/config",
+          "useRootTopic": false,
+          "processor": [
+            "let device_id = {",
+            " name : 'Pool Controller - njsPC',",
+            " ids: [`${ctx.vars.mqttTopic}`],",
+            " suggested_area : 'Pool'};",
+            "return JSON.stringify({ name: `${data.name} RPM`,",
+            "unique_id: `poolController-${data.id}-${data.name.replace(/\\s+/g, '').toLowerCase()}-rpm`,",
+            "availability_topic: `${ctx.vars.mqttTopic}/state/status`,",
+            "availability_template: \"{{'online' if value_json.name == 'ready' else 'offline'}}\",",
+            "state_topic: `${ctx.vars.mqttTopic}/state/pumps/${data.id}/${data.name.replace(/\\s+/g, '').toLowerCase()}/rpm`,",
+            "device: device_id,",
+            "icon: 'mdi:pump',",
+            "state_class: 'measurement',",
+            "unit_of_measurement: 'rpm',",
+            "value_template:'{{value_json.rpm}}'});"
+          ]
+        },
+        {
+          "topic": "@bind=vars.hassTopic;/sensor/@bind=vars.mqttTopic;/@bind=vars.mqttTopic;-@bind=data.id;-@bind=data.name;-watts/config",
+          "useRootTopic": false,
+          "processor": [
+            "let device_id = {",
+            " name : 'Pool Controller - njsPC',",
+            " ids: [`${ctx.vars.mqttTopic}`],",
+            " suggested_area : 'Pool'};",
+            "return JSON.stringify({ name: `${data.name} watts`,",
+            "unique_id: `poolController-${data.id}-${data.name.replace(/\\s+/g, '').toLowerCase()}-watts`,",
+            "availability_topic: `${ctx.vars.mqttTopic}/state/status`,",
+            "availability_template: \"{{'online' if value_json.name == 'ready' else 'offline'}}\",",
+            "state_topic: `${ctx.vars.mqttTopic}/state/pumps/${data.id}/${data.name.replace(/\\s+/g, '').toLowerCase()}/watts`,",
+            "device: device_id,",
+            "icon: 'mdi:lightning-bolt',",
+            "unit_of_measurement: 'W',",
+            "state_class: 'measurement',",
+            "device_class: 'power',",
+            "value_template:'{{value_json.watts}}'});"
+          ]
+        },
+        {
+          "topic": "@bind=vars.hassTopic;/sensor/@bind=vars.mqttTopic;/@bind=vars.mqttTopic;-@bind=data.id;-@bind=data.name;-flow/config",
+          "useRootTopic": false,
+          "processor": [
+            "let device_id = {",
+            " name : 'Pool Controller - njsPC',",
+            " ids: [`${ctx.vars.mqttTopic}`],",
+            " suggested_area : 'Pool'};",
+            "return JSON.stringify({ name: `${data.name} flow`,",
+            "unique_id: `poolController-${data.id}-${data.name.replace(/\\s+/g, '').toLowerCase()}-flow`,",
+            "availability_topic: `${ctx.vars.mqttTopic}/state/status`,",
+            "availability_template: \"{{'online' if value_json.name == 'ready' else 'offline'}}\",",
+            "state_topic: `${ctx.vars.mqttTopic}/state/pumps/${data.id}/${data.name.replace(/\\s+/g, '').toLowerCase()}/flow`,",
+            "device: device_id,",
+            "icon: 'mdi:waves-arrow-right',",
+            "state_class: 'measurement',",
+            "unit_of_measurement: 'gpm',",
+            "value_template:'{{value_json.flow}}'});"
+          ]
+        }
+      ]
+    },
+    {
+      "name": "feature",
+      "description": "Populate the feature topics",
+      "topics": [
+        {
+          "topic": "@bind=vars.hassTopic;/switch/@bind=vars.mqttTopic;/@bind=vars.mqttTopic;-@bind=data.id;-@bind=data.name;/config",
+          "useRootTopic": false,
+          "processor": [
+            "let device_id = {",
+            " name : 'Pool Controller - njsPC',",
+            " ids: [`${ctx.vars.mqttTopic}`],",
+            " suggested_area : 'Pool'};",
+            "return JSON.stringify({ name: data.name,",
+            "unique_id: `poolController-${data.id}-${data.name.replace(/\\s+/g, '').toLowerCase()}`,",
+            "availability_topic: `${ctx.vars.mqttTopic}/state/status`,",
+            "availability_template: \"{{'online' if value_json.name == 'ready' else 'offline'}}\",",
+            "state_topic: `${ctx.vars.mqttTopic}/state/features/${data.id}/${data.name.replace(/\\s+/g, '').toLowerCase()}`,",
+            "command_topic: `${ctx.vars.mqttTopic}/state/features/setState`,",
+            "payload_on: `{\"id\": ${data.id}, \"isOn\": true}`,",
+            "payload_off: `{\"id\": ${data.id}, \"isOn\": false}`,",
+            "state_on: `on`,",
+            "state_off: `off`,",
+            "device: device_id,",
+            "device_class: 'switch',",
+            "value_template:'{{value_json.isOn}}'});"
+          ],
+          "filter": "@bind=data.showInFeatures; === true"
+        }
+      ]
+    },
+    {
+      "name": "circuitGroup",
+      "description": "Populate the circuitGroup topics",
+      "topics": [
+        {
+          "topic": "@bind=vars.hassTopic;/switch/@bind=vars.mqttTopic;/@bind=vars.mqttTopic;-@bind=data.id;-@bind=data.name;/config",
+          "useRootTopic": false,
+          "processor": [
+            "let device_id = {",
+            " name : 'Pool Controller - njsPC',",
+            " ids: [`${ctx.vars.mqttTopic}`],",
+            " suggested_area : 'Pool'};",
+            "return JSON.stringify({ name: data.name,",
+            "unique_id: `poolController-${data.id}-${data.name.replace(/\\s+/g, '').toLowerCase()}`,",
+            "availability_topic: `${ctx.vars.mqttTopic}/state/status`,",
+            "availability_template: \"{{'online' if value_json.name == 'ready' else 'offline'}}\",",
+            "state_topic: `${ctx.vars.mqttTopic}/state/circuitGroups/${data.id}/${data.name.replace(/\\s+/g, '').toLowerCase()}`,",
+            "command_topic: `${ctx.vars.mqttTopic}/state/circuitGroups/setState`,",
+            "payload_on: `{\"id\": ${data.id}, \"isOn\": true}`,",
+            "payload_off: `{\"id\": ${data.id}, \"isOn\": false}`,",
+            "state_on: `on`,",
+            "state_off: `off`,",
+            "device: device_id,",
+            "device_class: 'switch',",
+            "value_template:'{{value_json.isOn}}'});"
+          ],
+          "filter": "@bind=data.showInFeatures; === true"
+        }
+      ]
+    },
+    {
+      "name": "body",
+      "description": "Populate the pool body/heater topics",
+      "topics": [
+        {
+          "topic": "@bind=vars.hassTopic;/climate/@bind=vars.mqttTopic;/@bind=vars.mqttTopic;-@bind=data.id;-@bind=data.name;/config",
+          "useRootTopic": false,
+          "processor": [
+            "let device_id = {",
+            " name : 'Pool Controller - njsPC',",
+            " ids: [`${ctx.vars.mqttTopic}`],",
+            " suggested_area : 'Pool'};",
+            "return JSON.stringify({ name: `${data.name} Heater`,",
+            "unique_id: `poolController-body-${data.id}-${data.name.replace(/\\s+/g, '').toLowerCase()}`,",
+            "availability_topic: `${ctx.vars.mqttTopic}/state/status`,",
+            "availability_template: \"{{'online' if value_json.name == 'ready' else 'offline'}}\",",
+            "action_topic: `${ctx.vars.mqttTopic}/state/temps/bodies/${data.id}/${data.name.replace(/\\s+/g, '').toLowerCase()}/heatStatus`,",
+            "action_template: `{{ 'off' if value_json.heatStatus.val==0 else 'heating' }}`,",
+            "device: device_id,",
+            "modes: ['off', 'heat'],",
+            "mode_command_template: `{\"id\": ${data.id}, \"mode\": {{0 if value=='off' else 1}}}`,",
+            "mode_command_topic: `${ctx.vars.mqttTopic}/state/body/heatmode`,", 
+            "mode_state_template: `{{ 'off' if value_json.heatMode.val==0 else 'heat' }}`,", 
+            "mode_state_topic: `${ctx.vars.mqttTopic}/state/temps/bodies/${data.id}/${data.name.replace(/\\s+/g, '').toLowerCase()}/heatMode`,",
+            "max_temp: `${(state.temps.data.units.name === 'F') ? 104.0 : 40.0}`,",
+            "min_temp: `${(state.temps.data.units.name === 'F') ? 65.0 : 18.0}`,",
+            "temperature_command_template: `{\"id\": ${data.id}, \"setPoint\": {{value}}}`,",
+            "temperature_command_topic: `${ctx.vars.mqttTopic}/state/body/setpoint`,",
+            "temperature_state_template: '{{value_json.setPoint}}',",
+            "temperature_state_topic: `${ctx.vars.mqttTopic}/state/temps/bodies/${data.id}/${data.name.replace(/\\s+/g, '').toLowerCase()}/setPoint`,",
+            "temperature_unit: `${state.temps.data.units.name}`,",
+            "current_temperature_topic: `${ctx.vars.mqttTopic}/state/temps/bodies/${data.id}/${data.name.replace(/\\s+/g, '').toLowerCase()}/temp`,",
+            "current_temperature_template: '{{value_json.temp}}'});"
+          ]
+        }
+      ]
+    },
+    {
+      "name": "temps",
+      "description": "Populate the temp sensor",
+      "topics": [
+        {
+          "topic": "@bind=vars.hassTopic;/sensor/@bind=vars.mqttTopic;/@bind=vars.mqttTopic;-1-airsensor/config",
+          "useRootTopic": false,
+          "processor": [
+            "let device_id = {",
+            " name : 'Pool Controller - njsPC',",
+            " ids: [`${ctx.vars.mqttTopic}`],",
+            " suggested_area : 'Pool'};",
+            "return JSON.stringify({ name: `Air temp`,",
+            "unique_id: `poolController-1-airsensor`,",
+            "availability_topic: `${ctx.vars.mqttTopic}/state/status`,",
+            "availability_template: \"{{'online' if value_json.name == 'ready' else 'offline'}}\",",
+            "device: device_id,",
+            "device_class: 'temperature',",
+            "state_class: 'measurement',",
+            "state_topic: `${ctx.vars.mqttTopic}/state/temps/air`,",
+            "unit_of_measurement: `°${state.temps.data.units.name}`,",
+            "value_template: '{{value_json.temp}}'});"
+          ]
+        }
+      ]
+    },
+    {
+      "name": "chemController",
+      "description": "Populate the chem controllers",
+      "topics": [
+        {
+          "topic": "@bind=vars.hassTopic;/sensor/@bind=vars.mqttTopic;/@bind=vars.mqttTopic;-@bind=data.name;-ph/config",
+          "useRootTopic": false,
+          "processor": [
+            "let device_id = {",
+            " name : 'Pool Controller - njsPC',",
+            " ids: [`${ctx.vars.mqttTopic}`],",
+            " suggested_area : 'Pool'};",
+            "return JSON.stringify({ name: `${data.name} pH`,",
+            "unique_id: `poolController-${data.id}-${data.name.replace(/\\s+/g, '').toLowerCase()}-ph`,",
+            "availability_topic: `${ctx.vars.mqttTopic}/state/status`,",
+            "availability_template: \"{{'online' if value_json.name == 'ready' else 'offline'}}\",",
+            "device: device_id,",
+            "icon: 'mdi:ph',",
+            "state_class: 'measurement',",
+            "state_topic: `${ctx.vars.mqttTopic}/state/chemControllers/${data.id}/${data.name.replace(/\\s+/g, '').toLowerCase()}/ph/level`});"
+          ]
+        },
+        {
+          "topic": "@bind=vars.hassTopic;/sensor/@bind=vars.mqttTopic;/@bind=vars.mqttTopic;-@bind=data.name;-orp/config",
+          "useRootTopic": false,
+          "processor": [
+            "let device_id = {",
+            " name : 'Pool Controller - njsPC',",
+            " ids: [`${ctx.vars.mqttTopic}`],",
+            " suggested_area : 'Pool'};",
+            "return JSON.stringify({ name: `${data.name} ORP`,",
+            "unique_id: `poolController-${data.id}-${data.name.replace(/\\s+/g, '').toLowerCase()}-orp`,",
+            "availability_topic: `${ctx.vars.mqttTopic}/state/status`,",
+            "availability_template: \"{{'online' if value_json.name == 'ready' else 'offline'}}\",",
+            "device: device_id,",
+            "icon: 'mdi:water-check-outline',",
+            "state_class: 'measurement',",
+            "unit_of_measurement: 'mV',",
+            "state_topic: `${ctx.vars.mqttTopic}/state/chemControllers/${data.id}/${data.name.replace(/\\s+/g, '').toLowerCase()}/orp/level`});"
+          ]
+        },
+        {
+          "topic": "@bind=vars.hassTopic;/sensor/@bind=vars.mqttTopic;/@bind=vars.mqttTopic;-@bind=data.name;-acid-tank-level/config",
+          "useRootTopic": false,
+          "processor": [
+            "let device_id = {",
+            " name : 'Pool Controller - njsPC',",
+            " ids: [`${ctx.vars.mqttTopic}`],",
+            " suggested_area : 'Pool'};",
+            "return JSON.stringify({ name: `${data.name} Acid Tank Level`,",
+            "unique_id: `poolController-${data.id}-${data.name.replace(/\\s+/g, '').toLowerCase()}-acid-tank-level`,",
+            "availability_topic: `${ctx.vars.mqttTopic}/state/status`,",
+            "availability_template: \"{{'online' if value_json.name == 'ready' else 'offline'}}\",",
+            "device: device_id,",
+            "icon: 'mdi:propane-tank-outline',",
+            "state_class: 'measurement',",
+            "state_topic: `${ctx.vars.mqttTopic}/state/chemControllers/${data.id}/${data.name.replace(/\\s+/g, '').toLowerCase()}/acidTankLevel`,",
+            "value_template: '{{value_json.acidTankLevel}}'});"
+          ]
+        },
+        {
+          "topic": "@bind=vars.hassTopic;/sensor/@bind=vars.mqttTopic;/@bind=vars.mqttTopic;-@bind=data.name;-flow-alarm/config",
+          "useRootTopic": false,
+          "processor": [
+            "let device_id = {",
+            " name : 'Pool Controller - njsPC',",
+            " ids: [`${ctx.vars.mqttTopic}`],",
+            " suggested_area : 'Pool'};",
+            "return JSON.stringify({ name: `${data.name} Flow Alarm`,",
+            "unique_id: `poolController-${data.id}-${data.name.replace(/\\s+/g, '').toLowerCase()}-flow-alarm`,",
+            "availability_topic: `${ctx.vars.mqttTopic}/state/status`,",
+            "availability_template: \"{{'online' if value_json.name == 'ready' else 'offline'}}\",",
+            "device: device_id,",
+            "icon: 'mdi:waves-arrow-right',",
+            "state_topic: `${ctx.vars.mqttTopic}/state/chemControllers/${data.id}/${data.name.replace(/\\s+/g, '').toLowerCase()}/alarms/flow`,",
+            "value_template: '{{value_json.name}}'});"
+          ]
+        }
+
+      ]
+    },
+    {
+      "name": "chlorinator",
+      "description": "Populate the chlorinators",
+      "topics": [
+        {
+          "topic": "@bind=vars.hassTopic;/sensor/@bind=vars.mqttTopic;/@bind=vars.mqttTopic;-@bind=data.name;-salt-level/config",
+          "useRootTopic": false,
+          "processor": [
+            "let device_id = {",
+            " name : 'Pool Controller - njsPC',",
+            " ids: [`${ctx.vars.mqttTopic}`],",
+            " suggested_area : 'Pool'};",
+            "return JSON.stringify({ name: `${data.name} Salt Level`,",
+            "unique_id: `poolController-${data.id}-${data.name.replace(/\\s+/g, '').toLowerCase()}-salt-level`,",
+            "availability_topic: `${ctx.vars.mqttTopic}/state/status`,",
+            "availability_template: \"{{'online' if value_json.name == 'ready' else 'offline'}}\",",
+            "device: device_id,",
+            "icon: 'mdi:shaker-outline',",
+            "state_class: 'measurement',",
+            "unit_of_measurement: 'ppm',",
+            "state_topic: `${ctx.vars.mqttTopic}/state/chlorinators/${data.id}/${data.name.replace(/\\s+/g, '').toLowerCase()}/saltLevel`,",
+            "value_template: '{{value_json.saltLevel}}'});"
+          ]
+        },
+        {
+          "topic": "@bind=vars.hassTopic;/sensor/@bind=vars.mqttTopic;/@bind=vars.mqttTopic;-@bind=data.name;-current-output/config",
+          "useRootTopic": false,
+          "processor": [
+            "let device_id = {",
+            " name : 'Pool Controller - njsPC',",
+            " ids: [`${ctx.vars.mqttTopic}`],",
+            " suggested_area : 'Pool'};",
+            "return JSON.stringify({ name: `${data.name} Current Output`,",
+            "unique_id: `poolController-${data.id}-${data.name.replace(/\\s+/g, '').toLowerCase()}-current-output`,",
+            "availability_topic: `${ctx.vars.mqttTopic}/state/status`,",
+            "availability_template: \"{{'online' if value_json.name == 'ready' else 'offline'}}\",",
+            "device: device_id,",
+            "icon: 'mdi:gauge',",
+            "state_class: 'measurement',",
+            "unit_of_measurement: '%',",
+            "state_topic: `${ctx.vars.mqttTopic}/state/chlorinators/${data.id}/${data.name.replace(/\\s+/g, '').toLowerCase()}/currentOutput`,",
+            "value_template: '{{value_json.currentOutput}}'});"
+          ]
+        },
+        {
+          "topic": "@bind=vars.hassTopic;/binary_sensor/@bind=vars.mqttTopic;/@bind=vars.mqttTopic;-@bind=data.name;-superchlorinate/config",
+          "useRootTopic": false,
+          "processor": [
+            "let device_id = {",
+            " name : 'Pool Controller - njsPC',",
+            " ids: [`${ctx.vars.mqttTopic}`],",
+            " suggested_area : 'Pool'};",
+            "return JSON.stringify({ name: `${data.name} Super Chlorinate`,",
+            "unique_id: `poolController-${data.id}-${data.name.replace(/\\s+/g, '').toLowerCase()}-super-chlorinate`,",
+            "availability_topic: `${ctx.vars.mqttTopic}/state/status`,",
+            "availability_template: \"{{'online' if value_json.name == 'ready' else 'offline'}}\",",
+            "device: device_id,",
+            "device_class: 'running',",
+            "icon: 'mdi:exclamation',",
+            "state_topic: `${ctx.vars.mqttTopic}/state/chlorinators/${data.id}/${data.name.replace(/\\s+/g, '').toLowerCase()}/superChlor`,",
+            "payload_on: 'on',",
+            "payload_off: 'off',",
+            "value_template: '{{value_json.superChlor}}'});"
+          ]
+        }
+      ]
+    }
+  ]
+}

package/web/bindings/influxDB.json

@@ -38,6 +38,16 @@
               "value": "@bind=data.solar;",
               "type": "int"
             },
+            {
+              "name": "airTempF",
+              "value": "@bind=data.air;",
+              "type": "float"
+            },
+            {
+              "name": "solarTempF",
+              "value": "@bind=data.solar;",
+              "type": "float"
+            },
             {
               "name": "waterSensor1",
               "value": "@bind=data.waterSensor1;",
@@ -88,6 +98,11 @@
               "value": "@bind=data.temp;",
               "type": "int"
             },
+            {
+              "name": "@bind=data.name+'F';",
+              "value": "@bind=data.temp;",
+              "type": "float"
+            },
             {
               "name": "@bind=data.name+'.setPoint';",
               "value": "@bind=data.setPoint;",

package/web/bindings/mqtt.json

@@ -34,7 +34,9 @@
       ],
       "rootTopic-DIRECTIONS": "You can override the root topic by renaming _rootTopic to rootTopic",
       "_rootTopic": "@bind=(state.equipment.alias).replace(' ','-').replace('/','').toLowerCase();",
-      "clientId": "@bind='mqttjs_njsPC_'+Math.random().toString(16).substr(2, 8);"
+      "clientId": "@bind='mqttjs_njsPC_'+Math.random().toString(16).substr(2, 8);",
+      "willTopic": "state/status",
+      "willPayload": "{\"val\":3,\"name\":\"lost\",\"desc\":\"Connection Lost\",\"percent\":0}"
     }
   },
   "events": [
@@ -240,21 +242,23 @@
       "description": "Populate the circuitGroup topic",
       "topics": [
         {
-          "topic": "state/circuitGroups/@bind=data.id;/name",
-          "message": "{\"id\":@bind=data.id;,\"isOn\":@bind=data.isOn?'\"on\"':'\"off\"';}",
+          "topic": "state/circuitGroups/@bind=data.id;/@bind=data.name;",
+          "message": "{\"id\":@bind=data.id;,\"isOn\":@bind=data.isOn?'\"on\"':'\"off\"';,\"endTime\":\"@bind=data.endTime;\"}",
           "description": "Bind name to the state topic."
         },
         {
-          "topic": "state/circuitGroups/@bind=data.id;/isOn",
+          "topic": "state/circuitGroups/@bind=data.id;/@bind=data.name;/isOn",
           "message": "{\"id\":@bind=data.id;,\"isOn\":@bind=data.isOn?'\"on\"':'\"off\"';}",
-          "description": "Bind the on/off status to the topic."
+          "description": "Bind the on/off status to the topic.",
+          "enabled": false
         },
         {
-          "topic": "state/circuitGroups/@bind=data.id;/type",
-          "message": "{\"type\":@bind=data.type;}"
+          "topic": "state/circuitGroups/@bind=data.id;/@bind=data.name;/type",
+          "message": "{\"type\":@bind=data.type;}",
+          "enabled": false
         },
         {
-          "topic": "state/circuitGroups/@bind=data.id;/showInFeatures",
+          "topic": "state/circuitGroups/@bind=data.id;/@bind=data.name;/showInFeatures",
           "message": "{\"showInFeatures\":@bind=data.showInFeatures;}",
           "description": "Indicates wether the item should show in features."
         }
@@ -285,6 +289,11 @@
           "message": "{\"setPoint\":@bind=data.setPoint;}",
           "description": "Send set point."
         },
+        {
+          "topic": "state/temps/bodies/@bind=data.id;/@bind=data.name;/heatSetpoint",
+          "message": "{\"heatSetpoint\":@bind=data.setPoint;}",
+          "description": "Send heat set point."
+        },
         {
           "topic": "state/temps/bodies/@bind=data.id;/@bind=data.name;/coolSetpoint",
           "message": "{\"coolSetpoint\":@bind=data.coolSetpoint;}",
@@ -303,7 +312,7 @@
       "topics": [
         {
           "topic": "state/chlorinators/@bind=data.id;/@bind=data.name;",
-          "message": "{\"id\":@bind=data.id;,\"isOn\":@bind=data.isOn?'\"on\"':'\"off\"';}",
+          "message": "{\"id\":@bind=data.id;,\"isOn\":@bind=data.currentOutput > 0 ?'\"on\"':'\"off\"';}",
           "description": "Bind 'on'/'off' as a message to the state topic."
         },
         {
@@ -341,6 +350,16 @@
           "message": "{\"saltLevel\":@bind=data.saltLevel;}",
           "description": "Send salt level."
         },
+        {
+          "topic": "state/chlorinators/@bind=data.id;/@bind=data.name;/saltRequired",
+          "message": "{\"saltRequired\":@bind=data.saltRequired;}",
+          "description": "Send the calculated salt requirement."
+        },
+        {
+          "topic": "state/chlorinators/@bind=data.id;/@bind=data.name;/saltTarget",
+          "message": "{\"saltTarget\":@bind=data.saltTarget;}",
+          "description": "Send the target salt level."
+        },
         {
           "topic": "state/chlorinators/@bind=data.id;/@bind=data.name;/type",
           "message": "{\"type\":@bind=data.type;}",

package/web/bindings/mqttAlt.json

@@ -383,6 +383,11 @@
           "message": "@bind=data.setPoint;",
           "description": "Setpoint."
         },
+        {
+          "topic": "state/temps/bodies/@bind=data.id;/heatSetpoint",
+          "message": "@bind=data.setPoint;",
+          "description": "Heat setpoint."
+        },
         {
           "topic": "state/temps/bodies/@bind=data.id;/coolSetpoint",
           "message": "@bind=data.coolSetpoint;",
@@ -444,6 +449,16 @@
           "message": "@bind=data.saltLevel;",
           "description": "Send salt level."
         },
+        {
+          "topic": "state/chlorinators/@bind=data.id;/@bind=data.name;/saltTarget",
+          "message": "@bind=data.saltTarget;",
+          "description": "Send the target salt level."
+        },
+        {
+          "topic": "state/chlorinators/@bind=data.id;/@bind=data.name;/saltRequired",
+          "message": "@bind=data.saltRequired;",
+          "description": "Send the calculated salt requirement."
+        },
         {
           "topic": "state/chlorinators/@bind=data.id;/type",
           "message": "@bind=data.type;",