homebridge-smartsystem 6.2.3 → 6.2.6

package/.vscode/settings.json

@@ -2,5 +2,6 @@
   "files.exclude": {
     "**/*.js": true,
     "**/*.js.map": true
-  }
+  },
+  "task.allowAutomaticTasks": true
 }

package/README.md

@@ -272,6 +272,9 @@ Homebridge UI version
  - 1: always write config to file too (next to sending through the HB-UI API)
  - 2: added headers to http calls from switches, dimmers and up/down's (including OH stuff)
  - 3: fixed bug in Sanitizer of UnitConfig preventing from publishing units to homebridge
+ - 4: fixed empty name bug in unit-def / new accessory()
+ - 5: fixed bad displayNames in published units
+ - 6: power: 5% instead of 10% for power rules
  
 
 ## Hardware 

package/accessories/accessory.js

@@ -9,9 +9,9 @@ const logger_1 = require("../duotecno/logger");
 class Accessory {
     constructor(api, unit) {
         this.homebridge = api.hap;
-        this.unit = unit; // : Duotecno Unit
-        this.name = unit.getDisplayName();
         this.uuid_base = unit.getSerialNr();
+        this.unit = unit; // : Duotecno Unit
+        this.name = unit.getDisplayName() || this.uuid_base;
         // get all services and add ours
         this.services = this.getAccessoryServices();
         this.services.push(this.getInformationService());
@@ -33,10 +33,10 @@ class Accessory {
         throw new Error('The getSystemServices method must be overridden.');
     }
     getModelName() {
-        return this.name;
+        return this.name || this.unit.getSerialNr();
     }
     getName() {
-        return this.name;
+        return this.name || this.unit.getSerialNr();
     }
     getSerialNumber() {
         if (this.unit)

package/accessories/accessory.ts

@@ -18,9 +18,10 @@ export class Accessory {
 
   constructor(api: API, unit: Unit) {
     this.homebridge = api.hap;
-    this.unit = unit;       // : Duotecno Unit
-    this.name = unit.getDisplayName();
+
     this.uuid_base = unit.getSerialNr();
+    this.unit = unit;       // : Duotecno Unit
+    this.name = unit.getDisplayName() || this.uuid_base;
 
     // get all services and add ours
     this.services = this.getAccessoryServices();
@@ -47,10 +48,10 @@ export class Accessory {
   }
 
   getModelName(): string {
-    return this.name;
+    return this.name || this.unit.getSerialNr();
   }
   getName(): string {
-    return this.name;
+    return this.name || this.unit.getSerialNr();
   }
 
   getSerialNumber(): string {

package/config.dhcpcd

@@ -0,0 +1,5 @@
+interface eth0
+static ip_address=1.2.3.4
+static routers=1.2.3.1
+
+static domain_name_servers=8.8.8.8

package/config.json

@@ -147,6 +147,9 @@
         "logicalAddress": 102,
         "masterAddress": "192.168.0.97",
         "masterPort": 5001,
+        "name": "unit 252:102",
+        "displayName": "unit 252:102",
+        "extendedType": 0,
         "channel": "0+1",
         "power": 1706
       },
@@ -155,6 +158,9 @@
         "logicalAddress": 100,
         "masterAddress": "192.168.0.97",
         "masterPort": 5001,
+        "name": "unit 252:100",
+        "displayName": "unit 252:100",
+        "extendedType": 0,
         "channel": "2+3",
         "power": 2494
       },
@@ -163,6 +169,9 @@
         "logicalAddress": 103,
         "masterAddress": "192.168.0.97",
         "masterPort": 5001,
+        "name": "unit 252:103",
+        "displayName": "unit 252:103",
+        "extendedType": 0,
         "channel": "4+5",
         "power": null
       },
@@ -171,6 +180,9 @@
         "logicalAddress": 101,
         "masterAddress": "192.168.0.97",
         "masterPort": 5001,
+        "name": "unit 252:101",
+        "displayName": "unit 252:101",
+        "extendedType": 0,
         "channel": "8",
         "power": null
       }
@@ -217,6 +229,9 @@
         "logicalAddress": 102,
         "masterAddress": "192.168.0.97",
         "masterPort": 5001,
+        "name": "unit 252:102",
+        "displayName": "unit 252:102",
+        "extendedType": 0,
         "channel": "0+1+2",
         "power": null
       },
@@ -225,6 +240,9 @@
         "logicalAddress": 100,
         "masterAddress": "192.168.0.97",
         "masterPort": 5001,
+        "name": "unit 252:100",
+        "displayName": "unit 252:100",
+        "extendedType": 0,
         "channel": "3+4+5",
         "power": null
       }
@@ -243,9 +261,11 @@
         "logicalAddress": 107,
         "masterAddress": "192.168.0.97",
         "masterPort": 5001,
+        "name": "Shelly Valies",
+        "displayName": "Shelly Valies",
+        "extendedType": 0,
         "nomacro": "Y",
         "nostop": "Y",
