iobroker.zigbee 3.0.0 → 3.0.1

package/admin/tab_m.html

@@ -935,113 +935,126 @@
                       </div>
                   </div>
               </div>
-              <div class="row epid0">
-                  <div class="col">
-                      <div class=endpointid>
-                          <p class="translate device_with_endpoint">Main Endpoint</p>
-                      </div>
-                  </div>
-                  <div class="col1">
-                      <div class="input-field groups">
-                          <select id="d_groups_ep0" class="materialSelect" multiple>
-                              <option value="1">select</option>
-                          </select>
-                          <label for="d_groups_ep0" class="translate">Groups</label>
-                      </div>
-                  </div>
-              </div>
-              <div class="row epid1">
-                  <div class="col epid">
-                      <div class=endpointid>
-                          <p class="translate device_with_endpoint">Sub Endpoint 1</p>
-                      </div>
-                  </div>
-                  <div class="col">
-                      <div class="input-field groups">
-                          <select id="d_groups_ep1" class="materialSelect" multiple>
-                              <option value="1">select</option>
-                          </select>
-                          <label for="d_groups_ep1" class="translate">Groups</label>
-                      </div>
-                  </div>
-              </div>
-              <div class="row epid2">
-                  <div class="col epid">
-                      <div class=endpointid>
-                          <p class="translate device_with_endpoint">Sub Endpoint 2</p>
-                      </div>
-                  </div>
-                  <div class="col">
-                      <div class="input-field groups">
-                          <select id="d_groups_ep2" class="materialSelect" multiple>
-                              <option value="1">select</option>
-                          </select>
-                          <label for="d_groups_ep2" class="translate">Groups</label>
-                      </div>
-                  </div>
-              </div>
-              <div class="row epid3">
-                  <div class="col epid">
-                      <div class=endpointid>
-                          <p class="translate device_with_endpoint">Sub Endpoint 3</p>
-                      </div>
-                  </div>
-                  <div class="col">
-                      <div class="input-field groups">
-                          <select id="d_groups_ep3" class="materialSelect" multiple>
-                              <option value="1">select</option>
-                          </select>
-                          <label for="d_groups_ep3" class="translate">Groups</label>
-                      </div>
-                  </div>
+              <div class="groups_available">
+              <div class="row">
+                <h6>Groups</h6>
               </div>
-              <div class="row epid4">
-                <div class="col epid">
-                    <div class=endpointid>
-                        <p class="translate device_with_endpoint">Sub Endpoint 4</p>
+                <div class="row epid0">
+                    <div class="col">
+                        <div class=endpointid>
+                            <p class="translate device_with_endpoint">Main Endpoint</p>
+                        </div>
+                    </div>
+                    <div class="col1">
+                        <div class="input-field groups">
+                            <select id="d_groups_ep0" class="materialSelect" multiple>
+                                <option value="1">select</option>
+                            </select>
+                            <label for="d_groups_ep0" class="translate">Groups</label>
+                        </div>
                     </div>
                 </div>
-                <div class="col">
-                    <div class="input-field groups">
-                        <select id="d_groups_ep4" class="materialSelect" multiple>
-                            <option value="1">select</option>
-                        </select>
-                        <label for="d_groups_ep4" class="translate">Groups</label>
+                <div class="row epid1">
+                    <div class="col epid">
+                        <div class=endpointid>
+                            <p class="translate device_with_endpoint">Sub Endpoint 1</p>
+                        </div>
+                    </div>
+                    <div class="col">
+                        <div class="input-field groups">
+                            <select id="d_groups_ep1" class="materialSelect" multiple>
+                                <option value="1">select</option>
+                            </select>
+                            <label for="d_groups_ep1" class="translate">Groups</label>
+                        </div>
                     </div>
                 </div>
