iobroker.zigbee 3.1.6 → 3.2.0

package/admin/index_m.html

@@ -332,14 +332,45 @@
             margin-right: auto;
             width: 80px;
         }
+        .sml_list {
+            display: flex;
+            align-items: center;
+            gap: 20px;
+        }
 
         #dataroweven { background-color: #909090; color: #c0c0c0 !important; }
         #datarowodd  { background-color: #c0c0c0; color: #202020 !important; }
         #datarowopt  { background-color: #707070; color: #c0c0c0 !important; }
         #datatable   { background-color: #3090c0; color: #202020 !important; }
+        #dataroweven_red { background-color: #909090; color: #c00000 !important; }
+        #datarowodd_red  { background-color: #C0C0C0; color: #c00000 !important; }
+        #datarowopt_red  { background-color: #707070; color: #c00000 !important; }
         #datared     { color: #C00000 !important;}
         #datalime     { background-color: #cddc31; color: #c00000 !important;}
 
+        .m.react-dark #dataroweven_red {
+            background-color: #500000 !important;
+        }
+        .m.react-dark #datarowodd_red {
+            background-color: #400000 !important;
+        }
+        .m.react-dark #datarowopt_red {
+            background-color: #300000 !important;
+        }
+        .m.react-dark #datarowodd {
+            background-color: #303030 !important;
+        }
+        .m.react-dark #dataroweven {
+            background-color: #505050 !important;
+        }
+        .m.react-dark #datatable {
+            background-color: #202020 !important;
+        }
+
+        .i.middle {
+            vertical-align:middle;
+        }
+
         #tab-main .main-toolbar-table .filter-input {
             display: inline-table;
             padding-left: 6px;
@@ -721,7 +752,7 @@
                     <li class="tab col s2"><a href="#tab-herdsman" id="hardware" class="translate tooltipped">Hardware</a></li>
                     <!--<li class="tab col s2"><a href="#tab-map" id="tabmap" class="translate tooltipped">Network map</a></li> -->
                     <!--<li class="tab col s1"><a href="#tab-binding" class="translate tooltipped">Binding</a></li> -->
-                    <li class="tab col s2"><a href="#tab-exclude" class="translate tooltipped">Local Overrides</a></li>
+                    <!--<li class="tab col s2"><a href="#tab-exclude" class="translate tooltipped">Local Overrides</a></li>-->
                     <li class="tab col s2"><a href="#tab-overrides" class="translate tooltipped">Local Data</a></li>
                     <!--<li class="tab col s2"><a href="#tab-main" id="devs" class="translate tooltipped">Devices</a></li>-->
                     <li class="tab col s2"><a href="#tab-dev" id="develop" class="translate tooltipped">Developer</a>
@@ -935,7 +966,8 @@
                     <a id="show_test_run" class="waves-effect waves-light blue btn"><img class="img-btn" src="img/start_stop.png" title="start / stop" ></a>&nbsp;
                     <a id="readNVRam-btn" class="waves-effect waves-light btn"><img class="img-btn" src="img/nvram_read.png" title="read nvram backup" ></a>&nbsp;
                     <a id="deleteNVRam-btn" class="waves-effect waves-light btn"><img class="img-btn" src="img/nvram_delete.png" title="remove nvram backup" ></a>&nbsp;
-                    <a id="reset-btn" class="waves-effect waves-light white-text btn translate"><img class="img-btn" src="img/reset.png" title="reset..." ></a>&nbsp;
+                    <a id="reset-btn" class="waves-effect waves-light white-text btn translate"><img class="img-btn" src="img/reset.png" title="reset adapter" ></a>&nbsp;
+                    <a id="restore-backup-btn" class="waves-effect waves-light white-text btn translate"><img class="img-btn" src="img/restore_backup.png" title="restore adapter from backup" ></a>&nbsp;
                 </div>
             </div>
             <div class="row textarea">
@@ -1201,12 +1233,87 @@
             </ul>
         </div>
         <div id="tab-overrides" class="col s12 page">