-        "name": "Shelly Valies",
         "unitName": "Red",
         "value": 0,
         "data": "",
@@ -259,9 +279,11 @@
         "logicalAddress": 105,
         "masterAddress": "192.168.0.97",
         "masterPort": 5001,
+        "name": "Screen Salon Top",
+        "displayName": "Screen Salon Top",
+        "extendedType": 0,
         "nomacro": "N",
         "nostop": "N",
-        "name": "Screen Salon Top",
         "unitName": "Salon Top",
         "value": 0,
         "data": "",
@@ -275,9 +297,11 @@
         "logicalAddress": 104,
         "masterAddress": "192.168.0.97",
         "masterPort": 5001,
+        "name": "Screen Tim small",
+        "displayName": "Screen Tim small",
+        "extendedType": 0,
         "nomacro": "N",
         "nostop": "Y",
-        "name": "Screen Tim small",
         "unitName": "Tim Small",
         "value": 0,
         "data": "",
@@ -291,9 +315,11 @@
         "logicalAddress": 35,
         "masterAddress": "gm.coppieters.be",
         "masterPort": 5005,
+        "name": "Test Plug",
+        "displayName": "Test Plug",
+        "extendedType": 0,
         "nomacro": "N",
         "nostop": "N",
-        "name": "Test Plug",
         "unitName": "Plug",
         "value": 0,
         "data": "",
@@ -307,14 +333,16 @@
         "logicalAddress": 34,
         "masterAddress": "192.168.0.97",
         "masterPort": 5001,
+        "name": "Demo",
+        "displayName": "Demo",
+        "extendedType": 0,
         "nomacro": "N",
         "nostop": "N",
-        "name": "Demo",
-        "unitName": "",
+        "unitName": "unit 3:34",
         "value": 0,
         "data": "b=2",
         "header": "{\"a\":101, \"b\": \"hallo\"}",
-        "method": "GET",
+        "method": "PUT",
         "type": "http",
         "plug": "http://localhost:3001/api/demo/haha?set=#B"
       }
@@ -350,6 +378,9 @@
         "logicalAddress": 102,
         "masterAddress": "192.168.0.97",
         "masterPort": 5001,
+        "name": "unit 252:102",
+        "displayName": "unit 252:102",
+        "extendedType": 0,
         "active": "N",
         "used": "N",
         "group": 0
@@ -359,6 +390,9 @@
         "logicalAddress": 103,
         "masterAddress": "192.168.0.97",
         "masterPort": 5001,
+        "name": "unit 252:103",
+        "displayName": "unit 252:103",
+        "extendedType": 0,
         "active": "N",
         "used": "N",
         "group": 0
@@ -368,6 +402,9 @@
         "logicalAddress": 100,
         "masterAddress": "192.168.0.97",
         "masterPort": 5001,
+        "name": "unit 252:100",
+        "displayName": "unit 252:100",
+        "extendedType": 0,
         "active": "N",
         "used": "N",
         "group": 0
@@ -377,6 +414,9 @@
         "logicalAddress": 101,
         "masterAddress": "192.168.0.97",
         "masterPort": 5001,
+        "name": "unit 252:101",
+        "displayName": "unit 252:101",
+        "extendedType": 0,
         "active": "N",
         "used": "N",
         "group": 0
@@ -386,6 +426,9 @@
         "logicalAddress": 105,
         "masterAddress": "192.168.0.97",
         "masterPort": 5001,
+        "name": "unit 252:105",
+        "displayName": "unit 252:105",
+        "extendedType": 0,
         "active": "N",
         "used": "N",
         "group": 0
@@ -395,6 +438,9 @@
         "logicalAddress": 104,
         "masterAddress": "192.168.0.97",
         "masterPort": 5001,
+        "name": "unit 252:104",
+        "displayName": "unit 252:104",
+        "extendedType": 0,
         "active": "N",
         "used": "N",
         "group": 0
@@ -404,6 +450,9 @@
         "logicalAddress": 106,
         "masterAddress": "192.168.0.97",
         "masterPort": 5001,
+        "name": "unit 252:106",
+        "displayName": "unit 252:106",
+        "extendedType": 0,
         "active": "N",
         "used": "N",
         "group": 0
@@ -413,6 +462,9 @@
         "logicalAddress": 1,
         "masterAddress": "192.168.0.97",
         "masterPort": 5001,
+        "name": "unit 3:1",
+        "displayName": "unit 3:1",
+        "extendedType": 0,
         "active": "N",
         "used": "N",
         "group": 0
@@ -422,6 +474,9 @@
         "logicalAddress": 0,
         "masterAddress": "192.168.0.97",
         "masterPort": 5001,
+        "name": "unit 3:0",
+        "displayName": "unit 3:0",
+        "extendedType": 0,
         "active": "N",
         "used": "N",
         "group": 0