-              </div>
-              <div class="row epid5">
+                <div class="row epid2">
+                    <div class="col epid">
+                        <div class=endpointid>
+                            <p class="translate device_with_endpoint">Sub Endpoint 2</p>
+                        </div>
+                    </div>
+                    <div class="col">
+                        <div class="input-field groups">
+                            <select id="d_groups_ep2" class="materialSelect" multiple>
+                                <option value="1">select</option>
+                            </select>
+                            <label for="d_groups_ep2" class="translate">Groups</label>
+                        </div>
+                    </div>
+                </div>
+                <div class="row epid3">
+                    <div class="col epid">
+                        <div class=endpointid>
+                            <p class="translate device_with_endpoint">Sub Endpoint 3</p>
+                        </div>
+                    </div>
+                    <div class="col">
+                        <div class="input-field groups">
+                            <select id="d_groups_ep3" class="materialSelect" multiple>
+                                <option value="1">select</option>
+                            </select>
+                            <label for="d_groups_ep3" class="translate">Groups</label>
+                        </div>
+                    </div>
+                </div>
+                <div class="row epid4">
+                    <div class="col epid">
+                        <div class=endpointid>
+                            <p class="translate device_with_endpoint">Sub Endpoint 4</p>
+                        </div>
+                    </div>
+                    <div class="col">
+                        <div class="input-field groups">
+                            <select id="d_groups_ep4" class="materialSelect" multiple>
+                                <option value="1">select</option>
+                            </select>
+                            <label for="d_groups_ep4" class="translate">Groups</label>
+                        </div>
+                    </div>
+                </div>
+                <div class="row epid5">
+                    <div class="col epid">
+                        <div class=endpointid>
+                            <p class="translate device_with_endpoint">Sub Endpoint 5</p>
+                        </div>
+                    </div>
+                    <div class="col">
+                        <div class="input-field groups">
+                            <select id="d_groups_ep5" class="materialSelect" multiple>
+                                <option value="1">select</option>
+                            </select>
+                            <label for="d_groups_ep5" class="translate">Groups</label>
+                        </div>
+                    </div>
+                </div>
+                <div class="row epid6">
                 <div class="col epid">
                     <div class=endpointid>
-                        <p class="translate device_with_endpoint">Sub Endpoint 5</p>
+                        <p class="translate device_with_endpoint">Sub Endpoint 6</p>
                     </div>
                 </div>
                 <div class="col">
                     <div class="input-field groups">
-                        <select id="d_groups_ep5" class="materialSelect" multiple>
+                        <select id="d_groups_ep6" class="materialSelect" multiple>
                             <option value="1">select</option>
                         </select>
-                        <label for="d_groups_ep5" class="translate">Groups</label>
+                        <label for="d_groups_ep6" class="translate">Groups</label>
+                        </div>
                     </div>
                 </div>
-              </div>
-              <div class="row epid6">
-            <div class="col epid">
-                <div class=endpointid>
-                    <p class="translate device_with_endpoint">Sub Endpoint 6</p>
-                </div>
             </div>
-            <div class="col">
-                <div class="input-field groups">
-                    <select id="d_groups_ep6" class="materialSelect" multiple>
-                        <option value="1">select</option>
-                    </select>
-                    <label for="d_groups_ep6" class="translate">Groups</label>
-                      </div>
-                  </div>
+              <div class="row">
+              <div class="options_available col1">
+                <h6>Options</h6>
+                <div class="options_grid">
+                </div>
+              </div>
               </div>
           </div>
           <div class="modal-footer">
+              <a name="add_options" class="waves-effect waves-green btn green translate"><i class="material-icons large">add_circle</i></a>
               <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>
           </div>

package/docs/en/readme.md

@@ -31,24 +31,19 @@ The software is divided into "converter" and "adapter".
 
 
 ## Installation
-1. Connect the coordinator hardware to the Raspberry Pi.<br>
-2. Connect to the Raspberry Pi using PuTTY, for example.<br>
-3. Determine the coordinator path. On Linux systems, this is often located in the /dev/serial/by-id directory. Alternatively, /dev/ttyUSB*, /dev/ttyAM* (Linux), /dev/tty.usbserial-* (macOS), or com* (Windows) are expected.<br>
+1. Connect the coordinator hardware to computer running ioBroker (or the network, in case of LAN/WLan coordinators).<br>
+2. Open a console on the server. In case of Unix/Linux based systems, this can be done remotely via ssh. Depending on the OS used, additional programs (e.g. puTTY on Windows) may be needed.<br>
+3. Determine the coordinator path. On Unix/Linux systems, this is often located in the /dev/serial/by-id directory. Alternatively, /dev/ttyUSB*, /dev/ttyAM* (Unix/Linux), /dev/tty.usbserial-* (macOS), or com* (Windows) are expected.<br>
 The following example shows a Linux installation on a Raspberry Pi. The command `ls -la /dev/serial/by-id/` produces the output shown in the image.
 ![](../de/img/Bild2.png)