+        <div class="navbar-fixed" style="height: 56px;">
+            <nav class="resposHeight" style="margin-left: -12px; line-height: 24px; width: calc(100% + 24px);">
+                <ul id="nav-mobile-2" class="left">
+                    <li>
+                        <a id="refresh_models_btn" class="btn-floating waves-effect waves-light tooltipped center-align hoverable translateT" title="refresh data">
+                            <i class="material-icons large">refresh</i>
+                        </a>
+                    </li>
+                    <li>
+                        <div class="col main-toolbar-table-types-tools main-toolbar-table-filter input-field" style="line-height: 24px;">
+                            <i class="material-icons prefix" style="line-height: 24px;">search</i>
+                            <input id="model-search" class="filter-input translateP" placeholder="" readonly="readonly" onfocus="if (this.hasAttribute('readonly')) {this.removeAttribute('readonly'); this.blur(); this.focus();}" data-lang-placeholder="Sort">
+                            <a class="model-filter-clear btn-floating btn-very-small translateT red lighten-3" title="Очистить" data-lang-title="clear" style="display: none;"><i class="material-icons">clear</i></a>
+                        </div>
+                    </li>
+                    <li>
+                        <div class="col input-field" style="line-height: 24px;">
+                            <i class="material-icons left" style="line-height: 24px; margin-top: 5px;">sort</i>
+                            <a id="model-sort-btn" class="dropdown-trigger btn" href="#" data-target="model-sort">all</a>
+                            <ul id="model-sort" class="dropdown-content" tabindex="0">
+                                <li class="model-sort-item" data-type="function(a,b) { return true }" tabindex="0">
+                                    <a class="translate" data-lang="default">default</a></li>
+                                <li class="model-sort-item" data-type="by type" tabindex="0">
+                                    <a class="translate" data-lang="by type">by type</a></li>
+                                <li class="model-sort-item" data-type="by device count" tabindex="0">
+                                    <a class="translate" data-lang="by device count">by device count</a></li>
+                                <li class="model-sort-item" data-type="by option count" tabindex="0">
+                                    <a class="translate" data-lang="by option count">by option count</a></li>
+                            </ul>
+                        </div>
+                    </li>
+                    <li>
+                        <div class="col input-field" style="line-height: 24px;">
+                            <i class="material-icons left" style="line-height: 24px; margin-top: 5px;">filter_list</i>
+                            <a id="model-filter-btn" class="dropdown-trigger btn" href="#" data-target="model-filter">all</a>
+                            <ul id="model-filter" class="dropdown-content" tabindex="0">
+                                <li class="model-filter-item" data-type="with options" tabindex="0"><a class="translate" data-lang="without options">without options</a></li>
+                                <li class="model-filter-item" data-type="without options" tabindex="0"><a class="translate" data-lang="with options">with options</a></li>
+                                <li class="model-filter-item" data-type="routers" tabindex="0"><a class="translate" data-lang="Routers">Routers</a></li>
+                                <li class="model-filter-item" data-type="end devices" tabindex="0"><a class="translate" data-lang="End Devices">End Devices</a></li>
+                                <li class="model-filter-item" data-type="groups" tabindex="0"><a class="translate" data-lang="Groups">Groups</a></li>
+                                <li class="model-filter-item" data-type="all" tabindex="0"><a class="translate" data-lang="all">all</a></li>
+                            </ul>
+                        </div>
+                    </li>
+                </ul>
+            </nav>
+        </div>
+        <div class="row">
+            <!--
+            <div class="col s1 l1 m1"><a id="modelnamefilter" class="btn-large blue left" ><i class="material-icons icon-blue">filter_list</i></a></div>
+            <div class="col s5 l5 m5 input-field" style="line-height: 24px;"><input id="Filter" type="text" /><label class="translate">Search</div>
+            <div class="col s1 l1 m1"><a id="modelsetfilter" class="btn-large blue left" ><i class="material-icons icon-blue">reorder</i></a></div>
+            <div class="input-field suffix col s2 m2 l2">
+                <select id="channel" class="value">
+                    <option value="function(a) { return true }" selected>All</option>
+                    <option value="function(a) { return LocalDisplayDataValues[a].type == 'group' }">Groups</option>
+                    <option value="function(a) { return LocalDisplayDataValues[a].type == 'Router' }">Routers</option>
+                    <option value="function(a) { return LocalDisplayDataValues[a].type == 'Router' }">EndDevices</option>
+                    <option value="function(a) { return LocalDisplayDataValues[a].setOptions?.length > 0 }">with Options</option>
+                    <option value="function(a) { return !(LocalDisplayDataValues[a].setOptions?.length > 0) }">without Options</option>
+                    <label class="translate">Filter</label>
+                </select>
+            </div>
+            <div class="col s1 l1 m1"><a id="modelnamefilter" class="btn-large blue left" ><i class="material-icons icon-blue">sort</i></a></div>
+            <div class="input-field suffix col s2 m2 l2">
+                <select id="channel" class="value">
+                    <option value="function(a,b) { return 0 }" selected>noSort</option>
+                    <option value="function(a,b) { return LocalDisplayDataValues[a].type > LocalDisplayDataValues[b].type }">by type</option>
+                    <option value="function(a,b) { return LocalDisplayDataValues[a].devices?.length > LocalDisplayDataValues[b].devices?.length }">by device counttype</option>
+                    <option value="function(a,b) { return LocalDisplayDataValues[a].setOptions?.length > LocalDisplayDataValues[b].setOptions?.length }">by option count</option>
+                    <label class="translate">Sort</label>
+                </select>
+            </div></div>
             <div class="fixed-action-btn" style="margin-bottom: 100px">
                 <a id="updateData"
                     class="btn-floating waves-effect waves-light blue tooltipped center-align hoverable translateT"
                     title="update Data"><i class="material-icons large">replay</i></a>
             </div>