@@ -431,6 +486,9 @@
         "logicalAddress": 30,
         "masterAddress": "192.168.0.97",
         "masterPort": 5001,
+        "name": "unit 3:30",
+        "displayName": "unit 3:30",
+        "extendedType": 0,
         "active": "N",
         "used": "N",
         "group": 0
@@ -440,6 +498,9 @@
         "logicalAddress": 29,
         "masterAddress": "192.168.0.97",
         "masterPort": 5001,
+        "name": "unit 3:29",
+        "displayName": "unit 3:29",
+        "extendedType": 0,
         "active": "N",
         "used": "N",
         "group": 0
@@ -449,6 +510,9 @@
         "logicalAddress": 35,
         "masterAddress": "192.168.0.97",
         "masterPort": 5001,
+        "name": "unit 3:35",
+        "displayName": "unit 3:35",
+        "extendedType": 0,
         "active": "N",
         "used": "N",
         "group": 0
@@ -458,6 +522,9 @@
         "logicalAddress": 34,
         "masterAddress": "192.168.0.97",
         "masterPort": 5001,
+        "name": "unit 3:34",
+        "displayName": "unit 3:34",
+        "extendedType": 0,
         "active": "N",
         "used": "N",
         "group": 0
@@ -467,6 +534,9 @@
         "logicalAddress": 33,
         "masterAddress": "192.168.0.97",
         "masterPort": 5001,
+        "name": "unit 3:33",
+        "displayName": "unit 3:33",
+        "extendedType": 0,
         "active": "N",
         "used": "N",
         "group": 0
@@ -476,6 +546,9 @@
         "logicalAddress": 36,
         "masterAddress": "192.168.0.97",
         "masterPort": 5001,
+        "name": "unit 3:36",
+        "displayName": "unit 3:36",
+        "extendedType": 0,
         "active": "N",
         "used": "N",
         "group": 0
@@ -485,6 +558,9 @@
         "logicalAddress": 5,
         "masterAddress": "192.168.0.97",
         "masterPort": 5001,
+        "name": "unit 3:5",
+        "displayName": "unit 3:5",
+        "extendedType": 0,
         "active": "N",
         "used": "N",
         "group": 0
@@ -494,6 +570,9 @@
         "logicalAddress": 4,
         "masterAddress": "192.168.0.97",
         "masterPort": 5001,
+        "name": "unit 3:4",
+        "displayName": "unit 3:4",
+        "extendedType": 0,
         "active": "N",
         "used": "N",
         "group": 0
@@ -515,5 +594,14 @@
       "units": []
     }
   ],
-  "debug": false
+  "debug": false,
+  "settings": {
+    "network": {
+      "ip1": "1.2.3.4",
+      "gateway1": "1.2.3.1",
+      "nameservers": "8.8.8.8",
+      "ip2": "",
+      "gateway2": ""
+    }
+  }
 }

package/duotecno/types.js

@@ -373,7 +373,10 @@ exports.Sanitizers = {
             logicalNodeAddress: info.logicalNodeAddress || 0,
             logicalAddress: info.logicalAddress || 0,
             masterAddress: info.masterAddress || '',
-            masterPort: info.masterPort || 5001
+            masterPort: info.masterPort || 5001,
+            name: info.name || ('unit ' + info.logicalNodeAddress + ":" + info.logicalAddress),
+            displayName: info.displayName || info.name || ('unit ' + info.logicalNodeAddress + ":" + info.logicalAddress),
+            extendedType: info.extendedType || UnitExtendedType.kNoType
         };
     },
     unitConfig: function (config) {

package/duotecno/types.ts

@@ -563,7 +563,12 @@ export const Sanitizers = {
       logicalNodeAddress: info.logicalNodeAddress || 0,
       logicalAddress: info.logicalAddress || 0,
       masterAddress: info.masterAddress || '',
-      masterPort: info.masterPort || 5001
+      masterPort: info.masterPort || 5001,
+
+      name: info.name || ('unit '+info.logicalNodeAddress+":"+info.logicalAddress),
+      displayName: info.displayName || info.name || ('unit '+info.logicalNodeAddress+":"+info.logicalAddress),
+      
+      extendedType: info.extendedType || UnitExtendedType.kNoType
     };
   },
 

package/index.spec.js

@@ -1,42 +1,40 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const platform_1 = require("./server/platform");
-const protocol_1 = require("./duotecno/protocol");
-const types_1 = require("./duotecno/types");
 const logger_1 = require("./duotecno/logger");
-const master_1 = require("./duotecno/master");
 const fs = require("fs");
 const os = require("os");
 (0, logger_1.setLogFunction)(console.log);
