knx dimmer and colour (#21434)

arendst · May 18, 2024 · 285a6f3 · 285a6f3
1 parent 60a42f0
commit 285a6f3
Show file tree

Hide file tree

Showing 30 changed files with 172 additions and 8 deletions.
diff --git a/tasmota/include/tasmota.h b/tasmota/include/tasmota.h
@@ -283,7 +283,9 @@ const uint32_t LOOP_SLEEP_DELAY = 50;       // Lowest number of milliseconds to
 #define KNX_SLOT4              29
 #define KNX_SLOT5              30
 #define KNX_SCENE              31
-#define KNX_MAX_device_param   31
+#define KNX_DIMMER             32   // aka DPT_Scaling 5.001
+#define KNX_COLOUR             33   // aka DPT_Colour_RGB 232.600 or DPT_Colour_RGBW 251.600
+#define KNX_MAX_device_param   33
 #define MAX_KNXTX_CMNDS        5
 
 // XPT2046 resistive touch driver min/max raw values

diff --git a/tasmota/language/af_AF.h b/tasmota/language/af_AF.h
@@ -76,6 +76,7 @@
 #define D_COMMAND "Bevel"
 #define D_CONNECTED "Gekoppel"
 #define D_CORS_DOMAIN "CORS Domain"
+#define D_COLOR "Color"
 #define D_COUNT "Telling"
 #define D_COUNTER "Opnemer"
 #define D_CT_POWER "CT Power"

diff --git a/tasmota/language/bg_BG.h b/tasmota/language/bg_BG.h
@@ -76,6 +76,7 @@
 #define D_COMMAND "Команда"
 #define D_CONNECTED "Свързан"
 #define D_CORS_DOMAIN "Домейн на CORS"
+#define D_COLOR "Color"
 #define D_COUNT "Брой"
 #define D_COUNTER "Брояч"
 #define D_CT_POWER "ТТ Мощност"

diff --git a/tasmota/language/ca_AD.h b/tasmota/language/ca_AD.h
@@ -76,6 +76,7 @@
 #define D_COMMAND "Ordre"
 #define D_CONNECTED "Connectat"
 #define D_CORS_DOMAIN "Domini CORS"
+#define D_COLOR "Color"
 #define D_COUNT "Compta"
 #define D_COUNTER "Comptador"
 #define D_CT_POWER "Energia CT"

diff --git a/tasmota/language/cs_CZ.h b/tasmota/language/cs_CZ.h
@@ -76,6 +76,7 @@
 #define D_COMMAND "Příkaz"
 #define D_CONNECTED "...připojeno"
 #define D_CORS_DOMAIN "CORS Domain"
+#define D_COLOR "Color"
 #define D_COUNT "Počítej"
 #define D_COUNTER "Počítadlo"
 #define D_CT_POWER "CT Power"

diff --git a/tasmota/language/de_DE.h b/tasmota/language/de_DE.h
@@ -76,6 +76,7 @@
 #define D_COMMAND "Befehl"
 #define D_CONNECTED "verbunden"
 #define D_CORS_DOMAIN "CORS Domain"
+#define D_COLOR "Color"
 #define D_COUNT "Anzahl"             // used as a noun throughout
 #define D_COUNTER "Zähler"
 #define D_CT_POWER "CT Power"

diff --git a/tasmota/language/el_GR.h b/tasmota/language/el_GR.h
@@ -75,6 +75,7 @@
 #define D_COLDLIGHT "Ψυχρό"
 #define D_COMMAND "Εντολή"
 #define D_CONNECTED "Συνδεδεμένο"
+#define D_COLOR "Color"
 #define D_COUNT "Μέτρηση"
 #define D_CORS_DOMAIN "CORS Domain"
 #define D_COUNTER "Μετρητής"

diff --git a/tasmota/language/en_GB.h b/tasmota/language/en_GB.h
@@ -76,6 +76,7 @@
 #define D_COMMAND "Command"
 #define D_CONNECTED "Connected"
 #define D_CORS_DOMAIN "CORS Domain"
+#define D_COLOR "Color"
 #define D_COUNT "Count"
 #define D_COUNTER "Counter"
 #define D_CT_POWER "CT Power"

diff --git a/tasmota/language/es_ES.h b/tasmota/language/es_ES.h
@@ -76,6 +76,7 @@
 #define D_COMMAND "Comando"
 #define D_CONNECTED "Conectado"
 #define D_CORS_DOMAIN "Sitio WEB para CORS"
+#define D_COLOR "Color"
 #define D_COUNT "Conteo"
 #define D_COUNTER "Contador"
 #define D_CT_POWER "CT Power"

diff --git a/tasmota/language/fr_FR.h b/tasmota/language/fr_FR.h
@@ -76,6 +76,7 @@
 #define D_COMMAND "Commande"
 #define D_CONNECTED "Connecté"
 #define D_CORS_DOMAIN "Domaine CORS"
+#define D_COLOR "Color"
 #define D_COUNT "Compte"
 #define D_COUNTER "Compteur"
 #define D_CT_POWER "Puissance CT"

diff --git a/tasmota/language/fy_NL.h b/tasmota/language/fy_NL.h
@@ -76,6 +76,7 @@
 #define D_COMMAND "Oarder"
 #define D_CONNECTED "Ferbûn"
 #define D_CORS_DOMAIN "CORS Domain"
+#define D_COLOR "Color"
 #define D_COUNT "Nûmer"
 #define D_COUNTER "Teller"
 #define D_CT_POWER "CT Power"

diff --git a/tasmota/language/he_HE.h b/tasmota/language/he_HE.h
@@ -76,6 +76,7 @@
 #define D_COMMAND "פקודה"
 #define D_CONNECTED "מחובר"
 #define D_CORS_DOMAIN "CORS Domain"
+#define D_COLOR "Color"
 #define D_COUNT "סופר"
 #define D_COUNTER "מונה"
 #define D_CT_POWER "CT Power"

diff --git a/tasmota/language/hu_HU.h b/tasmota/language/hu_HU.h
@@ -76,6 +76,7 @@
 #define D_COMMAND "Parancs"
 #define D_CONNECTED "Csatlakoztatva"
 #define D_CORS_DOMAIN "CORS Domain"
+#define D_COLOR "Color"
 #define D_COUNT "Szám"
 #define D_COUNTER "Számláló"
 #define D_CT_POWER "CT erősség"

diff --git a/tasmota/language/it_IT.h b/tasmota/language/it_IT.h
@@ -76,6 +76,7 @@
 #define D_COMMAND              "Comando"
 #define D_CONNECTED            "Connesso"
 #define D_CORS_DOMAIN          "Dominio CORS"
+#define D_COLOR "Color"
 #define D_COUNT                "Conteggio"
 #define D_COUNTER              "Contatore"
 #define D_CT_POWER             "Alimentazione CT"

diff --git a/tasmota/language/ko_KO.h b/tasmota/language/ko_KO.h
@@ -75,6 +75,7 @@
 #define D_COLDLIGHT "차갑게"
 #define D_COMMAND "커맨드"
 #define D_CONNECTED "연결됨"
+#define D_COLOR "Color"
 #define D_COUNT "횟수"
 #define D_CORS_DOMAIN "CORS Domain"
 #define D_COUNTER "Counter"

diff --git a/tasmota/language/nl_NL.h b/tasmota/language/nl_NL.h
@@ -75,6 +75,7 @@
 #define D_COLDLIGHT "Koud"
 #define D_COMMAND "Opdracht"
 #define D_CONNECTED "Verbonden"
+#define D_COLOR "Color"
 #define D_COUNT "Aantal"
 #define D_CORS_DOMAIN "CORS Domain"
 #define D_COUNTER "Teller"

diff --git a/tasmota/language/pl_PL.h b/tasmota/language/pl_PL.h
@@ -76,6 +76,7 @@
 #define D_COMMAND "Komenda"
 #define D_CONNECTED "Połączony"
 #define D_CORS_DOMAIN "Domena CORS"
+#define D_COLOR "Color"
 #define D_COUNT "Licz"
 #define D_COUNTER "Licznik"
 #define D_CT_POWER "Moc CT"

diff --git a/tasmota/language/pt_BR.h b/tasmota/language/pt_BR.h
@@ -76,6 +76,7 @@
 #define D_COMMAND "Comando"
 #define D_CONNECTED "Ligado"
 #define D_CORS_DOMAIN "Domínio CORS"
+#define D_COLOR "Color"
 #define D_COUNT "Contagem"
 #define D_COUNTER "Contador"
 #define D_CT_POWER "Carga CT"

diff --git a/tasmota/language/pt_PT.h b/tasmota/language/pt_PT.h
@@ -76,6 +76,7 @@
 #define D_COMMAND "Comando"
 #define D_CONNECTED "Ligado"
 #define D_CORS_DOMAIN "CORS Domain"
+#define D_COLOR "Color"
 #define D_COUNT "Contagem"
 #define D_COUNTER "Contador"
 #define D_CT_POWER "CT Power"

diff --git a/tasmota/language/ro_RO.h b/tasmota/language/ro_RO.h
@@ -76,6 +76,7 @@
 #define D_COMMAND "Comandă"
 #define D_CONNECTED "Conectat"
 #define D_CORS_DOMAIN "Domeniu CORS"
+#define D_COLOR "Color"
 #define D_COUNT "Numărătoare"
 #define D_COUNTER "Contor"
 #define D_CT_POWER "Putere Transformată"

diff --git a/tasmota/language/ru_RU.h b/tasmota/language/ru_RU.h
@@ -77,6 +77,7 @@
 #define D_COMMAND "Команда"
 #define D_CONNECTED "Соединен"
 #define D_CORS_DOMAIN "Домен CORS"
+#define D_COLOR "Color"
 #define D_COUNT "Подсчет"
 #define D_COUNTER "Счетчик"
 #define D_CT_POWER "CT Power"

diff --git a/tasmota/language/sk_SK.h b/tasmota/language/sk_SK.h
@@ -76,6 +76,7 @@
 #define D_COMMAND "Príkaz"
 #define D_CONNECTED "...pripojené"
 #define D_CORS_DOMAIN "CORS Domain"
+#define D_COLOR "Color"
 #define D_COUNT "Počítaj"
 #define D_COUNTER "Počítadlo"
 #define D_CT_POWER "CT Power"

diff --git a/tasmota/language/sv_SE.h b/tasmota/language/sv_SE.h
@@ -76,6 +76,7 @@
 #define D_COMMAND "Kommando"
 #define D_CONNECTED "Ansluten"
 #define D_CORS_DOMAIN "CORS Domain"
+#define D_COLOR "Color"
 #define D_COUNT "Räkna"
 #define D_COUNTER "Räknare"
 #define D_CT_POWER "CT Power"

diff --git a/tasmota/language/tr_TR.h b/tasmota/language/tr_TR.h
@@ -76,6 +76,7 @@
 #define D_COMMAND "Komut"
 #define D_CONNECTED "Bağlandı"
 #define D_CORS_DOMAIN "CORS Domain"
+#define D_COLOR "Color"
 #define D_COUNT "Sayı"
 #define D_COUNTER "Sayaç"
 #define D_CT_POWER "CT Power"

diff --git a/tasmota/language/uk_UA.h b/tasmota/language/uk_UA.h
@@ -76,6 +76,7 @@
 #define D_COMMAND "Команда"
 #define D_CONNECTED "Під'єднано"
 #define D_CORS_DOMAIN "Домен CORS"
+#define D_COLOR "Color"
 #define D_COUNT "разів"
 #define D_COUNTER "Лічильник"
 #define D_CT_POWER "CT Power"

diff --git a/tasmota/language/vi_VN.h b/tasmota/language/vi_VN.h
@@ -76,6 +76,7 @@
 #define D_COMMAND "Dòng Lệnh"
 #define D_CONNECTED "Đã kết nối"
 #define D_CORS_DOMAIN "CORS Domain"
+#define D_COLOR "Color"
 #define D_COUNT "Đếm"
 #define D_COUNTER "Bộ đếm"
 #define D_CT_POWER "CT Power"

diff --git a/tasmota/language/zh_CN.h b/tasmota/language/zh_CN.h
@@ -76,6 +76,7 @@
 #define D_COMMAND "命令:"
 #define D_CONNECTED "已连接"
 #define D_CORS_DOMAIN "CORS Domain"
+#define D_COLOR "Color"
 #define D_COUNT "数量:"
 #define D_COUNTER "计数器"
 #define D_CT_POWER "CT Power"

diff --git a/tasmota/language/zh_TW.h b/tasmota/language/zh_TW.h
@@ -76,6 +76,7 @@
 #define D_COMMAND "命令:"
 #define D_CONNECTED "已連線"
 #define D_CORS_DOMAIN "跨來源資源共享的網域(CORS Domain)"
+#define D_COLOR "Color"
 #define D_COUNT "數量:"
 #define D_COUNTER "Counter"
 #define D_CT_POWER "CT Power"

diff --git a/tasmota/tasmota_xdrv_driver/xdrv_04_light.ino b/tasmota/tasmota_xdrv_driver/xdrv_04_light.ino
@@ -1549,6 +1549,9 @@ void LightPreparePower(power_t channels = 0xFFFFFFFF) {    // 1 = only RGB, 2 =
   #ifdef USE_DOMOTICZ
         DomoticzUpdatePowerState(Light.device + i);
   #endif  // USE_DOMOTICZ
+  #ifdef USE_KNX
+        KnxUpdateLight();
+  #endif
       }
     }
   } else {
@@ -1585,6 +1588,9 @@ void LightPreparePower(power_t channels = 0xFFFFFFFF) {    // 1 = only RGB, 2 =
 #ifdef USE_DOMOTICZ
     DomoticzUpdatePowerState(Light.device);
 #endif  // USE_DOMOTICZ
+#ifdef USE_KNX
+    KnxUpdateLight();
+#endif
   }
 
   if (Settings->flag3.hass_tele_on_power) {  // SetOption59 - Send tele/%topic%/STATE in addition to stat/%topic%/RESULT