Fix bugs and add relay

alydersen · Apr 9, 2021 · 275ffbe · 275ffbe
1 parent 0061685
commit 275ffbe
Show file tree

Hide file tree

Showing 10 changed files with 55 additions and 71 deletions.
diff --git a/.homeychangelog.json b/.homeychangelog.json
@@ -91,5 +91,8 @@
   },
   "0.4.3": {
     "en": "Bugfixes for SDK 3 compatibility"
+  },
+  "0.4.4": {
+    "en": "Adding support for 6ch I/O Module (MSC06.432)"
   }
 }
diff --git a/app.js b/app.js
@@ -188,25 +188,33 @@ class HDLSmartBus extends Homey.App {
       // DIMMERS
       this._dimmers[signal.sender.id] = signal.sender;
       await this.homey.drivers.getDriver("dimmer").updateValues(signal).catch((error) => {
-        console.error(error);
+        if (error.message !== 'invalid_device') {
+          console.error(error.message);
+        }
       });
     } else if (await hdlRelays.isOne()) {
       // RELAYS
       this._relays[signal.sender.id] = signal.sender;
       await this.homey.drivers.getDriver("relay").updateValues(signal).catch((error) => {
-        console.error(error);
+        if (error.message !== 'invalid_device') {
+          console.error(error.message);
+        }
       });
     } else if (await hdlMultisensors.isOne()) {
       // MULTISENSORS
       this._multisensors[signal.sender.id] = signal.sender;
       await this.homey.drivers.getDriver("multisensor").updateValues(signal).catch((error) => {
-        console.error(error);
+        if (error.message !== 'invalid_device') {
+          console.error(error.message);
+        }
       });
     } else if (await hdlTempsensors.isOne()) {
       // TEMPSENSORS
       this._tempsensors[signal.sender.id] = signal.sender;
       await this.homey.drivers.getDriver("tempsensor").updateValues(signal).catch((error) => {
-        console.error(error);
+        if (error.message !== 'invalid_device') {
+          console.error(error.message);
+        }
       });
     }
   }

