From 7aa91386d84ec16fb4a8eb85b96f6c7398e67907 Mon Sep 17 00:00:00 2001 From: Tcharp38 Date: Mon, 6 Nov 2023 15:57:27 +0100 Subject: [PATCH] =?UTF-8?q?Gledopto=20Spectre=20Blanc=20&=20RGBW=20GU10:?= =?UTF-8?q?=20Correction=20mod=C3=A8les=20(2646)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/config/devices/GL-S-003Z/GL-S-003Z.json | 72 ++++++++++---------- core/config/devices/GL-S-004Z/GL-S-004Z.json | 58 ++++++++-------- docs/fr_FR/Changelog.rst | 1 + 3 files changed, 66 insertions(+), 65 deletions(-) diff --git a/core/config/devices/GL-S-003Z/GL-S-003Z.json b/core/config/devices/GL-S-003Z/GL-S-003Z.json index f629b0d541..a9de391746 100755 --- a/core/config/devices/GL-S-003Z/GL-S-003Z.json +++ b/core/config/devices/GL-S-003Z/GL-S-003Z.json @@ -2,6 +2,7 @@ "GL-S-003Z": { "manufacturer": "Gledopto", "model": "GL-S-003Z", + "type": "Gledopto RGBW GU10", "timeout": "60", "configuration": { "mainEP": "0B", @@ -11,15 +12,39 @@ "category": { "light": "1" }, - "type": "Gledopto RGBW GU10", "commands": { - "etat": { + "On": { + "use": "act_zbCmdC-0006-On", + "isVisible": 1 + }, + "Off": { + "use": "act_zbCmdC-0006-Off", + "isVisible": 1 + }, + "Toggle": { + "use": "act_zbCmdC-0006-Toggle" + }, + "Status": { "use": "inf_zbAttr-0006-OnOff", + "isVisible": 1, + "nextLine": "after" + }, + "Get Status": { + "use": "act_zbReadAttribute", + "params": "clustId=0006&attrId=0000" + }, + "Set Level": { + "use": "act_setLevel-Light", "isVisible": 1 }, - "CurrentLevel-0008": { + "Level": { "use": "inf_zbAttr-0008-CurrentLevel", - "isVisible": 1 + "isVisible": 1, + "nextLine": "after" + }, + "Get Level": { + "use": "act_zbReadAttribute", + "params": "clustId=0008&attrId=0000" }, "CurrentX": { "use": "inf_zbAttr-0300-CurrentX", @@ -29,18 +54,6 @@ "use": "inf_zbAttr-0300-CurrentY", "isVisible": 1 }, - "On": { - "use": "act_zbCmdC-0006-On", - "isVisible": 1 - }, - "Off": { - "use": "act_zbCmdC-0006-Off", - "isVisible": 1 - }, - "Set Level": { - "use": "act_setLevel-Light", - "isVisible": 1 - }, "Colour": { "use": "Colour" }, @@ -76,14 +89,6 @@ "use": "act_zbReadAttribute", "params": "clustId=0300&attrId=0004" }, - "Get-Status": { - "use": "act_zbReadAttribute", - "params": "clustId=0006&attrId=0000" - }, - "Get-CurrentLevel": { - "use": "act_zbReadAttribute", - "params": "clustId=0008&attrId=0000" - }, "Identify": { "use": "act_zbCmdC-Identify", "isVisible": 1 @@ -93,7 +98,7 @@ }, "Bind-0006-ToZigate": { "use": "act_zbBindToZigate", - "params": "clustId=0008", + "params": "clustId=0006", "execAtCreation": "Yes", "execAtCreationDelay": 9 }, @@ -103,6 +108,12 @@ "execAtCreation": "Yes", "execAtCreationDelay": 11 }, + "Bind-0008-ToZigate": { + "use": "act_zbBindToZigate", + "params": "clustId=0008", + "execAtCreation": "Yes", + "execAtCreationDelay": 9 + }, "SetReporting-0008-0000": { "use": "act_zbConfigureReporting", "params": "clustId=0008&attrType=20&attrId=0000&minInterval=0000&maxInterval=0000&changeVal=", @@ -163,17 +174,6 @@ }, "setTemperatureLight": { "use": "setTemperatureLight" - }, - "SWBuildID": { - "use": "inf_zbAttr-0000-SWBuildID" - }, - "Get-SWBuildID": { - "use": "act_zbReadAttribute", - "params": "clustId=0000&attrId=4000" - }, - "Toggle": { - "use": "act_zbCmdC-0006-Toggle", - "nextLine": "after" } } } diff --git a/core/config/devices/GL-S-004Z/GL-S-004Z.json b/core/config/devices/GL-S-004Z/GL-S-004Z.json index 82c13f70c5..5dcecdac5c 100755 --- a/core/config/devices/GL-S-004Z/GL-S-004Z.json +++ b/core/config/devices/GL-S-004Z/GL-S-004Z.json @@ -2,6 +2,7 @@ "GL-S-004Z": { "manufacturer": "Gledopto", "model": "GL-C-004Z", + "type": "Gledopto Spectre Blanc", "timeout": "60", "configuration": { "mainEP": "0B", @@ -11,16 +12,7 @@ "category": { "light": "1" }, - "type": "Gledopto Spectre Blanc", "commands": { - "etat": { - "use": "inf_zbAttr-0006-OnOff", - "isVisible": 1 - }, - "CurrentLevel-0008": { - "use": "inf_zbAttr-0008-CurrentLevel", - "isVisible": 1 - }, "On": { "use": "act_zbCmdC-0006-On", "isVisible": 1 @@ -29,10 +21,31 @@ "use": "act_zbCmdC-0006-Off", "isVisible": 1 }, + "Toggle": { + "use": "act_zbCmdC-0006-Toggle" + }, + "Status": { + "use": "inf_zbAttr-0006-OnOff", + "isVisible": 1, + "nextLine": "after" + }, + "Get-Status": { + "use": "act_zbReadAttribute", + "params": "clustId=0006&attrId=0000" + }, "Set Level": { "use": "act_setLevel-Light", "isVisible": 1 }, + "Level": { + "use": "inf_zbAttr-0008-CurrentLevel", + "isVisible": 1, + "nextLine": "after" + }, + "Get Level": { + "use": "act_zbReadAttribute", + "params": "clustId=0008&attrId=0000" + }, "Set 2200K": { "use": "act_zbCmdC-0300-MoveToColorTemp", "params": "slider=2200", @@ -61,14 +74,6 @@ "setTemperatureLight": { "use": "setTemperatureLight" }, - "Get-Status": { - "use": "act_zbReadAttribute", - "params": "clustId=0006&attrId=0000" - }, - "Get-CurrentLevel": { - "use": "act_zbReadAttribute", - "params": "clustId=0008&attrId=0000" - }, "Identify": { "use": "act_zbCmdC-Identify", "isVisible": 1 @@ -78,7 +83,7 @@ }, "Bind-0006-ToZigate": { "use": "act_zbBindToZigate", - "params": "clustId=0008", + "params": "clustId=0006", "execAtCreation": "Yes", "execAtCreationDelay": 9 }, @@ -88,22 +93,17 @@ "execAtCreation": "Yes", "execAtCreationDelay": 11 }, + "Bind-0008-ToZigate": { + "use": "act_zbBindToZigate", + "params": "clustId=0008", + "execAtCreation": "Yes", + "execAtCreationDelay": 9 + }, "SetReporting-0008-0000": { "use": "act_zbConfigureReporting", "params": "clustId=0008&attrType=20&attrId=0000&minInterval=0000&maxInterval=0000&changeVal=", "execAtCreation": "Yes", "execAtCreationDelay": 11 - }, - "SWBuildID": { - "use": "inf_zbAttr-0000-SWBuildID" - }, - "Get-SWBuildID": { - "use": "act_zbReadAttribute", - "params": "clustId=0000&attrId=4000" - }, - "Toggle": { - "use": "act_zbCmdC-0006-Toggle", - "nextLine": "after" } } } diff --git a/docs/fr_FR/Changelog.rst b/docs/fr_FR/Changelog.rst index e2ffda604e..75c5929f2f 100644 --- a/docs/fr_FR/Changelog.rst +++ b/docs/fr_FR/Changelog.rst @@ -10,6 +10,7 @@ ChangeLog - Modèles: Cmde 'onGroupBroadcast'/'offGroupBroadcast' remplacée (cmd-0006 + addrMode=04). - Télécommande virtuelle: Correction pour 'onGroupBroadcast'/'offGroupBroadcast'. - SilverCrest-HG08673-FR: Mises-à-jour du modèle (2635). +- Gledopto Spectre Blanc & RGBW GU10: Correction modèles (2646). 231104-BETA-2 -------------