hmipw-drs4 virtual channels (#157)

rdmtc · Aug 25, 2019 · 7ad7471 · 7ad7471
1 parent 0afe91b
commit 7ad7471
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 18 deletions.
diff --git a/homematic-devices/hmipw-drs4.js b/homematic-devices/hmipw-drs4.js
@@ -53,18 +53,25 @@ class AccMultiService extends Accessory {
         const channels = config.description.CHILDREN;
 
         for (let i = 2; i < (channels.length - 1); i += 4) {
-            const ch = channels[i];
-            if (!this.option(i)) {
-                continue;
-            }
+            for (let vi = 0; vi < 3; vi ++) {
+                const channelNumber = i + vi;
+                const ch = channels[channelNumber];
+                if (vi === 0 && !this.option(channelNumber)) {
+                    continue;
+                } else if (vi !== 0 && !this.option(channelNumber, 'enabled')) {
+                    continue;
+                }
+
+
+                const name = ccu.channelNames[ch];
+                const dp = config.iface + '.' + ch + '.STATE';
+                const type = this.option(channelNumber, 'type') || 'Switch';
 
-            const name = ccu.channelNames[ch];
-            const dp = config.iface + '.' + ch + '.STATE';
-            const type = this.option(i, 'type') || 'Switch';
+                node.debug(channelNumber + ' ' + type + ' ' + this.option(channelNumber, 'type'));
 
-            node.debug(i + ' ' + type + ' ' + this.option(i, 'type'));
+                addService.call(this, type, dp, name);
+            }
 
-            addService.call(this, type, dp, name);
         }
     }
 }
@@ -98,17 +105,24 @@ module.exports = class HmipwDrs {
         } else {
             const channels = config.description.CHILDREN;
             for (let i = 2; i < (channels.length - 1); i += 4) {
-                const ch = channels[i];
-                if (!this.option(ch)) {
-                    continue;
-                }
+                for (let vi = 0; vi < 3; vi ++) {
+                    const channelNumber = i + vi;
+                    const ch = channels[channelNumber];
+                    if (vi === 0 && !this.option(channelNumber)) {
+                        continue;
+                    } else if (vi !== 0 && !this.option(channelNumber, 'enabled')) {
+                        continue;
+                    }
 
-                const name = ccu.channelNames[ch];
+                    const name = ccu.channelNames[ch];
+
+                    const chConfig = Object.assign({}, config, {accChannel: ch, name});
+                    chConfig.description = Object.assign({}, config.description, {ADDRESS: ch});
+
+                    new AccSingleService(chConfig, node);
+                }
 
-                const chConfig = Object.assign({}, config, {accChannel: ch, name});
-                chConfig.description = Object.assign({}, config.description, {ADDRESS: ch});
 
-                new AccSingleService(chConfig, node);
             }
         }
     }

diff --git a/nodes/redmatic-homekit-homematic-devices.html b/nodes/redmatic-homekit-homematic-devices.html
@@ -555,7 +555,7 @@
                             case 'hmipw-drs4':
                             case 'hmipw-drs8':
                                 addOption(addr, 'SingleAccessory');
-                                addChannels(addr, 2, channelCount - 2, 4, {type: switchTypes});
+                                addVirtualChannels(addr, 2, channelCount - 2, 4, {type: switchTypes});
                                 break;
 
                             case 'hmipw-dri16':