Virtual remote fix for #addrGroup#

KiwiHC16 · Nov 17, 2024 · 331f9c1 · 331f9c1
1 parent dce1276
commit 331f9c1
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/.tools/check_json.php b/.tools/check_json.php
@@ -724,7 +724,7 @@ function overloadCmd($devModel, $cmdJName, $cmd) {
 
         $devCmd = $devModel['commands'][$cmdJName];
 
-        if (isset($devCmd['params'])) {
+        if (isset($devCmd['params']) && ($devCmd['params'] != '')) {
             // Overwritting default settings with 'params' content
             // TODO: This should be done on 'configuration/request' only ??
             $paramsArr = explode('&', $devCmd['params']); // ep=01&clustId=0000 => ep=01, clustId=0000

diff --git a/core/config/devices/ZB-SW01/ZB-SW01.json b/core/config/devices/ZB-SW01/ZB-SW01.json
@@ -14,13 +14,7 @@
         },
         "commands": {
             "Identify": {
-                "use": "act_zbCmdC-Identify",
-                "isVisible": 1
-            },
-            "Status": {
-                "use": "inf_zbAttr-0006-OnOff",
-                "isVisible": 1,
-                "nextLine": "after"
+                "use": "act_zbCmdC-Identify"
             },
             "On": {
                 "use": "act_zbCmdC-0006-On",
@@ -40,6 +34,11 @@
                 "use": "act_zbReadAttribute",
                 "params": "clustId=0006&attrId=0000"
             },
+            "Status": {
+                "use": "inf_zbAttr-0006-OnOff",
+                "isVisible": 1,
+                "nextLine": "after"
+            },
             "Bind-01-0006-ToZigate": {
                 "use": "act_zbBindToZigate",
                 "params": "ep=01&clustId=0006",

diff --git a/core/config/devices/remotecontrol/remotecontrol.json b/core/config/devices/remotecontrol/remotecontrol.json
@@ -3,6 +3,7 @@
         "manufacturer": "Abeille",
         "model": "Virtual remote",
         "type": "Abeille's virtual remote",
+        "genericType": "Light",
         "timeout": "",
         "configuration": {
             "mainEP": "01",
@@ -12,6 +13,9 @@
         "category": {
             "light": "1"
         },
+        "variables": {
+            "addrGroup": "1212"
+        },
         "commands": {
             "On group": {
                 "use": "act_zbCmdC-0006-OnGroup",

diff --git a/docs/fr_FR/Changelog.md b/docs/fr_FR/Changelog.md
@@ -2,6 +2,7 @@
 
 - Amélioration: Modèle pour Tuya 2 keys remote (2731).
 - Amélioration: Support Tuya: Ajout function générique 'rcvValueEnum'.
+- Correction: Regression telecommande virtuelle (2732).
 
 ## 241115-BETA-1