homebridge-smartsystem 6.3.2 → 6.3.4

package/README.md

@@ -277,9 +277,10 @@ Homebridge UI version
  - 6: power: 5% instead of 10% for power rules
 
  ### v6.3.x - 23-09-2022 - Shelly PM release
- - 1: first test 1 PM
+ - 1: first test Shelly PM - allow address or addresses, example: "192.168.0.95,102.168.0.96"
  - 2: logging now more according to debug true/false in the config file
- 
+ - 3: power bindings now when: 5% change < 1000W, 2% change > 1000W
+ - 4: added if in set-plug if smappee not (yet) connected.
 
 ## Hardware 
 A Raspberry Pi that connects to a Duotecno IP Node 

package/config.json

@@ -8,138 +8,104 @@
         "type": "sun",
         "channel": "0",
         "low": 30,
-        "high": 900,
+        "high": 3000,
         "actions": [
           {
-            "name": "Mood A",
+            "name": "Lamp-Bottom",
             "value": false,
             "masterAddress": "192.168.0.97",
             "masterPort": 5001,
-            "logicalAddress": 10,
-            "logicalNodeAddress": 252
+            "logicalAddress": 34,
+            "logicalNodeAddress": 3
           },
           {
-            "name": "Mood A",
-            "value": 50,
+            "name": "Lamp-Bottom",
+            "value": false,
             "masterAddress": "192.168.0.97",
             "masterPort": 5001,
-            "logicalAddress": 10,
-            "logicalNodeAddress": 252
+            "logicalAddress": 34,
+            "logicalNodeAddress": 3
           },
           {
-            "name": "Mood A",
+            "name": "Lamp-Bottom",
             "value": true,
             "masterAddress": "192.168.0.97",
             "masterPort": 5001,
-            "logicalAddress": 10,
-            "logicalNodeAddress": 252
+            "logicalAddress": 34,
+            "logicalNodeAddress": 3
           }
         ],
-        "power": 3263,
-        "current": 2
+        "power": 146,
+        "current": 1
       },
       {
         "type": "power",
-        "channel": "4",
-        "low": 10,
-        "high": 20,
+        "channel": "7+8+9",
+        "low": 100,
+        "high": 10000,
         "actions": [
           {
-            "name": "Mood B",
+            "name": "",
             "value": false,
             "masterAddress": "192.168.0.97",
             "masterPort": 5001,
-            "logicalAddress": 11,
-            "logicalNodeAddress": 252
+            "logicalAddress": 30,
+            "logicalNodeAddress": 3
           },
           {
-            "name": "Mood B",
-            "value": 50,
+            "name": "",
+            "value": true,
             "masterAddress": "192.168.0.97",
             "masterPort": 5001,
-            "logicalAddress": 11,
-            "logicalNodeAddress": 252
+            "logicalAddress": 30,
+            "logicalNodeAddress": 3
           },
           {
-            "name": "Mood B",
+            "name": "0;0",
             "value": true,
             "masterAddress": "192.168.0.97",
             "masterPort": 5001,
-            "logicalAddress": 11,
-            "logicalNodeAddress": 252
+            "logicalAddress": 0,
+            "logicalNodeAddress": 0
           }
         ],
-        "power": 1,
-        "current": 0
+        "power": 446,
+        "current": 1
       },
       {
         "type": "power",
         "channel": "7+8+9",
-        "low": 30,
+        "low": 400,
         "high": 900,
         "actions": [
           {
-            "name": "",
-            "value": -1,
-            "masterAddress": "192.168.0.97",
-            "masterPort": 5001,
-            "logicalAddress": 4,
-            "logicalNodeAddress": 3
-          },
-          {
-            "name": "",
-            "value": -1,
+            "name": "Lamp-Top",
+            "value": false,
             "masterAddress": "192.168.0.97",
             "masterPort": 5001,
-            "logicalAddress": 4,
+            "logicalAddress": 33,
             "logicalNodeAddress": 3
           },
           {
-            "name": "",
-            "value": -1,
+            "name": "Lamp-Top",
+            "value": true,
             "masterAddress": "192.168.0.97",
             "masterPort": 5001,
-            "logicalAddress": 4,
+            "logicalAddress": 33,
             "logicalNodeAddress": 3
-          }
-        ]
-      },
-      {
-        "type": "sun",
-        "channel": "7",
-        "low": 0,
-        "high": 0,
-        "actions": [
-          {
-            "name": "Mood C",
-            "value": false,
-            "masterAddress": "192.168.0.97",
-            "masterPort": 5001,
-            "logicalAddress": 12,
-            "logicalNodeAddress": 252
-          },
-          {
-            "name": "Mood C",
-            "value": 50,
-            "masterAddress": "192.168.0.97",
-            "masterPort": 5001,
-            "logicalAddress": 12,
-            "logicalNodeAddress": 252
           },
           {
-            "name": "Mood C",
+            "name": "--",
             "value": true,
             "masterAddress": "192.168.0.97",
             "masterPort": 5001,
-            "logicalAddress": 12,
-            "logicalNodeAddress": 252
+            "logicalAddress": 0,
+            "logicalNodeAddress": 0
           }
-        ],
-        "power": 3263,
-        "current": 2
+        ]
       }
     ],