-logger_1.logSettings["spec"] = logger_1.LogLevel.debug;
-let platform;
-(0, logger_1.log)("spec", "running in directory: " + process.cwd());
-const isMac = (os.platform() === "darwin");
+logger_1.logSettings["spec"] = logger_1.LogLevel.log;
+const osType = os.platform();
+(0, logger_1.log)("spec", "running in directory: " + process.cwd() + " on " + osType);
+const isMac = (osType === "darwin");
 const kConfigFiles = (isMac) ? (__dirname) : (os.homedir() + "/duotecno");
 if (!fs.existsSync(kConfigFiles))
     fs.mkdirSync(kConfigFiles);
-const fn = kConfigFiles + "/config.json";
-(0, logger_1.log)("spec", "Config in " + fn);
 function adder(plugin, platform, list) {
     (0, logger_1.log)("spec", "************* plugin: " + plugin + ", platform: " + platform);
     (0, logger_1.log)("spec", "************* list: " + JSON.stringify(list));
 }
-function tester() {
-    // testing
-    let m = new master_1.Master(platform.system, types_1.Sanitizers.masterConfig({ name: "master1", address: "12", port: 21, password: "x", active: true, nodenames: {} }));
-    let n = new protocol_1.Node(m, types_1.Sanitizers.nodeInfo({ name: "node1" }));
-    let u = new protocol_1.Unit(n, types_1.Sanitizers.unitInfo({ name: "unit|123 $", type: 7 }));
-    (0, logger_1.log)("spec", "Testing names -> getName = " + u.getName() + ", getDisplayname = " + u.getDisplayName() + ", type " + u.type + ", extType = " + u.extendedType + ", getTypeName = " + u.typeName());
-    u = new protocol_1.Unit(n, types_1.Sanitizers.unitInfo({ name: "unit|20", type: 1 }));
-    (0, logger_1.log)("spec", "Testing names -> getName = " + u.getName() + ", getDisplayname = " + u.getDisplayName() + ", type " + u.type + ", extType = " + u.extendedType + ", getTypeName = " + u.typeName());
-}
 try {
+    const fn = kConfigFiles + "/config.json";
+    (0, logger_1.log)("spec", "Reading config from " + fn);
     const configBuf = fs.readFileSync(fn);
     const configStr = configBuf.toString();
     const config = JSON.parse(configStr);
-    platform = new platform_1.Platform(console, config, { registerPlatformAccessories: adder });
+    (0, logger_1.debug)("spec", config);
+    const platform = new platform_1.Platform(console, config, { registerPlatformAccessories: adder });
 }
 catch (err) {
     (0, logger_1.log)("spec", err);
 }
+// function tester() {
+//   // testing
+//   let m = new Master(platform.system, Sanitizers.masterConfig({name: "master1", address: "12", port: 21, password:"x", active: true, nodenames: {}}));
+//   let n = new Node(m, Sanitizers.nodeInfo({name: "node1"}));
+//   let u = new Unit(n, Sanitizers.unitInfo({name: "unit|123 $", type: 7}));
+//   log("spec", "Testing names -> getName = " + u.getName() + ", getDisplayname = " + u.getDisplayName() + ", type " + u.type + ", extType = " + u.extendedType + ", getTypeName = " + u.typeName());
+//   u = new Unit(n, Sanitizers.unitInfo({name: "unit|20", type: 1}));
+//   log("spec", "Testing names -> getName = " + u.getName() + ", getDisplayname = " + u.getDisplayName() + ", type " + u.type + ", extType = " + u.extendedType + ", getTypeName = " + u.typeName());
+// }
 //# sourceMappingURL=index.spec.js.map

package/index.spec.ts

@@ -1,50 +1,53 @@
 import { Platform } from "./server/platform";
 import { Unit, Node } from "./duotecno/protocol";
 import { Sanitizers } from "./duotecno/types";
-import { log, LogLevel, logSettings, setLogFunction } from "./duotecno/logger";
+import { debug, log, LogLevel, logSettings, setLogFunction } from "./duotecno/logger";
 import { Master } from "./duotecno/master";
 import { API } from "homebridge";
 import * as fs from "fs";
 import * as os from "os";
 
 setLogFunction(console.log);
-logSettings["spec"] = LogLevel.debug;
+logSettings["spec"] = LogLevel.log;
 
-let platform;
-log("spec", "running in directory: " + process.cwd());
 
-const isMac = (os.platform() === "darwin");
+const osType = os.platform();
+log("spec", "running in directory: " + process.cwd() + " on " + osType);
+
+const isMac = (osType === "darwin");
 const kConfigFiles = (isMac) ? (__dirname) : (os.homedir() + "/duotecno");
 if (! fs.existsSync(kConfigFiles)) fs.mkdirSync(kConfigFiles);
 
-const fn = kConfigFiles + "/config.json";
-log("spec", "Config in " + fn);
 
 function adder(plugin: string, platform: string, list: any[]) {
   log("spec", "************* plugin: " + plugin + ", platform: " + platform);
   log("spec", "************* list: " + JSON.stringify(list));
 }
 