-4. ioBroker -> Install the ZigBee adapter, here version 1.8.10 as an example. <br> ![](../de/img/Bild3.png) <br> This installs all required software components (converter and adapter).
-5. Open the adapter configuration. The following image shows the interface from version 2.1.0 onwards.<br>![](img/Zigbee_config_en.png)<br>
+4. ioBroker -> Install the ZigBee adapter, here version 1.8.10 as an example. <br> ![](../de/img/Bild3.png) <br> This installs all required software components (converter and adapter). <br>![](img/Zigbee_config_en.png)<br>
+5. Open the adapter configuration. The above image shows the interface version 3.0.0 or newer.
 In this situation, the admin indicates whether the ZigBee subsystem is started (A).
-6. Enter the port for the coordinator. (B) In the case of USB coordinators, this is the previously determined device path.
-(B) In the case of USB coordinators, this is the previously determined device path.
-(B) Bei USB-Koordinatoren ist dies der zuvor ermittelte Gerätepfad.
-(B) In the case of USB coordinators, this is the device path previously determined.
-(B) Bei USB-Koordinatoren ist dies der zuvor ermittelte Gerätepfad.
- For coordinators controlled via the network, the network address and port must be specified in the form tcp://ip:port instead of the device path. If the adapter itself (not the Zigbee subsystem) is active, a list of available serial interfaces is available for selection. The following applies when selecting:
+6. Enter the port for the coordinator (B). In the case of USB coordinators, this is the previously determined device path. For coordinators controlled via the network, the network address and port must be specified in the form tcp://ip:port instead of the device path. If the adapter itself (not the Zigbee subsystem) is active, a list of available serial interfaces is available for selection. The following applies when selecting:
 - If multiple adapters with different USB devices are used for communication on the system, a port from the /dev/serial/by-id directory (if available) should **absolutely** be selected. This ensures that the adapter's association with the coordinator is retained when the system is restarted.
 - If only one USB device is used, the /dev/TTY* port is preferable. This allows the coordinator to be replaced with an identical device in the event of a defect without having to adjust the configuration.
 7. Assign a Network ID and Pan ID to distinguish it from other ZigBee networks within wireless range. e.g., starting with adapter version 2.1.0, ExtPanID (C) and PanID (D) are automatically pre-assigned with random values ​​until the configuration is saved.<br>