-            <div id="tab-overrides" row>
+            -->
+            <div id="tab-overrides-content" row>
                 Nothing to see yet.
             </div>
         </div>
@@ -1284,17 +1391,17 @@
         </div>
     </div>
 
-    <div id="chooseimage" class="modal">
+    <div id="chooseimage" class="modal modal-fixed-footer">
         <div class="modal-content">
             <div class="row">
-                <h3 class="translate">Data override</h3>
+                <h3 class="translate">Edit model options</h3>
                 <div class="row">
                     <div class="col s12 input-field">
                         <input id="d_name" type="text" class="value validate">
                         <label for="d_name" class="translate">Name</label>
                     </div>
                 </div>
-                    <div class="row">
+                <div class="row">
                     <div class="col s9 input-field">
                         <select id="images" class="icons">
                         </select>
@@ -1303,15 +1410,26 @@
                     <div class="col s3 ">
                         <div class="currentIcon"><img src="img/unknown.png"></div>
                     </div>
+                    <div class="col options_grid s12">
+                        No Options available
+                    </div>
+                    <div class="new_options_available">
+                        <div class="input-field suffix col s10 m10 l10">
+                            <select id="option_Selector" class="materialSelect"></select class="value" />
+                                <label for="option_Selector">Available Options</label>
+                        </div>
+                        <div class="col">
+                            <a name="add_options" id="option_add_1084" class="waves-effect waves-green btn-large">
+                            <i class="material-icons large icon-green">add_circle</i></a>
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="row">
-            </div>
         </div>
         <div class="modal-footer">
             <div class="forcedelete" id = "globaldiv">
                 <label>
-                    <input id="globaloverride" type="checkbox" class="value"/>
+                    <input id="globaloverride" type="checkbox" class="value filled-in" checked="checked" disabled="disabled"/>
                     <span class="translate" for="globaloverride">Apply to model</span>
                 </label>
             </div>
@@ -1410,6 +1528,26 @@
         </div>
     </div>
 
+    <div id="modalrestore" class="modal">
+        <div class="modal-content">
+            <h3 class="translate">Select backup to restore</h3>
+            <!--p class="translate">Restore Info</p-->
+            <div class="new_backups_available">
+                <div class="input-field suffix col s10 m10 l10">
+                    <select id="backup_Selector" class="materialSelect"></select class="value" />
+                        <label for="backup_Selector">Available Backups</label>
+                </div>
+                <div class="col col s2 m2 l2">
+                    <a name="restore_this" id="restore_this" class="waves-effect waves-green btn-large">
+                    <i class="material-icons large icon-green tooltipped" title="restore">beenhere</i></a>
+                </div>
+            </div>
+        </div>
+        <div class="modal-footer">
+            <a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat translate">Cancel</a>
+        </div>
+    </div>
+
     <div id="modalviewconfig" class="modal modal-fixed-footer">
         <div class="modal-content">
             <h3 class="translate">Map view config</h3>

package/admin/tab_m.html

@@ -943,11 +943,11 @@
 
         <div id="modaledit" class="modal">
             <div class="modal-content">
-                <h3 class="translate">Rename / Group device</h3>
+                <h3 class="translate">Group device</h3>
                 <div class="row">
                     <div class="col s12">
                         <div class="input-field">
-                            <input id="d_name" type="text" class="value validate">
+                            <input disabled id="d_name" type="text" class="value validate">
                             <label for="d_name" class="translate">Name</label>
                         </div>
                     </div>
@@ -1008,7 +1008,7 @@
         <div id="groupedit" class="modal">
             <div class="modal-content">
                 <div class = "editgroup">
-                    <h3 class="translate">Edit Group</h3>
+                    <h3 class="translate">Edit group members</h3>
                 </div>
                 <div class="row">
                     <div class="col s4 m4 l2 hide">
@@ -1018,7 +1018,7 @@
                         </div>
                     </div>
                         <div class="input-field col s8 m8 l10">
-                        <input id="g_name" type="text" class="value validate">
+                        <input id="g_name" type="text" class="value validate" disabled="">
                         <label for="g_name" class="translate">Name</label>
                     </div>
                 </div>