-function tester() {
-  // testing
-  let m = new Master(platform.system, Sanitizers.masterConfig({name: "master1", address: "12", port: 21, password:"x", active: true, nodenames: {}}));
-  let n = new Node(m, Sanitizers.nodeInfo({name: "node1"}));
-  let u = new Unit(n, Sanitizers.unitInfo({name: "unit|123 $", type: 7}));
-  log("spec", "Testing names -> getName = " + u.getName() + ", getDisplayname = " + u.getDisplayName() + ", type " + u.type + ", extType = " + u.extendedType + ", getTypeName = " + u.typeName());
-  u = new Unit(n, Sanitizers.unitInfo({name: "unit|20", type: 1}));
-  log("spec", "Testing names -> getName = " + u.getName() + ", getDisplayname = " + u.getDisplayName() + ", type " + u.type + ", extType = " + u.extendedType + ", getTypeName = " + u.typeName());
-}
-
-
 
 try {
+  const fn = kConfigFiles + "/config.json";
+  log("spec", "Reading config from " + fn);
+
   const configBuf = fs.readFileSync(fn);
   const configStr = configBuf.toString();
   const config = JSON.parse(configStr);
+  debug("spec", config);
 
-  platform = new Platform(console, config, <API>{registerPlatformAccessories: adder});
+  const platform = new Platform(console, config, <API>{registerPlatformAccessories: adder});
 
 } catch(err) {
   log("spec", err);
 }
 
+
+// function tester() {
+//   // testing
+//   let m = new Master(platform.system, Sanitizers.masterConfig({name: "master1", address: "12", port: 21, password:"x", active: true, nodenames: {}}));
+//   let n = new Node(m, Sanitizers.nodeInfo({name: "node1"}));
+//   let u = new Unit(n, Sanitizers.unitInfo({name: "unit|123 $", type: 7}));
+//   log("spec", "Testing names -> getName = " + u.getName() + ", getDisplayname = " + u.getDisplayName() + ", type " + u.type + ", extType = " + u.extendedType + ", getTypeName = " + u.typeName());
+//   u = new Unit(n, Sanitizers.unitInfo({name: "unit|20", type: 1}));
+//   log("spec", "Testing names -> getName = " + u.getName() + ", getDisplayname = " + u.getDisplayName() + ", type " + u.type + ", extType = " + u.extendedType + ", getTypeName = " + u.typeName());
+// }
+

package/package.json

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

package/server/powerbase.js

@@ -17,6 +17,7 @@ const base_1 = require("./base");
 //  used by Smappee, Shelly PM, P1 Meter, ...
 // Johan Coppieters, Jul 2022.
 //
+const kPercentChange = 0.05;
 class PowerBase extends base_1.Base {
     constructor(type, system) {
         super(type);
@@ -97,8 +98,8 @@ class PowerBase extends base_1.Base {
             // 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 * 0.1)))) {
-                    (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 * 0.1));
+                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));
                     this.applyBinding(b, power)
                         .then(value => {
                         b.power = value;
@@ -107,7 +108,7 @@ class PowerBase extends base_1.Base {
                         .catch((e) => (0, logger_1.err)(this.type, 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 * 0.1));
+                    (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));
                 }
             });
         }

package/server/powerbase.ts

@@ -9,6 +9,8 @@ import { Context } from "./webapp";
 // Johan Coppieters, Jul 2022.
 //
 
+const kPercentChange = 0.05;
+
 
 export class PowerBase extends Base {
   system: System;
@@ -112,8 +114,8 @@ export class PowerBase extends Base {
       // 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 * 0.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 * 0.1))
+        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))
           this.applyBinding(b, power)
             .then(value => {
               b.power = value;
@@ -122,7 +124,7 @@ export class PowerBase extends Base {
             .catch((e) => err(this.type, 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 * 0.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))
         }
       });
     }

package/server/smartapp.ts

@@ -22,7 +22,7 @@ import { existsSync, truncateSync, writeFileSync } from 'fs';
 import { Shelly } from './shelly';
 import { P1 } from './p1';
 import { post } from "../duotecno/api";
-import { getConfig, setAPIConfig, setToken } from "../duotecno/config";
+import { setToken } from "../duotecno/config";
 
 const kMaster = {name: "master", type: "string", default: "0.0.0.0:5001"} as const;
 const kAddress = {name: "address", type: "string", default: "0.0.0.0"} as const;

package/server/views/settings.ejs

@@ -20,7 +20,6 @@
           Settings<button class="right btn waves-effect waves-light" type="submit" name="action" value="reset">Reset to DHCP</button>
           <button class="right btn waves-effect waves-light" type="submit" name="action" value="install">Install IP Settings</button>
           <button class="right btn waves-effect waves-light" type="submit" name="action" value="reboot">Reboot PI</button>
-          <button class="right btn waves-effect waves-light" type="submit" name="action" value="restart">Restart Homebridge</button>
         </h1>
         
         <div class="row">
