homebridge-smartsystem 6.1.5 → 6.1.6

package/README.md

@@ -19,25 +19,25 @@ inherited versions of smartApp
 - v3.1 - include switches (only 1 type working) / september 2019
 - v3.1.1 - added unit-macro cmd status changes / september 2019
 
-## v5.0.1, March 2020, Johan, first merge working
+### v5.0.1, March 2020, Johan, first merge working
 - new separate branch "v2.0"
 
-## v5.0.2, May 2020, Johan, working version of 
+### v5.0.2, May 2020, Johan, working version of 
 - backup, restore
 - store scenes and execute them on status changes
 - add http switches (next to smappee - mqqt) like Shelly
 
-## v5.0.5, June 2020, Johan, feature release
+### v5.0.5, June 2020, Johan, feature release
 - added "Condition" moods
 - sort on logical unit address
 - added: #, *, ! type modifiers
 
-## v5.0.6, .7, .8
+### v5.0.6, .7, .8
 - (6,7) Fixed small reported issues
 - (8) Bug fixes for saving switches
 - (8) added new app
 
-## v5.1.0b1
+### v5.1.0b1
 - add nr-devices in webpage of services
 - change display name (sfeer)
 - feedback of plugs
@@ -136,125 +136,127 @@ switch =>
 - removed: logicalReqNodeAddress (never used)
 - removed test configs from repo
 
-## v5.6.8/9
+### v5.6.8/9
 - trying to fix connection loss
 
-## v5.6.10
+### v5.6.10
 - add heartbeat to master to prevent connection loss
 
-## v5.6.11
+### v5.6.11
 - fix PIR and other stuff like values for virtual units / macro's
 
-## v5.6.12
+### v5.6.12
 - added logging for files
 - R2: added new version of the app v2.3.4 B2
 - R3: keep heartbeat if socket closes unexpectedly
 - R4: added not ready message
 - R5: support for short url's  /node/unit/value
 
-## v5.7.1
+### v5.7.1
 - smappee channel rules now accept 3+2+7 format for a channel
 
-## v5.7.2
+### v5.7.2
 - smappee now has "sun" rules: low == (production < consumption>)
 
-## v5.8.0
+### v5.8.0
 - Added API calls /masters/list & services  /units/set & get
 
-## v5.9.0
+### v5.9.0
 - added extended type selection in master->node->unit->detail page (not yet tested !!) 
 
-## v5.9.1
+### v5.9.1
 - added stubs for openHAB switch/dimmer/updown
 
-## v5.9.2
+### v5.9.2
 - added active / used unit flag, allowing more units in the gateway, only those "actice" are sent to Homebridge
 
-## v5.10.0
+### v5.10.0
 - openHAB support for up/downs, dimmers en switches. copied from smartapp.js file of Pieter Becu <pieter@bqnet.be>
 
-## v5.10.1
+### v5.10.1
 - added git user.name/email to update.sh
 
-## v5.10.2
+### v5.10.2
 - better upgrade to new config layout (used - active units)
 
-## v5.10.3
+### v5.10.3
 - waiting for active config units (not total units)
 
-## v5.10.4
+### v5.10.4
 - Extended saved type was not used on restart
 
-## v5.10.5 - R1/2/3
+### v5.10.5 - R1/2/3
 - Added $T (0-511) for bindings (Hue)
 - trying to fix up/down - windowcovering
 - trying to fix ready state (nr units in systems versus in config)
-## v5.10.5 - R4
+### v5.10.5 - R4
 - changed mood-press(true) to (-1)
-## v5.10.5 - R5 - 26/02/2021
+### v5.10.5 - R5 - 26/02/2021
 - send "stop" to openHAB for status = 0
-## v5.10.5 - R6 - 27/02/2021
+### v5.10.5 - R6 - 27/02/2021
 - app upgrade to 2.3.7