@@ -1054,7 +1054,7 @@
         <div id="chooseimage" class="modal modal-fixed-footer">
             <div class="modal-content">
                 <div class="row">
-                    <h3 class="translate">Data override</h3>
+                    <h3 class="translate">Edit device options</h3>
                     <div class="row">
                         <div class="col s12 input-field">
                             <input id="d_name" type="text" class="value validate">
@@ -1087,11 +1087,10 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <div class="forcedelete" id = "globaldiv">
+                <div class="forcedelete hide" id = "globaldiv">
                     <label>
                         <input id="globaloverride" type="checkbox" class="value"/>
                         <span class="translate" for="globaloverride">Apply to model</span>
-                    </label>
                 </div>
                 <a name="save" href="#!" class="modal-action modal-close waves-effect waves-green btn green translate">Save</a>
                 <a href="#!" class="modal-action modal-close waves-effect waves-red btn-flat translate">Cancel</a>
@@ -1153,7 +1152,7 @@
             </div>
             <div class="modal-footer">
                 <a name="IEEE" href="#!" class="modal-action waves-effect waves-red btn-flat left">Network</a>
-                <a name="endpairing" id="endpairing" href="#!" class="modal-action  waves-effect waves-red btn red translate">Stop</a>
+                <a name="endpairing" id="endpairing" href="#!" class="waves-effect waves-red btn red translate">Stop</a>
                 <a name="extendpairing" id="extendpairing" href="#!" class="modal-action waves-effect waves-green btn green translate">Extend</a>
                 <a name="hide" href="#!" class="modal-action modal-close waves-effect waves-green btn green translate">Hide</a>
             </div>

package/docs/de/readme.md

