iobroker.zigbee 1.8.1 → 1.8.5

package/README.md

@@ -10,12 +10,17 @@
 [![Downloads](https://img.shields.io/npm/dm/iobroker.zigbee.svg)](https://www.npmjs.com/package/iobroker.zigbee)
 
 ## ioBroker adapter for Zigbee devices via TI cc2531/cc2530/cc26x2r/cc2538 and deCONZ ConBee/RaspBee.
-With the Zigbee-coordinator based on `Texas Instruments SoC, deCONZ ConBee/RaspBee` modules, `Silicon Labs EZSP v8` or `ZIGate USB-TTL` it creates its own zigbee-network, into which zigbee-devices are connected. By work directly with the coordinator, the driver allows you to manage devices without additional application / gateways / bridge from device manufacturers (Xiaomi / TRADFRI / Hue / Tuya). About the device Zigbee-network can be read [here (in English)](https://www.zigbee2mqtt.io/information/zigbee_network.html).
+
+With the Zigbee-coordinator based on Texas Instruments SoC, deCONZ ConBee/RaspBee modules, Silicon Labs EZSP v8 or ZIGate USB-TTL it creates its own zigbee-network, into which zigbee-devices are connected. By work directly with the coordinator, the driver allows you to manage devices without additional application / gateways / bridge from device manufacturers (Xiaomi / TRADFRI / Hue / Tuya). About the device Zigbee-network can be read [here (in English)](https://www.zigbee2mqtt.io/information/zigbee_network.html).
 
 ## Hardware
+
+
 One coordinator device is required for each zigbee Adapter instance. The device must be flashed with the respective coordinator firmware. A list of supported coordinators, the necessary equipment for the firmware and the device preparation process for different coordinator devices are described [here (in English)](https://www.zigbee2mqtt.io/guide/adapters/) or [here (in Russian)](https://myzigbee.ru/books/%D0%BF%D1%80%D0%BE%D1%88%D0%B8%D0%B2%D0%BA%D0%B8/page/%D0%BF%D1%80%D0%BE%D1%88%D0%B8%D0%B2%D0%BA%D0%B0-cc2531cc2530)
 
+
 ### Texas Instruments SoC
+
 Recommended devices are based on either the CC2652 or CC1352 chip. Devices based on cc253x chips are still supported but are no longer recommended.
 Only CC26xx/cc1352/cc2538 Devices support extraction of the NVRam backup which should allow to swap coordinator hardware without having to reconnect all zigbee devices to the network.
 Current firmware files for these devices can be found [on GitHub](https://github.com/Koenkk/Z-Stack-firmware)
@@ -27,7 +32,9 @@ Current firmware files for these devices can be found [on GitHub](https://github
 <span><img src="docs/de/img/CC2538_CC2592_PA.PNG" width="100"></span>
 <span><img src="docs/de/img/cc26x2r.PNG" width="100"></span>
 
+
 ### Dresden Elektronik SoC
+
 <span><img src="docs/en/img/deconz.png"></span>
 
 recommended:
@@ -38,18 +45,23 @@ no longer recommended:
 - ConBee I
 - RaspBee
 
-While `Conbee/RaspBee` Support is no longer considered experimental in the zigbee-herdsman and zigbee-herdsman-converters libraries used by the zigbee Adapter, use of these devices with the adapter may limit functionality. Known issues are:
+While Conbee/RaspBee Support is no longer considered experimental in the zigbee-herdsman and zigbee-herdsman-converters libraries used by the zigbee Adapter, use of these devices with the adapter may limit functionality. Known issues are:
 - link quality display may be incorrect
 - device map metrics may be incorrect
 - NVRam Backup is not supported.
 
 ### Silicon Labs SoC
-Support for [Silicon Lab Zigbee](https://www.silabs.com/wireless/zigbee) based adapters is experimental. The initial support for EZSP v8 is still not yet considered stable and the project is in need of more developers volunteering to help with this integration. Please refer to the respective documentation on [this page](https://www.zigbee2mqtt.io/guide/adapters/) and [ongoing development discussion](https://github.com/Koenkk/zigbee-herdsman/issues/319) with regard to the state of Silabs EmberZNet Serial Protocol (EZSP) adapter implementation integration into the zigbee-herdsman and zigbee-herdsman-converters libraries which it depends on.
+
+Support for [Silicon Lab Zigbee](https://www.silabs.com/wireless/zigbee) based adapters is experimental. The initial support for EZSP v8 is still not yet considered stable and the project is in need of more developers volenteering to help with this integration. Please refer to the respective documentation on [this page](https://www.zigbee2mqtt.io/guide/adapters/) and [ongoing development discussion](https://github.com/Koenkk/zigbee-herdsman/issues/319) with regards to the state of Silabs EmberZNet Serial Protocol (EZSP) adapter implementation integration into the zigbee-herdsman and zigbee-herdsman-converters libraries which it depends on.
+
 
 ### ZiGate SoC
-Support for [ZiGate](https://zigate.fr) based adapters is experimental. The initial support for ZiGate is still not yet considered stable and the project is in need of more developers volunteering to help with this integration. Please refer to the respective documentation on [this page](https://www.zigbee2mqtt.io/guide/adapters/) and [ongoing development discussion](https://github.com/Koenkk/zigbee-herdsman/issues/242) with regard to the state of ZiGate adapter implementation into the zigbee-herdsman and zigbee-herdsman-converters libraries which it depends on.
+
+Support for [ZiGate](https://zigate.fr) based adapters is experimental. The initial support for ZiGate is still not yet considered stable and the project is in need of more developers volenteering to help with this integration. Please refer to the respective documentation on [this page](https://www.zigbee2mqtt.io/guide/adapters/) and [ongoing development discussion](https://github.com/Koenkk/zigbee-herdsman/issues/242) with regards to the state of ZiGate adapter implementation into the zigbee-herdsman and zigbee-herdsman-converters libraries which it depends on.
+
 
 ## Work with adapter
+
 ![](docs/tutorial/zigbee.png)
 
 To start the driver, you must specify the name of the port on which the Zigbee-module (stick) is connected. Usually this is the port `/dev/ttyACM0` or `/dev/ttyUSB0` for the UART-connection. Or you can find with `ls -l /dev/serial/by-id` the device direct.
@@ -57,6 +69,7 @@ To start the driver, you must specify the name of the port on which the Zigbee-m
 open the settings and change port
 ![](docs/tutorial/settings.png)
 
+
 For Windows this will be the COM port number.
 
 Starting from version 1.0.0 you can also use *tcp connection* for cases using esp8266 (or other microcontrollers) as serial-bridge. For example `tcp://192.168.1.46:8880`. Read more info here https://www.zigbee2mqtt.io/information/connecting_cc2530#via-an-esp8266
@@ -79,14 +92,18 @@ It is a Zigbee feature, intended for example to switch bulbs synchronized. Assig
 
 Note: Not all devices support groups (not supported by end devices like sensors).
 
+
 ### Binding
+
 https://www.zigbee2mqtt.io/information/binding
 
 ### Developer Tab
-This is a tool for advanced users to test currently unsupported devices or enhance this adapter's functionality. More instructions can be found on tab.
+
+This is a tool for advanced users to test currently unsupported devices or enhance this adapters functionality. More instructions can be found on tab.
 ![](docs/tutorial/tab-dev-1.png)
 
 ## Additional info
+
 There is a [friendly project](https://github.com/koenkk/zigbee2mqtt) with similar functionality on the same technologies, where you can work with the same devices using the MQTT protocol. Therefore, if any improvements or support for new zigbee-devices occur in the Zigbee2MQTT project, we can transfer and add the same functionality to this adapter. If you notice this, then write the issue - we'll postpone it.
 
 There are knowledge bases that can be useful for working with Zigbee-devices and equipment:
@@ -94,9 +111,11 @@ There are knowledge bases that can be useful for working with Zigbee-devices and
 * in Russian https://myzigbee.ru/
 
 ## Supported devices
+
 Works with devices from this list https://github.com/ioBroker/ioBroker.zigbee/wiki/Supported-devices
 
 ## Donate
+
 You can thank the authors by these links:
 * to Kirov Ilya https://www.paypal.me/goofyk
 * to Arthur Rupp https://paypal.me/ArthurRupp
@@ -112,7 +131,14 @@ You can thank the authors by these links:
     ### **WORK IN PROGRESS**
 -->
 
+
 ## Changelog
+### 1.8.5 (2022-11-30)
+* (arteck) fix for new code
+
+### 1.8.3 (2022-11-30)
+* (arteck) back to old source
+
 ### 1.8.1 (2022-11-28)
 * (bluefox) Packages updated
 * (bluefox) Added names of serial ports in configuration dialog
@@ -163,8 +189,8 @@ You can thank the authors by these links:
   - when a pingable device is marked active (from being inactive) it will be pinged again.
   - inactive devices are excluded from OTA updates.
 * (asgothian) Group rework part 2:
-  - state `device.groups` will now be deleted with state Cleanup
-  - state `info.groups` is now obsolete and will be deleted at adapter start (after transferring data to
+  - state device.groups will now be deleted with state Cleanup
+  - state info.groups is now obsolete and will be deleted at adapter start (after transferring data to
     the new storage)
 * (asgothian) Device name persistance.
   - Changes to device names made within the zigbee adapter are stored in the file dev_names.json. This file
@@ -178,7 +204,7 @@ You can thank the authors by these links:
 
 ### 1.6.12 (2022-01)
 * (asgothian) Groups were newly revised (read [here](https://github.com/ioBroker/ioBroker.zigbee/pull/1327) )
-   -  object `device.groups` is obsolet. The old one is no longer up to date
+   -  object device.groups is obsolet..the old one is no longer up to date
 
 ### 1.6.9 (2021-12)
 * (simatec) fix admin Dark-Mode

package/admin/admin.js

@@ -597,21 +597,22 @@ function showDevices() {
         deleteGroupConfirmation(id, getDevName(dev_block));
     });
     $('.card-reveal-buttons button[name=\'edit\']').click(function () {
-        const dev_block = $(this).parents('div.device'),
-            id = getDevId(dev_block),
-            name = getDevName(dev_block);
+        const dev_block = $(this).parents('div.device');
+        const id = getDevId(dev_block);
+        const name = getDevName(dev_block);
         editName(id, name);
     });
     $('.card-reveal-buttons button[name=\'editgrp\']').click(function () {
-        const dev_block = $(this).parents('div.device'),
-            id = dev_block.attr('id').replace(namespace + '.group_', ''),
-            name = getDevName(dev_block);
+        const dev_block = $(this).parents('div.device');
+        const id = dev_block.attr('id').replace(namespace + '.group_', '');
+        const name = getDevName(dev_block);
         editGroupName(id, name, false);
     });
     $('button.btn-floating[name=\'join\']').click(function () {
         const dev_block = $(this).parents('div.device');
-        if (!$('#pairing').hasClass('pulse'))
+        if (!$('#pairing').hasClass('pulse')) {
             joinProcess(getDevId(dev_block));
+        }
         showPairingProcess();
     });
     $('.card-reveal-buttons button[name=\'info\']').click(function () {
@@ -685,10 +686,8 @@ function checkFwUpdate() {
 function letsPairing() {
     messages = [];
     sendTo(namespace, 'letsPairing', {}, function (msg) {
-        if (msg) {
-            if (msg.error) {
-                showMessage(msg.error, _('Error'));
-            }
+        if (msg && msg.error) {
+            showMessage(msg.error, _('Error'));
         }
     });
 }
@@ -696,10 +695,8 @@ function letsPairing() {
 function touchlinkReset() {
     messages = [];
     sendTo(namespace, 'touchlinkReset', {}, function (msg) {
-        if (msg) {
-            if (msg.error) {
-                showMessage(msg.error, _('Error'));
-            }
+        if (msg && msg.error) {
+            showMessage(msg.error, _('Error'));
         }
     });
 }
@@ -707,10 +704,8 @@ function touchlinkReset() {
 function joinProcess(devId) {
     messages = [];
     sendTo(namespace, 'letsPairing', {id: devId}, function (msg) {
-        if (msg) {
-            if (msg.error) {
-                showMessage(msg.error, _('Error'));
-            }
+        if (msg && msg.error) {
+            showMessage(msg.error, _('Error'));
         }
     });
 }
@@ -727,7 +722,6 @@ function getCoordinatorInfo() {
     });
 }
 
-
 function getDevices() {
     getCoordinatorInfo();
     sendTo(namespace, 'getDevices', {}, function (msg) {
@@ -773,17 +767,25 @@ function getMap() {
 // the function loadSettings has to exist ...
 // eslint-disable-next-line no-unused-vars
 function load(settings, onChange) {
-    if (settings.panID === undefined) settings.panID = 6754;
-    if (settings.extPanID === undefined) settings.extPanID = 'DDDDDDDDDDDDDDDD';
+    settings.panID = settings.panID || 6754;
+    settings.extPanID = settings.extPanID || 'DDDDDDDDDDDDDDDD';
     // fix for previous wrong value
-    if (settings.extPanID === 'DDDDDDDDDDDDDDD') settings.extPanID = 'DDDDDDDDDDDDDDDD';
-    if (settings.precfgkey === undefined) settings.precfgkey = '01030507090B0D0F00020406080A0C0D';
-    if (settings.channel === undefined) settings.channel = 11;
-    if (settings.disablePing === undefined) settings.disablePing = false;
+    if (settings.extPanID === 'DDDDDDDDDDDDDDD') {
+        settings.extPanID = 'DDDDDDDDDDDDDDDD';
+    }
+    settings.precfgkey = settings.precfgkey || '01030507090B0D0F00020406080A0C0D';
+    if (settings.channel === undefined){
+        settings.channel = 11;
+    }
+    if (settings.disablePing === undefined) {
+        settings.disablePing = false;
+    }
 
     // example: select elements with id=key and class=value and insert value
     for (const key in settings) {
-        if (savedSettings.indexOf(key) === -1) continue;
+        if (savedSettings.indexOf(key) === -1) {
+            continue;
+        }
         // example: select elements with id=key and class=value and insert value
         const value = $('#' + key + '.value');
         if (value.attr('type') === 'checkbox') {
@@ -820,8 +822,9 @@ function load(settings, onChange) {
         showPairingProcess();
     });
     $('#pairing').click(function () {
-        if (!$('#pairing').hasClass('pulse'))
+        if (!$('#pairing').hasClass('pulse')) {
             letsPairing();
+        }
         showPairingProcess();
     });
 

package/admin/i18n/de/translations.json

@@ -98,10 +98,10 @@
     "notImplementedText": "Sie können hier eigene Befehle an Ihre Geräte senden, die noch nicht als Objekte implementiert sind. Es kann auch verwendet werden, um undokumentierte Einstellungen Ihrer Geräte zu finden. Oder um die Auswirkungen von Einstellungen zu testen und zu entscheiden, ob es sich lohnt, sie als Objekt zu implementieren. Und so weiter...",
     "to make it available for other user too": "um es auch für andere Benutzer verfügbar zu machen",
     "Excludes": "ausschließen",
-    "ExcludeTextTranslation": "Sie können hier einige Geräte hinzufügen, die von unserer Verarbeitungausgeschlossen werden sollten. Sie verwenden dann nur exposes vom ZigBee-Herdsman-Converter. Nach dem Hinzufügen starten Sie bitte den Adapter neu.",
+    "ExcludeTextTranslation": "Sie können hier einige Geräte hinzufügen, die von unserer Verarbeitung ausgeschlossen werden sollten. Sie verwenden dann nur exposes vom ZigBee-Herdsman-Converter. Nach dem Hinzufügen starten Sie bitte den Adapter neu.",
     "Please contribute your discoveries": "Bitte geben Sie uns Ihre Vorschläge",
     "zigbee-shepherd": "Sie können die zu sendenden Rohdaten hier bearbeiten. Verwenden Sie diese nicht, wenn Sie sich nicht sicher sind, was Sie tun! Verwenden Sie das JSON-Format (Attributnamen in doppelten Anführungszeichen!). Es können auch zusätzliche Eigenschaften hinzugefügt werden. Siehe Beispiele oben. (Format wie von zigbee-shepherd verwendet)",
-    "SettingsExclude": "Erzwingen Sie den Start des Adapters mit inkonsistenter Konfiguration (nicht empfohlen). Bitte aktualisieren Sie den Adapter auf kompatible Firmware und erstellen Sie Ihr Netzwerk so schnell wie möglich neu.",
+    "SettingsExclude": "Den Start des Adapters mit inkonsistenter Konfiguration erzwingen(nicht empfohlen). Bitte aktualisieren Sie den Adapter auf kompatible Firmware und erstellen Sie Ihr Netzwerk so schnell wie möglich neu.",
     "disable internal Backup": "Deaktiviere die interne Sicherung",
     "Disable active availability check": "Aktive Verfügbarkeitsprüfung deaktivieren",
     "Others": "andere Einstellungen"