homebridge-smartsystem 6.3.4 → 6.4.2

package/duotecno/protocol.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Protocol = exports.Unit = exports.Node = exports.recName = exports.Rec = exports.TempPreset = exports.cmdName = void 0;
+exports.Protocol = exports.Unit = exports.Node = exports.recName = exports.Rec = exports.TempPreset = exports.cmdName = exports.reqNodeAttributes = void 0;
 const types_1 = require("./types");
 const logger_1 = require("./logger");
 // Duotecno master IP protocol implementation
@@ -19,21 +19,29 @@ const logger_1 = require("./logger");
 // Mar 2019 - v2 - rewrite to support multiple masters
 //
 // Dec 2019 - v3 - for app side only
+// May-Nov 2021 - v4 - changes for pro-app
+// Nov 2022 - Register and merge with gateway
 ///////////////////////////
 // Commands + attributes //
 ///////////////////////////
 var Cmd;
 (function (Cmd) {
     Cmd[Cmd["SetSensorValue"] = 7] = "SetSensorValue";
+    Cmd[Cmd["Internal"] = 9] = "Internal";
+    Cmd[Cmd["SetBasicAudio"] = 159] = "SetBasicAudio";
+    Cmd[Cmd["SetExtendedAudio"] = 208] = "SetExtendedAudio";
+    Cmd[Cmd["SetAVMatrix"] = 202] = "SetAVMatrix";
     Cmd[Cmd["SetSwitch"] = 163] = "SetSwitch";
     Cmd[Cmd["SetDimmer"] = 162] = "SetDimmer";
     Cmd[Cmd["SetControl"] = 168] = "SetControl";
     Cmd[Cmd["SetMotor"] = 182] = "SetMotor";
     Cmd[Cmd["SetSensor"] = 136] = "SetSensor";
+    Cmd[Cmd["SetDateTime"] = 170] = "SetDateTime";
     Cmd[Cmd["Login"] = 214] = "Login";
     Cmd[Cmd["Heartbeat"] = 215] = "Heartbeat";
     Cmd[Cmd["DatabaseInfo"] = 209] = "DatabaseInfo";
     Cmd[Cmd["SetSchedule"] = 217] = "SetSchedule";
+    Cmd[Cmd["Register"] = 224] = "Register";
 })(Cmd || (Cmd = {}));
 // for Set Switch/Dimmer/Control
 const reqDim = 3;
@@ -49,6 +57,16 @@ const reqUnitInfo = 2;
 const reqUnitStatus = 3;
 // for Schedule
 const reqSchedule = 218;
+// for versions et al
+const reqNodeManagement = 220;
+var reqNodeAttributes;
+(function (reqNodeAttributes) {
+    reqNodeAttributes[reqNodeAttributes["masterSupported"] = 0] = "masterSupported";
+    reqNodeAttributes[reqNodeAttributes["isMaster"] = 4] = "isMaster";
+    reqNodeAttributes[reqNodeAttributes["nodeInfo"] = 5] = "nodeInfo";
+    reqNodeAttributes[reqNodeAttributes["nodeVersion"] = 6] = "nodeVersion";
+    reqNodeAttributes[reqNodeAttributes["nodeProtocol"] = 7] = "nodeProtocol";
+})(reqNodeAttributes = exports.reqNodeAttributes || (exports.reqNodeAttributes = {}));
 function cmdName(cmd) {
     return Cmd[cmd] || "cmd" + cmd;
 }
@@ -80,6 +98,8 @@ var Rec;
     Rec[Rec["TimeDateStatus"] = 71] = "TimeDateStatus";
     Rec[Rec["HeartbeatStatus"] = 72] = "HeartbeatStatus";
     Rec[Rec["ScheduleStatus"] = 73] = "ScheduleStatus";
+    Rec[Rec["NodeMgtInfo"] = 74] = "NodeMgtInfo";
+    Rec[Rec["Register"] = 77] = "Register";
     // return info from recDBInfo
     Rec[Rec["Info"] = 64] = "Info";
     // return info from reqUnitStatus