-    "address": "192.168.0.186",
+    "address": "192.168.0.184",
     "uid": "57e3e0d8-bb05-4b04-8662-1a9871998f3f",
     "bindings": [
       {
@@ -190,40 +156,7 @@
   },
   "p1": {
     "debug": false,
-    "rules": [
-      {
-        "type": "power",
-        "channel": "3+4+5",
-        "low": 30,
-        "high": 1500,
-        "actions": [
-          {
-            "name": "--",
-            "value": false,
-            "masterAddress": "192.168.0.97",
-            "masterPort": 5001,
-            "logicalAddress": 0,
-            "logicalNodeAddress": 0
-          },
-          {
-            "name": "--",
-            "value": 50,
-            "masterAddress": "192.168.0.97",
-            "masterPort": 5001,
-            "logicalAddress": 0,
-            "logicalNodeAddress": 0
-          },
-          {
-            "name": "Alles aan",
-            "value": true,
-            "masterAddress": "192.168.0.97",
-            "masterPort": 5001,
-            "logicalAddress": 5,
-            "logicalNodeAddress": 3
-          }
-        ]
-      }
-    ],
+    "rules": [],
     "bindings": [
       {
         "logicalNodeAddress": 252,
@@ -380,6 +313,102 @@
       }
     ],
     "cunits": [
+      {
+        "logicalNodeAddress": 252,
+        "logicalAddress": 102,
+        "masterAddress": "192.168.0.97",
+        "masterPort": 5001,
+        "name": "<Solar Panels",
+        "displayName": "<Solar Panels",
+        "extendedType": 0,
+        "active": "N",
+        "used": "Y",
+        "group": 0
+      },
+      {
+        "logicalNodeAddress": 252,
+        "logicalAddress": 103,
+        "masterAddress": "192.168.0.97",
+        "masterPort": 5001,
+        "name": ">Cars",
+        "displayName": ">Cars",
+        "extendedType": 0,
+        "active": "N",
+        "used": "Y",
+        "group": 0
+      },
+      {
+        "logicalNodeAddress": 252,
+        "logicalAddress": 100,
+        "masterAddress": "192.168.0.97",
+        "masterPort": 5001,
+        "name": ">Grid",
+        "displayName": ">Grid",
+        "extendedType": 0,
+        "active": "N",
+        "used": "Y",
+        "group": 0
+      },
+      {
+        "logicalNodeAddress": 252,
+        "logicalAddress": 101,
+        "masterAddress": "192.168.0.97",
+        "masterPort": 5001,
+        "name": ">Swimmingpool",
+        "displayName": ">Swimmingpool",
+        "extendedType": 0,
+        "active": "N",
+        "used": "Y",
+        "group": 0
+      },
+      {
+        "logicalNodeAddress": 252,
+        "logicalAddress": 7,
+        "masterAddress": "192.168.0.97",
+        "masterPort": 5001,
+        "name": "Bottom-Left",
+        "displayName": "Bottom-Left",
+        "extendedType": 102,
+        "active": "Y",
+        "used": "Y",
+        "group": 0
+      },
+      {
+        "logicalNodeAddress": 3,
+        "logicalAddress": 30,
+        "masterAddress": "192.168.0.97",
+        "masterPort": 5001,
+        "name": "Blue LED",
+        "displayName": "Blue LED",
+        "extendedType": 1,
+        "active": "N",
+        "used": "Y",
+        "group": 0
+      },
+      {
+        "logicalNodeAddress": 3,
+        "logicalAddress": 34,
+        "masterAddress": "192.168.0.97",
+        "masterPort": 5001,
+        "name": "Lamp-Bottom",
+        "displayName": "Lamp-Bottom",
+        "extendedType": 2,
+        "active": "N",
+        "used": "Y",
+        "group": 0
+      },
+      {
+        "logicalNodeAddress": 3,
+        "logicalAddress": 33,
+        "masterAddress": "192.168.0.97",
+        "masterPort": 5001,
+        "name": "Lamp-Top",
+        "displayName": "Lamp-Top",
+        "extendedType": 2,
+        "active": "N",
+        "used": "Y",
+        "group": 0
+      },
       {
         "logicalNodeAddress": 3,
         "logicalAddress": 4,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "homebridge-smartsystem",
   "displayname": "Duotecno Bridge",
-  "version": "6.3.2",
+  "version": "6.3.4",
   "description": "SmartServer (Proxy Websockets to TCP sockets, Smappee MQTT, Duotecno IP Nodes, Homekit interface)",
   "main": "index.js",
   "author": "Johan Coppieters",
@@ -9,7 +9,8 @@
   "license": "ISC",
   "scripts": {
     "start": "DEBUG=* homebridge -D -P '/Users/johan/Development/duotecno/smartsocket'",
-    "watch": "npx tsc --build . --watch"
+    "watch": "npx tsc --build . --watch",
+    "publish": "npx tsc --build && npm i && npm publish"
   },
   "engines": {
     "node": ">=14.18.1",

package/server/powerbase.js

@@ -94,22 +94,40 @@ class PowerBase extends base_1.Base {
     //////////////////////////////////////////////
     // Bindings to Duotecno virtual temp sensor //
     //////////////////////////////////////////////
+    significant(current, previous) {
+        // no values yet -> don't update
+        if (isNaN(current))
+            return false;
+        // no previous value -> always update
+        if (isNaN(previous))
+            return true;
+        // less than 1000W -> update on: difference > 5% previous
+        if (current < 1000)
+            return Math.abs(previous - current) > (previous * 0.05);
+        // more than 1000W -> update on: difference > 2% previous
+        if (current >= 1000)
+            return Math.abs(previous - current) > (previous * 0.02);
+        return false;
+    }
     applyBindings() {
         if (this.realtimeCounter % 2 === 0) {
             // for all bindings
             this.bindings.forEach(b => {
                 const power = this.evalPower(b.channel);
-                if ((!isNaN(power)) && (isNaN(b.power) || (Math.abs(b.power - power) > Math.abs(b.power * kPercentChange)))) {
-                    (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: " + Math.abs(b.power * kPercentChange));
+                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));
                     this.applyBinding(b, power)
                         .then(value => {
                         b.power = value;
-                        // debug("homebridge", "set unit " + b.name + " to " + value);
+                        // debug("power", "set unit " + b.name + " to " + value);
                     })
                         .catch((e) => (0, logger_1.err)(this.type, e.message || e));
-                }
-                else {
-                    (0, logger_1.debug)("power", "DONT to " + b.channel + " = " + b.power + " -> " + power + " for " + b.name + " (" + b.logicalNodeAddress + ";" + b.logicalAddress + "): difference: " + Math.abs(b.power - power) + " > threshold: " + Math.abs(b.power * kPercentChange));
+                    // } else {
+                    // debug("power", "DONT 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));
                 }
             });
         }
@@ -122,8 +140,8 @@ class PowerBase extends base_1.Base {
                     yield unit.setSensorValue(Math.abs(value));
                 return value;
             }
-            else {
-                throw new Error("***** UNIT NOT FOUND for binding (" + value + ") " + binding.masterAddress + " - " + binding.logicalNodeAddress + ";" + binding.logicalAddress + " *****");
+            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 + " *****");
             }
         });
     }
@@ -144,7 +162,6 @@ class PowerBase extends base_1.Base {
                 if (rule.type === "power") {
                     // add all channels this rule refers to
                     power = this.evalPower(rule.channel);
-                    // power = rule.channel.split("+").reduce((acc, cur) => acc + this.channels[parseInt(cur)]?.power ?? 0, 0);
                 }
                 else if (rule.type === "sun") {
                     // calc fake power usage
@@ -191,10 +208,12 @@ class PowerBase extends base_1.Base {
     applyCommand(action) {
         return __awaiter(this, void 0, void 0, function* () {
             const unit = this.system.findUnit(this.system.findMaster(action.masterAddress, action.masterPort), action.logicalNodeAddress, action.logicalAddress);
-            if (unit)
+            if (unit) {
                 yield unit.setState(action.value);
-            else
-                throw new Error("***** UNIT NOT FOUND for action (" + action.value + ") " + action.masterAddress + " - " + action.logicalNodeAddress + ";" + action.logicalAddress + " *****");
+            }
+            else if ((action.logicalNodeAddress != 0) || (action.logicalAddress != 0)) {
+                throw new Error("***** UNIT NOT FOUND for action for value " + action.value + " to " + action.masterAddress + " - " + action.logicalNodeAddress + ";" + action.logicalAddress + " *****");
+            }
         });
     }
     //

package/server/powerbase.ts

@@ -111,36 +111,61 @@ export class PowerBase extends Base {
   //////////////////////////////////////////////
   // Bindings to Duotecno virtual temp sensor //
   //////////////////////////////////////////////
+  significant(current: number, previous: number): boolean {
+    // no values yet -> don't update
+    if (isNaN(current))
+      return false;
+    
+    // no previous value -> always update
+    if (isNaN(previous))
+      return true;
+
+    // less than 1000W -> update on: difference > 5% previous
+    if (current < 1000)
+      return Math.abs(previous - current) > (previous * 0.05);
+
+    // more than 1000W -> update on: difference > 2% previous
+    if (current >= 1000)
+      return Math.abs(previous - current) > (previous * 0.02);
+
+    return false;
+  }
+
   applyBindings() {
     if (this.realtimeCounter % 2 === 0) {
       // for all bindings
       this.bindings.forEach( b => {
         const power = this.evalPower(b.channel);
-        if ((!isNaN(power)) && (isNaN(b.power) || (Math.abs(b.power - power) > Math.abs(b.power * kPercentChange)))) {
-          debug("power", "APPLY to " + b.channel + " = " + b.power + " -> " + power + " for " + b.name + " (" + b.logicalNodeAddress + ";" + b.logicalAddress + "): difference: " + Math.abs(b.power - power) + " > threshold: " + Math.abs(b.power * kPercentChange))
+        if (this.significant(power, b.power)) {
+          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));
           this.applyBinding(b, power)
             .then(value => {
               b.power = value;
-              // debug("homebridge", "set unit " + b.name + " to " + value);
+              // debug("power", "set unit " + b.name + " to " + value);
             })
             .catch((e) => 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) + " > threshold: " + Math.abs(b.power * kPercentChange))
+        // } else {
+          // debug("power", "DONT 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));
         }
       });
     }
   }
 
   async applyBinding(binding: Binding, value: number): Promise<number> {
-    const unit = this.system.findUnit(this.system.findMaster(binding.masterAddress, binding.masterPort), binding.logicalNodeAddress, binding.logicalAddress);
+    const unit = this.system.findUnit(this.system.findMaster(binding.masterAddress, binding.masterPort), 
+                                      binding.logicalNodeAddress, binding.logicalAddress);
     if (unit) {
       if (!isNaN(value))
         await unit.setSensorValue(Math.abs(value));
       return value;
 
-    } else {
-      throw new Error("***** UNIT NOT FOUND for binding (" + value + ") " + binding.masterAddress + " - " + binding.logicalNodeAddress + ";" + binding.logicalAddress + " *****");
+    } 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 + " *****");
     }
   }
 
@@ -151,8 +176,8 @@ export class PowerBase extends Base {
   applyRules() {
     if (this.realtimeCounter % 60 === 0) {
       log("power", this.type +  " > RealTime totals: Power = " + this.realtime.totalPower + 
-      ", Export = " + this.realtime.totalExportEnergy + 
-      ", Import = " + this.realtime.totalImportEnergy);
+                                ", Export = " + this.realtime.totalExportEnergy + 
+                                ", Import = " + this.realtime.totalImportEnergy);
     }
 
     if (this.realtimeCounter % 5 === 0) {
@@ -164,7 +189,6 @@ export class PowerBase extends Base {
         if (rule.type === "power") {
           // add all channels this rule refers to
           power = this.evalPower(rule.channel);
-          // power = rule.channel.split("+").reduce((acc, cur) => acc + this.channels[parseInt(cur)]?.power ?? 0, 0);
 
         } else if (rule.type === "sun") {
           // calc fake power usage
@@ -201,11 +225,12 @@ export class PowerBase extends Base {
       rule.current = newCurrent;
       if (newCurrent < rule.actions.length) {
         this.applyCommand(rule.actions[newCurrent])
-          .then((val) => {debug("power", "## sent command -> " + rule.type + 
-                                    ", power = " + power + ", channel = " + rule.channel + 
-                                    " -> current = " + newCurrent + 
-                                    " (unit: " + rule.actions[newCurrent].name + ", value: " + rule.actions[newCurrent].value + ")");
-                          rule.current = newCurrent;})
+          .then((val) => { debug("power", "## sent command -> " + rule.type + 
+                                          ", power = " + power + ", channel = " + rule.channel + 
+                                          " -> current = " + newCurrent + 
+                                          " (unit: " + rule.actions[newCurrent].name + ", value: " + rule.actions[newCurrent].value + ")");
+                           rule.current = newCurrent;
+                         })
           .catch((e) => err(this.type, e.message));
       }
     }
@@ -213,10 +238,12 @@ export class PowerBase extends Base {
 
   async applyCommand(action: Action) {
     const unit = this.system.findUnit(this.system.findMaster(action.masterAddress, action.masterPort), action.logicalNodeAddress, action.logicalAddress);
-    if (unit)
+    if (unit) {
       await unit.setState(action.value);
-    else
-      throw new Error("***** UNIT NOT FOUND for action (" + action.value + ") " + action.masterAddress + " - " + action.logicalNodeAddress + ";" + action.logicalAddress + " *****");
+
+    } else if ((action.logicalNodeAddress != 0) || (action.logicalAddress != 0)) {
+      throw new Error("***** UNIT NOT FOUND for action for value " + action.value + " to " + action.masterAddress + " - " + action.logicalNodeAddress + ";" + action.logicalAddress + " *****");
+    }
   }
 
   //

package/server/smappee.js

@@ -280,9 +280,14 @@ class Smappee extends powerbase_1.PowerBase {
         if ((typeof currState === "boolean") && (state != currState)) {
             // do we need to do this?  do we get an mqtt status message ??
             this.plugs[plugNr].value = currState;
-            const topic = 'servicelocation/' + this.config.uid + '/plug/' + plugNr + '/setstate';
-            const payload = '{"value": "' + ((state) ? "ON" : "OFF") + '", "since": "' + (new Date().getTime()) + '"}';
-            this.client.publish(topic, payload);
+            if (this.client) {
+                const topic = 'servicelocation/' + this.config.uid + '/plug/' + plugNr + '/setstate';
+                const payload = '{"value": "' + ((state) ? "ON" : "OFF") + '", "since": "' + (new Date().getTime()) + '"}';
+                this.client.publish(topic, payload);
+            }
+            else {
+                (0, logger_1.err)("smappee", "no open connection (yet?) to " + this.config.uid + " on " + this.config.address);
+            }
         }
     }
 }

package/server/smappee.ts

@@ -296,9 +296,13 @@ export class Smappee extends PowerBase {
       // do we need to do this?  do we get an mqtt status message ??
       this.plugs[plugNr].value = currState; 
 
-      const topic = 'servicelocation/' + this.config.uid + '/plug/' + plugNr + '/setstate';
-      const payload = '{"value": "' + ((state) ? "ON" : "OFF") + '", "since": "' + (new Date().getTime()) + '"}';
-      this.client.publish(topic, payload);
+      if (this.client) {
+        const topic = 'servicelocation/' + this.config.uid + '/plug/' + plugNr + '/setstate';
+        const payload = '{"value": "' + ((state) ? "ON" : "OFF") + '", "since": "' + (new Date().getTime()) + '"}';
+        this.client.publish(topic, payload);
+      } else {
+        err("smappee", "no open connection (yet?) to " + this.config.uid + " on " + this.config.address);
+      }
     }
   }