Add actuator state (3EF0) and richer config for relays

Author: codeaholics

src/config.js

@@ -10,7 +10,8 @@ class Config {
 
         rawConfig.forEach((site) => {
             this.allControllers[site.controller] = {
-                zones: site.zones
+                zones: site.zones,
+                relays: site.relays
             };
 
             Object.getOwnPropertyNames(site.devices).forEach((addr) => {
@@ -20,6 +21,22 @@ class Config {
                     zoneName: site.zones[site.devices[addr].zone]
                 });
             });
+
+            if (site.relays) {
+                if (site.relays.dhw) {
+                    this.allDevices[site.relays.dhw] = Object.freeze({
+                        name: 'Hot Water',
+                        subsystem: 'dhw'
+                    });
+                }
+
+                if (site.relays.boiler) {
+                    this.allDevices[site.relays.boiler] = Object.freeze({
+                        name: 'Boiler',
+                        subsystem: 'boiler'
+                    });
+                }
+            }
         });
     }
 

src/decoders/actuator-state.js

@@ -0,0 +1,43 @@
+export default function(m) {
+    if (m.isRequest()) { return null; }
+    if (!((m.isReply() && m.addr[0].isOpenTherm() && m.addr[1].isSiteController()) ||
+          (m.isInformation() && m.addr[0].isRelay() && m.addr[0].isConfigured()))) {
+        return null;
+    }
+    if (m.length % 3 !== 0) { throw new Error('ACTUATOR_STATE payload length incorrect'); }
+
+    function readBit(byte, bit) {
+        // eslint-disable-next-line no-bitwise
+        return (byte & (1 << bit)) >> bit;
+    }
+
+    const result = {
+        decoded: {
+            type: 'ACTUATOR_STATE',
+            device: m.addr[0].describe()
+        }
+    };
+
+    if (m.length >= 3) {
+        m.skip(1);
+        result.decoded.modulation = m.readUInt8() / 200;
+        m.skip(1);
+    }
+
+    if (m.length >= 6) {
+        const state = m.readUInt8();
+        result.decoded.ch = readBit(state, 1) * 100;
+        result.decoded.dhw = readBit(state, 2) * 100;
+        result.decoded.flame = readBit(state, 3) * 100;
+        result.decoded.cooling = readBit(state, 4) * 100;
+        m.skip(2);
+    }
+
+    if (m.length >= 9) {
+        result.decoded.chEnabled = readBit(m.readUInt8(), 0);
+        result.decoded.chSetpoint = m.readUInt8();
+        m.skip(1);
+    }
+
+    return result;
+}

src/decoders/index.js

@@ -4,6 +4,7 @@ import heatDemand from './heat-demand';
 import setpoint from './setpoint';
 import dhwTemp from './dhw-temp';
 import zoneWindow from './zone-window';
+import actuatorState from './actuator-state';
 
 function externalSensor() {
     return {
@@ -85,14 +86,6 @@ function actuatorCheck() {
     };
 }
 
-function actuatorState() {
-    return {
-        decoded: {
-            type: 'ACTUATOR_STATE'
-        }
-    };
-}
-
 export default {
     '0002': externalSensor,
     '0004': zoneName,