iobroker.zigbee2mqtt 2.2.1 → 2.4.0
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 +13 -1
- package/admin/i18n/de/translations.json +2 -1
- package/admin/i18n/en/translations.json +2 -1
- package/admin/i18n/es/translations.json +2 -1
- package/admin/i18n/fr/translations.json +2 -1
- package/admin/i18n/it/translations.json +2 -1
- package/admin/i18n/nl/translations.json +2 -1
- package/admin/i18n/pl/translations.json +2 -1
- package/admin/i18n/pt/translations.json +2 -1
- package/admin/i18n/ru/translations.json +2 -1
- package/admin/i18n/uk/translations.json +25 -0
- package/admin/i18n/zh-cn/translations.json +2 -1
- package/admin/jsonConfig.json +5 -0
- package/io-package.json +33 -28
- package/lib/deviceController.js +90 -67
- package/lib/exposes.js +216 -224
- package/lib/states.js +108 -75
- package/lib/statesController.js +43 -19
- package/lib/z2mController.js +6 -1
- package/main.js +2 -2
- package/package.json +4 -4
package/README.md
CHANGED
|
@@ -30,6 +30,18 @@ This adapter allows to control the data points of the devices of a Zigbee2MQTT i
|
|
|
30
30
|
Placeholder for the next version (at the beginning of the line):
|
|
31
31
|
### **WORK IN PROGRESS**
|
|
32
32
|
-->
|
|
33
|
+
### 2.4.0 (2022-11-08)
|
|
34
|
+
|
|
35
|
+
- (o0shojo0o) fix for devices with multiple endpoints ([#57](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/57)).
|
|
36
|
+
- (o0shojo0o) added option `Brightness move should also turn the light on or off`
|
|
37
|
+
- (o0shojo0o) added state toggle for groups
|
|
38
|
+
- (o0shojo0o) more dynamic during data point creation ([#48](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/48)).
|
|
39
|
+
|
|
40
|
+
### 2.3.0 (2022-10-30)
|
|
41
|
+
|
|
42
|
+
- (o0shojo0o) added support for the `toggle` of states that support this.
|
|
43
|
+
- (o0shojo0o) added correct handling of `color_move` and `color_temperature_move`
|
|
44
|
+
|
|
33
45
|
### 2.2.1 (2022-10-25)
|
|
34
46
|
|
|
35
47
|
- (o0shojo0o) fix state roles and access
|
|
@@ -40,7 +52,7 @@ This adapter allows to control the data points of the devices of a Zigbee2MQTT i
|
|
|
40
52
|
|
|
41
53
|
- (o0shojo0o) added support for [Lidl HG06467 effects](https://www.zigbee2mqtt.io/devices/HG06467.html#trigger-effects)
|
|
42
54
|
- (o0shojo0o) added support for hs color
|
|
43
|
-
- (o0shojo0o) simulated_brightness data point is added only for supported devices
|
|
55
|
+
- (o0shojo0o) `simulated_brightness` data point is added only for supported devices
|
|
44
56
|
|
|
45
57
|
### 2.1.1 (2022-10-16)
|
|
46
58
|
|
|
@@ -20,5 +20,6 @@
|
|
|
20
20
|
"Color temperature sync with color": "Farbtemperatur mit Farbe synchronisieren",
|
|
21
21
|
"Use Kelvin instead of mired for the color temps": "Kelvin anstelle von Mired für die Farbtemperaturen verwenden",
|
|
22
22
|
"Other configurations": "Andere Konfigurationen",
|
|
23
|
-
"Proxy Zigbee2MQTT logs to ioBroker logs": "Proxy Zigbee2MQTT Protokolle zu ioBroker Protokollen"
|
|
23
|
+
"Proxy Zigbee2MQTT logs to ioBroker logs": "Proxy Zigbee2MQTT Protokolle zu ioBroker Protokollen",
|
|
24
|
+
"Brightness move should also turn the light on or off": "Brightness move soll auch das Licht ein- oder ausschalten"
|
|
24
25
|
}
|
|
@@ -20,5 +20,6 @@
|
|
|
20
20
|
"Color temperature sync with color": "Color temperature sync with color",
|
|
21
21
|
"Use Kelvin instead of mired for the color temps": "Use Kelvin instead of mired for the color temps",
|
|
22
22
|
"Other configurations": "Other configurations",
|
|
23
|
-
"Proxy Zigbee2MQTT logs to ioBroker logs": "Proxy Zigbee2MQTT logs to ioBroker logs"
|
|
23
|
+
"Proxy Zigbee2MQTT logs to ioBroker logs": "Proxy Zigbee2MQTT logs to ioBroker logs",
|
|
24
|
+
"Brightness move should also turn the light on or off": "Brightness move should also turn the light on or off"
|
|
24
25
|
}
|
|
@@ -20,5 +20,6 @@
|
|
|
20
20
|
"Color temperature sync with color": "Sincronización de la temperatura del color con el color",
|
|
21
21
|
"Use Kelvin instead of mired for the color temps": "Use Kelvin en lugar de mired para las temperaturas de color",
|
|
22
22
|
"Other configurations": "Otras configuraciones",
|
|
23
|
-
"Proxy Zigbee2MQTT logs to ioBroker logs": "Proxy de registros Zigbee2MQTT a registros de ioBroker"
|
|
23
|
+
"Proxy Zigbee2MQTT logs to ioBroker logs": "Proxy de registros Zigbee2MQTT a registros de ioBroker",
|
|
24
|
+
"Brightness move should also turn the light on or off": "El movimiento de brillo también debe encender o apagar la luz"
|
|
24
25
|
}
|
|
@@ -20,5 +20,6 @@
|
|
|
20
20
|
"Color temperature sync with color": "Synchronisation de la température de couleur avec la couleur",
|
|
21
21
|
"Use Kelvin instead of mired for the color temps": "Utilisez Kelvin au lieu de embourbé pour les températures de couleur",
|
|
22
22
|
"Other configurations": "Autres configurations",
|
|
23
|
-
"Proxy Zigbee2MQTT logs to ioBroker logs": "Proxy Zigbee2MQTT se connecte aux journaux ioBroker"
|
|
23
|
+
"Proxy Zigbee2MQTT logs to ioBroker logs": "Proxy Zigbee2MQTT se connecte aux journaux ioBroker",
|
|
24
|
+
"Brightness move should also turn the light on or off": "Le mouvement de luminosité devrait également allumer ou éteindre la lumière"
|
|
24
25
|
}
|
|
@@ -20,5 +20,6 @@
|
|
|
20
20
|
"Color temperature sync with color": "Sincronizzazione della temperatura del colore con il colore",
|
|
21
21
|
"Use Kelvin instead of mired for the color temps": "Usa Kelvin invece di mired per le temperature di colore",
|
|
22
22
|
"Other configurations": "Altre configurazioni",
|
|
23
|
-
"Proxy Zigbee2MQTT logs to ioBroker logs": "Proxy Zigbee2MQTT registra nei registri di ioBroker"
|
|
23
|
+
"Proxy Zigbee2MQTT logs to ioBroker logs": "Proxy Zigbee2MQTT registra nei registri di ioBroker",
|
|
24
|
+
"Brightness move should also turn the light on or off": "Il movimento della luminosità dovrebbe anche accendere o spegnere la luce"
|
|
24
25
|
}
|
|
@@ -20,5 +20,6 @@
|
|
|
20
20
|
"Color temperature sync with color": "Synchronisatie van kleurtemperatuur met kleur",
|
|
21
21
|
"Use Kelvin instead of mired for the color temps": "Gebruik Kelvin in plaats van mired voor de kleurtemperaturen",
|
|
22
22
|
"Other configurations": "Andere configuraties",
|
|
23
|
-
"Proxy Zigbee2MQTT logs to ioBroker logs": "Proxy Zigbee2MQTT logt in op ioBroker logs"
|
|
23
|
+
"Proxy Zigbee2MQTT logs to ioBroker logs": "Proxy Zigbee2MQTT logt in op ioBroker logs",
|
|
24
|
+
"Brightness move should also turn the light on or off": "Helderheidsbeweging moet ook het licht aan- of uitzetten"
|
|
24
25
|
}
|
|
@@ -20,5 +20,6 @@
|
|
|
20
20
|
"Color temperature sync with color": "Synchronizacja temperatury barwowej z kolorem",
|
|
21
21
|
"Use Kelvin instead of mired for the color temps": "Użyj Kelvina zamiast mired dla temperatury kolorów",
|
|
22
22
|
"Other configurations": "Inne konfiguracje",
|
|
23
|
-
"Proxy Zigbee2MQTT logs to ioBroker logs": "Proxy Zigbee2MQTT loguje do logów ioBroker"
|
|
23
|
+
"Proxy Zigbee2MQTT logs to ioBroker logs": "Proxy Zigbee2MQTT loguje do logów ioBroker",
|
|
24
|
+
"Brightness move should also turn the light on or off": "Ruch jasności powinien również włączać lub wyłączać światło"
|
|
24
25
|
}
|
|
@@ -20,5 +20,6 @@
|
|
|
20
20
|
"Color temperature sync with color": "Sincronização da temperatura de cor com a cor",
|
|
21
21
|
"Use Kelvin instead of mired for the color temps": "Use Kelvin em vez de atolado para as temperaturas de cor",
|
|
22
22
|
"Other configurations": "Outras configurações",
|
|
23
|
-
"Proxy Zigbee2MQTT logs to ioBroker logs": "Proxy Zigbee2MQTT logs para logs ioBroker"
|
|
23
|
+
"Proxy Zigbee2MQTT logs to ioBroker logs": "Proxy Zigbee2MQTT logs para logs ioBroker",
|
|
24
|
+
"Brightness move should also turn the light on or off": "O movimento de brilho também deve ligar ou desligar a luz"
|
|
24
25
|
}
|
|
@@ -20,5 +20,6 @@
|
|
|
20
20
|
"Color temperature sync with color": "Синхронизация цветовой температуры с цветом",
|
|
21
21
|
"Use Kelvin instead of mired for the color temps": "Используйте шкалу Кельвина вместо майреда для цветовой температуры.",
|
|
22
22
|
"Other configurations": "Другие конфигурации",
|
|
23
|
-
"Proxy Zigbee2MQTT logs to ioBroker logs": "Проксировать журналы Zigbee2MQTT в журналы ioBroker"
|
|
23
|
+
"Proxy Zigbee2MQTT logs to ioBroker logs": "Проксировать журналы Zigbee2MQTT в журналы ioBroker",
|
|
24
|
+
"Brightness move should also turn the light on or off": "Изменение яркости также должно включать или выключать свет."
|
|
24
25
|
}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
{
|
|
2
|
+
"zigbee2mqtt adapter settings": "Налаштування адаптера для zigbee2mqtt",
|
|
3
|
+
"Select and configure your Zigbee2MQTT connection": "Виберіть і налаштуйте підключення Zigbee2MQTT",
|
|
4
|
+
"Select connection to Zigbee2MQTT": "Виберіть підключення до Zigbee2MQTT",
|
|
5
|
+
"Websocket": "Websocket",
|
|
6
|
+
"External MQTT-Server (Experimental)": "Зовнішній MQTT-сервер (експериментальний)",
|
|
7
|
+
"Internal MQTT-Server (Experimental)": "Внутрішній MQTT-сервер (експериментальний)",
|
|
8
|
+
"Configure your Zigbee2MQTT connection": "Налаштуйте підключення Zigbee2MQTT",
|
|
9
|
+
"Websocket IP-Address": "IP-адреса Websocket",
|
|
10
|
+
"Websocket Port": "Порт Websocket",
|
|
11
|
+
"Create a dummy MQTT-Server for Zigbee2MQTT": "Створіть фіктивний MQTT-сервер для Zigbee2MQTT",
|
|
12
|
+
"External MQTT-Server IP-Address": "IP-адреса зовнішнього MQTT-сервера",
|
|
13
|
+
"External MQTT-Server Port": "Зовнішній порт MQTT-сервера",
|
|
14
|
+
"MQTT-Server IP-Address bind": "Прив’язка IP-адреси MQTT-сервера",
|
|
15
|
+
"MQTT-Server Port": "Порт MQTT-сервера",
|
|
16
|
+
"Configure your Zigbee2MQTT WebUi connection": "Налаштуйте підключення Zigbee2MQTT WebUi",
|
|
17
|
+
"WebUi Address": "Адреса WebUI",
|
|
18
|
+
"WebUi Port": "Порт WebUi",
|
|
19
|
+
"Color configurations": "Кольорові конфігурації",
|
|
20
|
+
"Color temperature sync with color": "Синхронізація колірної температури з кольором",
|
|
21
|
+
"Use Kelvin instead of mired for the color temps": "Використовуйте для колірних температур замість Кельвіна",
|
|
22
|
+
"Other configurations": "Інші конфігурації",
|
|
23
|
+
"Proxy Zigbee2MQTT logs to ioBroker logs": "Журнали проксі Zigbee2MQTT до журналів ioBroker",
|
|
24
|
+
"Brightness move should also turn the light on or off": "Переміщення яскравості також повинно вмикати або вимикати світло"
|
|
25
|
+
}
|
|
@@ -20,5 +20,6 @@
|
|
|
20
20
|
"Color temperature sync with color": "色温与颜色同步",
|
|
21
21
|
"Use Kelvin instead of mired for the color temps": "使用 Kelvin 而不是 mired 作为色温",
|
|
22
22
|
"Other configurations": "其他配置",
|
|
23
|
-
"Proxy Zigbee2MQTT logs to ioBroker logs": "代理 Zigbee2MQTT 日志到 ioBroker 日志"
|
|
23
|
+
"Proxy Zigbee2MQTT logs to ioBroker logs": "代理 Zigbee2MQTT 日志到 ioBroker 日志",
|
|
24
|
+
"Brightness move should also turn the light on or off": "亮度移动也应该打开或关闭灯"
|
|
24
25
|
}
|
package/admin/jsonConfig.json
CHANGED
|
@@ -144,6 +144,11 @@
|
|
|
144
144
|
"size": 2,
|
|
145
145
|
"newLine": true
|
|
146
146
|
},
|
|
147
|
+
"brightnessMoveOnOff": {
|
|
148
|
+
"type": "checkbox",
|
|
149
|
+
"label": "Brightness move should also turn the light on or off",
|
|
150
|
+
"newLine": true
|
|
151
|
+
},
|
|
147
152
|
"proxyZ2MLogs": {
|
|
148
153
|
"type": "checkbox",
|
|
149
154
|
"label": "Proxy Zigbee2MQTT logs to ioBroker logs",
|
package/io-package.json
CHANGED
|
@@ -1,8 +1,34 @@
|
|
|
1
1
|
{
|
|
2
2
|
"common": {
|
|
3
3
|
"name": "zigbee2mqtt",
|
|
4
|
-
"version": "2.
|
|
4
|
+
"version": "2.4.0",
|
|
5
5
|
"news": {
|
|
6
|
+
"2.4.0": {
|
|
7
|
+
"en": "fix for devices with multiple endpoints ([#57](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/57)).\nadded option `Brightness move should also turn the light on or off`\nadded state toggle for groups \nmore dynamic during data point creation ([#48](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/48)).",
|
|
8
|
+
"de": "fix für Geräte mit mehreren Endpunkten [#57](https://github.com/o0shojo0o/ioBroker.zigbee2mqt/issues/57).\nzusätzliche Option `Brightness move sollte auch das Licht ein- oder ausschalten `\nzusatzzustandswinkel für gruppen\nmehr Dynamik bei der Erstellung von Datenpunkten [#48](https://github.com/o0shojo0o/ioBroker.zigbee2mqt/issues/48).",
|
|
9
|
+
"ru": "исправить для устройств с несколькими точками [#57](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/57).\nдобавленная опция `Перемещение яркости должно также повернуть свет на или вне`\nдобавлена государственная очка для групп\nболее динамично во время создания данных [#48](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/48).",
|
|
10
|
+
"pt": "correção para dispositivos com múltiplos endpoints [#57](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/57).\nopção adicionada `Brightness move também deve ligar ou desligar a luz`\nadicionado conjunto de estado para grupos\nmais dinâmico durante a criação do ponto de dados [#48](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/48).",
|
|
11
|
+
"nl": "vertaling:.\nvoegde optie 'Brightness zet ook het licht aan of uit'\nvertaling:\ndynamischer tijdens datapunt 48: github.com/oshojoo/ioBroker.",
|
|
12
|
+
"fr": "correction des dispositifs comportant plusieurs paramètres [#57](https://github.com/o0shojo0o/ioBroker.zigbee2mqt/issues/57).\noption ajoutée `Brightness move should also turn the light on or off`\nla lutte de l'état pour les groupes\nplus dynamique lors de la création de points de données [#48](https://github.com/o0shojo0o/ioBroker.zigbee2mqt/issues/48).",
|
|
13
|
+
"it": "fix per dispositivi con più endpoint [#57](https://github.com/o0shojo0o/ioBroker.zigbee2mqt/issues/57).\nopzione aggiunta `Brightness movimento dovrebbe anche accendere o spegnere la luce `\ntoggle di stato aggiunto per gruppi\npiù dinamica durante la creazione di data point [#48](https://github.com/o0shojo0o/ioBroker.zigbee2mqt/issues/48).",
|
|
14
|
+
"es": "fix for devices with multiple endpoints [#57](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/57).\nopción agregada `El movimiento de la rectitud también debe encender o apagar la luz &apos\nañadido a la lucha estatal para grupos\nmás dinámica durante la creación de puntos de datos [#48](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/48).",
|
|
15
|
+
"pl": "urządzenia z wieloma punktami końcowymi (#57(https:/github.com/o0shojo0/ioBroker.zigbee2mqtt/issues/57).\ndodano również możliwość wykonania ruchu `Brightness'\ndodać stan dla grup\ndynamiczny w czasie tworzenia danych (#48)(https:/github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/48).",
|
|
16
|
+
"uk": "виправлення для пристроїв з декількома кінцевими точками [#57](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/57).\nдоданий варіант `Брайтний рух також повинен перетворювати світло або вимкнути`\nдодано державний контроль за групами\nбільш динамічний при створенні точки даних [#48](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/48).",
|
|
17
|
+
"zh-cn": "fix 有多个最终用户的装置[第57号](http://github.com/o0shojo0o/ioBroker.zigbee2mqt/issues/57).\n增加“权利流动”的选择,也应该改变“或”以外的照明。\n加入集团的州\n在数据点创建期间,增加活力[第48](http://github.com/oshojo0o/ioBroker.zigbee2mqt/issues/48)."
|
|
18
|
+
},
|
|
19
|
+
"2.3.0": {
|
|
20
|
+
"en": "added support for the `toggle` of states that support this.\nadded correct handling of `color_move` and `color_temperature_move`",
|
|
21
|
+
"de": "zusätzliche unterstützung für den kippen von staaten, die dies unterstützen.\nkorrekte handhabung von color_move und color_temperature_move",
|
|
22
|
+
"ru": "добавлена поддержка в отношении государств, которые поддерживают это.\nдобавлена правильная обработка color_move и color_temperature_move",
|
|
23
|
+
"pt": "acrescentou apoio para o conjunto de estados que apoiam isso.\nadicionado manuseio correto de color_move e color_temperature_move",
|
|
24
|
+
"nl": "steun toegevoegd voor de toggle van staten die dit ondersteunen.\nvoegde de juiste kleding en kleurtemperatuur toe",
|
|
25
|
+
"fr": "a ajouté un soutien pour la lutte des etats qui appuient cela.\nla manipulation correcte de color_move et color_temperature_move",
|
|
26
|
+
"it": "ha aggiunto il sostegno per la lotta di stati che sostengono questo.\naggiunto corretto trattamento di colore_move e colore_temperature_move",
|
|
27
|
+
"es": "agregó apoyo para la lucha de estados que apoyan esto.\nañadido correcto manejo de color_move y color_temperature_move",
|
|
28
|
+
"pl": "dodał wsparcie dla porozumień stanów, które to wspierają.\ndodano poprawne zachowanie koloru i kolor_temperature_move",
|
|
29
|
+
"uk": "додана підтримка для тягових станів, які підтримують це.\nдодано правильну обробку кольором_move та color_ infrastructure_move",
|
|
30
|
+
"zh-cn": "此外,还支持支持这一国家。.\n· 删除白色、流血和色色色色色彩。"
|
|
31
|
+
},
|
|
6
32
|
"2.2.1": {
|
|
7
33
|
"en": "fix state roles and access\nfix state handling\nfix createZ2MMessage",
|
|
8
34
|
"de": "zustandsrollen und zugriff beheben\nmanuelle zustandsbearbeitung\nfix erstellenZ2MMessage",
|
|
@@ -67,30 +93,6 @@
|
|
|
67
93
|
"pl": "! BREAKING CHANGE! (ANG.)\n\nzigbee2MQTT dodano połączenie konfigurowalne. (Odrodzenie się)\nStrona internetowa\nOficjalna strona MQTT-Server\nOficjalna strona MQTT\nzoptymalizowany stan pisania w ioBrokerze\nustalono poprawny zbiór statusu związku",
|
|
68
94
|
"uk": "* БРЕАКІНГ ЧАНГ*\n\nдодано налаштування підключення до Zigbee2MQTT (Налаштування повинні бути відновлені)\nВеб-сайт\nЗовнішній MQTT-Server\nВнутрішній MQTT-Server\nоптимізоване державне письмо продуктивність в ioBroker\nвиправлено правильний набір статусу підключення",
|
|
69
95
|
"zh-cn": "页:1 BREAKREANGE*\n\n兹格贝雷2 MQTT的可图联系 (必须重启)\n网站\n外贸总协定\n内贸总协定\n最佳国家书面表现\na. 固定的联络点地位"
|
|
70
|
-
},
|
|
71
|
-
"1.0.0": {
|
|
72
|
-
"en": "*!!!BREAKING CHANGE!!!**\n\nadded options for external MQTT-Server\nconnection to zigbe2mqtt completely reworked and changed to MQTT\nlots of bugfixes\nautomatically set button actions back to false\nadded support for Zigbee2MQTT feature simulated_brightness\nadded config check\nadded log output about coordinator details",
|
|
73
|
-
"de": "*! BREAKING CHANGE*\n\nweitere Optionen für externen MQTT-Server\nanschluss an Zickbe2mqt komplett überarbeitet und in MQTT geändert\nviele bugfixes\nautomatisch schaltfläche aktionen wieder auf false setzen\nunterstützung für Zigbee2MQTT Funktion simuliert_brightness\nzusatzprüfung\nlog ausgabe von koordinatordaten hinzugefügt",
|
|
74
|
-
"ru": "*! ИЗМЕНЕНИЕ ЗАВТРА*\n\nдобавлены опции для внешнего MQTT-Server\nподключение к zigbe2mqtt полностью переработано и изменено в MQTT\nмного багфиксов\nавтоматически установите кнопки действия назад к ложному\nдобавлена поддержка функции Zigbee2MQTT simulated_brightness\nдобавлено config check\nдобавил выход журнала о деталях координатора",
|
|
75
|
-
"pt": "*! QUE GRANDE MUDANÇA\n\nopções adicionadas para MQTT-Server externo\nconexão com zigbe2mqtt completamente retrabalhado e alterado para MQTT\nlotes de correções de bugs\nautomaticamente definir as ações do botão de volta ao falso\nsuporte adicionado para recurso Zigbee2MQTT simulado_brightness\nverificação de configuração adicionada\nadicionado saída de log sobre detalhes do coordenador",
|
|
76
|
-
"nl": "♪ \n\nvoegde opties toe voor externe MQT-Server\nverbinding met Zigbe2mqt volledig herwerkt en veranderd in MQT\nveel insectenfixen\nautomatisch de knoppen opzetten naar valse\nsteun toegevoegd voor Zigbee2MQT\nvoegde config check toe\nvertaling:",
|
|
77
|
-
"fr": "*! CHANGE DE BREAKING*\n\noptions supplémentaires pour MQTT-Server externe\nconnexion à zigbe2mqtt complètement retravaillé et changé à MQTT\nbeaucoup de bugfixes\ndéfinir automatiquement les actions de bouton retour à false\nsupport ajouté pour la fonction Zigbee2MQTT simulée_brightness\nconfig check ajouté\nproduit log ajouté sur les coordonnées des coordonnateurs",
|
|
78
|
-
"it": "# CAMBIAMENTO\n\nopzioni aggiuntive per MQTT-Server esterno\nconnessione a zigbe2mqt completamente rielaborato e cambiato in MQTT\nmolti bugfix\nautomaticamente impostare le azioni del pulsante indietro a false\nsupporto aggiunto per Zigbee2MQTT funzione simulated_brightness\ncontrollo configurazione aggiunto\nuscita di log aggiunto sui dettagli del coordinatore",
|
|
79
|
-
"es": "*! ¡CAMBIANDO\n\nopciones adicionales para MQTT-Server externo\nconexión a zigbe2mqtt completamente rediseñado y cambiado a MQTT\nmuchos bugfixes\nautomáticamente poner las acciones del botón de nuevo a falso\nsoporte añadido para función Zigbee2MQTT simulado_brightness\ncontrol de configuración añadido\nproducción de registro agregada sobre detalles de coordinadores",
|
|
80
|
-
"pl": "! BREAKING CHANGE! (ANG.)\n\nobsługa MQTT-Server\nzigbe2mqtt całkowicie przerobił i zmienił MQTT\nwiele błędów\nautomatycznie ustawione akcje przycisku\ndodano obsługę Zigbee2MQTT\nsprawdzać\ndokładna produkcja logów na temat szczegółów koordynacji",
|
|
81
|
-
"zh-cn": "页:1 BREAKREANGE*\n\n外贸总协定\n与zigbe2mqt完全重新工作,并改装到外贸总协定\n批发\n自动建立但顿行动回到虚假的行动\n对Zigbee2MQTT特征的增援\n增幅检查\n协调员的产出"
|
|
82
|
-
},
|
|
83
|
-
"0.2.0": {
|
|
84
|
-
"en": "group states corrected\nadded option 'Use Kelvin instead of mired for the color temps'\nremove available logic, now will use the information from z2m\nrename noLogDevices to logfilter\nlots of bugfixes\nadded noLogDevices functionality\nadded debugmessage for specific device functionality\nadded some states are default false\nadded support for scenes defined on a device\nfix available state role\nfix subscribeWritableStates",
|
|
85
|
-
"de": "gruppenzustände korrigiert\nzusatzoption 'Use Kelvin anstelle von mired für die Farbe Tempos '\ndie verfügbare logik entfernen, jetzt die informationen von z2m verwenden\numbenennen noLogDevices zum Logfilter\nviele bugfixes\nnoLogDevices Funktionalität hinzugefügt\ndebugmessage für spezifische gerätefunktionalität\neinige zustände standardmäßig falsch hinzugefügt\nunterstützung für szenen, die auf einem gerät definiert sind\nfix verfügbare zustandsrolle\nabonnierenWritableState",
|
|
86
|
-
"ru": "исправлены состояния группы\nдобавлена опция 'Используйте Kelvin вместо mired для цветовых темп « »\nудалить доступную логику, теперь будет использовать информацию из z2m\nпереименовать noLogDevices для logfilter\nмного багфиксов\nдобавлена функция noLogDevices\nдобавлено debugmessage для конкретной функциональности устройства\nдобавлены некоторые государства по умолчанию false\nдобавлена поддержка сцен, определенных на устройстве\nисправить доступную государственную роль\nисправить подпискуWritableStates",
|
|
87
|
-
"pt": "estados do grupo corrigidos\nopção adicionada 'Use Kelvin em vez de mired para os temps de cor '\nremover a lógica disponível, agora usará as informações do z2m\nrenomear noLogDevices para logfilter\nlotes de correções de bugs\nadicionado noLogDevices funcionalidade\nadicionado debugmessage para funcionalidade específica do dispositivo\nadicionado alguns estados são padrão falso\nsuporte adicionado para cenas definidas em um dispositivo\ncorrigir a função estadual disponível\ncorrigir assinantesEstados disponíveis",
|
|
88
|
-
"nl": "de groep zegt:\nvoegde optie 'Use Kelvin' in plaats van de kleuren tempen '\nverwijder de logica, nu zal de informatie van z2m gebruiken\nnoLog Devices\nveel insectenfixen\nnoLog Devices functionaliteit\nvoegde debugmesage toe voor specifieke apparaat functionaliteit\nsommige staten zijn vals\nsteun voor scènes gedefinieerd op een apparaat\nbeschikbare staatsrol\nvertaling:",
|
|
89
|
-
"fr": "états de groupe corrigés\noption ajoutée 'Utiliser Kelvin au lieu de mired pour le temps de couleur '\nsupprimer la logique disponible, maintenant utilisera les informations de z2m\nrenommer noLogDevices to logfilter\nbeaucoup de bugfixes\najout de fonctionnalité noLogDevices\najout debugmessage pour la fonctionnalité de périphérique spécifique\ncertains états ajoutés sont par défaut faux\nsupport ajouté pour les scènes définies sur un appareil\nle rôle de l ' état\nfixer souscrire",
|
|
90
|
-
"it": "gruppo stati corretti\nopzione aggiunta 'Usa Kelvin invece di mired per le tentazioni di colore '\nrimuovere la logica disponibile, ora userà le informazioni da z2m\nrinominare noLogDevices per logfilter\nmolti bugfix\naggiunto noLogDevices funzionalità\ndebugmessage aggiunto per funzionalità specifiche del dispositivo\naggiunto alcuni stati sono falsi di default\nsupporto aggiunto per scene definite su un dispositivo\ncorrezione del ruolo di stato disponibile\nfissare abbonamentiWritableStates",
|
|
91
|
-
"es": "estados del grupo corregidos\nopción agregada 'Use Kelvin en lugar de mired para el color temps '\neliminar la lógica disponible, ahora utilizará la información de z2m\nnoLogDevices to logfilter\nmuchos bugfixes\nnoLogDevices funcionalidad\ndebugmesage añadido para la funcionalidad específica del dispositivo\nañadido algunos estados son falsos\nsoporte añadido para escenas definidas en un dispositivo\nfijar la función estatal disponible\nfijar suscriptosEstados disponibles",
|
|
92
|
-
"pl": "państwa grupowe poprawiły\ndodał opcję 'Use Kelvin' zamiast śmiać kolorowe tempo. '\nzdejmowanie dostępnej logiki wykorzystuje obecnie informacje z 2 m\nnazwa NoLogDevices (ang.)\nwiele błędów\ndodano obsługę NoLogDevices\ndodanie debugmessage dla konkretnej funkcjonalności\ndodanie niektórych stanów jest fałszywe\ndodano wsparcie dla scen zdefiniowanych na urządzenie\nfunkcja stanowa\nrecovery",
|
|
93
|
-
"zh-cn": "更正\n加上“Use Kelvin”的备选办法,而不是对色彩的诱惑。 评 注\n删除现有逻辑,现在将使用兹2m的信息。\n目 录\n批发\n增加无车辆功能\n增加特定装置功能的碎片\n另有一些国家的违约情况\n对一个装置所界定的场地的更多支持\nf 现有国家作用\nfix 有线性的国家"
|
|
94
96
|
}
|
|
95
97
|
},
|
|
96
98
|
"titleLang": {
|
|
@@ -103,7 +105,8 @@
|
|
|
103
105
|
"it": "zigbee2mqtt",
|
|
104
106
|
"es": "zigbee2mqtt",
|
|
105
107
|
"pl": "zigbee2mqtt",
|
|
106
|
-
"zh-cn": "zigbee2mqtt"
|
|
108
|
+
"zh-cn": "zigbee2mqtt",
|
|
109
|
+
"uk": "zigbee2mqtt"
|
|
107
110
|
},
|
|
108
111
|
"desc": {
|
|
109
112
|
"en": "Zigbee2MQTT adapter for ioBroker",
|
|
@@ -115,7 +118,8 @@
|
|
|
115
118
|
"it": "Adattatore Zigbee2MQTT per ioBroker",
|
|
116
119
|
"es": "Adaptador Zigbee2MQTT para ioBroker",
|
|
117
120
|
"pl": "Adapter Zigbee2MQTT do ioBroker",
|
|
118
|
-
"zh-cn": "用于 ioBroker 的 Zigbee2MQTT 适配器"
|
|
121
|
+
"zh-cn": "用于 ioBroker 的 Zigbee2MQTT 适配器",
|
|
122
|
+
"uk": "Адаптер Zigbee2MQTT для ioBroker"
|
|
119
123
|
},
|
|
120
124
|
"authors": [
|
|
121
125
|
"Dennis Rathjen <dennis.rathjen@outlook.de>"
|
|
@@ -191,7 +195,8 @@
|
|
|
191
195
|
"debugLogEnabled": false,
|
|
192
196
|
"proxyZ2MLogs": true,
|
|
193
197
|
"useKelvin": false,
|
|
194
|
-
"colorTempSyncColor": false
|
|
198
|
+
"colorTempSyncColor": false,
|
|
199
|
+
"brightnessMoveOnOff": false
|
|
195
200
|
},
|
|
196
201
|
"objects": [],
|
|
197
202
|
"instanceObjects": [
|
package/lib/deviceController.js
CHANGED
|
@@ -6,11 +6,12 @@ const rgb = require('./rgb.js');
|
|
|
6
6
|
//const createCache = {};
|
|
7
7
|
|
|
8
8
|
class DeviceController {
|
|
9
|
-
constructor(adapter, deviceCache, groupCache, config, createCache) {
|
|
9
|
+
constructor(adapter, deviceCache, groupCache, config, logCustomizations, createCache) {
|
|
10
10
|
this.adapter = adapter;
|
|
11
11
|
this.groupCache = groupCache;
|
|
12
12
|
this.deviceCache = deviceCache;
|
|
13
13
|
this.config = config;
|
|
14
|
+
this.logCustomizations = logCustomizations;
|
|
14
15
|
this.createCache = createCache;
|
|
15
16
|
}
|
|
16
17
|
|
|
@@ -25,6 +26,9 @@ class DeviceController {
|
|
|
25
26
|
scenes = scenes.concat(expose.endpoints[key].scenes);
|
|
26
27
|
}
|
|
27
28
|
}
|
|
29
|
+
if (this.logCustomizations.debugDevices.includes(expose.ieee_address)) {
|
|
30
|
+
this.adapter.log.warn(`--->>> fromZ2M -> ${expose.ieee_address} exposes: ${JSON.stringify(expose)}`);
|
|
31
|
+
}
|
|
28
32
|
// if the device is already present in the cache, remove it
|
|
29
33
|
this.removeDeviceByIeee(this.deviceCache, expose.ieee_address);
|
|
30
34
|
defineDeviceFromExposes(this.deviceCache, expose.friendly_name, expose.ieee_address, expose.definition, expose.power_source, scenes, this.config);
|
|
@@ -34,6 +38,7 @@ class DeviceController {
|
|
|
34
38
|
|
|
35
39
|
|
|
36
40
|
async defineGroupDevice(groupID, ieee_address, scenes) {
|
|
41
|
+
const propName = this.adapter.config.brightnessMoveOnOff == true ? 'brightness_move_onoff' : 'brightness_move';
|
|
37
42
|
const newDevice = {
|
|
38
43
|
id: groupID,
|
|
39
44
|
ieee_address: ieee_address,
|
|
@@ -41,76 +46,93 @@ class DeviceController {
|
|
|
41
46
|
states: [
|
|
42
47
|
states.state,
|
|
43
48
|
states.brightness,
|
|
44
|
-
//states.color,
|
|
45
|
-
states.brightness_move,
|
|
46
49
|
states.colortemp_move,
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
50
|
+
{
|
|
51
|
+
id: 'brightness_move',
|
|
52
|
+
prop: propName,
|
|
53
|
+
name: 'Dimming',
|
|
54
|
+
icon: undefined,
|
|
55
|
+
role: 'state',
|
|
56
|
+
write: true,
|
|
57
|
+
read: false,
|
|
58
|
+
type: 'number',
|
|
59
|
+
min: -50,
|
|
60
|
+
max: 50,
|
|
61
|
+
def: 0
|
|
62
|
+
},
|
|
63
|
+
{
|
|
64
|
+
id: 'color',
|
|
65
|
+
prop: 'color',
|
|
66
|
+
name: 'Color',
|
|
67
|
+
icon: undefined,
|
|
68
|
+
role: 'level.color.rgb',
|
|
69
|
+
write: true,
|
|
70
|
+
read: true,
|
|
71
|
+
type: 'string',
|
|
72
|
+
def: '#ff00ff',
|
|
73
|
+
setter: (value) => {
|
|
74
|
+
let xy = [0, 0];
|
|
75
|
+
const rgbcolor = colors.ParseColor(value);
|
|
76
|
+
xy = rgb.rgb_to_cie(rgbcolor.r, rgbcolor.g, rgbcolor.b);
|
|
77
|
+
return {
|
|
78
|
+
x: xy[0],
|
|
79
|
+
y: xy[1]
|
|
80
|
+
};
|
|
81
|
+
},
|
|
82
|
+
getter: payload => {
|
|
83
|
+
if (payload.color_mode != 'xy' && this.config.colorTempSyncColor == false) {
|
|
84
|
+
return undefined;
|
|
85
|
+
}
|
|
86
|
+
if (payload.color && payload.color.x && payload.color.y) {
|
|
87
|
+
const colorval = rgb.cie_to_rgb(payload.color.x, payload.color.y);
|
|
88
|
+
return '#' + utils.decimalToHex(colorval[0]) + utils.decimalToHex(colorval[1]) + utils.decimalToHex(colorval[2]);
|
|
89
|
+
} else {
|
|
90
|
+
return undefined;
|
|
91
|
+
}
|
|
92
|
+
},
|
|
93
|
+
},
|
|
94
|
+
{
|
|
95
|
+
id: 'colortemp',
|
|
96
|
+
prop: 'color_temp',
|
|
97
|
+
name: 'Color temperature',
|
|
98
|
+
icon: undefined,
|
|
99
|
+
role: 'level.color.temperature',
|
|
100
|
+
write: true,
|
|
101
|
+
read: true,
|
|
102
|
+
type: 'number',
|
|
103
|
+
min: this.config.useKelvin == true ? utils.miredKelvinConversion(500) : 150,
|
|
104
|
+
max: this.config.useKelvin == true ? utils.miredKelvinConversion(150) : 500,
|
|
105
|
+
def: this.config.useKelvin == true ? utils.miredKelvinConversion(150) : 500,
|
|
106
|
+
unit: this.config.useKelvin == true ? 'K' : 'mired',
|
|
107
|
+
setter: (value) => {
|
|
108
|
+
return utils.toMired(value);
|
|
109
|
+
},
|
|
110
|
+
getter: (payload) => {
|
|
111
|
+
if (payload.color_mode != 'color_temp') {
|
|
112
|
+
return undefined;
|
|
113
|
+
}
|
|
114
|
+
if (this.config.useKelvin == true) {
|
|
115
|
+
return utils.miredKelvinConversion(payload.color_temp);
|
|
116
|
+
} else {
|
|
117
|
+
return payload.color_temp;
|
|
118
|
+
}
|
|
119
|
+
},
|
|
120
|
+
},
|
|
121
|
+
{
|
|
122
|
+
id: 'state_toggle',
|
|
123
|
+
name: 'Toggle the state',
|
|
124
|
+
icon: undefined,
|
|
125
|
+
role: 'button',
|
|
126
|
+
write: true,
|
|
127
|
+
read: true,
|
|
128
|
+
type: 'boolean',
|
|
129
|
+
setattr: 'state',
|
|
130
|
+
def: true,
|
|
131
|
+
setter: (value) => (value) ? 'TOGGLE' : undefined
|
|
107
132
|
}
|
|
108
|
-
|
|
133
|
+
],
|
|
109
134
|
};
|
|
110
135
|
|
|
111
|
-
// @ts-ignore
|
|
112
|
-
newDevice.states.push(colortemp);
|
|
113
|
-
|
|
114
136
|
// Create buttons for scenes
|
|
115
137
|
for (const scene of scenes) {
|
|
116
138
|
const sceneSate = {
|
|
@@ -121,6 +143,7 @@ class DeviceController {
|
|
|
121
143
|
role: 'button',
|
|
122
144
|
write: true,
|
|
123
145
|
read: true,
|
|
146
|
+
def: true,
|
|
124
147
|
type: 'boolean',
|
|
125
148
|
setter: (value) => (value) ? scene.id : undefined
|
|
126
149
|
};
|