Merge pull request #52 from alydersen/chore/revert_curtains

Reverting back the curtain driver

.homeychangelog.json

@@ -175,5 +175,8 @@
   },
   "1.0.7": {
     "en": "Refactoring code to improve performance and future proofing"
+  },
+  "1.0.8": {
+    "en": "Reverting back curtain driver after previous bugfix"
   }
 }

.homeycompose/app.json

@@ -1,6 +1,6 @@
 {
   "id": "com.github.alydersen.hdl-smartbus-homey",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "compatibility": ">=5.0.0",
   "sdk": 3,
   "name": {

app.json

@@ -1,7 +1,7 @@
 {
   "_comment": "This file is generated. Please edit .homeycompose/app.json instead.",
   "id": "com.github.alydersen.hdl-smartbus-homey",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "compatibility": ">=5.0.0",
   "sdk": 3,
   "name": {

drivers/curtain/driver.js

@@ -53,49 +53,59 @@ class CurtainDriver extends Homey.Driver {
     };
   }
 
-  async updateValues(signal) {
-    if (signal.parse)
-      signal.data = signal.parse(signal.payload);
-
-    // Parse and check the incoming signal, return if missing or invalid
-    if (signal.data == undefined) return;
-
-    if (signal.code == 0xE3E4) {
-      // This signal contains all channels, we need to process it for every device
-      signal.data.curtains.forEach((crtn, index) => {
-        // Get the device from Homey, return if not found or error
-        let signature = this.homey.app.devSignChnld(signal.sender.id, crtn.number)
-        let homeyDevice = this.getDevice(signature);
-        if ( typeof homeyDevice === 'undefined' || homeyDevice instanceof Error ) return;
-
-        // Update status only to idle (when autostop is used)
-        if (signal.data.curtains[index].status == 0) {
-          homeyDevice.updateStatus(signal.data.curtains[index].status);
-        }
-      });
+  getDeviceFromSignal(signal, channel) {
+    let hdl_subnet = this.homey.settings.get("hdl_subnet");
 
-    } else {
-      // Get the device from Homey, return if not found or error
-      let signature = this.homey.app.devSignChnld(signal.sender.id, signal.data.curtain)
-      let homeyDevice = this.getDevice(signature);
-      if ( typeof homeyDevice === 'undefined' || homeyDevice instanceof Error ) return;
+    let deviceSignature = {
+      id: `${hdl_subnet}.${signal.sender.id}.${signal.data.channel || channel}`,
+      address: `${hdl_subnet}.${signal.sender.id}`,
+      channel: signal.data.channel || channel
+    };
+
+    return this.getDevice(deviceSignature);    
+  }
+
+  async updateValues(signal) {
+      if (signal.parse)
+        signal.data = signal.parse(signal.payload);
 
-      switch (signal.code) {
-        case 0xE3E1:
-          device.updateStatus(signal.data.status);
-          break;
-
-        case 0xE3E3:
-          device.updateStatus(signal.data.status);
-          if (signal.data.duration != null) // in some cases duration is not in response
-            device.updateDuration(signal.data.duration);
-          break;
-
-        case 0xE801:
-          device.updateDuration(signal.data.duration);
-          break;
+      if (signal.data) {
+        if (signal.code == 0xE3E4) {
+          // This signal contains all channels, we need to process it for every device
+          signal.data.curtains.forEach((crtn, index) => {
+            let device = this.getDeviceFromSignal(signal, crtn.number);
+            if (typeof device !== 'undefined') {
+              if (device instanceof Error) return;
+
+              // Update status only to idle (when autostop is used)
+              if (signal.data.curtains[index].status == 0)
+                device.updateStatus(signal.data.curtains[index].status);
+            }
+          });
+
+        } else {
+          let device = this.getDeviceFromSignal(signal, signal.data.curtain);
+          if (typeof device !== 'undefined') {
+            if (device instanceof Error) return;
+
+            switch (signal.code) {
+              case 0xE3E1:
+                device.updateStatus(signal.data.status);
+                break;
+
+              case 0xE3E3:
+                device.updateStatus(signal.data.status);
+                if (signal.data.duration != null) // in some cases duration is not in response
+                  device.updateDuration(signal.data.duration);
+                break;
+
+              case 0xE801:
+                device.updateDuration(signal.data.duration);
+                break;
+            }
+          }
+        }
       }
-    }
   }
 
   async onPairListDevices() {
@@ -136,4 +146,4 @@ class CurtainDriver extends Homey.Driver {
   }
 }
 
-module.exports = CurtainDriver;
+module.exports = CurtainDriver;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.github.alydersen.homey-smartbus",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "main": "app.js",
   "devDependencies": {
     "@types/homey": "npm:homey-apps-sdk-v3-types@^0.3.1"