diff --git a/core/class/AbeilleCmdProcess.class.php b/core/class/AbeilleCmdProcess.class.php index fabd382aba..d381bf9aa4 100755 --- a/core/class/AbeilleCmdProcess.class.php +++ b/core/class/AbeilleCmdProcess.class.php @@ -2842,16 +2842,14 @@ function processCmd($Command) { return; // Msg Type = 0x0530 - $cmd = "0530"; + $zgCmd = "0530"; //
// // // - // // - // // // @@ -2874,20 +2872,20 @@ function processCmd($Command) { $data1 = $addrMode.$addr.$srcEp.$dstEp.$clustId.$profId.$secMode.$radius.$dataLength; $data = $data1.$data2; - $this->addCmdToQueue2(PRIO_NORM, $dest, $cmd, $data, $addr, $addrMode); + $this->addCmdToQueue2(PRIO_NORM, $dest, $zgCmd, $data, $addr, $addrMode); return; } // End $cmdName == 'getRoutingTable' // Zigbee command: Get binding table (Mgmt_Bind_req) - // Mandatory params: 'address' + // Mandatory params: 'addr' // Optional params: none else if ($cmdName == 'getBindingTable') { - $required = ['address']; + $required = ['addr']; if (!$this->checkRequiredParams($required, $Command)) return; // Msg Type = 0x0530 - $cmd = "0530"; + $zgCmd = "0530"; //
// @@ -2899,7 +2897,7 @@ function processCmd($Command) { // $addrMode = "02"; // Short addr mode - $addr = $Command['address']; + $addr = $Command['addr']; $srcEp = "00"; $dstEp = "00"; $profId = "0000"; @@ -2915,7 +2913,7 @@ function processCmd($Command) { $data1 = $addrMode.$addr.$srcEp.$dstEp.$clustId.$profId.$secMode.$radius.$dataLength; $data = $data1.$data2; - $this->addCmdToQueue2(PRIO_NORM, $dest, $cmd, $data, $addr, $addrMode); + $this->addCmdToQueue2(PRIO_NORM, $dest, $zgCmd, $data, $addr, $addrMode); return; } diff --git a/core/class/AbeilleParser.class.php b/core/class/AbeilleParser.class.php index df6a917786..93d93f0981 100755 --- a/core/class/AbeilleParser.class.php +++ b/core/class/AbeilleParser.class.php @@ -795,12 +795,12 @@ function deviceUpdates($net, $addr, $ep, $updates = []) { if ($profalux && ($eq['modelId'] !== false) && ($eq['modelId'] !== 'MAI-ZTS')) { if (!isset($eq['bindingTableSize'])) { parserLog('debug', ' Profalux v2: Requesting binding table size.'); - msgToCmd(PRIO_NORM, "Cmd".$net."/".$addr."/getBindingTable", "address=".$addr); + msgToCmd(PRIO_NORM, "Cmd".$net."/".$addr."/getBindingTable", ""); return false; // Remote still not binded with curtain } if ($eq['bindingTableSize'] == 0) { parserLog('debug', ' Profalux v2: Waiting remote to be binded.'); - msgToCmd(PRIO_NORM, "Cmd".$net."/".$addr."/getBindingTable", "address=".$addr); + msgToCmd(PRIO_NORM, "Cmd".$net."/".$addr."/getBindingTable", ""); return false; // Remote still not binded with curtain } parserLog('debug', ' Profalux v2: Remote binded. Let\'s configure.'); diff --git a/desktop/js/Abeille.js b/desktop/js/Abeille.js index e153e0d3bf..0d20b2182b 100755 --- a/desktop/js/Abeille.js +++ b/desktop/js/Abeille.js @@ -1948,7 +1948,7 @@ function interrogate(request) { payload = ""; } else if (request == "getBindingTable") { topic = "Cmd" + logicalId + "_getBindingTable"; - payload = "address=" + eqAddr; + payload = ""; } else if (request == "getNeighborTable") { topic = "Cmd" + logicalId + "_getNeighborTable"; startIdx = document.getElementById("idStartIdx").value; diff --git a/docs/fr_FR/Changelog.md b/docs/fr_FR/Changelog.md index b98c4307a6..9b6e6d3dd8 100644 --- a/docs/fr_FR/Changelog.md +++ b/docs/fr_FR/Changelog.md @@ -23,6 +23,7 @@ - Amélioration aspect visuel. - Support multi-passerelles: Des tas de modifs internes. +- Interne: Cmd: Mise-à-jour 'getBindingTable()' (suppression champ 'address') ## 240501-STABLE-1