@@ -151,8 +171,8 @@ class Unit {
         this.extendedType = this.extendedType || this.calcExtendedType();
         this.name = this.name || this.getSerialNr();
         // delete the "<" and ">" for power meters
-        if (this.extendedType === types_1.UnitExtendedType.kPower)
-            this.name = this.name.substring(1);
+        // if (this.extendedType === UnitExtendedType.kPower) 
+        //   this.name = this.name.substring(1);
         // make a name for homekit, without the | but add § is 'specials' to add "sfeer", etc...
         // if the display name is empty make a N[nodeAdr]-U[unitAdr] name.
         // delete all type modifiers ( $, * and ! )
@@ -229,11 +249,12 @@ class Unit {
             case types_1.UnitType.kDimmer: return "03|" + name;
             case types_1.UnitType.kSwitch: return "04|" + name;
             case types_1.UnitType.kMood: return "09|" + name;
-            case types_1.UnitType.kInput: return "11|" + name;
+            case types_1.UnitType.kInput: return "10|" + name;
+            // case UnitType.kPower: return "11|" + name;
             case types_1.UnitType.kExtendedAudio: "12|" + name;
-            case types_1.UnitType.kAudio: return "12|" + name;
-            case types_1.UnitType.kAV: return "13|" + name;
-            case types_1.UnitType.kVideo: return "14|" + name;
+            case types_1.UnitType.kAudio: return "13|" + name;
+            case types_1.UnitType.kAV: return "14|" + name;
+            case types_1.UnitType.kVideo: return "15|" + name;
             case types_1.UnitType.kIRTX: return "19|" + name;
             default: return "99|" + name;
         }
@@ -280,9 +301,9 @@ class Unit {
         //////////////////
         // Temp / Power //
         //////////////////
-        if ((this.type === types_1.UnitType.kTemperature) &&
-            ((this.name[0] === "<") || (this.name[0] === ">")))
-            return types_1.UnitExtendedType.kPower;
+        //if ((this.type === UnitType.kTemperature) &&
+        //    ((this.name[0] === "<") || (this.name[0] === ">")))
+        //  return UnitExtendedType.kPower;
         /////////////
         // Up/Down //
         /////////////
@@ -472,12 +493,55 @@ exports.Protocol = {
             .map(val => String.fromCharCode(val))
             .join("");
     },
+    makeWord: function (arr, at) {
+        return arr[at + 0] * 256 + arr[at + 1];
+    },
+    makeSignedWord: function (arr, at) {
+        if (arr[at + 0] > 127)
+            return (arr[at + 0] - 255) * 256 +
+                (arr[at + 1] - 255) - 1;
+        else
+            return arr[at + 0] * 256 + arr[at + 1];
+    },
     makeLong: function (arr, at) {
         return arr[at + 0] * 256 * 256 * 256 +
             arr[at + 1] * 256 * 256 +
             arr[at + 2] * 256 +
             arr[at + 3];
     },
+    makeSigned: function (arr, at) {
+        if (arr[at + 0] > 127)
+            return (arr[at + 0] - 255) * 256 * 256 * 256 +
+                (arr[at + 1] - 255) * 256 * 256 +
+                (arr[at + 2] - 255) * 256 +
+                (arr[at + 3] - 255) - 1;
+        else
+            return arr[at + 0] * 256 * 256 * 256 +
+                arr[at + 1] * 256 * 256 +
+                arr[at + 2] * 256 +
+                arr[at + 3];
+    },
+    signedToArray: function (value) {
+        if (value < 0)
+            return [256 + Math.floor(value / 256 / 256 / 256),
+                256 + Math.floor(value / 256 / 256) % 256,
+                256 + Math.floor(value / 256) % 256,
+                256 + Math.floor(value) % 256];
+        else
+            return [Math.floor(value / 256 / 256 / 256),
+                Math.floor(value / 256 / 256) % 256,
+                Math.floor(value / 256) % 256,
+                Math.floor(value) % 256];
+    },
+    signedWordToArray: function (value) {
+        if (value < 0)
+            return [256 + Math.floor(value / 256) % 256, 256 + Math.floor(value) % 256];
+        else
+            return [Math.floor(value / 256) % 256, Math.floor(value) % 256];
+    },
+    wordToArray: function (value) {
+        return [Math.floor(value / 256) % 256, Math.floor(value) % 256];
+    },
     isStatus: function (cmd) {
         return (cmd === Rec.Mood) ||
             (cmd === Rec.Dimmer) ||
@@ -529,8 +593,8 @@ exports.Protocol = {
                 socket.write(data + String.fromCharCode(10));
                 return types_1.WriteError.writeOK;
             }
-            catch (err) {
-                (0, logger_1.log)("protocol", "error sending through socket " + err.message);
+            catch (e) {
+                (0, logger_1.err)("protocol", "error sending through socket " + e.message);
                 return types_1.WriteError.writeFatal;
             }
         }
@@ -609,6 +673,9 @@ exports.Protocol = {
     buildRequestSchedule() {
         return [reqSchedule, 0];
     },
+    buildRequestNodeMgt(method = reqNodeAttributes.nodeProtocol) {
+        return [reqNodeManagement, method];
+    },
     getCmdAndMethod: function (unit, value) {
         switch (unit.type) {
             case types_1.UnitType.kDimmer:
@@ -656,10 +723,10 @@ exports.Protocol = {
         return [Cmd.SetSensor, 13, node.logicalAddress, unit.logicalAddress, preset];
     },
     buildSetSensor(node, unit, value) {
-        return [Cmd.SetSensorValue, 10, node.logicalAddress, unit.logicalAddress, types_1.UnitType.kTemperature, Math.floor(value / 256), value % 256];
+        return [Cmd.SetSensorValue, 10, node.logicalAddress, unit.logicalAddress, types_1.UnitType.kTemperature, ...this.wordToArray(value)];
     },
     buildSetPreset(node, unit, preset, value) {
-        return [Cmd.SetSensor, 1, node.logicalAddress, unit.logicalAddress, preset, Math.floor(value / 256), value % 256];
+        return [Cmd.SetSensor, 1, node.logicalAddress, unit.logicalAddress, preset, ...this.wordToArray(value)];
     },
     buildIncDecPreset(node, unit, inc) {
         return [Cmd.SetSensor, (inc) ? 5 : 6, node.logicalAddress, unit.logicalAddress];
@@ -671,6 +738,16 @@ exports.Protocol = {
     buildSendSchedule(schedule) {
         return [Cmd.SetSchedule, 0, Math.max(0, Math.min(3, schedule))];
     },
+    buildRegister(register, value) {
+        if (typeof value != "undefined") {
+            // set register
+            return [Cmd.Register, 1, ...this.wordToArray(register), ...this.signedToArray(value)];
+        }
+        else {
+            // get register
+            return [Cmd.Register, 2, ...this.wordToArray(register)];
+        }
+    },
     ///////////////////
     // Received info //
     ///////////////////
@@ -678,13 +755,13 @@ exports.Protocol = {
         let kind = "-";
         if (next.cmd === Rec.Sensor) {
             // sensor -> value
-            unit.value = next.message[9] * 256 + next.message[10]; // 10x current temperature
+            unit.value = this.makeWord(next.message, 9); // 10x current temperature
             unit.status = next.message[7]; // 0=idle, 1=heating, 2=cooling
             unit.preset = (next.message[6]) ? next.message[8] : -1; // 0=sun, 1=half sun, 2=moon, 3=half moon, -1 = off
-            unit.sun = next.message[11] * 256 + next.message[12]; // 10x temperature
-            unit.hsun = next.message[13] * 256 + next.message[14]; // 10x temperature
-            unit.moon = next.message[15] * 256 + next.message[16]; // 10x temperature
-            unit.hmoon = next.message[17] * 256 + next.message[18]; // 10x temperature
+            unit.sun = this.makeWord(next.message, 11); // 10x temperature
+            unit.hsun = this.makeWord(next.message, 13); // 10x temperature
+            unit.moon = this.makeWord(next.message, 15); // 10x temperature
+            unit.hmoon = this.makeWord(next.message, 17); // 10x temperature
             (0, logger_1.debug)("protocol", "received status - " + unit.getDisplayName() + ", temperature = " + unit.value / 10.0 + ", sun = " + unit.sun);
             kind = "S";
             // Dimmers, switches and moods have 
@@ -737,16 +814,11 @@ exports.Protocol = {
             // only change dim value when state = 1 (ON, PIR ON, DIM STOP) for Dimmers and IRTX + for any setpoint event
             if ((((next.message[4] === 1) || (next.message[4] === 6) || (next.message[4] === 7)) && (next.message[5] === 1)) ||
                 (next.message[4] === 11)) {
-                unit.value = next.message[6] * 256 + next.message[7];
+                unit.value = this.makeWord(next.message, 6);
             }
             (0, logger_1.debug)("protocol", "received status - macro -> value=" + unit.value + " / status=" + unit.status);
             kind = "M";
         }
-        // clear the timer to turn the mood off again.
-        //if (unit.resetTimer) {
-        //  clearInterval(unit.resetTimer);
-        //  unit.resetTimer = null;
-        //}
         this.alertSubscriber(unit);
         this.emitter.emit('update', unit, kind);
     },

package/duotecno/protocol.ts

@@ -1,5 +1,5 @@
 import { CommRecord, Message, Sanitizers, NodeInfo, UnitInfo, DBInfo, WriteError, hex, NodeType, UnitType, UnitExtendedType, UnitState, two } from "./types";
-import { debug, log } from "./logger";
+import { debug, log, err } from "./logger";
 import { Master } from "./master";
 import { SmartSocket } from "./smartsocket";
 import { EventEmitter } from "events";
@@ -11,6 +11,8 @@ import { EventEmitter } from "events";
 // Mar 2019 - v2 - rewrite to support multiple masters
 //
 // Dec 2019 - v3 - for app side only
+// May-Nov 2021 - v4 - changes for pro-app
+// Nov 2022 - Register and merge with gateway
 
 
 ///////////////////////////
@@ -18,15 +20,25 @@ import { EventEmitter } from "events";
 ///////////////////////////
 enum Cmd {
   SetSensorValue = 7,
+  Internal = 9,     // smartsystem defined (not Duotecno)
+
+  SetBasicAudio = 159,
+  SetExtendedAudio = 208,
+  SetAVMatrix = 202,
+
   SetSwitch = 163,
   SetDimmer = 162,
   SetControl = 168,
   SetMotor = 182,
   SetSensor = 136,
+
+  SetDateTime = 170,
+
   Login = 214,
   Heartbeat = 215,
   DatabaseInfo = 209,
-  SetSchedule = 217
+  SetSchedule = 217,
+  Register = 224
 }
 
 // for Set Switch/Dimmer/Control
@@ -47,6 +59,16 @@ const reqUnitStatus = 3;
 // for Schedule
 const reqSchedule = 218;
 
+// for versions et al
+const reqNodeManagement = 220;
+export enum reqNodeAttributes {
+  masterSupported = 0,
+  isMaster = 4,
+  nodeInfo = 5,
+  nodeVersion = 6,
+  nodeProtocol = 7
+}
+
 
 export function cmdName(cmd: number | string) {
   return Cmd[cmd] || "cmd"+cmd;
@@ -88,6 +110,8 @@ export enum Rec {
   TimeDateStatus = 71,
   HeartbeatStatus = 72,
   ScheduleStatus = 73,
+  NodeMgtInfo = 74,
+  Register = 77,
 
   // return info from recDBInfo
   Info = 64,
@@ -207,8 +231,8 @@ export class Unit {
     this.name = this.name || this.getSerialNr();
 
     // delete the "<" and ">" for power meters
-    if (this.extendedType === UnitExtendedType.kPower) 
-      this.name = this.name.substring(1);
+    // if (this.extendedType === UnitExtendedType.kPower) 
+    //   this.name = this.name.substring(1);
 
     // make a name for homekit, without the | but add § is 'specials' to add "sfeer", etc...
     // if the display name is empty make a N[nodeAdr]-U[unitAdr] name.
@@ -290,12 +314,14 @@ export class Unit {
       case UnitType.kDimmer: return "03|" + name;
       case UnitType.kSwitch: return "04|" + name;
       case UnitType.kMood: return "09|" + name;
-      case UnitType.kInput: return "11|" + name;
+      case UnitType.kInput: return "10|" + name;
+      // case UnitType.kPower: return "11|" + name;
       case UnitType.kExtendedAudio: "12|" + name;
-      case UnitType.kAudio: return "12|" + name;
-      case UnitType.kAV: return "13|" + name;
-      case UnitType.kVideo: return "14|" + name;
+      case UnitType.kAudio: return "13|" + name;
+      case UnitType.kAV: return "14|" + name;
+      case UnitType.kVideo: return "15|" + name;
       case UnitType.kIRTX: return "19|" + name;
+
       default: return "99|" + name;
     } 
   }
@@ -347,9 +373,9 @@ export class Unit {
     //////////////////
     // Temp / Power //
     //////////////////
-    if ((this.type === UnitType.kTemperature) &&
-        ((this.name[0] === "<") || (this.name[0] === ">")))
-      return UnitExtendedType.kPower;
+    //if ((this.type === UnitType.kTemperature) &&
+    //    ((this.name[0] === "<") || (this.name[0] === ">")))
+    //  return UnitExtendedType.kPower;
 
 
     /////////////
@@ -552,12 +578,55 @@ export const Protocol = {
               .join("");
   },
 
+  makeWord: function(arr: Array<number>, at: number) {
+    return arr[at+0] * 256 + arr[at+1];
+  },
+  makeSignedWord: function(arr: Array<number>, at: number) {
+    if (arr[at+0] > 127)
+      return (arr[at+0]-255) * 256 + 
+             (arr[at+1]-255) - 1;
+    else
+      return arr[at+0] * 256 + arr[at+1];
+  }, 
   makeLong: function(arr: Array<number>, at: number) {
     return arr[at+0] * 256 * 256 * 256 + 
            arr[at+1] * 256 * 256 + 
            arr[at+2] * 256 + 
            arr[at+3];
   },
+  makeSigned: function(arr: Array<number>, at: number) {
+    if (arr[at+0] > 127)
+      return (arr[at+0]-255) * 256 * 256 * 256 + 
+             (arr[at+1]-255) * 256 * 256 + 
+             (arr[at+2]-255) * 256 + 
+             (arr[at+3]-255) - 1;
+    else
+      return arr[at+0] * 256 * 256 * 256 + 
+             arr[at+1] * 256 * 256 + 
+             arr[at+2] * 256 + 
+             arr[at+3];
+  },
+  signedToArray: function(value: number) {
+    if (value < 0)
+      return [256 + Math.floor(value / 256 / 256 / 256), 
+              256 + Math.floor(value / 256 / 256) % 256, 
+              256 + Math.floor(value / 256)  % 256, 
+              256 + Math.floor(value) % 256]
+    else
+      return [Math.floor(value / 256 / 256 / 256), 
+              Math.floor(value / 256 / 256) % 256, 
+              Math.floor(value / 256)  % 256, 
+              Math.floor(value) % 256];
+  },
+  signedWordToArray: function(value: number) {
+    if (value < 0)
+      return [256 + Math.floor(value / 256) % 256, 256 + Math.floor(value) % 256];
+    else
+      return [Math.floor(value / 256) % 256, Math.floor(value) % 256];
+  },
+  wordToArray: function(value: number) {
+    return [Math.floor(value / 256) % 256, Math.floor(value) % 256];
+  },
 
   isStatus: function(cmd: number): boolean {
     return (cmd === Rec.Mood)   ||
@@ -617,8 +686,8 @@ export const Protocol = {
         socket.write(data+String.fromCharCode(10));
         return WriteError.writeOK;
 
-      } catch(err) {
-        log("protocol", "error sending through socket " + err.message);
+      } catch(e) {
+        err("protocol", "error sending through socket " + e.message);
         return WriteError.writeFatal;
       }
     } else {
@@ -715,6 +784,9 @@ export const Protocol = {
   buildRequestSchedule(): Message {
     return [reqSchedule, 0];
   },
+  buildRequestNodeMgt(method = reqNodeAttributes.nodeProtocol): Message {
+    return [reqNodeManagement, method];
+  },
 
   getCmdAndMethod: function(unit: Unit, value: number | boolean): CmdSet {
     switch (unit.type) {
@@ -771,10 +843,10 @@ export const Protocol = {
     return [Cmd.SetSensor, 13, node.logicalAddress, unit.logicalAddress, preset];
   },
   buildSetSensor(node: Node, unit: Unit, value: number): Message {
-    return [Cmd.SetSensorValue, 10, node.logicalAddress, unit.logicalAddress, UnitType.kTemperature, Math.floor(value / 256), value % 256];
+    return [Cmd.SetSensorValue, 10, node.logicalAddress, unit.logicalAddress, UnitType.kTemperature, ...this.wordToArray(value)];
   },
   buildSetPreset(node: Node, unit: Unit, preset: number, value: number): Message {
-    return [Cmd.SetSensor, 1, node.logicalAddress, unit.logicalAddress, preset, Math.floor(value / 256), value % 256];
+    return [Cmd.SetSensor, 1, node.logicalAddress, unit.logicalAddress, preset, ...this.wordToArray(value)];
   },
   buildIncDecPreset(node: Node, unit: Unit, inc: boolean): Message {
     return [Cmd.SetSensor, (inc) ? 5 : 6, node.logicalAddress, unit.logicalAddress];
@@ -788,6 +860,16 @@ export const Protocol = {
     return [Cmd.SetSchedule, 0, Math.max(0, Math.min(3, schedule))];
   },
 
+  buildRegister(register: number, value?: number) {
+    if (typeof value != "undefined") {
+      // set register
+      return  [Cmd.Register, 1, ...this.wordToArray(register), ...this.signedToArray(value)];
+    } else {
+      // get register
+      return [Cmd.Register, 2, ...this.wordToArray(register)];
+    }
+  },
+
   ///////////////////
   // Received info //
   ///////////////////
@@ -796,13 +878,13 @@ export const Protocol = {
 
     if (next.cmd === Rec.Sensor) { 
       // sensor -> value
-      unit.value  = next.message[9]*256  +  next.message[10];   // 10x current temperature
+      unit.value  = this.makeWord(next.message, 9);   // 10x current temperature
       unit.status = next.message[7];                            // 0=idle, 1=heating, 2=cooling
       unit.preset = (next.message[6]) ? next.message[8] : -1;   // 0=sun, 1=half sun, 2=moon, 3=half moon, -1 = off
-      unit.sun    = next.message[11]*256 +  next.message[12];   // 10x temperature
-      unit.hsun   = next.message[13]*256 +  next.message[14];   // 10x temperature
-      unit.moon   = next.message[15]*256 +  next.message[16];   // 10x temperature
-      unit.hmoon  = next.message[17]*256 +  next.message[18];   // 10x temperature
+      unit.sun    = this.makeWord(next.message, 11);   // 10x temperature
+      unit.hsun   = this.makeWord(next.message, 13);   // 10x temperature
+      unit.moon   = this.makeWord(next.message, 15);   // 10x temperature
+      unit.hmoon  = this.makeWord(next.message, 17);   // 10x temperature
       debug("protocol", "received status - " + unit.getDisplayName() + ", temperature = " + <number>unit.value / 10.0 + ", sun = " + unit.sun);
       kind = "S";
   
@@ -858,19 +940,13 @@ export const Protocol = {
       // only change dim value when state = 1 (ON, PIR ON, DIM STOP) for Dimmers and IRTX + for any setpoint event
       if ((((next.message[4] === 1) || (next.message[4] === 6) || (next.message[4] === 7)) && (next.message[5] === 1)) || 
           (next.message[4] === 11)) {
-        unit.value = next.message[6]*256 + next.message[7];
+        unit.value = this.makeWord(next.message, 6);
       }
       
       debug("protocol", "received status - macro -> value=" + unit.value + " / status=" + unit.status);
       kind = "M";
     }
 
-    // clear the timer to turn the mood off again.
-    //if (unit.resetTimer) {
-    //  clearInterval(unit.resetTimer);
-    //  unit.resetTimer = null;
-    //}
-
     this.alertSubscriber(unit);
     this.emitter.emit('update', unit, kind);
   },

package/duotecno/types.js

@@ -140,7 +140,9 @@ var SwitchType;
     SwitchType["kSomfy"] = "somfy";
 })(SwitchType = exports.SwitchType || (exports.SwitchType = {}));
 ;
-exports.kEmptyBinding = Object.assign({ channel: "0" }, exports.kEmptyUnit);
+exports.kEmptyBinding = {
+    channel: "0", masterAddress: "0.0.0.0", masterPort: 5001, register: 0
+};
 exports.kEmptyAction = Object.assign(Object.assign({}, exports.kEmptyUnit), { value: false });
 ;
 exports.kEmptyRule = {
@@ -325,9 +327,11 @@ exports.Sanitizers = {
         return rule;
     },
     bindingConfig(binding) {
-        const b = exports.Sanitizers.unitDef(Object.assign({}, binding));
-        b.channel = binding.channel || "0";
-        b.power = binding.power || NaN;
+        const b = Object.assign({}, exports.kEmptyBinding);
+        b.masterAddress = binding.masterAddress || '',
+            b.register = binding.register || 0,
+            b.masterPort = binding.masterPort || 5001,
+            b.channel = binding.channel || "0";
         return b;
     },
     //////////////

package/duotecno/types.ts

@@ -207,19 +207,24 @@ export enum SwitchType {
 };
 
 
-export interface Binding extends UnitDef {
+export interface Binding {
+  masterAddress: string;
+  masterPort: number;
+  register: number;
   channel: string;
-  power?: number;
+  value?: number;
 }
 export const kEmptyBinding: Binding = { 
-  channel: "0", ...kEmptyUnit
+  channel: "0", masterAddress: "0.0.0.0", masterPort: 5001, register: 0
 } as const;
 
+
 export interface Action extends UnitDef {
   value: number | boolean;
 }
 export const kEmptyAction: Action = { ...kEmptyUnit, value: false } as const;
 
+
 export interface Rule {
   type: string;
   channel: string;
@@ -512,10 +517,11 @@ export const Sanitizers = {
   },
 
   bindingConfig(binding): Binding {
-    const b = <Binding>Sanitizers.unitDef({... binding});
-
+    const b = <Binding>{... kEmptyBinding};
+    b.masterAddress = binding.masterAddress || '',
+    b.register = binding.register || 0,
+    b.masterPort = binding.masterPort || 5001,
     b.channel = binding.channel || "0";
-    b.power = binding.power || NaN;
     return b;
   },
 

package/index.spec.js

@@ -23,6 +23,7 @@ try {
     const configStr = configBuf.toString();
     const config = JSON.parse(configStr);
     (0, logger_1.debug)("spec", config);
+    config.debug = true;
     const platform = new platform_1.Platform(console, config, { registerPlatformAccessories: adder });
 }
 catch (err) {

package/index.spec.ts

@@ -33,6 +33,7 @@ try {
   const configStr = configBuf.toString();
   const config = JSON.parse(configStr);
   debug("spec", config);
+  config.debug = true;
 
   const platform = new Platform(console, config, <API>{registerPlatformAccessories: adder});
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "homebridge-smartsystem",
   "displayname": "Duotecno Bridge",
-  "version": "6.3.4",
+  "version": "6.4.2",
   "description": "SmartServer (Proxy Websockets to TCP sockets, Smappee MQTT, Duotecno IP Nodes, Homekit interface)",
   "main": "index.js",
   "author": "Johan Coppieters",

package/server/powerbase.js

@@ -114,19 +114,19 @@ class PowerBase extends base_1.Base {
             // for all bindings
             this.bindings.forEach(b => {
                 const power = this.evalPower(b.channel);
-                if (this.significant(power, b.power)) {
-                    (0, logger_1.debug)("power", "APPLY to " + b.channel + " = " + b.power + " -> " + power + " for " + b.name +
-                        " (" + b.logicalNodeAddress + ";" + b.logicalAddress + "): difference: " + Math.abs(b.power - power) +
-                        " > threshold: 5% =" + Math.abs(b.power * 0.05) + " > threshold: 2% =" + Math.abs(b.power * 0.02));
+                if (this.significant(power, b.value)) {
+                    (0, logger_1.debug)("power", "APPLY to " + b.channel + " = " + b.value + " -> " + power + " for " + b.register +
+                        "): difference: " + Math.abs(b.value - power) +
+                        " > threshold: 5% =" + Math.abs(b.value * 0.05) + " > threshold: 2% =" + Math.abs(b.value * 0.02));
                     this.applyBinding(b, power)
-                        .then(value => {
-                        b.power = value;
-                        // debug("power", "set unit " + b.name + " to " + value);
+                        .then(power => {
+                        b.value = power;
+                        (0, logger_1.debug)("power", "set register " + b.register + " to " + power);
                     })
                         .catch((e) => (0, logger_1.err)(this.type, e.message || e));
                     // } else {
-                    // debug("power", "DONT to " + b.channel + " = " + b.power + " -> " + power + " for " + b.name + 
-                    //                " (" + b.logicalNodeAddress + ";" + b.logicalAddress + "): difference: " + Math.abs(b.power - power) + 
+                    // debug("power", "DONT to " + b.channel + " = " + b.power + " -> " + power + " for " + b.register + 
+                    //                " : difference: " + Math.abs(b.power - power) + 
                     //                " > threshold: 5% =" + Math.abs(b.power * 0.05) + " > threshold: 2% =" + Math.abs(b.power * 0.02));
                 }
             });
@@ -134,15 +134,14 @@ class PowerBase extends base_1.Base {
     }
     applyBinding(binding, value) {
         return __awaiter(this, void 0, void 0, function* () {
-            const unit = this.system.findUnit(this.system.findMaster(binding.masterAddress, binding.masterPort), binding.logicalNodeAddress, binding.logicalAddress);
-            if (unit) {
-                if (!isNaN(value))
-                    yield unit.setSensorValue(Math.abs(value));
+            const master = this.system.findMaster(binding.masterAddress, binding.masterPort);
+            if (master) {
+                yield master.setRegisterValue(binding.register, value);
                 return value;
             }
-            else if ((binding.logicalNodeAddress != 0) || (binding.logicalAddress != 0)) {
-                throw new Error("***** UNIT NOT FOUND for binding value " + value + " to " + binding.masterAddress + " - " + binding.logicalNodeAddress + ";" + binding.logicalAddress + " *****");
-            }
+            else if ((!binding.masterAddress) || (binding.register)) {
+                throw new Error("***** MASTER NOT FOUND for binding for value " + value + " to " + binding.masterAddress + ":" + binding.masterPort + " - register = " + binding.register + " *****");
+            } // else empty binding -> no error 
         });
     }
     /////////////////////