iobroker.zigbee 1.10.0 → 1.10.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +7 -0
- package/admin/admin.js +4 -1
- package/admin/i18n/de/translations.json +1 -1
- package/admin/i18n/en/translations.json +1 -1
- package/admin/i18n/pl/translations.json +2 -2
- package/admin/img/E2213.png +0 -0
- package/admin/img/LED2005R5.jpg +0 -0
- package/admin/img/WXKG01LM.png +0 -0
- package/admin/img/ZG-205Z-A.png +0 -0
- package/admin/index_m.html +10 -10
- package/admin/words.js +2 -2
- package/io-package.json +29 -28
- package/lib/commands.js +18 -0
- package/main.js +6 -3
- package/package.json +3 -3
package/README.md
CHANGED
|
@@ -134,6 +134,13 @@ You can thank the authors by these links:
|
|
|
134
134
|
-----------------------------------------------------------------------------------------------------
|
|
135
135
|
|
|
136
136
|
## Changelog
|
|
137
|
+
### 1.10.2 (2024-01-25)
|
|
138
|
+
* (arteck) dependency update
|
|
139
|
+
|
|
140
|
+
### 1.10.1 (2024-01-21)
|
|
141
|
+
* (arteck) Baudrate is now configurable. works ONLY with Deconz/Conbee( 38400 )
|
|
142
|
+
* (arteck) add nvbackup.json delete button
|
|
143
|
+
|
|
137
144
|
### 1.10.0 (2024-01-13)
|
|
138
145
|
* (arteck) new zigbee-herdsman-converters 18.x
|
|
139
146
|
* (arteck) configure message is now a warning
|
package/admin/admin.js
CHANGED
|
@@ -31,7 +31,7 @@ const updateCardInterval = setInterval(updateCardTimer, 6000);
|
|
|
31
31
|
|
|
32
32
|
const savedSettings = [
|
|
33
33
|
'port', 'panID', 'channel', 'disableLed', 'countDown', 'groups', 'extPanID', 'precfgkey', 'transmitPower',
|
|
34
|
-
'adapterType', 'debugHerdsman', 'disableBackup', 'disablePing', 'external', 'startWithInconsistent', 'warnOnDeviceAnnouncement'
|
|
34
|
+
'adapterType', 'debugHerdsman', 'disableBackup', 'disablePing', 'external', 'startWithInconsistent', 'warnOnDeviceAnnouncement', 'baudRate'
|
|
35
35
|
];
|
|
36
36
|
|
|
37
37
|
function getDeviceByID(ID) {
|
|
@@ -806,6 +806,9 @@ function load(settings, onChange) {
|
|
|
806
806
|
if (settings.warnOnDeviceAnnouncement === undefined) {
|
|
807
807
|
settings.warnOnDeviceAnnouncement = true;
|
|
808
808
|
}
|
|
809
|
+
if (settings.baudRate === undefined) {
|
|
810
|
+
settings.baudRate = 115200;
|
|
811
|
+
}
|
|
809
812
|
|
|
810
813
|
// example: select elements with id=key and class=value and insert value
|
|
811
814
|
for (const key in settings) {
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
"Command": "Befehl",
|
|
17
17
|
"Command Type": "Befehlstyp",
|
|
18
18
|
"Configure reporting": "Konfigurieren Sie die Berichterstellung",
|
|
19
|
-
"Countdown": "Countdown zwischen
|
|
19
|
+
"Countdown": "Countdown zwischen 10 und 240 Sek während der Kopplung",
|
|
20
20
|
"Delete confirmation": "Löschen bestätigen",
|
|
21
21
|
"Developer": "Entwickler",
|
|
22
22
|
"Device": "Gerät",
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
"Command": "Command",
|
|
17
17
|
"Command Type": "Command type",
|
|
18
18
|
"Configure reporting": "Configure reporting",
|
|
19
|
-
"Countdown": "Countdown between
|
|
19
|
+
"Countdown": "Countdown between 10 and 240 sec during the pairing",
|
|
20
20
|
"Delete confirmation": "Delete confirmation",
|
|
21
21
|
"Developer": "Developer",
|
|
22
22
|
"Device": "Device",
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
"Binding": "połączenie",
|
|
6
6
|
"Binding configuration": "Konfiguracja wiązania",
|
|
7
7
|
"COM port name": "Nazwa portu COM",
|
|
8
|
-
"Cancel": "
|
|
8
|
+
"Cancel": "Odwołaj",
|
|
9
9
|
"Channel": "Kanał",
|
|
10
10
|
"ChannelChangeText": "Kanał ustawia używaną częstotliwość radiową. Można go zmienić, aby uniknąć konfliktów z istniejącymi sieciami Wi-Fi. <b>Podczas zmiany wszystkie urządzenia muszą zostać ponownie nauczone!</b>",
|
|
11
11
|
"Check firmware updates": "Sprawdź aktualizacje oprogramowania układowego",
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
"Command": "Komenda",
|
|
17
17
|
"Command Type": "Typ polecenia",
|
|
18
18
|
"Configure reporting": "Skonfiguruj raportowanie",
|
|
19
|
-
"Countdown": "Countdown między
|
|
19
|
+
"Countdown": "Countdown między 10 a 240 sekundem podczas łączenia",
|
|
20
20
|
"Delete confirmation": "Usuń potwierdzenie",
|
|
21
21
|
"Developer": "Developer",
|
|
22
22
|
"Device": "Urządzenie",
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
package/admin/index_m.html
CHANGED
|
@@ -494,8 +494,7 @@
|
|
|
494
494
|
</div>
|
|
495
495
|
<div class="nav-content">
|
|
496
496
|
<ul class="tabs tabs-transparent">
|
|
497
|
-
<li class="tab col s2"><a href="#tab-main" id="devs" class="translate tooltipped">Devices</a></li>
|
|
498
|
-
<!-- <li class="tab col s2"><a href="#tab-groups" class="translate tooltipped">Groups</a></li>-->
|
|
497
|
+
<li class="tab col s2"><a href="#tab-main" id="devs" class="translate tooltipped">Devices</a></li>
|
|
499
498
|
<li class="tab col s2"><a href="#tab-map" id="tabmap" class="translate tooltipped">Network map</a>
|
|
500
499
|
</li>
|
|
501
500
|
<li class="tab col s2"><a href="#tab-binding" class="translate tooltipped">Binding</a></li>
|
|
@@ -590,7 +589,7 @@
|
|
|
590
589
|
</ul>
|
|
591
590
|
</span>
|
|
592
591
|
</div>
|
|
593
|
-
<div class="input-field col s12 m6
|
|
592
|
+
<div class="input-field col s12 m6 l2">
|
|
594
593
|
<select id="adapterType" class="value">
|
|
595
594
|
<option value="" disabled selected class="translate">Choose type</option>
|
|
596
595
|
<option value="zstack">TI Z-Stack/CCxxxx</option>
|
|
@@ -600,8 +599,12 @@
|
|
|
600
599
|
</select>
|
|
601
600
|
<label class="translate">Type</label>
|
|
602
601
|
</div>
|
|
603
|
-
<div class="input-field col s6 m3
|
|
604
|
-
<input id="
|
|
602
|
+
<div class="input-field col s6 m3 l2">
|
|
603
|
+
<input id="baudRate" type="number" min="38400" max="115200" class="value"/>
|
|
604
|
+
<label class="translate" for="baudRate">Baudate Deconz/Conbee</label>
|
|
605
|
+
</div>
|
|
606
|
+
<div class="input-field col s6 m3 l2">
|
|
607
|
+
<input id="countDown" type="number" min="10" max="240" class="value"/>
|
|
605
608
|
<label class="translate" for="countDown">Countdown</label>
|
|
606
609
|
</div>
|
|
607
610
|
</div>
|
|
@@ -659,11 +662,6 @@
|
|
|
659
662
|
<input id="precfgkey" type="text" pattern="[a-fA-F\d]+" class="validate value"/>
|
|
660
663
|
<label class="translate" for="precfgkey">Transport Key</label>
|
|
661
664
|
</div>
|
|
662
|
-
<div class="input-field col s12 m6 l8">
|
|
663
|
-
<p class="translate">Tranport Key Text</p>
|
|
664
|
-
</div>
|
|
665
|
-
</div>
|
|
666
|
-
<div class="row">
|
|
667
665
|
<div class="input-field col s12 m6 l4 col-transmitPower">
|
|
668
666
|
<select id="transmitPower" class="value">
|
|
669
667
|
<option value="" disabled selected class="translate">transmitPower</option>
|
|
@@ -675,6 +673,7 @@
|
|
|
675
673
|
<label class="translate" for="transmitPower">transmitPower</label>
|
|
676
674
|
</div>
|
|
677
675
|
</div>
|
|
676
|
+
|
|
678
677
|
<div class="row">
|
|
679
678
|
<h6 class="translate">Others</h6>
|
|
680
679
|
<div class="input-field col s12 m6 l4 col-disableLed">
|
|
@@ -1175,6 +1174,7 @@
|
|
|
1175
1174
|
<p class="translate">Reset Info</p>
|
|
1176
1175
|
<a id="soft" data-mode="soft" class="modal-action modal-close waves-effect waves-red btn translate">Soft-Reset</a>
|
|
1177
1176
|
<a id="hard" data-mode="hard" class="modal-action modal-close waves-effect waves-red btn translate">Hard-Reset</a>
|
|
1177
|
+
<a id="delNvbackup" data-mode="delNvbackup" class="modal-action modal-close waves-effect waves-red btn translate">delete NVBackup.json</a>
|
|
1178
1178
|
</div>
|
|
1179
1179
|
<div class="modal-footer">
|
|
1180
1180
|
<a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat translate">Cancel</a>
|
package/admin/words.js
CHANGED
|
@@ -8,7 +8,7 @@ systemDictionary = {
|
|
|
8
8
|
"Binding": { "uk": "Прив'язка", "en": "Binding", "de": "Binding", "ru": "Привязка", "pt": "Ligação", "nl": "Verbindend", "fr": "Contraignant", "it": "Rilegatura", "es": "Unión", "pl": "połączenie", "zh-cn": "捆绑"},
|
|
9
9
|
"Binding configuration": { "uk": "Конфігурація привʼязки", "en": "Binding configuration", "de": "Binding konfiguration", "ru": "Конфигурация привязки", "pt": "Configuração de ligação", "nl": "Bindende configuratie", "fr": "Configuration de la liaison", "it": "Configurazione vincolante", "es": "Configuración de enlace", "pl": "Konfiguracja wiązania", "zh-cn": "绑定配置"},
|
|
10
10
|
"COM port name": { "uk": "Імʼя COM порта", "en": "COM port name", "de": "COM-Anschlussname", "ru": "Имя или адрес порта", "pt": "Nome da porta COM", "nl": "COM-poortnaam", "fr": "Nom du port COM", "it": "Nome della porta COM", "es": "Nombre del puerto COM", "pl": "Nazwa portu COM", "zh-cn": "设备端口"},
|
|
11
|
-
"Cancel": { "uk": "Скасувати", "en": "Cancel", "de": "Abbrechen", "ru": "Отмена", "pt": "Cancelar", "nl": "Annuleren", "fr": "Annuler", "it": "Annulla", "es": "Cancelar", "pl": "
|
|
11
|
+
"Cancel": { "uk": "Скасувати", "en": "Cancel", "de": "Abbrechen", "ru": "Отмена", "pt": "Cancelar", "nl": "Annuleren", "fr": "Annuler", "it": "Annulla", "es": "Cancelar", "pl": "Odwołaj", "zh-cn": "取消"},
|
|
12
12
|
"Channel": { "uk": "Канал", "en": "Channel", "de": "Kanal", "ru": "Канал", "pt": "Canal", "nl": "Kanaal", "fr": "Canal", "it": "Canale", "es": "Canal", "pl": "Kanał", "zh-cn": "信道"},
|
|
13
13
|
"Check firmware updates": { "uk": "Перевірити оновлення прошивок пристроїв", "en": "Check firmware updates", "de": "Auf Firmware-Updates überprüfen", "ru": "Проверить обновления прошивки", "pt": "Verifique as atualizações de firmware", "nl": "Controleer firmware-updates", "fr": "Vérifier les mises à jour du firmware", "it": "Controlla gli aggiornamenti del firmware", "es": "Verifique las actualizaciones de firmware", "pl": "Sprawdź aktualizacje oprogramowania układowego", "zh-cn": "检查固件更新"},
|
|
14
14
|
"Choose channel": { "uk": "Виберіть канал", "en": "Choose channel", "de": "Kanal auswählen", "ru": "Выберите канал", "pt": "Escolha o canal", "nl": "Kies een kanaal", "fr": "Choisissez la chaîne", "it": "Scegli il canale", "es": "Elige canal", "pl": "Wybierz kanał", "zh-cn": "选择频道"},
|
|
@@ -17,7 +17,7 @@ systemDictionary = {
|
|
|
17
17
|
"Command": { "uk": "Команда", "en": "Command", "de": "Befehl", "ru": "Команда", "pt": "Comando", "nl": "Commando", "fr": "Commande", "it": "Comando", "es": "Mando", "pl": "Komenda", "zh-cn": "命令"},
|
|
18
18
|
"Command Type": { "uk": "Тип команди", "en": "Command type", "de": "Befehlstyp", "ru": "Тип команды", "pt": "Tipo de Comando", "nl": "Commando type", "fr": "Type de commande", "it": "Tipo di comando", "es": "Tipo de comando", "pl": "Typ polecenia", "zh-cn": "命令类型"},
|
|
19
19
|
"Configure reporting": { "uk": "Налаштувати звітність", "en": "Configure reporting", "de": "Konfigurieren Sie die Berichterstellung", "ru": "Настроить отчеты", "pt": "Configurar relatórios", "nl": "Configureer rapportage", "fr": "Configurer les rapports", "it": "Configura i rapporti", "es": "Configurar informes", "pl": "Skonfiguruj raportowanie", "zh-cn": "配置报告"},
|
|
20
|
-
"Countdown": { "uk": "Зворотний відлік від 0 до 255 секунд під час підʼєднання нових компонентів Zigbee до координатора.", "en": "Countdown between
|
|
20
|
+
"Countdown": { "uk": "Зворотний відлік від 0 до 255 секунд під час підʼєднання нових компонентів Zigbee до координатора.", "en": "Countdown between 10 and 240 sec during the pairing", "de": "Countdown zwischen 10 und 240 Sek während der Kopplung", "ru": "Обратный отсчет от 0 до 255 секунд во время сопряжения новых компонентов Zigbee с координатором.", "pt": "Contagem regressiva entre 0 e 255 seg", "nl": "Aftellen tussen 0 en 255 sec tijdens het pairen van nieuwe Zigbee componenten met de coördinator.", "fr": "Compte à rebours entre 0 et 255 sec pendant l'assemblage de nouveaux composants Zigbee avec le coordinateur.", "it": "Conto alla rovescia tra 0 e 255 sec", "es": "Cuenta atrás entre 0 y 255 seg.", "pl": "Countdown między 10 a 240 sekundem podczas łączenia", "zh-cn": "倒计时(0-255秒)"},
|
|
21
21
|
"Delete confirmation": { "uk": "Підтвердження видалення", "en": "Delete confirmation", "de": "Löschen bestätigen", "ru": "Подтвердите удаление", "pt": "Excluir confirmação", "nl": "Bevestig verwijderen", "fr": "Confirmer la suppression", "it": "Cancella conferma", "es": "Eliminar confirmación", "pl": "Usuń potwierdzenie", "zh-cn": "确认删除?"},
|
|
22
22
|
"Developer": { "uk": "Розробник", "en": "Developer", "de": "Entwickler", "ru": "Разработчику", "pt": "Developer", "nl": "Ontwikkelaar", "fr": "Développeur", "it": "Developer", "es": "Developer", "pl": "Developer", "zh-cn": "开发者页面"},
|
|
23
23
|
"Device": { "uk": "Пристрій", "en": "Device", "de": "Gerät", "ru": "Устройство", "pt": "Dispositivo", "nl": "Apparaat", "fr": "Dispositif", "it": "Dispositivo", "es": "Dispositivo", "pl": "Urządzenie", "zh-cn": "设备"},
|
package/io-package.json
CHANGED
|
@@ -1,8 +1,34 @@
|
|
|
1
1
|
{
|
|
2
2
|
"common": {
|
|
3
3
|
"name": "zigbee",
|
|
4
|
-
"version": "1.10.
|
|
4
|
+
"version": "1.10.2",
|
|
5
5
|
"news": {
|
|
6
|
+
"1.10.2": {
|
|
7
|
+
"en": "dependency update",
|
|
8
|
+
"de": "aktualisierung der abhängigkeit",
|
|
9
|
+
"ru": "обновление",
|
|
10
|
+
"pt": "atualização de dependência",
|
|
11
|
+
"nl": "afhankelijkheidsupdate",
|
|
12
|
+
"fr": "mise à jour de la dépendance",
|
|
13
|
+
"it": "aggiornamento della dipendenza",
|
|
14
|
+
"es": "actualización de la dependencia",
|
|
15
|
+
"pl": "aktualizacja zależności",
|
|
16
|
+
"uk": "оновлення залежності",
|
|
17
|
+
"zh-cn": "依赖性更新"
|
|
18
|
+
},
|
|
19
|
+
"1.10.1": {
|
|
20
|
+
"en": "Baudrate is now configurable. works ONLY with Deconz/Conbee( 38400 )\nadd nvbackup.json delete button",
|
|
21
|
+
"de": "Baudrate ist jetzt konfigurierbar. funktioniert nur mit Deconz/Conbee( 38400 )\nnvbackup hinzufügen. json löschen taste",
|
|
22
|
+
"ru": "Baudrate теперь настраиваемый. работает только с Deconz/Conbee (38400)\nдобавьте nvbackup. кнопка",
|
|
23
|
+
"pt": "O Baudrate agora é configurável. funciona somente com Deconz/Conbee( 38400 )\nadicionar nvbackup. botão de exclusão json",
|
|
24
|
+
"nl": "Baudrate is nu configureerbaar. ALLEEN werkt met Deconz/Conbee( 38400 )\nnvbackup toevoegen. json delete knop",
|
|
25
|
+
"fr": "Baudrate est maintenant configurable. fonctionne uniquement avec Decanz/Conbee( 38400 )\najouter nvbackup. bouton de suppression de json",
|
|
26
|
+
"it": "Baudrate è ora configurabile. funziona SOLO con Deconz/Conbee( 38400 )\naggiungere nvbackup. pulsante di cancellazione json",
|
|
27
|
+
"es": "Baudrate es ahora configurable. sólo funciona con Deconz/Conbee( 38400 )\nañadir nvbackup. json delete botón",
|
|
28
|
+
"pl": "Baudrate jest teraz konfigurowalny. działa tylko z Deconz / Conbee (38400)\ndodaj nvbackup. json usuń przycisk",
|
|
29
|
+
"uk": "Baudrate тепер конфігурується. працює ONLY з Deconz/Conbee( 38400 )\nдодати nvbackup. json видалити кнопка",
|
|
30
|
+
"zh-cn": "鲍德拉特现在可塑. 仅与Deconz/Conbee(38400)合作\n添加 nv 备份。 json 删除按钮"
|
|
31
|
+
},
|
|
6
32
|
"1.10.0": {
|
|
7
33
|
"en": "new zigbee-herdsman-converters 18.x\nconfigure message is now a warning",
|
|
8
34
|
"de": "neue zickbee-herdsman-konverter 18.x\nkonfigurieren von meldungen",
|
|
@@ -67,32 +93,6 @@
|
|
|
67
93
|
"pl": "typ",
|
|
68
94
|
"uk": "тип",
|
|
69
95
|
"zh-cn": "类型"
|
|
70
|
-
},
|
|
71
|
-
"1.9.3": {
|
|
72
|
-
"en": "last zhc Version 16.x\ncorr reboot in statecontroller",
|
|
73
|
-
"de": "letzte Version 16.x\nkorr reboot in statecontroller",
|
|
74
|
-
"ru": "последняя версия zhc 16.x\nкорр перезагрузка в государственный контролер",
|
|
75
|
-
"pt": "última versão zhc 16.x\nreboot de corr no controlador de estado",
|
|
76
|
-
"nl": "laatste Zhc Version 16\ncorr reboot in staatscontroller",
|
|
77
|
-
"fr": "dernière version zhc 16.x\ncorr reboot in statecontroller",
|
|
78
|
-
"it": "ultima versione zhc 16.x\nreboot corr in statocontroller",
|
|
79
|
-
"es": "última versión 16.x\nreboot de corr en statecontroller",
|
|
80
|
-
"pl": "ostatnia wersja 16.x\nkor reboot w systemie kontroli państwa",
|
|
81
|
-
"uk": "остання версія jc 16.x\nперезавантаження коренів в держконтролері",
|
|
82
|
-
"zh-cn": "上一次zhc Version 16x\n州控制容忍的报复"
|
|
83
|
-
},
|
|
84
|
-
"1.9.2": {
|
|
85
|
-
"en": "gen states from exposes as function\nrebuild dev_names.json with state cleanup button",
|
|
86
|
-
"de": "gen-staaten von exponiert als funktion\ndev_names neu aufbauen. json with state cleanup taste",
|
|
87
|
-
"ru": "гены из экспозиций как функция\nперестроить dev_names. json с государственной кнопкой очистки",
|
|
88
|
-
"pt": "gen estados de exposições como função\nreconstruir dev_names. json com botão de limpeza do estado",
|
|
89
|
-
"nl": "gen staten van blootstelling als functioneren\nherbouwde dev namen. json met staatsopruimknop",
|
|
90
|
-
"fr": "gen states from exposes as function\nreconstruire dev_names. json avec bouton de nettoyage de l'état",
|
|
91
|
-
"it": "gen stati da espone come funzione\nricostruire dev_names. json con il pulsante di pulizia dello stato",
|
|
92
|
-
"es": "gen estados de expone como función\nreconstruir dev_names. json con botón de limpieza del estado",
|
|
93
|
-
"pl": "państwa genowe zjawiają się jako funkcje\nodbudowa nazw. json z przyciskiem czystego przycisku",
|
|
94
|
-
"uk": "генні стани від вибухів як функції\nrebuild dev_names. json з державною кнопкою очищення",
|
|
95
|
-
"zh-cn": "根塔里斯·奥古尔(签名)\n页:1 j. 有国家清洁,但顿"
|
|
96
96
|
}
|
|
97
97
|
},
|
|
98
98
|
"titleLang": {
|
|
@@ -254,7 +254,8 @@
|
|
|
254
254
|
"disableBackup": false,
|
|
255
255
|
"external": "",
|
|
256
256
|
"startWithInconsistent": false,
|
|
257
|
-
"warnOnDeviceAnnouncement": true
|
|
257
|
+
"warnOnDeviceAnnouncement": true,
|
|
258
|
+
"baudRate": 115200
|
|
258
259
|
},
|
|
259
260
|
"instanceObjects": [
|
|
260
261
|
{
|
package/lib/commands.js
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
3
|
const getZbId = require('./utils').getZbId;
|
|
4
|
+
const fs = require('fs');
|
|
5
|
+
const pathLib = require('path');
|
|
4
6
|
const statesMapping = require('./devices');
|
|
5
7
|
const disallowedDashStates = [
|
|
6
8
|
'link_quality', 'available', 'battery', 'groups', 'device_query',
|
|
@@ -46,6 +48,11 @@ class Commands {
|
|
|
46
48
|
onMessage(obj) {
|
|
47
49
|
if (typeof obj === 'object' && obj.command) {
|
|
48
50
|
switch (obj.command) {
|
|
51
|
+
case 'reset':
|
|
52
|
+
if (obj && obj.message && obj.message.mode == 'delNvbackup') {
|
|
53
|
+
this.delNvBackup(obj.from, obj.command, obj.message, obj.callback);
|
|
54
|
+
}
|
|
55
|
+
break;
|
|
49
56
|
case 'letsPairing':
|
|
50
57
|
if (obj && obj.message && typeof obj.message === 'object') {
|
|
51
58
|
this.letsPairing(obj.from, obj.command, obj.message, obj.callback);
|
|
@@ -110,6 +117,17 @@ class Commands {
|
|
|
110
117
|
}
|
|
111
118
|
}
|
|
112
119
|
|
|
120
|
+
delNvBackup(from, command, msg, callback) {
|
|
121
|
+
try {
|
|
122
|
+
if (this.zbController) {
|
|
123
|
+
const name = this.zbController.herdsman.adapter.backupPath;
|
|
124
|
+
require('fs').unlinkSync(name);
|
|
125
|
+
}
|
|
126
|
+
} catch (error) {
|
|
127
|
+
this.error(error);
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
|
|
113
131
|
async letsPairing(from, command, message, callback) {
|
|
114
132
|
if (this.zbController) {
|
|
115
133
|
let devId = '';
|
package/main.js
CHANGED
|
@@ -281,9 +281,10 @@ class Zigbee extends utils.Adapter {
|
|
|
281
281
|
const toAdd = {...definition};
|
|
282
282
|
delete toAdd['homeassistant'];
|
|
283
283
|
try {
|
|
284
|
-
zigbeeHerdsmanConverters.
|
|
285
|
-
} catch {
|
|
284
|
+
zigbeeHerdsmanConverters.addDefinition(toAdd);
|
|
285
|
+
} catch (e) {
|
|
286
286
|
this.log.error(`unable to apply external converter ${JSON.stringify(toAdd)}`);
|
|
287
|
+
this.log.error(`${e}`);
|
|
287
288
|
}
|
|
288
289
|
}
|
|
289
290
|
}
|
|
@@ -961,6 +962,8 @@ class Zigbee extends utils.Adapter {
|
|
|
961
962
|
// https://github.com/ioBroker/ioBroker.zigbee/issues/668
|
|
962
963
|
const extPanIdFix = this.config.extPanIdFix ? this.config.extPanIdFix : false;
|
|
963
964
|
|
|
965
|
+
const baudRate = parseInt(this.config.baudRate ? this.config.baudRate : 115200);
|
|
966
|
+
|
|
964
967
|
return {
|
|
965
968
|
net: {
|
|
966
969
|
panId: panID,
|
|
@@ -970,7 +973,7 @@ class Zigbee extends utils.Adapter {
|
|
|
970
973
|
},
|
|
971
974
|
sp: {
|
|
972
975
|
port: port,
|
|
973
|
-
baudRate:
|
|
976
|
+
baudRate: baudRate,
|
|
974
977
|
rtscts: false,
|
|
975
978
|
adapter: adapterType,
|
|
976
979
|
},
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "iobroker.zigbee",
|
|
3
|
-
"version": "1.10.
|
|
3
|
+
"version": "1.10.2",
|
|
4
4
|
"author": {
|
|
5
5
|
"name": "Kirov Ilya",
|
|
6
6
|
"email": "kirovilya@gmail.com"
|
|
@@ -26,8 +26,8 @@
|
|
|
26
26
|
"humanize-duration": "^3.31.0",
|
|
27
27
|
"tar": "^6.2.0",
|
|
28
28
|
"typescript": "^5.3.3",
|
|
29
|
-
"zigbee-herdsman": "0.
|
|
30
|
-
"zigbee-herdsman-converters": "18.
|
|
29
|
+
"zigbee-herdsman": "0.33.2",
|
|
30
|
+
"zigbee-herdsman-converters": "18.20.0"
|
|
31
31
|
},
|
|
32
32
|
"description": "Zigbee devices",
|
|
33
33
|
"devDependencies": {
|