-8. Select a suitable ZigBee channel (E). Please note that ZigBee and 2.4GHz Wi-Fi share the same frequency band. The optimal channel therefore depends, among other things, on the Wi-Fi channels used in the area. The channel names for ZigBee and Wi-Fi are **not** identical. It is also advisable to limit your selection to the ZigBee Light Link channels (11, 15, 20, 25). If a channel is selected that does not belong to the ZLL, the interface displays a yellow triangle with an exclamation mark above the entered channel. <br>After the adapter has been successfully started, a scan of the network channels can also be performed via the configuration.<br>
+8. Select a suitable ZigBee channel (E). Please note that ZigBee and 2.4GHz Wi-Fi share the same frequency band. The optimal channel therefore depends, among other things, on the Wi-Fi channels used in the area. The channel names for ZigBee and Wi-Fi are **not** identical, e.g. WIFI channel 11 and Zigbee channel 11 do **not** interfere with each other. It is also advisable to limit your selection to the ZigBee Light Link channels (11, 15, 20, 25). If a channel is selected that does not belong to the ZLL, the interface displays a yellow triangle with an exclamation mark above the entered channel. <br>After the adapter has been successfully started, a scan of the network channels can also be performed via the configuration.<br>
 **Note:** Starting with adapter version 2.1.0, it is possible to change the channel without deleting the configuration and re-learning all devices. However, **this feature is considered experimental** – individual devices may not respond to the channel change; these devices will then need to be re-learned.<br>
 9. Check whether the Zigbee subsystem is starting. To do this, try starting the Zigbee subsystem using *Start/Stop* (F). The progress of the start attempt can be observed in the log. The icon (A) changes from black/red to black/orange while the Herdsman starts. If the attempt was successful, the icon disappears completely; otherwise, it turns red again, and the messages in the log provide clues as to the cause.<br>
 The Herdsman can also be stopped using the same button. The icon is also displayed in black/orange. **Important: Stopping can take up to 2 minutes in some cases – especially when using network coordinators.** Patience is required here. After Herdsman has been terminated, the icon appears in black/red and the message 'Herdsman stopped!' appears.

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "zigbee",
-    "version": "3.0.0",
+    "version": "3.0.1",
     "news": {
+      "3.0.1": {
+        "en": "Fix for Ikea SOMRIG configuration raising 'definition.endpoint is not a function' error.\nAccess to 'zigbee2mqtt options as settings in zigbee adapter (ALPHA Stage !)\nFix for 'error: zigbee.0 (1118300) zigbee.0 already running' at adapter start (Alpha Stage)\nUpdated hardware configuration panel - exchanged text buttons for buttons with icons.\nLimited states on device tiles to states which are read only or which can be modified sensibly via the device tile.\n",
+        "de": "Fix für Ikea SOMRIG Konfiguration erhöhen 'Definition. Endpoint ist kein Funktionsfehler.\nZugriff auf 'zigbee2mqtt Optionen als Einstellungen im Zickbee Adapter (ALPHA Stage!)\nFix für 'error: zigbee.0 (1118300) zigbee.0 bereits läuft' bei Adapterstart (Alpha Stage)\nAktualisiertes Hardware-Konfigurationsfeld - ausgetauschte Texttasten für Tasten mit Symbolen.\nBegrenzte Zustände auf Gerätefliesen zu Zuständen, die nur gelesen werden oder über die Gerätefliese sensibel modifiziert werden können.\n",
+        "ru": "Исправьте конфигурацию IKEA SOMRIG, повысив «определение». Конечная точка не является ошибкой функции.\nДоступ к опциям Zigbee2mqtt в качестве настроек в адаптере Zigbee (стадия ALPHA!)\nИсправьте ошибку: zigbee.0 (1118300) zigbee.0 уже работает на старте адаптера\nОбновленная аппаратная панель конфигурации - обмен текстовыми кнопками на кнопки с иконками.\nОграниченные состояния на плитках устройства к состояниям, которые читаются только или которые могут быть изменены чувственно через плитку устройства.\n",
+        "pt": "Corrigir para configuração Ikea SOMRIG elevando 'definição. endpoint não é um erro de função.\nAcesso às opções \"zigbee2mqttt como configurações no adaptador zigbee (Estação LAPHA!)\nFix for 'error: zigbee.0 (1118300) zigbee.0 já em execução' no início do adaptador (Alpha Stage)\nPainel de configuração de hardware atualizado - botões de texto trocados para botões com ícones.\nEstados limitados em telhas de dispositivo para estados que são lidos apenas ou que podem ser modificados sensivelmente através da telha do dispositivo.\n",
+        "nl": "Fix voor Ikea SOMRIG configuratie verhogen 'definitie. eindpunt is geen functiefout.\nToegang tot 'zigbee2mqtt opties als instellingen in zigbee adapter (ALPHA Stage !)\nFix voor 'fout: zigbee.0 (1118300) zigbee.0 al actief' bij adapterstart (Alpha Stage)\nBijgewerkt hardware configuratiepaneel - uitgewisselde tekstknoppen voor knoppen met pictogrammen.\nBeperkte toestanden op apparaattegels naar toestanden die alleen worden gelezen of die verstandig kunnen worden gewijzigd via de apparaattegel.\n",
+        "fr": "Correction pour la configuration Ikea SOMRIG augmentant la définition. le paramètre n'est pas une erreur de fonction.\nAccès aux options 'zigbee2mqtt comme réglages dans l'adaptateur zigbee (ALPHA Stage !)\nCorrection pour 'erreur: zigbee.0 (1118300) zigbee.0 déjà en cours d'exécution' au démarrage de l'adaptateur (Alpha Stage)\nPanneau de configuration du matériel mis à jour - boutons texte échangés pour les boutons avec des icônes.\nLes états limités sur les tuiles de l'appareil aux états qui sont lus seulement ou qui peuvent être modifiés de façon sensible via la tuile de l'appareil.\n",
+        "it": "Fissare per Ikea SOMRIG configurazione aumentando 'definizione. endpoint non è un errore di funzione.\nAccesso alle opzioni 'zigbee2mqtt come impostazioni nell'adattatore zigbee (ALPHA Stage !)\nCorrezione per 'error: zigbee.0 (1118300) zigbee.0 già in esecuzione' all'inizio dell'adattatore (Alpha Stage)\nPannello di configurazione hardware aggiornato - pulsanti di testo scambiati per pulsanti con icone.\nStati limitati su piastrelle di dispositivo a stati che sono letti solo o che possono essere modificati sensibilmente tramite la piastrella del dispositivo.\n",
+        "es": "Arregla para la configuración de Ikea SOMRIG criando 'definición. endpoint no es un error de función.\nAcceso a las opciones 'zigbee2mqtt como configuración en el adaptador de zigbee (ALPHA Stage !)\nFijación para 'error: zigbee.0 (1118300) zigbee.0 ya funcionando en el inicio del adaptador (Alpha Stage)\nPanel de configuración de hardware actualizado - botones de texto intercambiados para botones con iconos.\nEstados limitados en fichas de dispositivo a estados que se leen solamente o que pueden ser modificados de forma sensata a través de la ficha del dispositivo.\n",
+        "pl": "Napraw dla definicji podnoszenie konfiguracji Ikea SOMRIG. Punkt końcowy nie jest błędem funkcji.\nDostęp do opcji 'zigbee2mqtt jako ustawień w adapterze zigbee (ALPHA Stage!)\nFix for 'error: zigbee.0 (1118300) zigbee.0 already running' at adapter start (Alpha Stage)\nAktualizacja panelu konfiguracji sprzętowej - wymieniono przyciski tekstowe na przyciski z ikonami.\nOgraniczone stany na płytkach urządzenia do stanów, które są tylko odczytywane lub które mogą być modyfikowane w sposób rozsądny za pomocą płytki urządzenia.\n",
+        "uk": "Виправлення для налаштування Ikea SOMRIG 'Визначення. кінцева точка не є помилкою функції.\nДоступ до опцій Zigbee2mqtt як налаштування адаптера Zigbee (ALPHA Stage !)\nВиправлення для 'error: zigbee.0 (1118300) zigbee.0 вже запущений' при запуску адаптера (Alpha Stage)\nОновлена панель конфігурації обладнання - обмінні текстові кнопки для гудзиків з іконками.\nОбмежені стани на плитці пристрою для станів, які читаються тільки або які можуть бути змінені, швидко через плитку пристрою.\n",
+        "zh-cn": "修复Ikea SOMRIG 配置提升定义 。 结束点不是一个函数'错误.\n访问 'zigbee2mqtt 选项作为 Zigbee 适配器的设置( ALPHA stage !) \n在适配器启动( Alpha Stage)时为 'error: zigbee. 0 (1118300) zigbee. 0 已经运行' 进行修复\n更新的硬件配置面板 - 用图标交换文本按钮作为按钮.\n将设备瓦片的状态限制在只读或通过设备瓦片可敏感修改的状态.\n"
+      },
       "3.0.0": {
         "en": "Breaking change: Start of zigbee subsystem requires configuration entry !!!\nHardware configuration panel\nUpdate for external converter - detect /dist/ subfolder\nUpdate device image: use of icons defined in external converter (beta)\n",
         "de": "Bruchänderung: Beginn des Zickbee Subsystems erfordert Konfigurationseintrag!!!\nHardware-Konfigurationspanel\nUpdate für externen Konverter - Erkennung /dist/ Unterordner\nGerätebild aktualisieren: Verwendung von Icons, die im externen Konverter (beta) definiert sind\n",
@@ -80,19 +93,6 @@
         "pl": "ZMIANY ZBIORCZE\n\nprzełączanie na konwertery 21 zmienia eksponaty dużej liczby urządzeń (głównie pilotów)\nnowa metoda kontrolowania koloru na podstawie podkanałów dla rgb, hs i xy\nWyświetla jako domyślne dla urządzeń ALL. Używanie starej definicji jako opcji\nWymaga węzła 20.x lub nowsze\n\nNapraw parowanie\nzmienić ping\nopóźnianie generowania mapy aż do uruchomienia odświeżania, wiadomości mapy po generacji\nusunąć zakładkę wiązania z zakładki zigbee\nponownie zamówić karty w konfiguracji\nusunąć zakładkę wiązania z konfiguracji\nusuń mapę z konfiguracji\ndodaj debug do karty zigbee\nHerdsman 3.2.5, Konwertery 21.30.0\nWyświetla jako domyślne, użycie starych definicji urządzenia jako dotychczasowe opcjonalne\nObrazy specyficzne dla użytkownika (oparte na modelu, na urządzeniu)\nUlepszona edycja grupowa - usunąć członków z karty grupowej",
         "uk": "БРЕАКІНГОВІ ЗМІНИ\n\nперемикач на перетворювачі 21 змінює висадки для великої кількості пристроїв (найбільш віддалені)\nновий метод контролю кольору на основі підканалів для rgb, hs і xy\nЗа замовчуванням для всіх пристроїв. Використання старого визначення як варіант\nВимагає Node 20.x або нові\n\nФіксація Пірсинг\nзмінити пінг\nгенерація карти затримки до освіження активується, повідомлення після генерації\nвидалити вкладку в'язання з вкладки zigbee\nвкладка зворотного замовлення в конфігурації\nвидалити вкладку з конфігурації\nвидалити карту з конфігурації\nadd debug до zigbee tab\nEnglish, Українська, Français..\nЕкспози як за замовчуванням, використання застарілих параметрів пристрою, як необов'язковий\nКористувальницькі специфічні зображення (моделі на основі пристрою)\nУдосконалено редагування груп - видалення членів з групової картки",
         "zh-cn": "裂变\n\n21 更改大量设备(大多为远程设备)的曝光量\n基于 rgb、 hs 和 xy 子通道的新的颜色控制方法\n曝光为默认所有设备 。 仅将旧定义用作选项\n需要节点 20.x 或更新\n\n修复对齐\n更改键\n将映射生成延迟到刷新启动, 映射消息生成后\n从 zigbee 标签中删除绑定标签\n在配置中重新排序标签\n从配置中删除绑定标签\n从配置中删除地图\n添加调试到 zigbee 标签\n牧民 3.2.5,转换器 21.30.0\n将曝光作为默认, 将旧设备定义作为遗留选项\n用户特定图像( 基于模型、 设备)\n改进组编辑 - 从组卡中删除成员"
-      },
-      "1.10.14": {
-        "en": "Herdsman 2.1.9, Converters 20.58.0\nFix: Aqara T1M (CL-L02D) \ndeleteDeviceStates change to deleteObj",
-        "de": "Herdsman 2.1.9, Konverter 20.58.0\nFix: Aqara T1M (CL-L02D)\nlöschen DeviceState Änderung zum Löschen Ob",
-        "ru": "Herdsman 2.1.9, Converters 20.58.0\nFix: Aqara T1M (CL-L02D)\nудалить Устройства меняются для удаления Obj",
-        "pt": "Herdsman 2.1.9, Conversores 20.58.0\nFix: Aqara T1M (CL-L02D)\nexcluir DeviceStates mudam para excluir Objecção",
-        "nl": "Herdsman 2.1.9, Converters 20.58.0\nFix: Aqara T1M (CL-L02D)\nverwijderen Apparaatstaten wijzigen om te verwijderen Obj",
-        "fr": "Herdsman 2.1.9, Convertisseurs 20.58.0\nCorrection: Aqara T1M (CL-L02D)\nsupprimer Les états de périphérique changent pour supprimer OBJ",
-        "it": "Herdsman 2.1.9, Convertitori 20.58.0\nFisso: Aqara T1M (CL-L02D)\ncancella DeviceStates modifica per eliminare Obj",
-        "es": "Herdsman 2.1.9, convertidores 20.58.0\nFijación: Aqara T1M (CL-L02D)\nborrar Los Estados de dispositivos cambian para eliminar Obj",
-        "pl": "Herdsman 2.1.9, konwertery 20.58.0\nFix: Aqara T1M (CL- L02D)\nusuń DeviceStates zmienić, aby usunąć Obj",
-        "uk": "Herdsman 2.1.9, Конвертер 20.58.0\nФіксація: Aqara T1M (CL-L02D)\nвидалити Зміна стану пристроїв для видалення Офіціант",
-        "zh-cn": "牧民2.1.9,转换器 20.58.0\n修补:Aqara T1M(CL-L02D)\n删除 设备状态更改以删除 欧比"
       }
     },
     "titleLang": {
@@ -159,6 +159,7 @@
       "tab": "materialize"
     },
     "messagebox": true,
