Skip to content

Commit

Permalink
Merge pull request #24 from o0shojo0o:dev
Browse files Browse the repository at this point in the history
added option for color temperature sync with color
  • Loading branch information
o0shojo0o authored Oct 14, 2022
2 parents f450fca + ecd407f commit 156a9f5
Show file tree
Hide file tree
Showing 16 changed files with 438 additions and 273 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ Zigbee2MQTT adapter for ioBroker

### **WORK IN PROGRESS**

- (o0shojo0o) added option for color temperature sync with color
- (o0shojo0o) fix logfilter and debugDevices
- (o0shojo0o) lots of bugfixes
- (o0shojo0o) now set the correct min/max at color temp
Expand Down
28 changes: 20 additions & 8 deletions admin/i18n/de/translations.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,24 @@
{
"zigbee2mqtt adapter settings": "Adaptereinstellungen für zigbee2mqtt",
"External MQTT-Server IP-Adress": "IP-Adresse des externen MQTT-Servers",
"External MQTT-Server Port": "Port des externen MQTT-Servers",
"Use external MQTT-Server": "Externen MQTT-Server verwenden",
"MQTT-Server IP-Adress bind": "MQTT-Server IP-Adresse binden",
"MQTT-Server Port": "MQTT-Server Port",
"zigbee2mqtt adapter settings": "Adaptereinstellungen für Zigbee2MQTT",
"Select and configure your Zigbee2MQTT connection": "Wählen und konfiguriere die Zigbee2MQTT Verbindung",
"Select connection to Zigbee2MQTT": "Zigbee2MQTT Verbindung auswählen",
"Websocket": "Websocket",
"External MQTT-Server (Experimental)": "Externer MQTT-Server (Experimentell)",
"Internal MQTT-Server (Experimental)": "Interner MQTT-Server (Experimentell)",
"Configure your Zigbee2MQTT connection": "Konfigurier die Zigbee2MQTT Verbindung",
"Websocket IP-Address": "Websocket IP-Adresse",
"Websocket Port": "Websocket Port",
"Create a dummy MQTT-Server for Zigbee2MQTT": "Dummy MQTT-Server für Zigbee2MQTT erstellen",
"External MQTT-Server IP-Address": "IP-Adresse des externen MQTT-Servers",
"External MQTT-Server Port": "Externer MQTT-Server Port",
"MQTT-Server IP-Address bind": "MQTT-Server IP-Adresse binden",
"MQTT-Server Port": "MQTT-Server-Port",
"Configure your Zigbee2MQTT WebUi connection": "Zigbee2MQTT WebUi Verbindung Konfiguration",
"WebUi Address": "WebUi Adresse",
"WebUi Port": "WebUi Port",
"Use Kelvin instead of mired for the color temps": "Verwenden Sie Kelvin anstelle von Mired für die Farbtemperaturen",
"Proxy Zigbee2MQTT logs to ioBroker logs": "Proxy Zigbee2MQTT-Protokolle zu ioBroker-Protokollen"
"Color configurations": "Farbkonfigurationen",
"Color temperature sync with color": "Farbtemperatur mit Farbe synchronisieren",
"Use Kelvin instead of mired for the color temps": "Kelvin anstelle von Mired für die Farbtemperaturen verwenden",
"Other configurations": "Andere Konfigurationen",
"Proxy Zigbee2MQTT logs to ioBroker logs": "Proxy Zigbee2MQTT Protokolle zu ioBroker Protokollen"
}
18 changes: 15 additions & 3 deletions admin/i18n/en/translations.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,24 @@
{
"zigbee2mqtt adapter settings": "Adapter settings for zigbee2mqtt",
"External MQTT-Server IP-Adress": "External MQTT-Server IP-Adress",
"Select and configure your Zigbee2MQTT connection": "Select and configure Zigbee2MQTT connection",
"Select connection to Zigbee2MQTT": "Select connection to Zigbee2MQTT",
"Websocket": "Websocket",
"External MQTT-Server (Experimental)": "External MQTT-Server (Experimental)",
"Internal MQTT-Server (Experimental)": "Internal MQTT-Server (Experimental)",
"Configure your Zigbee2MQTT connection": "Configure your Zigbee2MQTT connection",
"Websocket IP-Address": "Websocket IP-Address",
"Websocket Port": "Websocket Port",
"Create a dummy MQTT-Server for Zigbee2MQTT": "Create a dummy MQTT-Server for Zigbee2MQTT",
"External MQTT-Server IP-Address": "External MQTT-Server IP-Address",
"External MQTT-Server Port": "External MQTT-Server Port",
"Use external MQTT-Server": "Use external MQTT-Server",
"MQTT-Server IP-Adress bind": "MQTT-Server IP-Adress bind",
"MQTT-Server IP-Address bind": "MQTT-Server IP-Address bind",
"MQTT-Server Port": "MQTT-Server Port",
"Configure your Zigbee2MQTT WebUi connection": "Configure Zigbee2MQTT WebUi connection",
"WebUi Address": "WebUi Address",
"WebUi Port": "WebUi Port",
"Color configurations": "Color configurations",
"Color temperature sync with color": "Color temperature sync with color",
"Use Kelvin instead of mired for the color temps": "Use Kelvin instead of mired for the color temps",
"Other configurations": "Other configurations",
"Proxy Zigbee2MQTT logs to ioBroker logs": "Proxy Zigbee2MQTT logs to ioBroker logs"
}
18 changes: 15 additions & 3 deletions admin/i18n/es/translations.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,24 @@
{
"zigbee2mqtt adapter settings": "Configuración del adaptador para zigbee2mqtt",
"External MQTT-Server IP-Adress": "Dirección IP del servidor MQTT externo",
"Select and configure your Zigbee2MQTT connection": "Seleccionar y configurar la conexión Zigbee2MQTT",
"Select connection to Zigbee2MQTT": "Seleccionar conexión a Zigbee2MQTT",
"Websocket": "Websocket",
"External MQTT-Server (Experimental)": "Servidor MQTT externo (experimental)",
"Internal MQTT-Server (Experimental)": "Servidor MQTT interno (experimental)",
"Configure your Zigbee2MQTT connection": "Configura tu conexión Zigbee2MQTT",
"Websocket IP-Address": "Dirección IP de Websocket",
"Websocket Port": "puerto websocket",
"Create a dummy MQTT-Server for Zigbee2MQTT": "Cree un servidor MQTT ficticio para Zigbee2MQTT",
"External MQTT-Server IP-Address": "Dirección IP del servidor MQTT externo",
"External MQTT-Server Port": "Puerto de servidor MQTT externo",
"Use external MQTT-Server": "Usar servidor MQTT externo",
"MQTT-Server IP-Adress bind": "Enlace de dirección IP del servidor MQTT",
"MQTT-Server IP-Address bind": "Enlace de dirección IP del servidor MQTT",
"MQTT-Server Port": "Puerto del servidor MQTT",
"Configure your Zigbee2MQTT WebUi connection": "Configurar la conexión Zigbee2MQTT WebUi",
"WebUi Address": "Dirección de interfaz de usuario web",
"WebUi Port": "Puerto WebUi",
"Color configurations": "Configuraciones de color",
"Color temperature sync with color": "Sincronización de la temperatura del color con el color",
"Use Kelvin instead of mired for the color temps": "Use Kelvin en lugar de mired para las temperaturas de color",
"Other configurations": "Otras configuraciones",
"Proxy Zigbee2MQTT logs to ioBroker logs": "Proxy de registros Zigbee2MQTT a registros de ioBroker"
}
18 changes: 15 additions & 3 deletions admin/i18n/fr/translations.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,24 @@
{
"zigbee2mqtt adapter settings": "Paramètres de l'adaptateur pour zigbee2mqtt",
"External MQTT-Server IP-Adress": "Adresse IP du serveur MQTT externe",
"Select and configure your Zigbee2MQTT connection": "Sélectionnez et configurez la connexion Zigbee2MQTT",
"Select connection to Zigbee2MQTT": "Sélectionnez la connexion à Zigbee2MQTT",
"Websocket": "Websocket",
"External MQTT-Server (Experimental)": "Serveur MQTT externe (expérimental)",
"Internal MQTT-Server (Experimental)": "Serveur MQTT interne (expérimental)",
"Configure your Zigbee2MQTT connection": "Configurez votre connexion Zigbee2MQTT",
"Websocket IP-Address": "Adresse IP Websocket",
"Websocket Port": "Port WebSocket",
"Create a dummy MQTT-Server for Zigbee2MQTT": "Créer un serveur MQTT factice pour Zigbee2MQTT",
"External MQTT-Server IP-Address": "Adresse IP du serveur MQTT externe",
"External MQTT-Server Port": "Port serveur MQTT externe",
"Use external MQTT-Server": "Utiliser un serveur MQTT externe",
"MQTT-Server IP-Adress bind": "Liaison d'adresse IP MQTT-Server",
"MQTT-Server IP-Address bind": "Liaison d'adresse IP MQTT-Server",
"MQTT-Server Port": "Port du serveur MQTT",
"Configure your Zigbee2MQTT WebUi connection": "Configurer la connexion Zigbee2MQTT WebUi",
"WebUi Address": "Adresse de l'interface Web",
"WebUi Port": "Port WebUI",
"Color configurations": "Configurations de couleur",
"Color temperature sync with color": "Synchronisation de la température de couleur avec la couleur",
"Use Kelvin instead of mired for the color temps": "Utilisez Kelvin au lieu de embourbé pour les températures de couleur",
"Other configurations": "Autres configurations",
"Proxy Zigbee2MQTT logs to ioBroker logs": "Proxy Zigbee2MQTT se connecte aux journaux ioBroker"
}
18 changes: 15 additions & 3 deletions admin/i18n/it/translations.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,24 @@
{
"zigbee2mqtt adapter settings": "Impostazioni dell'adattatore per zigbee2mqtt",
"External MQTT-Server IP-Adress": "Indirizzo IP del server MQTT esterno",
"Select and configure your Zigbee2MQTT connection": "Seleziona e configura la connessione Zigbee2MQTT",
"Select connection to Zigbee2MQTT": "Seleziona la connessione a Zigbee2MQTT",
"Websocket": "presa web",
"External MQTT-Server (Experimental)": "Server MQTT esterno (sperimentale)",
"Internal MQTT-Server (Experimental)": "Server MQTT interno (sperimentale)",
"Configure your Zigbee2MQTT connection": "Configura la tua connessione Zigbee2MQTT",
"Websocket IP-Address": "Indirizzo IP WebSocket",
"Websocket Port": "Porta WebSocket",
"Create a dummy MQTT-Server for Zigbee2MQTT": "Crea un server MQTT fittizio per Zigbee2MQTT",
"External MQTT-Server IP-Address": "Indirizzo IP del server MQTT esterno",
"External MQTT-Server Port": "Porta del server MQTT esterno",
"Use external MQTT-Server": "Utilizzare un server MQTT esterno",
"MQTT-Server IP-Adress bind": "Bind dell'indirizzo IP del server MQTT",
"MQTT-Server IP-Address bind": "Bind dell'indirizzo IP del server MQTT",
"MQTT-Server Port": "Porta server MQTT",
"Configure your Zigbee2MQTT WebUi connection": "Configura la connessione Zigbee2MQTT WebUi",
"WebUi Address": "Indirizzo WebUi",
"WebUi Port": "Porta WebUi",
"Color configurations": "Configurazioni colore",
"Color temperature sync with color": "Sincronizzazione della temperatura del colore con il colore",
"Use Kelvin instead of mired for the color temps": "Usa Kelvin invece di mired per le temperature di colore",
"Other configurations": "Altre configurazioni",
"Proxy Zigbee2MQTT logs to ioBroker logs": "Proxy Zigbee2MQTT registra nei registri di ioBroker"
}
18 changes: 15 additions & 3 deletions admin/i18n/nl/translations.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,24 @@
{
"zigbee2mqtt adapter settings": "Adapterinstellingen voor zigbee2mqtt",
"External MQTT-Server IP-Adress": "Extern MQTT-server IP-adres",
"Select and configure your Zigbee2MQTT connection": "Selecteer en configureer Zigbee2MQTT-verbinding",
"Select connection to Zigbee2MQTT": "Selecteer verbinding met Zigbee2MQTT",
"Websocket": "Websocket",
"External MQTT-Server (Experimental)": "Externe MQTT-server (experimenteel)",
"Internal MQTT-Server (Experimental)": "Interne MQTT-server (experimenteel)",
"Configure your Zigbee2MQTT connection": "Configureer uw Zigbee2MQTT-verbinding",
"Websocket IP-Address": "Websocket IP-adres",
"Websocket Port": "Websocket-poort",
"Create a dummy MQTT-Server for Zigbee2MQTT": "Maak een dummy MQTT-server voor Zigbee2MQTT",
"External MQTT-Server IP-Address": "Extern MQTT-server IP-adres",
"External MQTT-Server Port": "Externe MQTT-serverpoort",
"Use external MQTT-Server": "Externe MQTT-server gebruiken",
"MQTT-Server IP-Adress bind": "MQTT-server IP-adres binden",
"MQTT-Server IP-Address bind": "MQTT-server IP-adres binden",
"MQTT-Server Port": "MQTT-serverpoort",
"Configure your Zigbee2MQTT WebUi connection": "Configureer Zigbee2MQTT WebUi-verbinding",
"WebUi Address": "WebUi-adres",
"WebUi Port": "WebUi-poort",
"Color configurations": "Kleurconfiguraties",
"Color temperature sync with color": "Synchronisatie van kleurtemperatuur met kleur",
"Use Kelvin instead of mired for the color temps": "Gebruik Kelvin in plaats van mired voor de kleurtemperaturen",
"Other configurations": "Andere configuraties",
"Proxy Zigbee2MQTT logs to ioBroker logs": "Proxy Zigbee2MQTT logt in op ioBroker logs"
}
18 changes: 15 additions & 3 deletions admin/i18n/pl/translations.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,24 @@
{
"zigbee2mqtt adapter settings": "Ustawienia adaptera dla zigbee2mqtt",
"External MQTT-Server IP-Adress": "Zewnętrzny adres IP serwera MQTT",
"Select and configure your Zigbee2MQTT connection": "Wybierz i skonfiguruj połączenie Zigbee2MQTT",
"Select connection to Zigbee2MQTT": "Wybierz połączenie z Zigbee2MQTT",
"Websocket": "Gniazdo sieciowe",
"External MQTT-Server (Experimental)": "Zewnętrzny serwer MQTT (eksperymentalny)",
"Internal MQTT-Server (Experimental)": "Wewnętrzny serwer MQTT (eksperymentalny)",
"Configure your Zigbee2MQTT connection": "Skonfiguruj połączenie Zigbee2MQTT",
"Websocket IP-Address": "Adres IP gniazda sieciowego",
"Websocket Port": "Port gniazda sieciowego",
"Create a dummy MQTT-Server for Zigbee2MQTT": "Utwórz atrapę serwera MQTT dla Zigbee2MQTT",
"External MQTT-Server IP-Address": "Adres IP zewnętrznego serwera MQTT",
"External MQTT-Server Port": "Zewnętrzny port serwera MQTT",
"Use external MQTT-Server": "Użyj zewnętrznego serwera MQTT",
"MQTT-Server IP-Adress bind": "Powiązanie adresu IP serwera MQTT",
"MQTT-Server IP-Address bind": "Powiązanie adresu IP serwera MQTT-serwera",
"MQTT-Server Port": "Port serwera MQTT",
"Configure your Zigbee2MQTT WebUi connection": "Skonfiguruj połączenie Zigbee2MQTT WebUi",
"WebUi Address": "Adres WebUI",
"WebUi Port": "Port WebUI",
"Color configurations": "Konfiguracje kolorów",
"Color temperature sync with color": "Synchronizacja temperatury barwowej z kolorem",
"Use Kelvin instead of mired for the color temps": "Użyj Kelvina zamiast mired dla temperatury kolorów",
"Other configurations": "Inne konfiguracje",
"Proxy Zigbee2MQTT logs to ioBroker logs": "Proxy Zigbee2MQTT loguje do logów ioBroker"
}
18 changes: 15 additions & 3 deletions admin/i18n/pt/translations.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,24 @@
{
"zigbee2mqtt adapter settings": "Configurações do adaptador para zigbee2mqtt",
"External MQTT-Server IP-Adress": "Endereço IP do Servidor MQTT Externo",
"Select and configure your Zigbee2MQTT connection": "Selecione e configure a conexão Zigbee2MQTT",
"Select connection to Zigbee2MQTT": "Selecione a conexão com o Zigbee2MQTT",
"Websocket": "Websocket",
"External MQTT-Server (Experimental)": "Servidor MQTT Externo (Experimental)",
"Internal MQTT-Server (Experimental)": "Servidor MQTT Interno (Experimental)",
"Configure your Zigbee2MQTT connection": "Configure sua conexão Zigbee2MQTT",
"Websocket IP-Address": "Endereço IP do Websocket",
"Websocket Port": "Porta Websocket",
"Create a dummy MQTT-Server for Zigbee2MQTT": "Crie um servidor MQTT fictício para Zigbee2MQTT",
"External MQTT-Server IP-Address": "Endereço IP do servidor MQTT externo",
"External MQTT-Server Port": "Porta externa do servidor MQTT",
"Use external MQTT-Server": "Usar servidor MQTT externo",
"MQTT-Server IP-Adress bind": "Ligação de endereço IP do servidor MQTT",
"MQTT-Server IP-Address bind": "Ligação de endereço IP do servidor MQTT",
"MQTT-Server Port": "Porta do servidor MQTT",
"Configure your Zigbee2MQTT WebUi connection": "Configurar conexão Zigbee2MQTT WebUi",
"WebUi Address": "Endereço WebUi",
"WebUi Port": "Porta WebUI",
"Color configurations": "Configurações de cores",
"Color temperature sync with color": "Sincronização da temperatura de cor com a cor",
"Use Kelvin instead of mired for the color temps": "Use Kelvin em vez de atolado para as temperaturas de cor",
"Other configurations": "Outras configurações",
"Proxy Zigbee2MQTT logs to ioBroker logs": "Proxy Zigbee2MQTT logs para logs ioBroker"
}
18 changes: 15 additions & 3 deletions admin/i18n/ru/translations.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,24 @@
{
"zigbee2mqtt adapter settings": "Настройки адаптера для zigbee2mqtt",
"External MQTT-Server IP-Adress": "IP-адрес внешнего MQTT-сервера",
"Select and configure your Zigbee2MQTT connection": "Выберите и настройте соединение Zigbee2MQTT",
"Select connection to Zigbee2MQTT": "Выберите подключение к Zigbee2MQTT",
"Websocket": "Веб-сокет",
"External MQTT-Server (Experimental)": "Внешний MQTT-сервер (экспериментальный)",
"Internal MQTT-Server (Experimental)": "Внутренний MQTT-сервер (экспериментальный)",
"Configure your Zigbee2MQTT connection": "Настройте соединение Zigbee2MQTT",
"Websocket IP-Address": "IP-адрес веб-сокета",
"Websocket Port": "Порт веб-сокета",
"Create a dummy MQTT-Server for Zigbee2MQTT": "Создайте фиктивный MQTT-сервер для Zigbee2MQTT",
"External MQTT-Server IP-Address": "IP-адрес внешнего MQTT-сервера",
"External MQTT-Server Port": "Порт внешнего MQTT-сервера",
"Use external MQTT-Server": "Использовать внешний MQTT-сервер",
"MQTT-Server IP-Adress bind": "Привязка IP-адреса MQTT-сервера",
"MQTT-Server IP-Address bind": "Привязка IP-адреса MQTT-сервера",
"MQTT-Server Port": "Порт MQTT-сервера",
"Configure your Zigbee2MQTT WebUi connection": "Настроить соединение Zigbee2MQTT WebUi",
"WebUi Address": "Адрес веб-интерфейса",
"WebUi Port": "Порт веб-интерфейса",
"Color configurations": "Цветовые конфигурации",
"Color temperature sync with color": "Синхронизация цветовой температуры с цветом",
"Use Kelvin instead of mired for the color temps": "Используйте шкалу Кельвина вместо майреда для цветовой температуры.",
"Other configurations": "Другие конфигурации",
"Proxy Zigbee2MQTT logs to ioBroker logs": "Проксировать журналы Zigbee2MQTT в журналы ioBroker"
}
18 changes: 15 additions & 3 deletions admin/i18n/zh-cn/translations.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,24 @@
{
"zigbee2mqtt adapter settings": "zigbee2mqtt 的适配器设置",
"External MQTT-Server IP-Adress": "外部 MQTT-服务器 IP 地址",
"Select and configure your Zigbee2MQTT connection": "选择和配置 Zigbee2MQTT 连接",
"Select connection to Zigbee2MQTT": "选择连接到 Zigbee2MQTT",
"Websocket": "网络套接字",
"External MQTT-Server (Experimental)": "外部 MQTT-Server(实验性)",
"Internal MQTT-Server (Experimental)": "内部 MQTT 服务器(实验性)",
"Configure your Zigbee2MQTT connection": "配置您的 Zigbee2MQTT 连接",
"Websocket IP-Address": "Websocket IP 地址",
"Websocket Port": "Websocket 端口",
"Create a dummy MQTT-Server for Zigbee2MQTT": "为 Zigbee2MQTT 创建一个虚拟 MQTT 服务器",
"External MQTT-Server IP-Address": "外部 MQTT-服务器 IP 地址",
"External MQTT-Server Port": "外部 MQTT 服务器端口",
"Use external MQTT-Server": "使用外部 MQTT-Server",
"MQTT-Server IP-Adress bind": "MQTT-服务器 IP 地址绑定",
"MQTT-Server IP-Address bind": "MQTT-服务器 IP 地址绑定",
"MQTT-Server Port": "MQTT-服务器端口",
"Configure your Zigbee2MQTT WebUi connection": "配置 Zigbee2MQTT WebUi 连接",
"WebUi Address": "网页界面地址",
"WebUi Port": "WebUI 端口",
"Color configurations": "颜色配置",
"Color temperature sync with color": "色温与颜色同步",
"Use Kelvin instead of mired for the color temps": "使用 Kelvin 而不是 mired 作为色温",
"Other configurations": "其他配置",
"Proxy Zigbee2MQTT logs to ioBroker logs": "代理 Zigbee2MQTT 日志到 ioBroker 日志"
}
15 changes: 13 additions & 2 deletions admin/jsonConfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -122,17 +122,28 @@
"text": "",
"newLine": true
},
"otherHeader": {
"colorHeader": {
"type": "header",
"text": "Other configurations",
"text": "Color configurations",
"size": 2,
"newLine": true
},
"colorTempSyncColor": {
"type": "checkbox",
"label": "Color temperature sync with color",
"newLine": true
},
"useKelvin": {
"type": "checkbox",
"label": "Use Kelvin instead of mired for the color temps",
"newLine": true
},
"otherHeader": {
"type": "header",
"text": "Other configurations",
"size": 2,
"newLine": true
},
"proxyZ2MLogs": {
"type": "checkbox",
"label": "Proxy Zigbee2MQTT logs to ioBroker logs",
Expand Down
Loading

0 comments on commit 156a9f5

Please sign in to comment.