diff --git a/app.json b/app.json
@@ -1,6 +1,6 @@
 {
   "id": "com.github.alydersen.hdl-smartbus-homey",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "compatibility": ">=5.0.0",
   "sdk": 3,
   "name": {

diff --git a/drivers/dimmer/driver.js b/drivers/dimmer/driver.js
@@ -13,18 +13,14 @@ class DimmerDriver extends Homey.Driver {
     if (signal.sender.id == undefined) return;
 
     let hdl_subnet = this.homey.settings.get("hdl_subnet");
-    let updateValueFunction = this;
+    let parent = this;
     if (signal.data.channel != undefined) {
       if (signal.data.level != undefined) {
-        try {
-          let homeyDevice = updateValueFunction.getDevice({
-            id: `${hdl_subnet}.${signal.sender.id}.${signal.data.channel}`,
-            address: `${hdl_subnet}.${signal.sender.id}`,
-            channel: signal.data.channel
-          }).catch(error);
-        } catch (error) {
-          return;
-        }
+        let homeyDevice = parent.getDevice({
+          id: `${hdl_subnet}.${signal.sender.id}.${signal.data.channel}`,
+          address: `${hdl_subnet}.${signal.sender.id}`,
+          channel: signal.data.channel
+          });
         if (typeof homeyDevice !== 'undefined') {
           if (homeyDevice instanceof Error) return;
           homeyDevice.updateLevel(signal.data.level);
@@ -35,15 +31,11 @@ class DimmerDriver extends Homey.Driver {
     if (signal.data.channels != undefined) {
       signal.data.channels.forEach(function(element) {
         if (element.level != undefined) {
-          try {
-            let homeyDevice = updateValueFunction.getDevice({
-              id: `${hdl_subnet}.${signal.sender.id}.${element.number}`,
-              address: `${hdl_subnet}.${signal.sender.id}`,
-              channel: element.number
-              }).catch(error);
-          } catch (error) {
-            return;
-          }
+          let homeyDevice = parent.getDevice({
+            id: `${hdl_subnet}.${signal.sender.id}.${element.number}`,
+            address: `${hdl_subnet}.${signal.sender.id}`,
+            channel: element.number
+            });
           if (typeof homeyDevice !== 'undefined') {
             if (homeyDevice instanceof Error) return;
             homeyDevice.updateLevel(element.level);

diff --git a/drivers/multisensor/driver.js b/drivers/multisensor/driver.js
@@ -13,14 +13,9 @@ class MultisensorDriver extends Homey.Driver {
     if (signal.sender.id == undefined) return;
 
     let hdl_subnet = this.homey.settings.get("hdl_subnet");
-    let parent = this;
-    try {
-      let homeyDevice = parent.getDevice({
-        id: `${hdl_subnet}.${signal.sender.id}`
-      });
-    } catch (error) {
-      return;
-    }
+    let homeyDevice = this.getDevice({
+      id: `${hdl_subnet}.${signal.sender.id}`
+    });
     if (typeof homeyDevice === 'undefined') {
       return;
     }

diff --git a/drivers/relay/driver.js b/drivers/relay/driver.js
@@ -17,15 +17,11 @@ class RelayDriver extends Homey.Driver {
     let parent = this;
     if (signal.data.channel != undefined) {
       if (signal.data.level != undefined) {
-        try {
-          let homeyDevice = parent.getDevice({
-            id: `${hdl_subnet}.${signal.sender.id}.${signal.data.channel}`,
-            address: `${hdl_subnet}.${signal.sender.id}`,
-            channel: signal.data.channel
-            });
-        } catch (error) {
-          return;
-        }
+        let homeyDevice = parent.getDevice({
+          id: `${hdl_subnet}.${signal.sender.id}.${signal.data.channel}`,
+          address: `${hdl_subnet}.${signal.sender.id}`,
+          channel: signal.data.channel
+          });
         if (typeof homeyDevice !== 'undefined') {
           if (homeyDevice instanceof Error) return;
           homeyDevice.updateLevel(signal.data.level);
@@ -36,15 +32,11 @@ class RelayDriver extends Homey.Driver {
     if (signal.data.channels != undefined) {
       signal.data.channels.forEach(function(element) {
         if (element.level != undefined) {
-          try {
-            let homeyDevice = parent.getDevice({
-              id: `${hdl_subnet}.${signal.sender.id}.${element.number}`,
-              address: `${hdl_subnet}.${signal.sender.id}`,
-              channel: element.number
-              });
-          } catch (error) {
-            return;
-          }
+          let homeyDevice = parent.getDevice({
+            id: `${hdl_subnet}.${signal.sender.id}.${element.number}`,
+            address: `${hdl_subnet}.${signal.sender.id}`,
+            channel: element.number
+            });
           if (typeof homeyDevice !== 'undefined') {
             if (homeyDevice instanceof Error) return;
             homeyDevice.updateLevel(element.level);

diff --git a/drivers/tempsensor/driver.js b/drivers/tempsensor/driver.js
@@ -15,16 +15,11 @@ class TempsensorDriver extends Homey.Driver {
     if (signal.sender.id == undefined) return;
 
     let hdl_subnet = this.homey.settings.get("hdl_subnet");
-    let parent = this;
-    try {
-      let homeyDevice = parent.getDevice({
-        id: `${hdl_subnet}.${signal.sender.id}.${signal.data.channel}`,
-        address: `${hdl_subnet}.${signal.sender.id}`,
-        channel: signal.data.channel
-      });
-    } catch (error) {
-      return;
-    }
+    let homeyDevice = this.getDevice({
+      id: `${hdl_subnet}.${signal.sender.id}.${signal.data.channel}`,
+      address: `${hdl_subnet}.${signal.sender.id}`,
+      channel: signal.data.channel
+    });
     if (typeof homeyDevice !== 'undefined') {
       if (homeyDevice instanceof Error) return;
       homeyDevice.setCapabilityValue("measure_temperature", signal.data.temperature);

diff --git a/drivers/universal-switch/driver.js b/drivers/universal-switch/driver.js
@@ -20,22 +20,20 @@ class HdlUniversalSwitchDriver extends Homey.Driver {
       return;  // RETURN IF THE SIGNAL IS FROM MYSELF
 
     let hdl_subnet = this.homey.settings.get("hdl_subnet");
-    let parent = this;
-    try {
-      let homeyDevice = parent.getDevice({
-        id: `${hdl_subnet}.${signal.data.switch}`,
-        switch: signal.data.switch
-        });
-    } catch (error) {
-      return;
-    }
+    const homeyDevice = this.getDevice({
+      id: `${hdl_subnet}.${signal.data.switch}`,
+      switch: signal.data.switch
+      });
     if (typeof homeyDevice !== 'undefined') {
       if (homeyDevice instanceof Error) return;
       homeyDevice
         .setCapabilityValue("onoff", signal.data.status)
-        .catch(this.error);
+        .catch((error) => {
+          console.error(error);
+        });
       homeyDevice.respondToSender(signal.sender);
     }
+    return;
   }
 
   async onPairListDevices() {

diff --git a/hdl/hdl_relays.js b/hdl/hdl_relays.js
@@ -13,6 +13,7 @@ class HdlRelays {
 
   get list() {
     return {
+      "363": { channels: 6 },
       "423": { channels: 4 },
       "425": { channels: 6 },
       "426": { channels: 6 },

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.github.alydersen.homey-smartbus",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "main": "app.js",
   "devDependencies": {
     "@types/homey": "npm:homey-apps-sdk-v3-types@^0.1.0"