@@ -41,7 +40,7 @@
           </div>
         </div>
 
-        <div class="row">
+        <!-- div class="row">
           <div class="input-field col s6">
             <input placeholder="" id="ip2" name="ip2" type="text" value="<%= config.network.ip2 %>">
             <label for="ip2">Secondary Fixed IP Address / netmask</label>
@@ -50,7 +49,7 @@
             <input placeholder="" id="gateway2" name="gateway2" type="text" value="<%= config.network.gateway2 %>">
             <label for="gateway2">Secondary Gateway</label>
           </div>
-        </div>
+        </div -->
 
       </form>
 

package/config.p1.json

@@ -1,59 +0,0 @@
-{
-  "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
-        }
-      ]
-    }
-  ],
-  "bindings": [
-    {
-      "name": "<Solar Panels",
-      "value": 0,
-      "masterAddress": "192.168.0.97",
-      "masterPort": 5001,
-      "logicalAddress": 102,
-      "logicalNodeAddress": 252,
-      "channel": "0+1+2",
-      "power": null
-    },
-    {
-      "name": ">Grid",
-      "value": 0,
-      "masterAddress": "192.168.0.97",
-      "masterPort": 5001,
-      "logicalAddress": 100,
-      "logicalNodeAddress": 252,
-      "channel": "3+4+5",
-      "power": null
-    }
-  ],
-  "address": "192.168.0.214"
-}

package/config.server.json

@@ -1,4 +0,0 @@
-{
-  "debug": false,
-  "port": 9999
-}

package/config.settings.json

@@ -1,9 +0,0 @@
-{
-  "network": {
-    "ip1": "192.168.0.97",
-    "gateway1": "192.168.0.1",
-    "nameservers": "8.8.8.8 8.8.8.4",
-    "ip2": "",
-    "gateway2": ""
-  }
-}

package/config.smappee.json

@@ -1,183 +0,0 @@
-{
-  "rules": [
-    {
-      "type": "sun",
-      "channel": "0",
-      "low": 30,
-      "high": 900,
-      "actions": [
-        {
-          "name": "Mood A",
-          "value": false,
-          "masterAddress": "192.168.0.97",
-          "masterPort": 5001,
-          "logicalAddress": 10,
-          "logicalNodeAddress": 252
-        },
-        {
-          "name": "Mood A",
-          "value": 50,
-          "masterAddress": "192.168.0.97",
-          "masterPort": 5001,
-          "logicalAddress": 10,
-          "logicalNodeAddress": 252
-        },
-        {
-          "name": "Mood A",
-          "value": true,
-          "masterAddress": "192.168.0.97",
-          "masterPort": 5001,
-          "logicalAddress": 10,
-          "logicalNodeAddress": 252
-        }
-      ],
-      "power": -3382,
-      "current": 0
-    },
-    {
-      "type": "power",
-      "channel": "4",
-      "low": 10,
-      "high": 20,
-      "actions": [
-        {
-          "name": "Mood B",
-          "value": false,
-          "masterAddress": "192.168.0.97",
-          "masterPort": 5001,
-          "logicalAddress": 11,
-          "logicalNodeAddress": 252
-        },
-        {
-          "name": "Mood B",
-          "value": 50,
-          "masterAddress": "192.168.0.97",
-          "masterPort": 5001,
-          "logicalAddress": 11,
-          "logicalNodeAddress": 252
-        },
-        {
-          "name": "Mood B",
-          "value": true,
-          "masterAddress": "192.168.0.97",
-          "masterPort": 5001,
-          "logicalAddress": 11,
-          "logicalNodeAddress": 252
-        }
-      ],
-      "power": 0,
-      "current": 0
-    },
-    {
-      "type": "power",
-      "channel": "7+8+9",
-      "low": 30,
-      "high": 900,
-      "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",
-          "value": true,
-          "masterAddress": "192.168.0.97",
-          "masterPort": 5001,
-          "logicalAddress": 12,
-          "logicalNodeAddress": 252
-        }
-      ],
-      "power": 2207,
-      "current": 2
-    },
-    {
-      "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",
-          "value": true,
-          "masterAddress": "192.168.0.97",
-          "masterPort": 5001,
-          "logicalAddress": 12,
-          "logicalNodeAddress": 252
-        }
-      ]
-    }
-  ],
-  "address": "192.168.0.186",
-  "uid": "57e3e0d8-bb05-4b04-8662-1a9871998f3f",
-  "debug": false,
-  "bindings": [
-    {
-      "name": "<Solar",
-      "value": 0,
-      "masterAddress": "192.168.0.97",
-      "masterPort": 5001,
-      "logicalAddress": 102,
-      "logicalNodeAddress": 252,
-      "channel": "0+1",
-      "power": 1706
-    },
-    {
-      "name": ">Grid",
-      "value": 0,
-      "masterAddress": "192.168.0.97",
-      "masterPort": 5001,
-      "logicalAddress": 100,
-      "logicalNodeAddress": 252,
-      "channel": "2+3",
-      "power": 2494
-    },
-    {
-      "name": ">Cars",
-      "value": 0,
-      "masterAddress": "192.168.0.97",
-      "masterPort": 5001,
-      "logicalAddress": 103,
-      "logicalNodeAddress": 252,
-      "channel": "4+5",
-      "power": null
-    },
-    {
-      "name": ">Swimmingpool",
-      "value": 0,
-      "masterAddress": "192.168.0.97",
-      "masterPort": 5001,
-      "logicalAddress": 101,
-      "logicalNodeAddress": 252,
-      "channel": "8",
-      "power": null
-    }
-  ]
-}