-## v5.10.6 - 08/04/2021
+### v5.10.6 - 08/04/2021
 - delete spaces from backup names
 - updated files on the server: for f in *\ *.json ; do mv "$f" ${f//\ /}; done
 
-## v5.11.0 - 04/06/2021
+### v5.11.0 - 04/06/2021
 - fixed bug in sun/power selection of rule
 - changed power rule functionality (now: compare channels with "sun-consumption")
-## v5.11.0 - R2 - 04/06/2021
+### v5.11.0 - R2 - 04/06/2021
 - change name of master does not generate new master anymore
-## v5.11.1 - 04/06/2021
+### v5.11.1 - 04/06/2021
 - turn of debug -> production
-## v5.11.2 - 04/06/2021
+### v5.11.2 - 04/06/2021
 - Fixed Long standing rule editing bug: kEmptyRule included an array
-## v5.11.3 - 16/08/2021
+### v5.11.3 - 16/08/2021
 - don't do request status of clicking an up/down in the web interface
 - added extra logging for heartbeats
-## v5.11.5 - 17/08/2021
+### v5.11.5 - 17/08/2021
 - tryout for "no-macro" on a switch
 - fixes no-macro "save" bug
 - added send-no-stop for up/downs
 
-## v5.12.0 - 18/08/2021
+### v5.12.0 - 18/08/2021
 - added reconnect in the master conf file
 - cleaned up a lot of logging
 - auto read config file in constructor
-## v5.12.1 - 27-08-2021
+### v5.12.1 - 27-08-2021
 - use heartbeat to reconnect after network connection lost. Needs last version op ip master soft, in previous versions the heartbeat was broken.
-## v5.12.2 - 09-01-2022
+### v5.12.2 - 09-01-2022
 - fixed problem when checking smappee switch (only used nr, not type)
-## v5.12.3 - 10-01-2022
+### v5.12.3 - 10-01-2022
 - added reboot command -> in the homebridge page or as an url: /reboot
 
-## v5.13.0 - 23-05-2022
+### v5.13.0 - 23-05-2022
 - added "power" bindings -> set 1/10th of value of unit to power of channels. Visualisation is done in the Pro and Lite app.
-## v5.13.1 - 24-05-2022
+### v5.13.1 - 24-05-2022
 - Display nr devices on HomeBridge
 
-## v5.14.0 - 19-06-2022
+### v5.14.0 - 19-06-2022
 - network settings + reboot
-## v5.14.1 - todo
+### v5.14.1 - todo
 - listen on gpio pin
 
 ## v6.0.x - 01-07-2022
-- .1: first version running on Homebridge UI
+Homebridge UI version
+- .1: first working version
 - .9: read version from package.json
 - .10: removed "homekit" nav tab, 
  added "restart plugin" to settings, 
  set lock target state to "locked"
 
- ## v6.1.0 - 15-07-2022
+ ### v6.1.0 - 15-07-2022
  - global debug, log, err functions in types.ts
  - split smappee.ts in PowerBase + smappee/p1/shelly
 
- ## v6.1.x - 21-07-2022 - P1 release
+ ### v6.1.x - 21-07-2022 - P1 release
  - 0: implemented P1 power meter telegram
  - 1: bugfixes, timeout mgt, etc...
  - 2: try fixing logfunction errors
  - 3: reverting to console.log
  - 4: errors when starting power mgrs from platform.ts
  - 5: v6.1.3 changes were gone... restored them.
+ - 6: added login with pw in config + http.get with on-error
 
 ## Hardware 
 A Raspberry Pi that connects to a Duotecno IP Node 
@@ -355,6 +357,11 @@ sudo raspi-config
 curl -sSfL https://repo.homebridge.io/KEY.gpg | sudo gpg --dearmor | sudo tee /usr/share/keyrings/homebridge.gpg  > /dev/null
 echo "deb [signed-by=/usr/share/keyrings/homebridge.gpg] https://repo.homebridge.io stable main" | sudo tee /etc/apt/sources.list.d/homebridge.list > /dev/null
 
+# Deinstall old version running through pm2
+pm2 stop homebridge
+pm2 delete homebridge
+pm2 save
+
 # Install Homebridge
 sudo apt-get update
 sudo apt-get --yes install homebridge
@@ -384,7 +391,7 @@ sudo npm install --save homebridge-smartsystem
             "manufacturer": "Duotecno-Coppieters",
             "name": "Duotecno",
             "platform": "DuotecnoPlatform",
-            "smappee": true,
+            "smappee": true, "shelly": false, "p1": false,
             "smartapp": true,
             "system": true,
             "socapp": false

package/config.homebridge.json

@@ -12,10 +12,11 @@
       "platform": "DuotecnoPlatform",
       "smappee": true,
       "p1": true,
-      "shelly": true,
+      "shelly": false,
       "smartapp": true,
       "system": true,
-      "socapp": false
+      "socapp": false,
+      "password": "Tester"
     }
   ],
   "accessories": []

package/config.p1-dev.json

@@ -1,6 +1,59 @@
 {
   "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
+        }
+      ]
+    }
   ],
-  "address": "192.168.0.186",
-  "debug": false
+  "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.p1.json

@@ -1,6 +1,59 @@
 {
-  "rules": [],
-  "address": "192.168.0.214",
-  "debug": false,
-  "bindings": []
+  "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.system.json

@@ -7,7 +7,241 @@
   "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
+    }
   ]
 }

package/duotecno/types.js

@@ -104,7 +104,7 @@ exports.logSettings = {
     "protocol": LogLevel.noLog,
     "webapp": LogLevel.log,
     "p1": LogLevel.log,
-    "power": LogLevel.noLog
+    "power": LogLevel.log
 };
 // can be overriden with server log function
 exports.logFunction = console.log;
@@ -114,14 +114,14 @@ function setLogFunction(F) {
 }
 exports.setLogFunction = setLogFunction;
 function err(type, message) {
-    (0, exports.logFunction)(type + ": " + ((typeof message === "object") ? JSON.stringify(message) : message));
+    (0, exports.logFunction)(type + ": " + ((typeof message === "string") ? message : JSON.stringify(message)));
 }
 exports.err = err;
 function log(type, message) {
     var _a;
     const level = (_a = exports.logSettings[type]) !== null && _a !== void 0 ? _a : exports.logSettings["*"];
     if (level) {
-        (0, exports.logFunction)(type + ": " + ((typeof message === "object") ? JSON.stringify(message) : message));
+        (0, exports.logFunction)(type + ": " + ((typeof message === "string") ? message : JSON.stringify(message)));
     }
 }
 exports.log = log;
@@ -129,7 +129,7 @@ function debug(type, message) {
     var _a;
     const level = (_a = exports.logSettings[type]) !== null && _a !== void 0 ? _a : exports.logSettings["*"];
     if (level === LogLevel.debug) {
-        (0, exports.logFunction)(type + "> " + ((typeof message === "object") ? JSON.stringify(message) : message));
+        (0, exports.logFunction)(type + "> " + ((typeof message === "string") ? message : JSON.stringify(message)));
     }
 }
 exports.debug = debug;
@@ -261,6 +261,7 @@ exports.Sanitizers = {
         config.bridge.port = config.bridge.port || 51827;
         config.bridge.pin = config.bridge.pin || "577-03-001";
         config.description = config.description || "Duotecno Platform";
+        config.password = config.password || ("!@#$%^&*()" + new Date().getTime());
         config.platforms = config.platforms || [{}];
         for (let p in config.platforms)
             this.platform(config.platforms[p]);