+    "stopTimeout": 30000,
     "stopBeforeUpdate": true,
     "dataFolder": "zigbee_%INSTANCE%",
     "compact": true,

package/lib/commands.js

@@ -149,9 +149,14 @@ class Commands {
                             this.updateDeviceImage(obj.from, obj.command, obj.message, obj.callback);
                         }
                         break;
-                    case 'updateDeviceData':
+                    case 'updateLocalConfigItems':
                         if (obj.message && typeof obj.message === 'object') {
-                            this.updateDeviceData(obj.from, obj.command, obj.message, obj.callback);
+                            this.updateLocalConfigItems(obj.from, obj.command, obj.message, obj.callback);
+                        }
+                        break;
+                    case 'getLocalConfigItems':
+                        if (obj.message && typeof obj.message === 'object') {
+                            this.getLocalConfigItems(obj.from, obj.command, obj.message, obj.callback);
                         }
                         break;
                     case 'getDeviceCleanupRequired':
@@ -175,7 +180,7 @@ class Commands {
     }
 
     async readNvBackup(from, command, msg, callback) {
-        this.warn('readNvBackup called')
+        this.debug('readNvBackup called')
         try {
             const zo = this.adapter.getZigbeeOptions();
             const name = require('path').join(zo.dbDir, zo.backupPath);
@@ -186,7 +191,7 @@ class Commands {
             rv.precfgkey = (nvBackupJson.network_key ? nvBackupJson.network_key.key : undefined);
             rv.extPanID = nvBackupJson.extended_pan_id ? reverseByteString(nvBackupJson.extended_pan_id) : undefined;
             rv.panID = parseInt('0x'+nvBackupJson.pan_id);
-            this.warn('readNvBackup returns ' + JSON.stringify(rv))
+            this.debug('readNvBackup returns ' + JSON.stringify(rv))
             this.adapter.sendTo(from, command, rv, callback)
         }
         catch (error) {
@@ -702,10 +707,10 @@ class Commands {
         }
     }
 
-    async updateDeviceData(from, command, msg, callback) {
+    async updateLocalConfigItems(from, command, msg, callback) {
         if (this.stController) {
-            this.debug(`UpdateDeviceData : ${JSON.stringify(msg)}`)
-            const target = msg.target.replace(`${this.adapter.namespace}.`, '');
+            this.debug(`updateLocalConfigItems : ${JSON.stringify(msg)}`);
+            const target = msg.global ? msg.target : msg.target.replace(`${this.adapter.namespace}.`, '');
             const entity = await this.zbController.resolveEntity(target);
             //this.warn('entity for ' + target + ' is '+ JSON.stringify(entity))
             if (entity && !entity.mapped) {
@@ -720,16 +725,42 @@ class Commands {
                 }
             }
             if (entity) {
-                //this.warn('with Entity');
+                this.debug('updateLocalConfigItems with Entity');
                 this.stController.updateDev(target, entity.mapped.model, entity.mapped.model, () => {this.adapter.sendTo(from, command, {}, callback)});
             }
             else {
-                //this.warn('without Entity');
+                this.debug('updateLocalConfigItems without Entity');
                 this.stController.updateDev(target, undefined, 'group',() => {this.adapter.sendTo(from, command, {}, callback)});
             }
         }
     }
 
+    async getLocalConfigItems(from, command, msg, callback)
+    {
+        const rv = {};
+        if (this.stController) {
+            this.debug(`getLocalConfigItems : ${JSON.stringify(msg)}`)
+
+            if (msg.hasOwnProperty('global') && msg.hasOwnProperty('target') && (msg.hasOwnProperty('keys') || msg.hasOwnProperty('key')))
+            {
+                const target = msg.global ? msg.target : msg.target.replace(`${this.adapter.namespace}.`, '');
+                const keys = msg.hasOwnProperty('keys') ? msg.keys : [msg.key];
+                for (const key of keys) {
+                    const ld = this.stController.localConfig.getOverrideWithTargetAndKey(target, key, msg.global);
+                    if (ld != undefined) rv[key] = ld;
+                }
+
+                //const targetId = msg.id ? msg.id.replace(`${this.adapter.namespace}.`, '') : '';
+                //const targetModel = msg.model ? msg.model : '';
+            }
+            else {
+                rv.error = `missing data in message ${JSON.stringify(msg)}`;
+            }
+        }
+        else rv.error = 'stController not initialized - no Data sent'
+
+        this.adapter.sendTo(from, command, rv, callback);
+    }
 
     async reconfigure(from, command, msg, callback) {
         if (this.zbController && this.zbController.herdsmanStarted) {

package/lib/groups.js

@@ -265,7 +265,7 @@ class Groups {
                 this.warn(`renameGroup caught error ${JSON.stringify(e.code)}`);
             }
         }
-        this.warn(`rename group name ${name}, id ${id}, icon ${icon} remove ${JSON.stringify(message.removeMembers)}`);
+        this.debug(`rename group name ${name}, id ${id}, icon ${icon} remove ${JSON.stringify(message.removeMembers)}`);
         const group = await this.adapter.getObjectAsync(id);
         if (!group) {
             this.debug('group object doesnt exist ')

package/lib/localConfig.js

@@ -18,7 +18,6 @@ class localConfig extends EventEmitter {
         this.basefolder = undefined;
         this.retTimeoutHanlde = undefined;
         this.adapter.on('ready', () => this.onReady());
-        this.adapter.on('unload', callback => this.onUnload(callback));
     }
 
 
@@ -28,9 +27,9 @@ class localConfig extends EventEmitter {
 
     async onUnload(callback)
     {
-        this.info('local config saved');
         this.retainData();
-        callback();
+        // No callback here -
+        //callback();
     }
 
     info(message) {
@@ -76,14 +75,14 @@ class localConfig extends EventEmitter {
     async updateLocalOverride(_target, model, key, data, global)
     {
         const target = (global ? model : _target);
-        this.info(`updating local data: (${global ? 'global':'local'}) : ${target}:${key}:${data}`);
+        this.info(`updating local data: (${global ? 'global':'local'}) : ${target}:${key}:${JSON.stringify(data)}`);
 
         if (typeof target != 'string' || typeof key != 'string') {
             this.error(`update called with illegal id data:${JSON.stringify(target)}:${JSON.stringify(key)}:${JSON.stringify(data)}`)
             return false;
         }
         const base = global ? this.localData.by_model[target] || {} : this.localData.by_id[target] || {};
-        if (data && data.length > 0 && data != 'none') {
+        if (data && Object.keys(data).length > 0 && data != 'none') {
             if (key == 'icon')
                 base[key] = data.replace(this.basefolder, '.');
             else
@@ -103,10 +102,24 @@ class localConfig extends EventEmitter {
             if (base == {}) delete this.localData.by_id[target];
             else this.localData.by_id[target] = base;
         }
-        this.info(`Local Data for ${target} is ${JSON.stringify(base)}`);
+        this.info(`Local Data for ${target} is ${JSON.stringify(base)} after update`);
         return true;
     }
 
+    async getLocalOverride(_target, model, key, global)
+    {
+        const target = (global ? model : _target);
+        this.info(`getting local data: (${global ? 'global':'local'}) : ${target}:${key}`);
+
+        if (typeof target != 'string' || typeof key != 'string') {
+            this.error(`update called with illegal id data:${JSON.stringify(target)}:${JSON.stringify(key)}`)
+            return false;
+        }
+        const base = global ? this.localData.by_model[target] || {} : this.localData.by_id[target] || {};
+        const rv = {};
+        if (base.hasOwnProperty(key)) rv[key] = base[key];
+        return rv;
+    }
 
     NameForId(id, model, defaultName) {
         this.debug('name for id with ' + id + ' and ' + defaultName + ' from ' + JSON.stringify(this.localData));
@@ -213,7 +226,7 @@ class localConfig extends EventEmitter {
         return rv;
     }
 
-    getOverrideWithKey(target, key, isGlobal) {
+    getOverrideWithTargetAndKey(target, key, isGlobal) {
         const targetdata = this.getOverrideData(target, isGlobal);
         if (targetdata && targetdata.hasOwnProperty(key)) return targetdata[key];
         return undefined;
@@ -221,6 +234,7 @@ class localConfig extends EventEmitter {
 
     async updateFromDeviceNames() {
         const fn = this.adapter.expandFileName('dev_names.json');
+        this.info('Initializing localConfig from dev_names.json')
         fs.readFile(fn, (err, content) => {
             if (!err) {
                 let data_js = {};
@@ -233,8 +247,10 @@ class localConfig extends EventEmitter {
                 }
                 try {
                     for (const prop in data_js) {
-                        if (data_js[prop] != 'undefined')
+                        if (data_js[prop] != 'undefined') {
+                            this.info(`updating device name for ${prop} as ${data_js[prop]}`);
                             this.updateDeviceName(prop, data_js[prop]);
+                        }
                     }
                 }
                 catch (error) {
@@ -295,6 +311,13 @@ class localConfig extends EventEmitter {
         return rv;
     }
 
+    getOptions(dev_id) {
+        const ld = this.localData.by_id[dev_id];
+        if (ld === undefined || ld.options === undefined) return {};
+        this.debug(`getOptions for ${dev_id} : ${JSON.stringify(ld.options)}`);
+        return ld.options;
+    }
+
 }
 
 module.exports = localConfig;

package/lib/networkmap.js

@@ -9,6 +9,7 @@ class NetworkMap {
     start(zbController, stController) {
         this.zbController = zbController;
         this.stController = stController;
+        return this.stop;
     }
 
     stop() {
@@ -53,4 +54,4 @@ class NetworkMap {
     }
 }
 
-module.exports = NetworkMap;
+module.exports = NetworkMap;