package/config.smartapp.json

@@ -1,69 +0,0 @@
-{
-  "apiPort": 8581,
-  "apiHost": "192.168.0.99",
-  "socapp": false,
-  "port": 5002,
-  "switches": [
-    {
-      "name": "Shelly Valies",
-      "unitName": "Red",
-      "masterAddress": "192.168.0.97",
-      "masterPort": 5001,
-      "nomacro": "Y",
-      "nostop": "Y",
-      "logicalAddress": 107,
-      "logicalNodeAddress": 252,
-      "type": "httpdim",
-      "plug": "http://192.168.0.96/light/0?brightness=$&turn=#",
-      "data": "",
-      "method": "GET",
-      "value": 0
-    },
-    {
-      "name": "Screen Salon Top",
-      "unitName": "Salon Top",
-      "masterAddress": "192.168.0.97",
-      "masterPort": 5001,
-      "nomacro": "N",
-      "nostop": "N",
-      "logicalAddress": 105,
-      "logicalNodeAddress": 252,
-      "type": "somfy",
-      "plug": "1",
-      "data": "",
-      "method": "GET",
-      "value": 0
-    },
-    {
-      "name": "Screen Tim small",
-      "unitName": "Tim Small",
-      "masterAddress": "192.168.0.97",
-      "masterPort": 5001,
-      "nomacro": "N",
-      "nostop": "Y",
-      "logicalAddress": 104,
-      "logicalNodeAddress": 252,
-      "type": "httpupdown",
-      "plug": "2",
-      "data": "",
-      "method": "GET",
-      "value": 0
-    },
-    {
-      "name": "Test Plug",
-      "unitName": "Plug",
-      "masterAddress": "gm.coppieters.be",
-      "masterPort": 5005,
-      "nomacro": "N",
-      "nostop": "N",
-      "logicalAddress": 35,
-      "logicalNodeAddress": 16,
-      "type": "smappee",
-      "plug": "1",
-      "data": "",
-      "method": "GET",
-      "value": 0
-    }
-  ],
-  "debug": false
-}

package/config.system.json

