iobroker.zigbee 1.10.11 → 1.10.12

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "zigbee",
-    "version": "1.10.11",
+    "version": "1.10.12",
     "news": {
+      "1.10.12": {
+        "en": "corr Channel Scan",
+        "de": "corr Channel Scan",
+        "ru": "корректор канала",
+        "pt": "escaneamento do canal de cortiça",
+        "nl": "corr kanaalscan",
+        "fr": "balayage du canal corr",
+        "it": "corr Channel Scansione",
+        "es": "corr Channel Scan",
+        "pl": "corr Channel Scan",
+        "uk": "сканування каналу",
+        "zh-cn": "频道扫描"
+      },
       "1.10.11": {
         "en": "BREAKING CHANGE\n\nbugs : ChannelScan is currently not available\n\n\nfix linter errors\ndisable map display for deactivated devices\nnew option on map: disable physics interaction\nnew zigbee-herdsman-converters 20.28.0\nnew zigbee-herdsman 2.1.1\nAllow use of keyless converters (used for TuYa and compatible devices in zigbee-herdsman-converters\nswap from request to axios\ndelete groups works again",
         "de": "VERWENDUNGSBEREICH\n\nbugs : ChannelScan ist derzeit nicht verfügbar\n\n\nlinterfehler beheben\nkartenanzeige für deaktivierte geräte deaktivieren\nneue option auf der karte: physik-interaktion deaktivieren\nneue zickbee-herdsman-konverter 20.28.0\nneuer zickbee-herdsman 2.1.1\nVerwenden von schlüssellosen Wandlern (für TuYa und kompatible Geräte in Zickbee-herdsman-Konverter verwendet)\nswap von anfrage an axios\nlöschen von gruppen funktioniert wieder",
@@ -80,19 +93,6 @@
         "pl": "podstawowa aktualizacja\naktualizacja zależności",
         "uk": "оновлення ядра\nоновлення залежності",
         "zh-cn": "核心更新\n依赖性更新"
-      },
-      "1.10.5": {
-        "en": "icon ota device update\nicon fix",
-        "de": "icon ota device update\nsymbol fix",
-        "ru": "обновление значок ota\nзначок",
-        "pt": "atualização do dispositivo do ícone ota\ncorreção do ícone",
-        "nl": "pictogram ota apparaat update\npictogramfix",
-        "fr": "icône ota mise à jour du périphérique\ncorrection de l'icône",
-        "it": "icona ota aggiornamento del dispositivo\nicona fix",
-        "es": "icono ota actualización del dispositivo\nicono de fijación",
-        "pl": "icon ota aktualizacji urządzenia\nikona fix",
-        "uk": "ota пристрій оновлення\nфіксатор ікони",
-        "zh-cn": "图标 ota 设备更新\n图标修复"
       }
     },
     "titleLang": {

package/lib/zigbeecontroller.js

@@ -1007,63 +1007,24 @@ class ZigbeeController extends EventEmitter {
     }
 
     async getChannelsEnergy() {
-        /*
-        const BLANK_EUI64 = "0xFFFFFFFFFFFFFFFF";
-        const SLEEPY = 0xffff;
-
-        let clusterId = ZDO.ClusterId.NWK_UPDATE_REQUEST;
-
-        //for (let i=26;i>0;i--)
-        {
+        const clusterId = ZDO.ClusterId.NWK_UPDATE_REQUEST;
+        const result = {};
         try
         {
-            let result = {};
-            let payload = ZDO.Buffalo.buildRequest(false, clusterId, [11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26], 0x05, undefined, 0, undefined);
-            this.warn(`Payload is [${JSON.stringify(payload)}]`);
-            result = await this.herdsman.adapter.sendZdo(0x0, 0x0, clusterId , payload, false);
-            this.warn(`result is  ${JSON.stringify(result)}`)
-            //await this.Wait(5000);
-
-            //let payload1 = ZDO.Buffalo.buildRequest(true, clusterId, [16,17,18,19,20], 0x5, undefined, 0, undefined);
-            //result = await this.herdsman.adapter.sendZdo(0x0, 0x0, clusterId , payload1, false);
-            //this.warn(`result 2 is  ${JSON.stringify(result)}`)
-            //await this.Wait(5000);
-
-
-            //let payload2 = ZDO.Buffalo.buildRequest(true, clusterId, [21,22,23,24,25], 0x5, undefined, 0, undefined);
-            //result = await this.herdsman.adapter.sendZdo(0x0, 0x0, clusterId , payload2, false);
-            //this.warn(`result 3 is  ${JSON.stringify(result)}`)
-    /*        const payload = {
-                dstaddr: 0x0,
-                dstaddrmode: 0x02,
-                channelmask: 0x07FFF800,
-                scanduration: 0x5,
-                scancount: 1,
-                nwkmanageraddr: 0x0000
-            };
-            const energyScan = this.herdsman.adapter.znp.waitFor(
-                2, // unpi_1.Constants.Type.AREQ,
-                5, // Subsystem.ZDO,
-                'mgmtNwkUpdateNotify'
-            );
-            await this.herdsman.adapter.znp.request(
-                0x5, // Subsystem.ZDO
-                'mgmtNwkUpdateReq',
-                payload,
-                energyScan.ID
-            );
-            const result = await energyScan.start().promise;
-
-
-            //return result.payload;
+            const payload = ZDO.Buffalo.buildRequest(false, clusterId, [11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26], 0x05, 1, 0, undefined);
+            const scanresult = await this.herdsman.adapter.sendZdo(0x0, 0x0, clusterId , payload, false);
+            this.debug(`scanresult is  ${JSON.stringify(scanresult)}`)
+            result.energyvalues = scanresult[1].entryList;
+            this.debug(`result is  ${JSON.stringify(result)}`)
         }
         catch (error) {
             this.sendError(error);
-            this.error(`Failed to touchlinkReset ${error.stack}`);
+            this.error(`Failed to scan channels ${error.stack}`);
+            result.error = error;
 
         }
-    }
-    */
+        return result;
+
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.zigbee",
-  "version": "1.10.11",
+  "version": "1.10.12",
   "author": {
     "name": "Kirov Ilya",
     "email": "kirovilya@gmail.com"
@@ -21,7 +21,7 @@
     "serialport": "^12.0.0"
   },
   "dependencies": {
-    "@iobroker/adapter-core": "^3.1.3",
+    "@iobroker/adapter-core": "^3.2.2",
     "@iobroker/dm-utils": "^0.5.0",
     "humanize-duration": "^3.32.1",
     "tar": "^7.4.3",