From 593b11b0b0e40e00c1687effbcc624db4d064bb8 Mon Sep 17 00:00:00 2001
From: Tcharp38 <tcharp38@laposte.net>
Date: Fri, 2 Aug 2024 10:54:41 +0200
Subject: [PATCH] Zigate infos display fixes

---
 core/config/rucheCommand.json              | 55 +++++++++++++++++-----
 desktop/php/Abeille-Eq-Advanced-Zigate.php |  6 +--
 docs/fr_FR/Changelog.md                    |  8 +++-
 3 files changed, 52 insertions(+), 17 deletions(-)

diff --git a/core/config/rucheCommand.json b/core/config/rucheCommand.json
index c2994e9aeb..feab1536e0 100755
--- a/core/config/rucheCommand.json
+++ b/core/config/rucheCommand.json
@@ -1,11 +1,44 @@
 {
     "online": {
         "name": "Online",
-        "isHistorized": "0",
         "isVisible": "1",
         "Type": "info",
         "subType": "string",
-        "invertBinary": "0",
+        "template": ""
+    },
+    "FW-Version": {
+        "name": "FW version",
+        "isVisible": "1",
+        "Type": "info",
+        "subType": "string",
+        "template": ""
+    },
+    "Network-Status": {
+        "name": "Network Status",
+        "isVisible": "1",
+        "Type": "info",
+        "subType": "string",
+        "template": ""
+    },
+    "Network-Channel": {
+        "name": "Network Channel",
+        "isVisible": "1",
+        "Type": "info",
+        "subType": "string",
+        "template": ""
+    },
+    "PAN-ID": {
+        "name": "PAN ID",
+        "isVisible": "1",
+        "Type": "info",
+        "subType": "string",
+        "template": ""
+    },
+    "Ext_PAN-ID": {
+        "name": "Ext PAN ID",
+        "isVisible": "1",
+        "Type": "info",
+        "subType": "string",
         "template": ""
     },
     "Time-Time": {
@@ -17,19 +50,23 @@
     },
     "ZiGate-Time": {
         "name": "ZiGate-Time",
-        "isHistorized": "0",
         "isVisible": "0",
         "Type": "info",
         "subType": "string",
-        "invertBinary": "0",
         "template": "",
         "display": {
             "forceReturnLineAfter": "1"
         }
     },
+    "ZiGate-Power": {
+        "name": "ZiGate-Power",
+        "isVisible": "0",
+        "Type": "info",
+        "subType": "string",
+        "template": ""
+    },
     "permitJoin-Status": {
         "name": "Inclusion Status",
-        "isHistorized": "0",
         "isVisible": "1",
         "Type": "info",
         "subType": "binary",
@@ -41,7 +78,6 @@
     },
     "storeScene": {
         "name": "storeScene",
-        "isHistorized": "0",
         "isVisible": "0",
         "Type": "action",
         "subType": "message",
@@ -57,7 +93,6 @@
     },
     "recallScene": {
         "name": "recallScene",
-        "isHistorized": "0",
         "isVisible": "0",
         "Type": "action",
         "subType": "message",
@@ -73,7 +108,6 @@
     },
     "sceneGroupRecall": {
         "name": "sceneGroupRecall",
-        "isHistorized": "0",
         "isVisible": "0",
         "Type": "action",
         "subType": "message",
@@ -89,7 +123,6 @@
     },
     "addScene": {
         "name": "Add Scene",
-        "isHistorized": "0",
         "isVisible": "0",
         "Type": "action",
         "subType": "message",
@@ -104,7 +137,6 @@
     },
     "removeScene": {
         "name": "Remove Scene",
-        "isHistorized": "0",
         "isVisible": "0",
         "Type": "action",
         "subType": "message",
@@ -120,7 +152,6 @@
     },
     "removeSceneAll": {
         "name": "Remove Scene All",
-        "isHistorized": "0",
         "isVisible": "0",
         "Type": "action",
         "subType": "message",
@@ -136,7 +167,6 @@
     },
     "viewScene": {
         "name": "viewScene",
-        "isHistorized": "0",
         "isVisible": "0",
         "Type": "action",
         "subType": "message",
@@ -152,7 +182,6 @@
     },
     "getSceneMemberShip": {
         "name": "getSceneMemberShip",
-        "isHistorized": "0",
         "isVisible": "0",
         "Type": "action",
         "subType": "message",
diff --git a/desktop/php/Abeille-Eq-Advanced-Zigate.php b/desktop/php/Abeille-Eq-Advanced-Zigate.php
index 576a0b83a3..6083319ba1 100644
--- a/desktop/php/Abeille-Eq-Advanced-Zigate.php
+++ b/desktop/php/Abeille-Eq-Advanced-Zigate.php
@@ -132,9 +132,9 @@ function addZgButton($name, $class, $onclick, $onclick2 = "", $leftMargin = true
         <input type="text" value="" readonly>
         <?php addZgButton("{{Lire}}", "btn-default", 'getTXPower', ''); ?>
         <select id="idZgTxPower" style="width:80px; margin-left:4px" title="{{Puissance TX}}">
-            <option value=00>{{Min}}</option>
-            <option value=80 selected>{{Défaut}}</option>
-            <option value=BF>{{Max}}</option>
+            <option value=00>{{00/Min}}</option>
+            <option value=80 selected>{{80/Défaut}}</option>
+            <option value=BF>{{BF/Max}}</option>
         </select>
         <?php addZgButton("{{Appliquer}}", "btn-default", 'setTXPower', ''); ?>
     </div>
diff --git a/docs/fr_FR/Changelog.md b/docs/fr_FR/Changelog.md
index 6166873e82..1bd4d88d6f 100644
--- a/docs/fr_FR/Changelog.md
+++ b/docs/fr_FR/Changelog.md
@@ -2,7 +2,13 @@
 
 -   Correction: 'Commande 0102-01- inconnue' (2719).
 -   Sonoff SNZB-01P: Mise-à-jour du modèle (2716).
--   Correction: Collecte LQI: Code C1 n'est plus un timeout mais 'aucun eq en vie'.
+-   Correction collecte LQI: Code C1 n'est plus un timeout mais 'aucun eq en vie'.
+-   Corrections Zigate/avancé:
+    -   Affichage version FW Zigate (cmde 'FW-Version' manquante).
+    -   Affichage canal Zigate (cmde 'Network-Channel' manquante).
+    -   Affichage PAN-ID & Ext PAN-ID.
+    -   Affichage status réseau.
+    -   Affichage TX power.
 
 ## 240710-BETA-2