@@ -124,9 +124,9 @@ In Beiden Fällen ist es hinreichend den Adapter neu zu starten - die entspreche
 | ![](img/info.png) | Info <br> Öffnet die Informationsanzeige zum Gerät. Die auf dieser Seite dargestellten Informationen stammen direkt vom Gerät. Sie sind auch für unbekannte Geräte verfügbar.  |
 | ![](img/debug.png) | Gerät debuggen <br> Aktiviert / deaktivert die Erzeugung von erweiterten Debug-Meldungen für dieses Gerät. Die Farbe des Icons zeigt den aktuellen Status an: (Schwarz/Weiss: keine Debug Meldungen, Grün Debug Meldungen - deaktivierbar mit dieser Schaltflächce. Orange - Debug Meldungen via Filter unter zigbee.x.info.debugmessages.  |
 | ![](img/on_off.png) | An/Aus <br> Mit dieser Schaltfläche kann ein Gerät aktiviert / deaktiviert werden. Mit deaktiverten Geräten findet keine Kommunikation statt. |
-| ![](img/edit_image.png) | Bild / Name zusweisen <br> Mit dieser Schaltfläche ist es Möglich für das Gerät basierend auf dem Gerät oder dem Gerätetyp ein eigenes Bild und / oder einen eigenen Namen vorzugeben. Vorgaben die so gemacht werden bleiben erhalten wenn das Gerät gelöscht wird.  |
+| ![](img/edit_image.png) | Bild / Name zusweisen <br> Mit dieser Schaltfläche ist es Möglich die Bezeichnung des Gerätes, das Bild des Gerätes oder die Optionen des Gerätes anzupassen. Wichtig - die Einstellungen können hier **nur** auf Gerätebasis durchgeführt werden. Die Vorgabe auf Modellbasis ist in der Konfiguration hinterlegt.Vorgaben die so gemacht werden bleiben erhalten wenn das Gerät gelöscht wird.  |
 | ![](img/reconfigure.png) | Das Gerät konfigurieren. <br> Mit dieser Schaltfläche ist es Möglich für das Gerät erneut zu konfigurieren. Dabei wird der *Converter* Angewiesen die Aktionen durchzufuehren die zur Konfiguration vorgesehen sind. Ueblicherweise werden damit verscheidene Cluster / Attribute an den Koordinator gebunden, um dafuer zu sorgen das das Gerät Informationen *Event* getriggert an den Koordinator sendet.<br>Damit dieses erfolgreich ist muss das Gerät aktiv sein. Insbesondere bei Batterie-betriebenen Geräten ist das of nut kurz nach einer Aktivierung der Fall.<br>Bei einer erfolgreichen Konfiguration verschwindet der Dialog ohne weitere Meldung, und es wird eine Info Meldung im Log platziert. Nur wenn die Konfiguration nicht erfolgreich war gibt es eine Meldung. Dabei sind 2 Arten von Meldungen zu unterscheiden - eine allgemeine Zeitüberschreitung (The device did not repond in time to the configuration request. Another attempt will be made when the device is awake.) oder eine echte Fehlermeldung. Im Falle der Zeitüberschreitung wird das Gerät in eine Liste eingetragen und bei der naechsten Kontaktaufnahme konfiguriert. Im Fehlerfall unterbleibt die Konfiguration. |
-| ![](img/edit_grp.png) | Name / Gruppen editieren <br> Über diese Schaltfläche lässt sich der Name eines Gerätes sowie - wenn zutreffent - die Zuordnung des Gerätes zu einer oder mehreren Gruppen anpassen.   |
+| ![](img/edit_grp.png) | Name / Gruppen editieren <br> Über diese Schaltfläche lässt sich die Zuordnung des Gerätes zu einer oder mehreren Gruppen anpassen. Der Button ist nur bei Geräten verfügbar die sich auch gruppieren lassen. Hinweis: Fernbedienungen werden den Gruppen nicht hinzugefügt - statt dessen müssen diese via 'binding' an die Gruppe gebunden werden.  |
 | ![](img/delete.png) | Gerät löschen <br> Started den Löschvorgang für dieses Gerät.  |
 
 ## Zusätzliche Informationen

package/docs/en/readme.md

@@ -122,8 +122,8 @@ In both cases, restarting the adapter is sufficient – ​​the adapter's corr
 | ![](../de/img/reconfigure.png) | (re)configure the device. <br> This button allows to trigger a device configuration, which is used to tell the device what data to report automatically to the coordinator. The configuration items are defined in the *converter* for this device. Note that the device needs to be active for a configuration attempt to be successful. If the device is not active, the attempt will time out, and the device will be placed in a queue of devices to be configured the next time the device i sends a message.  |
 | ![](../de/img/debug.png) | Debug device <br> Enables / disables the generation of extended debug messages for this device. The color of the icon indicates the current status: (Black/White: no debug messages, Green: debug messages - can be deactivated with this button. Orange: debug messages via filter under zigbee.x.info.debugmessages. |
 | ![](../de/img/on_off.png) | On/Off <br> This button can be used to activate/deactivate a device. No communication takes place with deactivated devices. |
-| ![](../de/img/edit_image.png) | Assign image/name <br> This button allows you to specify a custom image and/or name for the device based on the device or device type. Settings made in this way are retained even if the device is deleted. |
-| ![](../de/img/edit_grp.png) | Edit name/groups <br> This button can be used to change the name of a device and - if applicable - the assignment of the device to one or more groups. |
+| ![](../de/img/edit_image.png) | Assign image/name <br> This button allows you to Assign a name, an icon or options for a specific device. Note that this assignment is **solely** on device level. model-level assingment is done via the settings. Settings made in this way are retained even if the device is deleted. |
+| ![](../de/img/edit_grp.png) | Edit name/groups <br> This button can be used change the devices associationw ith one or more groups. This button is only available on devices which can be assigned to groups. Note: Remotes are not added to the groups - they need to be bound to the group using the 'binding' tab. |
 | ![](../de/img/delete.png) | Delete device <br> Starts the deletion process for this device. |
 ## Additional information
 The Zigbee-Adapter shares the same libraries (zigbee-herdsman, zigbee-herdsman-converters) asn the [Zigbee2mqtt](https://www.zigbee2mqtt.io/) Project ([Github Link](https://github.com/Koenkk/zigbee2mqtt)). It is possible to use zigbee2mqtt.io directly with ioBroker using MQTT or its own [Adapter](https://github.com/arteck/ioBroker.zigbee2mqtt).<br>

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "zigbee",
-    "version": "3.1.6",
+    "version": "3.2.0",
     "news": {
+      "3.2.0": {
+        "en": "remove local overrides tab from config\nestablish local data tab in config to edit global and device level settings and options\nremove the local overrides tab\nremove the ability to set model level overrides from device tab.\nfix errors for 'polling' devices with changed poll times.\nwarning icon for devices which are not completely interviewed.\nimproved router detection for opening the network\nbugfix: open network on router\nZHC 25.x latest, ZH 6.1.3,\nrestore from in-adapter backup",
+        "de": "entfernen sie lokale overrides tab von config\nlokale daten tab erstellen, um globale und geräteebene einstellungen und optionen zu bearbeiten\nentfernen der lokalen overrides tab\nentfernen sie die fähigkeit, modellebene überschrieben von der geräte-tab.\nfehler für \"polling\"-geräte mit veränderten abfragezeiten beheben.\nwarnsymbol für geräte, die nicht vollständig interviewt werden.\nverbesserte routererkennung zum öffnen des netzwerks\nbugfix: offenes netzwerk auf router\nZHC 25.x neueste, ZH 6.1.3,\nwiederherstellung von in-adapter-backup",
+        "ru": "удалить локальную вкладку overrided из конфигураций\nустановить локальную вкладку данных в конфигурацию для редактирования глобальных настроек и параметров уровня устройства\nудалить вкладку local overrides\nудалить возможность установки переопределений уровня модели из вкладки устройства.\nисправление ошибок для «опросных» устройств с измененным временем опроса.\nиконка предупреждения для устройств, которые не были полностью опрошены.\nулучшенное обнаружение маршрутизатора для открытия сети\nbugfix: открытая сеть на маршрутизаторе\nZHC 25.x, ZH 6.1.3,\nвосстановление из in-adapter backup",
+        "pt": "remover a página de substituições locais da configuração\nestabelecer a página de dados locais na configuração para editar as configurações e opções globais e de nível do dispositivo\nremover a página de sobreposições locais\nremover a capacidade de definir os comandos de nível do modelo da aba do dispositivo.\ncorrigir erros para dispositivos de 'polling' com tempos de votação alterados.\nícone de aviso para dispositivos que não são completamente entrevistados.\ndetecção de roteador melhorada para abrir a rede\ncorreção de erros: abrir rede no roteador\nZHC 25.x mais recente, ZH 6.1.3,\nrestaurar a partir de backup no adaptador",
+        "nl": "tabblad overrides verwijderen uit config\nlokale datatabblad instellen in config om instellingen en opties voor het niveau van het apparaat en de globale instellingen te bewerken\nhet tabblad lokale overrides verwijderen\nverwijder de mogelijkheid om modelniveau overrides van apparaat tab.\nfouten te herstellen voor 'polling' apparaten met veranderde polltijden.\nwaarschuwingspictogram voor apparaten die niet volledig zijn geïnterviewd.\nverbeterde routerdetectie voor het openen van het netwerk\nbugfix: open netwerk op router\nZHC 25.x laatste, ZH 6.1.3,\nherstellen van in-adapter back-up",
+        "fr": "supprimer l'onglet local de la configuration\ncréer un onglet local de données dans la configuration pour modifier les paramètres et les options de niveau global et périphérique\nsupprimer l'onglet local de remplacement\nsupprimer la possibilité de définir les dépassements de niveau du modèle de l'onglet périphérique.\ncorriger les erreurs pour les dispositifs 'polling' avec des temps de sondage modifiés.\nicône d'avertissement pour les appareils qui ne sont pas complètement interviewés.\namélioration de la détection du routeur pour l'ouverture du réseau\nbugfix: ouvrir le réseau sur le routeur\nZHC 25.x dernier, ZH 6.1.3,\nrestaurer à partir de la sauvegarde dans l'adaptateur",
+        "it": "rimuovere la scheda override locale da config\nstabilire la scheda dati locale in configurazione per modificare le impostazioni e le opzioni del livello globale e del dispositivo\nrimuovere la scheda override locale\nrimuovere la capacità di impostare override di livello del modello dalla scheda del dispositivo.\ncorreggere gli errori per i dispositivi 'polling' con tempi di sondaggio modificati.\nicona di avviso per dispositivi che non sono completamente intervistati.\nmiglioramento del rilevamento del router per l'apertura della rete\nbugfix: aprire la rete sul router\nZHC 25.x ultimo, ZH 6.1.3,\nripristino da backup in-adapter",
+        "es": "eliminar la pestaña de anulaciones locales de config\nestablecer la ficha de datos local en config para editar ajustes y opciones a nivel global y de dispositivos\neliminar la ficha de anulación local\neliminar la capacidad de establecer el nivel de modelo anula de la pestaña dispositivo.\ncorrige errores para dispositivos 'polling' con tiempos de votación cambiados.\nicono de advertencia para dispositivos que no son entrevistados por completo.\nmejor detección de router para abrir la red\nbugfix: red abierta en router\nZHC 25.x más reciente, ZH 6.1.3,\nrestaurar de la copia de seguridad en el equipo",
+        "pl": "usuń lokalne nadjazdy z zakładki config\ntworzy lokalną kartę danych w konfigu, aby edytować globalne i na poziomie urządzenia ustawienia i opcje\nusuń kartę lokalnych nadwozi\nusuń możliwość ustawiania nadwyżek poziomu modelu z zakładki urządzenia.\nnaprawić błędy urządzeń 'sondażowych' ze zmienionymi okresami ankiety.\nikona ostrzegawcza dla urządzeń, które nie są w pełni przesłuchane.\nulepszone wykrywanie routerów w celu otwarcia sieci\nbugfix: otwarta sieć na routerze\nZHC 25.x najnowszy, ZH 6.1.3,\nprzywracanie z kopii zapasowej in- adaptera",
+        "uk": "видалити локальну вкладку overrides з налаштування\nвстановити локальну вкладку даних в конфігурацію для редагування параметрів рівня глобального та пристрою та параметрів\nвидалити локальну вкладку\nприбрати можливість встановити рівень моделі перенаряддя з вкладки пристрою.\nфіксувати помилки для пристроїв «запилення» з змінними термінами опитування.\nзначок попередження для пристроїв, які не повністю опитуються.\nполіпшення виявлення маршрутизатора для відкриття мережі\nвиправлення помилок: відкрита мережа на маршрутизаторі\nZHC 25.x останнє, ZH 6.1.3,\nвідновлення з резервної копії",
+        "zh-cn": "从配置中删除本地覆盖标签\n在配置中建立本地数据标签以编辑全局和设备级别设置和选项\n删除本地覆盖标签\n从设备标签中删除设置模型级别覆盖的能力 .\n修正“ 投票” 设备的错误, 并更改投票时间 .\n警告未完全访问设备的图标.\n为打开网络改进路由器检测\n错误修正: 在路由器上打开网络\nZHC 25.x最新版,ZH 6.1.3,\n从适应中备份恢复"
+      },
       "3.1.6": {
         "en": "Bugfixes\n",
         "de": "Bugfixes\n",
@@ -80,19 +93,6 @@
         "pl": "naprawić błąd 'icon' dla nieznanych urządzeń\nfix state for level.color.rgb role (hex _ color, akceptuje tylko # rrggbb values\nZH 4.4.1\nZHC 23.72.1\nprzygotowanie do złamania zmian w ZHC 24.0.0",
         "uk": "виправлено помилку 'icon' для невідомих пристроїв\nвиправити стан для рівня.color.rgb роль (hex_color, приймає тільки значення #rrggbb\nЗХ 4.4.1\nЗХК 23.72.1\nпідготовка до зміни розриву в ЗЖК 24.0.0",
         "zh-cn": "修复未知设备的“ icon” 错误\n级的固定状态.color.rgb 角色(hex_color,只接受#rrggbb值)\n兹哈4.4.1\nZHC 23.72.1 电话\n准备打破ZHC 24.0"
-      },
-      "3.0.2": {
-        "en": "fix images",
-        "de": "bilder",
-        "ru": "фиксировать изображения",
-        "pt": "corrigir imagens",
-        "nl": "afbeeldingen herstellen",
-        "fr": "réparer les images",
-        "it": "fissare le immagini",
-        "es": "fijar imágenes",
-        "pl": "poprawianie obrazów",
-        "uk": "фіксувати зображення",
-        "zh-cn": "修正图像"
       }
     },
     "titleLang": {

package/lib/DeviceDebug.js

@@ -27,7 +27,7 @@ class DeviceDebug extends EventEmitter {
     }
 
     start(statescontroller, zigbeecontroller) {
-        this.info('--- creating device debug ---');
+        this.debug('--- creating device debug ---');
         statescontroller.on('device_debug', this.onDebugEvent.bind(this))
         this.adapter.on('device_debug', this.onDebugEvent.bind(this))
         zigbeecontroller.on('device_debug', this.onDebugEvent.bind(this))

package/lib/backup.js

@@ -8,6 +8,7 @@ class Backup {
         this.adapter = adapter;
         this.adapter.on('message', this.onMessage.bind(this));
         this.inProgress = new Set();
+        this.options = {};
     }
 
     start(zbController, stController) {
@@ -40,10 +41,13 @@ class Backup {
         if (typeof obj === 'object' && obj.command) {
             switch (obj.command) {
                 case 'listbackups':
-                    this.listbackups(obj);
+                    this.listbackups(obj.from, obj.command, obj.message, obj.callback);
                     break;
                 case 'restore':
-                    this.restore(obj);
+                    this.restore(obj.from, obj.command, obj.message, obj.callback);
+                    break;
+                case 'backup':
+                    this.backup(() => this.sendTo(obj.from, obj.command, obj.message, obj.callback));
                     break;
             }
         }
@@ -51,19 +55,22 @@ class Backup {
 
     async configure(zigbeeOptions) {
         this.zigbeeOptions = zigbeeOptions;
-        this.backup(zigbeeOptions);
-        const allBackupFiles = this.listBackupsFiles(zigbeeOptions);
-        this.delBackupsFiles(zigbeeOptions, allBackupFiles);
+        this.options = zigbeeOptions;
+        this.backup();
+        const allBackupFiles = this.listBackupsFiles();
+        this.delBackupsFiles(allBackupFiles);
     }
 
-    backup(options) {
+    backup(callback) {
         // backup prior database and nv data before start adapter
         const files = [];
+        const options = this.options;
         if (options.disableBackup) {
             this.info(`internal Backups are disabled`);
         } else {
             if (fs.existsSync(pathLib.join(options.dbDir, options.backupPath))) files.push(options.backupPath);
             if (fs.existsSync(pathLib.join(options.dbDir, options.dbPath))) files.push(options.dbPath);
+            if (fs.existsSync(pathLib.join(options.dbDir, options.localConfigPath))) files.push(options.localConfigPath);
             if (files.length == 0) return;
 
             const d = new Date();
@@ -74,20 +81,23 @@ class Backup {
             const f = fs.createWriteStream(name);
             f.on('finish', () => {
                 this.debug(`Backup ${name} success`);
+                if (callback) callback();
             });
             f.on('error', err => {
                 this.error(`Cannot pack backup ${name}: ` + err);
+                if (callback) callback();
             });
             try {
                 tar.create({gzip: true, p: false, cwd: options.dbDir}, files).pipe(f);
             } catch (err) {
                 this.error(`Cannot pack backup ${name}: ` + err);
+                if (callback) callback();
             }
         }
     }
 
-    listBackupsFiles(options) {
-        const dir = options.dbDir;
+    listBackupsFiles() {
+        const dir = this.options.dbDir;
         const result = [];
 
         if (fs.existsSync(dir)) {
@@ -117,14 +127,14 @@ class Backup {
         }
     }
 
-    delBackupsFiles(options, files) {
+    delBackupsFiles(files) {
         const arr = files.length;
         if (arr > 10) {
             this.info('delete old Backup files. keep only last 10');
         }
 
         for (let i = 10; i < files.length; i++) {
-            const name = options.dbDir + '/' + files[i];
+            const name = this.options.dbDir + '/' + files[i];
             try {
                 require('fs').unlinkSync(name);
             } catch (error) {
@@ -134,34 +144,53 @@ class Backup {
     }
 
 
-    async listbackups(obj) {
-
+    async listbackups(from, command, message, callback) {
+        this.adapter.sendTo(from, command, {files:this.listBackupsFiles()}, callback);
     }
 
-    async restore(options, name) {
-        if (fs.existsSync(pathLib.join(options.dbDir, name))) {
+    async restore(from, command, msg, callback) {
+        const name = msg.name;
+        if (name == undefined) {
+            this.adapter.sendTo(from, command, {error:`cannot restore from undefined file`}, callback);
+            return;
+        }
+        const options = this.options;
+        const fn = pathLib.join(options.dbDir, name)
+        if (fs.existsSync(fn)) {
             try {
-                this.log.info('Stop herdsman');
-                if (this.reconnectTimer) clearTimeout(this.reconnectTimer);
-                this.callPluginMethod('stop');
-                if (this.zbController) {
-                    await this.zbController.stop();
-                }
+                this.info('Stopping Zigbee subsystem');
+                await this.adapter.testConnect({start:false});
                 const tar = require('tar');
+                const response = {};
                 try {
-                    tar.extract({file: name, cwd: options.dbDir}, err => {
+                    const target = this.options.dbDir;
+                    tar.extract({file: fn, cwd: target}, async err => {
                         if (err) {
-                            this.log.error(`Cannot extract from file ${name}: ${err}`);
+                            response.error = `Cannot extract from file ${fn}: ${err}`;
+                            this.error(response.error);
                         } else {
-                            this.log.info(`Extract from file ${name} success`);
+                            this.info(`Extract from file ${fn} success`);
+                        }
+                        const result = await this.adapter.testConnect({start:true});
+                        if (!result.status) {
+                            const errors = [];
+                            if (response.error) errors.push(response.error);
+                            errors.push('unable to start zigbee subsystem.');
+                            if (result.error) errors.push(result.error);
+                            errors.push('Please verify the configuration and the restored files');
+                            response.error = errors.join('\n');
                         }
-                        this.doConnect();
+                        this.adapter.sendTo(from, command, response, callback);
                     });
                 } catch (err) {
-                    this.log.error(`Cannot extrack backup ${name}: ${err}`);
+                    response.error = `Cannot extrack backup ${name}: ${err?.message || 'no reason given'}`
+                    this.error(response.error);
+                    this.adapter.sendTo(from, command, response, callback);
                 }
             } catch (error) {
-                this.log.error(`Stop herdsman error (${error.stack})`);
+                const errmsg = `Error stopping the zigbee subsystem: ${error?.message || 'no reason given'}`
+                this.error(errmsg);
+                this.adapter.sendTo(from, command, {error:errmsg}, callback);
             }
         }
     }