@@ -1,247 +0,0 @@
-{
-  "language": "EN",
-  "stores": false,
-  "multiple": false,
-  "socketserver": "ws.duotecno.eu",
-  "socketport": 9999,
-  "mood": "sfeer",
-  "debug": false,
-  "cmasters": [
-    {
-      "address": "192.168.0.97",
-      "port": 5001,
-      "password": "GMTecno",
-      "name": "Valies",
-      "active": true,
-      "nodenames": {
-        "3": "SB 1",
-        "4": "oled",
-        "252": " 20211003"
-      },
-      "debug": false
-    }
-  ],
-  "cunits": [
-    {
-      "active": "Y",
-      "used": "Y",
-      "group": 0,
-      "name": "<Solar Panels",
-      "displayName": "<Solar Panels",
-      "type": 4,
-      "extendedType": null,
-      "masterAddress": "192.168.0.97",
-      "masterPort": 5001,
-      "logicalNodeAddress": 252,
-      "logicalAddress": 102
-    },
-    {
-      "active": "Y",
-      "used": "Y",
-      "group": 0,
-      "name": ">Cars",
-      "displayName": ">Cars",
-      "type": 4,
-      "extendedType": null,
-      "masterAddress": "192.168.0.97",
-      "masterPort": 5001,
-      "logicalNodeAddress": 252,
-      "logicalAddress": 103
-    },
-    {
-      "active": "Y",
-      "used": "Y",
-      "group": 0,
-      "name": ">Grid",
-      "displayName": ">Grid",
-      "type": 4,
-      "extendedType": null,
-      "masterAddress": "192.168.0.97",
-      "masterPort": 5001,
-      "logicalNodeAddress": 252,
-      "logicalAddress": 100
-    },
-    {
-      "active": "Y",
-      "used": "Y",
-      "group": 0,
-      "name": ">Swimmingpool",
-      "displayName": ">Swimmingpool",
-      "type": 4,
-      "extendedType": null,
-      "masterAddress": "192.168.0.97",
-      "masterPort": 5001,
-      "logicalNodeAddress": 252,
-      "logicalAddress": 101
-    },
-    {
-      "active": "Y",
-      "used": "Y",
-      "group": 0,
-      "name": "Salon Top",
-      "displayName": "Salon Top",
-      "type": 8,
-      "extendedType": 8,
-      "masterAddress": "192.168.0.97",
-      "masterPort": 5001,
-      "logicalNodeAddress": 252,
-      "logicalAddress": 105
-    },
-    {
-      "active": "Y",
-      "used": "Y",
-      "group": 0,
-      "name": "Tim Small",
-      "displayName": "Tim Small",
-      "type": 8,
-      "extendedType": 8,
-      "masterAddress": "192.168.0.97",
-      "masterPort": 5001,
-      "logicalNodeAddress": 252,
-      "logicalAddress": 104
-    },
-    {
-      "active": "Y",
-      "used": "Y",
-      "group": 0,
-      "name": "Plug 1",
-      "displayName": "Plug 1",
-      "type": 2,
-      "extendedType": 2,
-      "masterAddress": "192.168.0.97",
-      "masterPort": 5001,
-      "logicalNodeAddress": 252,
-      "logicalAddress": 106
-    },
-    {
-      "active": "Y",
-      "used": "Y",
-      "group": 0,
-      "name": "Smartbox",
-      "displayName": "Smartbox",
-      "type": 4,
-      "extendedType": null,
-      "masterAddress": "192.168.0.97",
-      "masterPort": 5001,
-      "logicalNodeAddress": 3,
-      "logicalAddress": 1
-    },
-    {
-      "active": "Y",
-      "used": "Y",
-      "group": 0,
-      "name": "Valies",
-      "displayName": "Valies",
-      "type": 4,
-      "extendedType": null,
-      "masterAddress": "192.168.0.97",
-      "masterPort": 5001,
-      "logicalNodeAddress": 3,
-      "logicalAddress": 0
-    },
-    {
-      "active": "Y",
-      "used": "Y",
-      "group": 0,
-      "name": "Blue LED",
-      "displayName": "Blue LED",
-      "type": 1,
-      "extendedType": null,
-      "masterAddress": "192.168.0.97",
-      "masterPort": 5001,
-      "logicalNodeAddress": 3,
-      "logicalAddress": 30
-    },
-    {
-      "active": "Y",
-      "used": "Y",
-      "group": 0,
-      "name": "Red LED",
-      "displayName": "Red LED",
-      "type": 1,
-      "extendedType": null,
-      "masterAddress": "192.168.0.97",
-      "masterPort": 5001,
-      "logicalNodeAddress": 3,
-      "logicalAddress": 29
-    },
-    {
-      "active": "Y",
-      "used": "Y",
-      "group": 0,
-      "name": "Bulb",
-      "displayName": "Bulb",
-      "type": 2,
-      "extendedType": 2,
-      "masterAddress": "192.168.0.97",
-      "masterPort": 5001,
-      "logicalNodeAddress": 3,
-      "logicalAddress": 35
-    },
-    {
-      "active": "Y",
-      "used": "Y",
-      "group": 0,
-      "name": "Lamp-Bottom",
-      "displayName": "Lamp-Bottom",
-      "type": 2,
-      "extendedType": 2,
-      "masterAddress": "192.168.0.97",
-      "masterPort": 5001,
-      "logicalNodeAddress": 3,
-      "logicalAddress": 34
-    },
-    {
-      "active": "Y",
-      "used": "Y",
-      "group": 0,
-      "name": "Lamp-Top",
-      "displayName": "Lamp-Top",
-      "type": 2,
-      "extendedType": 2,
-      "masterAddress": "192.168.0.97",
-      "masterPort": 5001,
-      "logicalNodeAddress": 3,
-      "logicalAddress": 33
-    },
-    {
-      "active": "Y",
-      "used": "Y",
-      "group": 0,
-      "name": "Stopcontact stk",
-      "displayName": "Stopcontact stk",
-      "type": 2,
-      "extendedType": 2,
-      "masterAddress": "192.168.0.97",
-      "masterPort": 5001,
-      "logicalNodeAddress": 3,
-      "logicalAddress": 36
-    },
-    {
-      "active": "Y",
-      "used": "Y",
-      "group": 0,
-      "name": "Alles aan",
-      "displayName": "Alles aan",
-      "type": 7,
-      "extendedType": 7,
-      "masterAddress": "192.168.0.97",
-      "masterPort": 5001,
-      "logicalNodeAddress": 3,
-      "logicalAddress": 5
-    },
-    {
-      "active": "Y",
-      "used": "Y",
-      "group": 0,
-      "name": "Alles uit",
-      "displayName": "Alles uit",
-      "type": 7,
-      "extendedType": 7,
-      "masterAddress": "192.168.0.97",
-      "masterPort": 5001,
-      "logicalNodeAddress": 3,
-      "logicalAddress": 4
-    }
-  ]
-}