homebridge-smartsystem 6.4.2 → 6.4.3

package/duotecno/master.js

@@ -412,7 +412,7 @@ class Master extends base_1.Base {
             this.resolveLogin = null;
             // if logged in, ask protocol version
             if (this.isLoggedIn) {
-                this.send(protocol_1.Protocol.buildRequestNodeMgt(protocol_1.reqNodeAttributes.nodeProtocol));
+                this.send(protocol_1.Protocol.buildRequestNodeMgt(protocol_1.reqNodeAttributes.nodeVersion));
             }
         }
         else {
@@ -434,16 +434,14 @@ class Master extends base_1.Base {
             this.log("NodeMgtInfo - master " + this.getName() + " can be master: " + message[2]);
         }
         else if (message[1] === protocol_1.reqNodeAttributes.nodeVersion) {
-            console.log("*** -> " + message);
             this.log("NodeMgtInfo - version " + this.getName() + ", version: " + message[2] + "." + message[3]);
             this.version = message[2] * 100 + message[3];
-            //BUG - TODO: remove
-            this.protocol = message[2] * 100 + message[3];
+            console.log("*** version -> " + message + " -> " + this.version + " ***");
         }
         else if (message[1] === protocol_1.reqNodeAttributes.nodeProtocol) {
-            console.log("*** -> " + message);
             this.log("NodeMgtInfo - protocol " + this.getName() + ", protocol: " + message[2] + "." + message[3]);
             this.protocol = message[2] * 100 + message[3];
+            console.log("*** protocol -> " + message + " -> " + this.protocol + " ***");
         }
         else {
             this.err("dropped NodeMgtInfo info message = " + message[1] + ", message: " + message);
@@ -753,12 +751,12 @@ class Master extends base_1.Base {
     }
     requestRegisterValue(register) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.version >= 209) {
+            if (this.version >= 6609) {
                 yield this.send(protocol_1.Protocol.buildRegister(register));
                 this.info("request register: " + register);
             }
             else {
-                this.err("FC_REGISTERMAP not available before protocol v2.09");
+                this.err("FC_REGISTERMAP not available before firmware v66.09");
             }
         });
     }
@@ -775,12 +773,12 @@ class Master extends base_1.Base {
     }
     setRegisterValue(register, value) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.version >= 209) {
+            if (this.version >= 6609) {
                 yield this.send(protocol_1.Protocol.buildRegister(register, value));
                 this.info("set register: " + register + ", to: " + value);
             }
             else {
-                this.err("FC_REGISTERMAP not available before protocol v2.09");
+                this.err("FC_REGISTERMAP not available before firmware v66.09");
             }
         });
     }

package/duotecno/master.ts

@@ -459,7 +459,7 @@ export class Master extends Base {
 
       // if logged in, ask protocol version
       if (this.isLoggedIn) {
-        this.send(Protocol.buildRequestNodeMgt(reqNodeAttributes.nodeVersion));
+        this.send(Protocol.buildRequestNodeMgt(reqNodeAttributes.nodeProtocol));
       }
 
     } else {
@@ -818,11 +818,11 @@ export class Master extends Base {
   }
 
   async requestRegisterValue(register: number) {
-    if (this.version >= 6609) {
+    if (this.protocol >= 209) {
       await this.send(Protocol.buildRegister(register));
       this.info("request register: " + register);
     } else {
-      this.err("FC_REGISTERMAP not available before firmware v66.09")
+      this.err("FC_REGISTERMAP not available before protocol v2.09")
     }
   }
 
@@ -837,11 +837,11 @@ export class Master extends Base {
   }
 
   async setRegisterValue(register: number, value: number) {
-    if (this.version >= 6609) {
+    if (this.protocol >= 209) {
       await this.send(Protocol.buildRegister(register, value));
       this.info("set register: " + register + ", to: " + value);
     } else {
-      this.err("FC_REGISTERMAP not available before firmware v66.09")
+      this.err("FC_REGISTERMAP not available before protocol v2.09")
     }
   }
 

package/package.json

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

package/server/powerbase.js

@@ -249,7 +249,7 @@ class PowerBase extends base_1.Base {
     //
     updateBindings() {
         // sort on channel.
-        this.bindings.sort((a, b) => parseInt(a.channel) - parseInt(b.channel));
+        this.bindings.sort((a, b) => a.register - b.register);
         // sanitize and copy all rules into the config
         this.config.bindings = this.bindings.map(b => types_1.Sanitizers.bindingConfig(b));
         (0, logger_1.debug)("power", "config.bindings = " + JSON.stringify(this.config.bindings));

package/server/somfy.js

@@ -171,8 +171,9 @@ setup().then(() => {
     init = true;
     busy = false;
 }).catch((e) => {
-    (0, logger_1.debug)("somfy", "error setting up gpio package - running test mode");
-    (0, logger_1.debug)("somfy", e);
+    (0, logger_1.debug)("somfy", "gpio package not initialized");
+    if (e.code != "EACCES")
+        (0, logger_1.debug)("somfy", e);
     init = false;
     busy = false;
 });

package/server/somfy.ts

@@ -165,10 +165,10 @@ setup().then(() => {
   debug("somfy", "gpio package initialized");
   init = true;
   busy = false;
-  
+
 }).catch((e) => {
   debug("somfy", "gpio package not initialized");
-  if (e.code != "EACCES") debug("somfy", e);
+  if ((e.code != "EACCES") && (e.code != "ENOENT")) debug("somfy", e);
   init = false;
   busy = false;
 });