From c22215e9537a96bda4003ba6dd4307fe244b8dfe Mon Sep 17 00:00:00 2001 From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com> Date: Sat, 14 Mar 2020 17:21:54 +0000 Subject: [PATCH 01/31] Support for translations on "xsns_53_sml.ino" --- tasmota/language/en-GB.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tasmota/language/en-GB.h b/tasmota/language/en-GB.h index e28e153e9..6d3e8da3f 100644 --- a/tasmota/language/en-GB.h +++ b/tasmota/language/en-GB.h @@ -512,6 +512,26 @@ #define D_TX20_SOUTH "S" #define D_TX20_WEST "W" +// xsns_53_sml.ino +#define D_TPWRIN "Total-In" +#define D_TPWROUT "Total-Out" +#define D_TPWRCURR "Current-In/Out" +#define D_TPWRCURR1 "Current-In p1" +#define D_TPWRCURR2 "Current-In p2" +#define D_TPWRCURR3 "Current-In p3" +#define D_Strom_L1 "Current L1" +#define D_Strom_L2 "Current L2" +#define D_Strom_L3 "Current L3" +#define D_Spannung_L1 "Voltage L1" +#define D_Spannung_L2 "Voltage L2" +#define D_Spannung_L3 "Voltage L3" +#define D_METERNR "Meter_number" +#define D_METERSID "Service ID" +#define D_GasIN "Counter" // Gas-Verbrauch +#define D_H2oIN "Counter" // H2o-Verbrauch +#define D_StL1L2L3 "Current L1+L2+L3" +#define D_SpL1L2L3 "Voltage L1+L2+L3/3" + // tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box #define D_SENSOR_NONE "None" #define D_SENSOR_USER "User" From dacb9b09134169a090942f6688e014e195a86522 Mon Sep 17 00:00:00 2001 From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com> Date: Sat, 14 Mar 2020 17:27:26 +0000 Subject: [PATCH 02/31] Update pt-PT.h --- tasmota/language/pt-PT.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tasmota/language/pt-PT.h b/tasmota/language/pt-PT.h index 36188994d..ddaf0692f 100644 --- a/tasmota/language/pt-PT.h +++ b/tasmota/language/pt-PT.h @@ -512,6 +512,26 @@ #define D_TX20_SOUTH "S" #define D_TX20_WEST "O" +//xsns_53_sml.ino +#define D_TPWRIN "Total-Consumo" +#define D_TPWROUT "Total-Geração" +#define D_TPWRCURR "Corrente-Consumo/Geração" +#define D_TPWRCURR1 "Corrente-Consumo F1" +#define D_TPWRCURR2 "Corrente-Consumo F2" +#define D_TPWRCURR3 "Corrente-Consumo F3" +#define D_Strom_L1 "Corrente F1" +#define D_Strom_L2 "Corrente F2" +#define D_Strom_L3 "Corrente F3" +#define D_Spannung_L1 "Tensão F1" +#define D_Spannung_L2 "Tensão F2" +#define D_Spannung_L3 "Tensão F3" +#define D_METERNR "Número_Contador" +#define D_METERSID "ID Serviço" +#define D_GasIN "Contador" +#define D_H2oIN "Contador" +#define D_StL1L2L3 "Corrente F1+F2+F3" +#define D_SpL1L2L3 "Tensão F1+F2+F3/3" + // tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box #define D_SENSOR_NONE "Nenhum" #define D_SENSOR_USER "User" From e30b4d18f5e39860bba08e88ec09938824eb7ad6 Mon Sep 17 00:00:00 2001 From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com> Date: Sat, 14 Mar 2020 17:31:52 +0000 Subject: [PATCH 03/31] Remote fixed and unproper definitions of de-DE on xsns_53_sml.ino --- tasmota/xsns_53_sml.ino | 64 ----------------------------------------- 1 file changed, 64 deletions(-) diff --git a/tasmota/xsns_53_sml.ino b/tasmota/xsns_53_sml.ino index aeb57d0d8..feb634bf0 100755 --- a/tasmota/xsns_53_sml.ino +++ b/tasmota/xsns_53_sml.ino @@ -50,70 +50,6 @@ // addresses a bug in meter DWS74 //#define DWS74_BUG -// max 23 chars -#if MY_LANGUAGE==de-DE -// german web text -#define D_TPWRIN "Verbrauch" -#define D_TPWROUT "Einspeisung" -#define D_TPWRCURR "Aktueller Verbrauch" -#define D_TPWRCURR1 "Verbrauch P1" -#define D_TPWRCURR2 "Verbrauch P2" -#define D_TPWRCURR3 "Verbrauch P3" -#define D_Strom_L1 "Strom L1" -#define D_Strom_L2 "Strom L2" -#define D_Strom_L3 "Strom L3" -#define D_Spannung_L1 "Spannung L1" -#define D_Spannung_L2 "Spannung L2" -#define D_Spannung_L3 "Spannung L3" -#define D_METERNR "Zähler Nr" -#define D_METERSID "Service ID" -#define D_GasIN "Zählerstand" // Gas-Verbrauch -#define D_H2oIN "Zählerstand" // H2o-Verbrauch -#define D_StL1L2L3 "Ströme L1+L2+L3" -#define D_SpL1L2L3 "Spannung L1+L2+L3/3" - -#else -// other languages (tbd) -#undef D_TPWRIN -#undef D_TPWROUT -#undef D_TPWRCURR -#undef D_TPWRCURR1 -#undef D_TPWRCURR2 -#undef D_TPWRCURR3 -#undef D_Strom_L1 -#undef D_Strom_L2 -#undef D_Strom_L3 -#undef D_Spannung_L1 -#undef D_Spannung_L2 -#undef D_Spannung_L3 -#undef D_METERNR -#undef D_METERSID -#undef D_GasIN -#undef D_H2oIN -#undef D_StL1L2L3 -#undef D_SpL1L2L3 - -#define D_TPWRIN "Total-In" -#define D_TPWROUT "Total-Out" -#define D_TPWRCURR "Current-In/Out" -#define D_TPWRCURR1 "Current-In p1" -#define D_TPWRCURR2 "Current-In p2" -#define D_TPWRCURR3 "Current-In p3" -#define D_Strom_L1 "Current L1" -#define D_Strom_L2 "Current L2" -#define D_Strom_L3 "Current L3" -#define D_Spannung_L1 "Voltage L1" -#define D_Spannung_L2 "Voltage L2" -#define D_Spannung_L3 "Voltage L3" -#define D_METERNR "Meter_number" -#define D_METERSID "Service ID" -#define D_GasIN "Counter" // Gas-Verbrauch -#define D_H2oIN "Counter" // H2o-Verbrauch -#define D_StL1L2L3 "Current L1+L2+L3" -#define D_SpL1L2L3 "Voltage L1+L2+L3/3" - -#endif - // JSON Strings do not translate // max 23 char #define DJ_TPWRIN "Total_in" From 6944c438381d70442a109782f52afab9d67a669e Mon Sep 17 00:00:00 2001 From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com> Date: Sat, 14 Mar 2020 18:29:07 +0000 Subject: [PATCH 04/31] Update bg-BG.h --- tasmota/language/bg-BG.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tasmota/language/bg-BG.h b/tasmota/language/bg-BG.h index 9323c9174..8b7947be1 100644 --- a/tasmota/language/bg-BG.h +++ b/tasmota/language/bg-BG.h @@ -643,6 +643,26 @@ #define D_SENSOR_CC1101_GDO2 "CC1101 GDO2" #define D_SENSOR_HRXL_RX "HRXL Rx" +// xsns_53_sml.ino +#define D_TPWRIN "Total-In" +#define D_TPWROUT "Total-Out" +#define D_TPWRCURR "Current-In/Out" +#define D_TPWRCURR1 "Current-In p1" +#define D_TPWRCURR2 "Current-In p2" +#define D_TPWRCURR3 "Current-In p3" +#define D_Strom_L1 "Current L1" +#define D_Strom_L2 "Current L2" +#define D_Strom_L3 "Current L3" +#define D_Spannung_L1 "Voltage L1" +#define D_Spannung_L2 "Voltage L2" +#define D_Spannung_L3 "Voltage L3" +#define D_METERNR "Meter_number" +#define D_METERSID "Service ID" +#define D_GasIN "Counter" +#define D_H2oIN "Counter" +#define D_StL1L2L3 "Current L1+L2+L3" +#define D_SpL1L2L3 "Voltage L1+L2+L3/3" + // Units #define D_UNIT_AMPERE "A" #define D_UNIT_CENTIMETER "cm" From 915349edf649ff3ea91501f5b43efd9b4c59d73a Mon Sep 17 00:00:00 2001 From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com> Date: Sat, 14 Mar 2020 18:29:28 +0000 Subject: [PATCH 05/31] Update cs-CZ.h --- tasmota/language/cs-CZ.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tasmota/language/cs-CZ.h b/tasmota/language/cs-CZ.h index 6303708de..f9674fca3 100644 --- a/tasmota/language/cs-CZ.h +++ b/tasmota/language/cs-CZ.h @@ -512,6 +512,26 @@ #define D_TX20_SOUTH "J" #define D_TX20_WEST "Z" +// xsns_53_sml.ino +#define D_TPWRIN "Total-In" +#define D_TPWROUT "Total-Out" +#define D_TPWRCURR "Current-In/Out" +#define D_TPWRCURR1 "Current-In p1" +#define D_TPWRCURR2 "Current-In p2" +#define D_TPWRCURR3 "Current-In p3" +#define D_Strom_L1 "Current L1" +#define D_Strom_L2 "Current L2" +#define D_Strom_L3 "Current L3" +#define D_Spannung_L1 "Voltage L1" +#define D_Spannung_L2 "Voltage L2" +#define D_Spannung_L3 "Voltage L3" +#define D_METERNR "Meter_number" +#define D_METERSID "Service ID" +#define D_GasIN "Counter" +#define D_H2oIN "Counter" +#define D_StL1L2L3 "Current L1+L2+L3" +#define D_SpL1L2L3 "Voltage L1+L2+L3/3" + // tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box #define D_SENSOR_NONE "Není" #define D_SENSOR_USER "User" From e92bdeee8d48fbdb5e387190b7e6b5b4a93ccb6f Mon Sep 17 00:00:00 2001 From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com> Date: Sat, 14 Mar 2020 18:29:48 +0000 Subject: [PATCH 06/31] Update de-DE.h --- tasmota/language/de-DE.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tasmota/language/de-DE.h b/tasmota/language/de-DE.h index 8cf6d8def..342895e92 100644 --- a/tasmota/language/de-DE.h +++ b/tasmota/language/de-DE.h @@ -512,6 +512,26 @@ #define D_TX20_SOUTH "S" #define D_TX20_WEST "W" +// xsns_53_sml.ino +#define D_TPWRIN "Total-In" +#define D_TPWROUT "Total-Out" +#define D_TPWRCURR "Current-In/Out" +#define D_TPWRCURR1 "Current-In p1" +#define D_TPWRCURR2 "Current-In p2" +#define D_TPWRCURR3 "Current-In p3" +#define D_Strom_L1 "Current L1" +#define D_Strom_L2 "Current L2" +#define D_Strom_L3 "Current L3" +#define D_Spannung_L1 "Voltage L1" +#define D_Spannung_L2 "Voltage L2" +#define D_Spannung_L3 "Voltage L3" +#define D_METERNR "Meter_number" +#define D_METERSID "Service ID" +#define D_GasIN "Counter" +#define D_H2oIN "Counter" +#define D_StL1L2L3 "Current L1+L2+L3" +#define D_SpL1L2L3 "Voltage L1+L2+L3/3" + // tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box #define D_SENSOR_NONE "None" #define D_SENSOR_USER "User" From 292e470c6131cb1e7d2db65c2a5e8ea0372c9d5c Mon Sep 17 00:00:00 2001 From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com> Date: Sat, 14 Mar 2020 18:30:00 +0000 Subject: [PATCH 07/31] Update el-GR.h --- tasmota/language/el-GR.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tasmota/language/el-GR.h b/tasmota/language/el-GR.h index 4a59d87b8..5cd99ee6c 100644 --- a/tasmota/language/el-GR.h +++ b/tasmota/language/el-GR.h @@ -512,6 +512,26 @@ #define D_TX20_SOUTH "Ν" #define D_TX20_WEST "Δ" +// xsns_53_sml.ino +#define D_TPWRIN "Total-In" +#define D_TPWROUT "Total-Out" +#define D_TPWRCURR "Current-In/Out" +#define D_TPWRCURR1 "Current-In p1" +#define D_TPWRCURR2 "Current-In p2" +#define D_TPWRCURR3 "Current-In p3" +#define D_Strom_L1 "Current L1" +#define D_Strom_L2 "Current L2" +#define D_Strom_L3 "Current L3" +#define D_Spannung_L1 "Voltage L1" +#define D_Spannung_L2 "Voltage L2" +#define D_Spannung_L3 "Voltage L3" +#define D_METERNR "Meter_number" +#define D_METERSID "Service ID" +#define D_GasIN "Counter" +#define D_H2oIN "Counter" +#define D_StL1L2L3 "Current L1+L2+L3" +#define D_SpL1L2L3 "Voltage L1+L2+L3/3" + // tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box #define D_SENSOR_NONE "Κανένα" #define D_SENSOR_USER "User" From aae88af76205b2a32089d38ac37d43f095d682ff Mon Sep 17 00:00:00 2001 From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com> Date: Sat, 14 Mar 2020 18:30:11 +0000 Subject: [PATCH 08/31] Update en-GB.h --- tasmota/language/en-GB.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tasmota/language/en-GB.h b/tasmota/language/en-GB.h index 6d3e8da3f..45f202b64 100644 --- a/tasmota/language/en-GB.h +++ b/tasmota/language/en-GB.h @@ -532,6 +532,26 @@ #define D_StL1L2L3 "Current L1+L2+L3" #define D_SpL1L2L3 "Voltage L1+L2+L3/3" +// xsns_53_sml.ino +#define D_TPWRIN "Total-In" +#define D_TPWROUT "Total-Out" +#define D_TPWRCURR "Current-In/Out" +#define D_TPWRCURR1 "Current-In p1" +#define D_TPWRCURR2 "Current-In p2" +#define D_TPWRCURR3 "Current-In p3" +#define D_Strom_L1 "Current L1" +#define D_Strom_L2 "Current L2" +#define D_Strom_L3 "Current L3" +#define D_Spannung_L1 "Voltage L1" +#define D_Spannung_L2 "Voltage L2" +#define D_Spannung_L3 "Voltage L3" +#define D_METERNR "Meter_number" +#define D_METERSID "Service ID" +#define D_GasIN "Counter" +#define D_H2oIN "Counter" +#define D_StL1L2L3 "Current L1+L2+L3" +#define D_SpL1L2L3 "Voltage L1+L2+L3/3" + // tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box #define D_SENSOR_NONE "None" #define D_SENSOR_USER "User" From 7bcda8c2e5e449fee587a7f3ab0cfb3f0e7dd57f Mon Sep 17 00:00:00 2001 From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com> Date: Sat, 14 Mar 2020 18:30:21 +0000 Subject: [PATCH 09/31] Update es-ES.h --- tasmota/language/es-ES.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tasmota/language/es-ES.h b/tasmota/language/es-ES.h index 69c91c693..4a1bcc3ec 100644 --- a/tasmota/language/es-ES.h +++ b/tasmota/language/es-ES.h @@ -512,6 +512,26 @@ #define D_TX20_SOUTH "S" #define D_TX20_WEST "O" +// xsns_53_sml.ino +#define D_TPWRIN "Total-In" +#define D_TPWROUT "Total-Out" +#define D_TPWRCURR "Current-In/Out" +#define D_TPWRCURR1 "Current-In p1" +#define D_TPWRCURR2 "Current-In p2" +#define D_TPWRCURR3 "Current-In p3" +#define D_Strom_L1 "Current L1" +#define D_Strom_L2 "Current L2" +#define D_Strom_L3 "Current L3" +#define D_Spannung_L1 "Voltage L1" +#define D_Spannung_L2 "Voltage L2" +#define D_Spannung_L3 "Voltage L3" +#define D_METERNR "Meter_number" +#define D_METERSID "Service ID" +#define D_GasIN "Counter" +#define D_H2oIN "Counter" +#define D_StL1L2L3 "Current L1+L2+L3" +#define D_SpL1L2L3 "Voltage L1+L2+L3/3" + // tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box #define D_SENSOR_NONE "Ninguno" #define D_SENSOR_USER "Por Usuario" From a810405c12c2b6773818baa45bb5c0ab9a95f1f5 Mon Sep 17 00:00:00 2001 From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com> Date: Sat, 14 Mar 2020 18:30:30 +0000 Subject: [PATCH 10/31] Update fr-FR.h --- tasmota/language/fr-FR.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tasmota/language/fr-FR.h b/tasmota/language/fr-FR.h index 8b71a8067..01081312f 100644 --- a/tasmota/language/fr-FR.h +++ b/tasmota/language/fr-FR.h @@ -512,6 +512,26 @@ #define D_TX20_SOUTH "S" #define D_TX20_WEST "O" +// xsns_53_sml.ino +#define D_TPWRIN "Total-In" +#define D_TPWROUT "Total-Out" +#define D_TPWRCURR "Current-In/Out" +#define D_TPWRCURR1 "Current-In p1" +#define D_TPWRCURR2 "Current-In p2" +#define D_TPWRCURR3 "Current-In p3" +#define D_Strom_L1 "Current L1" +#define D_Strom_L2 "Current L2" +#define D_Strom_L3 "Current L3" +#define D_Spannung_L1 "Voltage L1" +#define D_Spannung_L2 "Voltage L2" +#define D_Spannung_L3 "Voltage L3" +#define D_METERNR "Meter_number" +#define D_METERSID "Service ID" +#define D_GasIN "Counter" +#define D_H2oIN "Counter" +#define D_StL1L2L3 "Current L1+L2+L3" +#define D_SpL1L2L3 "Voltage L1+L2+L3/3" + // tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box #define D_SENSOR_NONE "Aucun" #define D_SENSOR_USER "Utilisateur" From accb8b762ee6949056d8ec4070ed6b9a1ed6adf1 Mon Sep 17 00:00:00 2001 From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com> Date: Sat, 14 Mar 2020 18:30:57 +0000 Subject: [PATCH 11/31] Update he-HE.h --- tasmota/language/he-HE.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tasmota/language/he-HE.h b/tasmota/language/he-HE.h index 09a803be6..46f52a72d 100644 --- a/tasmota/language/he-HE.h +++ b/tasmota/language/he-HE.h @@ -512,6 +512,26 @@ #define D_TX20_SOUTH "S" #define D_TX20_WEST "W" +// xsns_53_sml.ino +#define D_TPWRIN "Total-In" +#define D_TPWROUT "Total-Out" +#define D_TPWRCURR "Current-In/Out" +#define D_TPWRCURR1 "Current-In p1" +#define D_TPWRCURR2 "Current-In p2" +#define D_TPWRCURR3 "Current-In p3" +#define D_Strom_L1 "Current L1" +#define D_Strom_L2 "Current L2" +#define D_Strom_L3 "Current L3" +#define D_Spannung_L1 "Voltage L1" +#define D_Spannung_L2 "Voltage L2" +#define D_Spannung_L3 "Voltage L3" +#define D_METERNR "Meter_number" +#define D_METERSID "Service ID" +#define D_GasIN "Counter" +#define D_H2oIN "Counter" +#define D_StL1L2L3 "Current L1+L2+L3" +#define D_SpL1L2L3 "Voltage L1+L2+L3/3" + // tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box #define D_SENSOR_NONE "None" #define D_SENSOR_USER "משתמש" From 2e96fbd80d38033b80a00e5a835c17a959a9d361 Mon Sep 17 00:00:00 2001 From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com> Date: Sat, 14 Mar 2020 18:31:20 +0000 Subject: [PATCH 12/31] Update hu-HU.h --- tasmota/language/hu-HU.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tasmota/language/hu-HU.h b/tasmota/language/hu-HU.h index 551d81014..5f3e29e35 100644 --- a/tasmota/language/hu-HU.h +++ b/tasmota/language/hu-HU.h @@ -512,6 +512,26 @@ #define D_TX20_SOUTH "D" #define D_TX20_WEST "NY" +// xsns_53_sml.ino +#define D_TPWRIN "Total-In" +#define D_TPWROUT "Total-Out" +#define D_TPWRCURR "Current-In/Out" +#define D_TPWRCURR1 "Current-In p1" +#define D_TPWRCURR2 "Current-In p2" +#define D_TPWRCURR3 "Current-In p3" +#define D_Strom_L1 "Current L1" +#define D_Strom_L2 "Current L2" +#define D_Strom_L3 "Current L3" +#define D_Spannung_L1 "Voltage L1" +#define D_Spannung_L2 "Voltage L2" +#define D_Spannung_L3 "Voltage L3" +#define D_METERNR "Meter_number" +#define D_METERSID "Service ID" +#define D_GasIN "Counter" +#define D_H2oIN "Counter" +#define D_StL1L2L3 "Current L1+L2+L3" +#define D_SpL1L2L3 "Voltage L1+L2+L3/3" + // tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box #define D_SENSOR_NONE "Nincs" #define D_SENSOR_USER "User" From a356306595cc17cf667bb28be3715d3b66440edb Mon Sep 17 00:00:00 2001 From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com> Date: Sat, 14 Mar 2020 18:31:34 +0000 Subject: [PATCH 13/31] Update it-IT.h --- tasmota/language/it-IT.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tasmota/language/it-IT.h b/tasmota/language/it-IT.h index e23c86757..2a5e1d565 100644 --- a/tasmota/language/it-IT.h +++ b/tasmota/language/it-IT.h @@ -512,6 +512,26 @@ #define D_TX20_SOUTH "S" #define D_TX20_WEST "O" +// xsns_53_sml.ino +#define D_TPWRIN "Total-In" +#define D_TPWROUT "Total-Out" +#define D_TPWRCURR "Current-In/Out" +#define D_TPWRCURR1 "Current-In p1" +#define D_TPWRCURR2 "Current-In p2" +#define D_TPWRCURR3 "Current-In p3" +#define D_Strom_L1 "Current L1" +#define D_Strom_L2 "Current L2" +#define D_Strom_L3 "Current L3" +#define D_Spannung_L1 "Voltage L1" +#define D_Spannung_L2 "Voltage L2" +#define D_Spannung_L3 "Voltage L3" +#define D_METERNR "Meter_number" +#define D_METERSID "Service ID" +#define D_GasIN "Counter" +#define D_H2oIN "Counter" +#define D_StL1L2L3 "Current L1+L2+L3" +#define D_SpL1L2L3 "Voltage L1+L2+L3/3" + // tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box #define D_SENSOR_NONE "Nessuno" #define D_SENSOR_USER "User" From 5a3b2b1c0c2e0d0304ac8d00e2ef7a278f761883 Mon Sep 17 00:00:00 2001 From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com> Date: Sat, 14 Mar 2020 18:31:46 +0000 Subject: [PATCH 14/31] Update ko-KO.h --- tasmota/language/ko-KO.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tasmota/language/ko-KO.h b/tasmota/language/ko-KO.h index ddc815de5..f650bf93a 100644 --- a/tasmota/language/ko-KO.h +++ b/tasmota/language/ko-KO.h @@ -512,6 +512,26 @@ #define D_TX20_SOUTH "S" #define D_TX20_WEST "W" +// xsns_53_sml.ino +#define D_TPWRIN "Total-In" +#define D_TPWROUT "Total-Out" +#define D_TPWRCURR "Current-In/Out" +#define D_TPWRCURR1 "Current-In p1" +#define D_TPWRCURR2 "Current-In p2" +#define D_TPWRCURR3 "Current-In p3" +#define D_Strom_L1 "Current L1" +#define D_Strom_L2 "Current L2" +#define D_Strom_L3 "Current L3" +#define D_Spannung_L1 "Voltage L1" +#define D_Spannung_L2 "Voltage L2" +#define D_Spannung_L3 "Voltage L3" +#define D_METERNR "Meter_number" +#define D_METERSID "Service ID" +#define D_GasIN "Counter" +#define D_H2oIN "Counter" +#define D_StL1L2L3 "Current L1+L2+L3" +#define D_SpL1L2L3 "Voltage L1+L2+L3/3" + // tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box #define D_SENSOR_NONE "없음" #define D_SENSOR_USER "User" From b96107cfb1c5342dabe75698b9b440724840ac02 Mon Sep 17 00:00:00 2001 From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com> Date: Sat, 14 Mar 2020 18:31:54 +0000 Subject: [PATCH 15/31] Update nl-NL.h --- tasmota/language/nl-NL.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tasmota/language/nl-NL.h b/tasmota/language/nl-NL.h index 46e29e1fd..f2c23af78 100644 --- a/tasmota/language/nl-NL.h +++ b/tasmota/language/nl-NL.h @@ -512,6 +512,26 @@ #define D_TX20_SOUTH "S" #define D_TX20_WEST "W" +// xsns_53_sml.ino +#define D_TPWRIN "Total-In" +#define D_TPWROUT "Total-Out" +#define D_TPWRCURR "Current-In/Out" +#define D_TPWRCURR1 "Current-In p1" +#define D_TPWRCURR2 "Current-In p2" +#define D_TPWRCURR3 "Current-In p3" +#define D_Strom_L1 "Current L1" +#define D_Strom_L2 "Current L2" +#define D_Strom_L3 "Current L3" +#define D_Spannung_L1 "Voltage L1" +#define D_Spannung_L2 "Voltage L2" +#define D_Spannung_L3 "Voltage L3" +#define D_METERNR "Meter_number" +#define D_METERSID "Service ID" +#define D_GasIN "Counter" +#define D_H2oIN "Counter" +#define D_StL1L2L3 "Current L1+L2+L3" +#define D_SpL1L2L3 "Voltage L1+L2+L3/3" + // tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box #define D_SENSOR_NONE "Geen" #define D_SENSOR_USER "Gebruiker" From 08875ad6e51d0c6ce22a87bd76cfee87ab0ddb65 Mon Sep 17 00:00:00 2001 From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com> Date: Sat, 14 Mar 2020 18:32:03 +0000 Subject: [PATCH 16/31] Update pl-PL.h --- tasmota/language/pl-PL.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tasmota/language/pl-PL.h b/tasmota/language/pl-PL.h index 2a75d6f46..2ca5a08c5 100644 --- a/tasmota/language/pl-PL.h +++ b/tasmota/language/pl-PL.h @@ -512,6 +512,26 @@ #define D_TX20_SOUTH "S" #define D_TX20_WEST "W" +// xsns_53_sml.ino +#define D_TPWRIN "Total-In" +#define D_TPWROUT "Total-Out" +#define D_TPWRCURR "Current-In/Out" +#define D_TPWRCURR1 "Current-In p1" +#define D_TPWRCURR2 "Current-In p2" +#define D_TPWRCURR3 "Current-In p3" +#define D_Strom_L1 "Current L1" +#define D_Strom_L2 "Current L2" +#define D_Strom_L3 "Current L3" +#define D_Spannung_L1 "Voltage L1" +#define D_Spannung_L2 "Voltage L2" +#define D_Spannung_L3 "Voltage L3" +#define D_METERNR "Meter_number" +#define D_METERSID "Service ID" +#define D_GasIN "Counter" +#define D_H2oIN "Counter" +#define D_StL1L2L3 "Current L1+L2+L3" +#define D_SpL1L2L3 "Voltage L1+L2+L3/3" + // tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box #define D_SENSOR_NONE "Brak" #define D_SENSOR_USER "Użytkownik" From aa857dc3035ce4d6391e55625c2c5f83639a7b6f Mon Sep 17 00:00:00 2001 From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com> Date: Sat, 14 Mar 2020 18:32:12 +0000 Subject: [PATCH 17/31] Update pt-BR.h --- tasmota/language/pt-BR.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tasmota/language/pt-BR.h b/tasmota/language/pt-BR.h index f1b8fdbc5..6b97ae380 100644 --- a/tasmota/language/pt-BR.h +++ b/tasmota/language/pt-BR.h @@ -512,6 +512,26 @@ #define D_TX20_SOUTH "S" #define D_TX20_WEST "O" +// xsns_53_sml.ino +#define D_TPWRIN "Total-In" +#define D_TPWROUT "Total-Out" +#define D_TPWRCURR "Current-In/Out" +#define D_TPWRCURR1 "Current-In p1" +#define D_TPWRCURR2 "Current-In p2" +#define D_TPWRCURR3 "Current-In p3" +#define D_Strom_L1 "Current L1" +#define D_Strom_L2 "Current L2" +#define D_Strom_L3 "Current L3" +#define D_Spannung_L1 "Voltage L1" +#define D_Spannung_L2 "Voltage L2" +#define D_Spannung_L3 "Voltage L3" +#define D_METERNR "Meter_number" +#define D_METERSID "Service ID" +#define D_GasIN "Counter" +#define D_H2oIN "Counter" +#define D_StL1L2L3 "Current L1+L2+L3" +#define D_SpL1L2L3 "Voltage L1+L2+L3/3" + // tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box #define D_SENSOR_NONE "Nenhum" #define D_SENSOR_USER "User" From 3645dda825b9298b92f4a7ec3097300cb4f2945b Mon Sep 17 00:00:00 2001 From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com> Date: Sat, 14 Mar 2020 18:32:20 +0000 Subject: [PATCH 18/31] Update ro-RO.h --- tasmota/language/ro-RO.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tasmota/language/ro-RO.h b/tasmota/language/ro-RO.h index 2db7cf4ba..3c1a79b3b 100644 --- a/tasmota/language/ro-RO.h +++ b/tasmota/language/ro-RO.h @@ -512,6 +512,26 @@ #define D_TX20_SOUTH "S" #define D_TX20_WEST "V" +// xsns_53_sml.ino +#define D_TPWRIN "Total-In" +#define D_TPWROUT "Total-Out" +#define D_TPWRCURR "Current-In/Out" +#define D_TPWRCURR1 "Current-In p1" +#define D_TPWRCURR2 "Current-In p2" +#define D_TPWRCURR3 "Current-In p3" +#define D_Strom_L1 "Current L1" +#define D_Strom_L2 "Current L2" +#define D_Strom_L3 "Current L3" +#define D_Spannung_L1 "Voltage L1" +#define D_Spannung_L2 "Voltage L2" +#define D_Spannung_L3 "Voltage L3" +#define D_METERNR "Meter_number" +#define D_METERSID "Service ID" +#define D_GasIN "Counter" +#define D_H2oIN "Counter" +#define D_StL1L2L3 "Current L1+L2+L3" +#define D_SpL1L2L3 "Voltage L1+L2+L3/3" + // tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box #define D_SENSOR_NONE "Fără" #define D_SENSOR_USER "Utilizator" From 75e6f07bc6e24c4c1adf047b23ea477998dd7838 Mon Sep 17 00:00:00 2001 From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com> Date: Sat, 14 Mar 2020 18:32:27 +0000 Subject: [PATCH 19/31] Update ru-RU.h --- tasmota/language/ru-RU.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tasmota/language/ru-RU.h b/tasmota/language/ru-RU.h index 5690f9209..d23b699b1 100644 --- a/tasmota/language/ru-RU.h +++ b/tasmota/language/ru-RU.h @@ -512,6 +512,26 @@ #define D_TX20_SOUTH "S" #define D_TX20_WEST "W" +// xsns_53_sml.ino +#define D_TPWRIN "Total-In" +#define D_TPWROUT "Total-Out" +#define D_TPWRCURR "Current-In/Out" +#define D_TPWRCURR1 "Current-In p1" +#define D_TPWRCURR2 "Current-In p2" +#define D_TPWRCURR3 "Current-In p3" +#define D_Strom_L1 "Current L1" +#define D_Strom_L2 "Current L2" +#define D_Strom_L3 "Current L3" +#define D_Spannung_L1 "Voltage L1" +#define D_Spannung_L2 "Voltage L2" +#define D_Spannung_L3 "Voltage L3" +#define D_METERNR "Meter_number" +#define D_METERSID "Service ID" +#define D_GasIN "Counter" +#define D_H2oIN "Counter" +#define D_StL1L2L3 "Current L1+L2+L3" +#define D_SpL1L2L3 "Voltage L1+L2+L3/3" + // tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box #define D_SENSOR_NONE "-нет-" #define D_SENSOR_USER "User" From 34e7c94879aac6d0c1b9d8db403501a65873dea9 Mon Sep 17 00:00:00 2001 From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com> Date: Sat, 14 Mar 2020 18:32:34 +0000 Subject: [PATCH 20/31] Update sk-SK.h --- tasmota/language/sk-SK.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tasmota/language/sk-SK.h b/tasmota/language/sk-SK.h index b7bd30f25..b5f5cf01e 100644 --- a/tasmota/language/sk-SK.h +++ b/tasmota/language/sk-SK.h @@ -512,6 +512,26 @@ #define D_TX20_SOUTH "J" #define D_TX20_WEST "Z" +// xsns_53_sml.ino +#define D_TPWRIN "Total-In" +#define D_TPWROUT "Total-Out" +#define D_TPWRCURR "Current-In/Out" +#define D_TPWRCURR1 "Current-In p1" +#define D_TPWRCURR2 "Current-In p2" +#define D_TPWRCURR3 "Current-In p3" +#define D_Strom_L1 "Current L1" +#define D_Strom_L2 "Current L2" +#define D_Strom_L3 "Current L3" +#define D_Spannung_L1 "Voltage L1" +#define D_Spannung_L2 "Voltage L2" +#define D_Spannung_L3 "Voltage L3" +#define D_METERNR "Meter_number" +#define D_METERSID "Service ID" +#define D_GasIN "Counter" +#define D_H2oIN "Counter" +#define D_StL1L2L3 "Current L1+L2+L3" +#define D_SpL1L2L3 "Voltage L1+L2+L3/3" + // tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box #define D_SENSOR_NONE "Žiaden" #define D_SENSOR_USER "User" From fafeea8da9cb693a92d16dce56931b852695f800 Mon Sep 17 00:00:00 2001 From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com> Date: Sat, 14 Mar 2020 18:32:46 +0000 Subject: [PATCH 21/31] Update sv-SE.h --- tasmota/language/sv-SE.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tasmota/language/sv-SE.h b/tasmota/language/sv-SE.h index 483633ae1..713864440 100644 --- a/tasmota/language/sv-SE.h +++ b/tasmota/language/sv-SE.h @@ -512,6 +512,26 @@ #define D_TX20_SOUTH "S" #define D_TX20_WEST "V" +// xsns_53_sml.ino +#define D_TPWRIN "Total-In" +#define D_TPWROUT "Total-Out" +#define D_TPWRCURR "Current-In/Out" +#define D_TPWRCURR1 "Current-In p1" +#define D_TPWRCURR2 "Current-In p2" +#define D_TPWRCURR3 "Current-In p3" +#define D_Strom_L1 "Current L1" +#define D_Strom_L2 "Current L2" +#define D_Strom_L3 "Current L3" +#define D_Spannung_L1 "Voltage L1" +#define D_Spannung_L2 "Voltage L2" +#define D_Spannung_L3 "Voltage L3" +#define D_METERNR "Meter_number" +#define D_METERSID "Service ID" +#define D_GasIN "Counter" +#define D_H2oIN "Counter" +#define D_StL1L2L3 "Current L1+L2+L3" +#define D_SpL1L2L3 "Voltage L1+L2+L3/3" + // tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box #define D_SENSOR_NONE "Ingen" #define D_SENSOR_USER "User" From d4f1fb53d926d9a0d8990d9dee2d62ee4fac78d2 Mon Sep 17 00:00:00 2001 From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com> Date: Sat, 14 Mar 2020 18:32:57 +0000 Subject: [PATCH 22/31] Update tr-TR.h --- tasmota/language/tr-TR.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tasmota/language/tr-TR.h b/tasmota/language/tr-TR.h index 62990d5aa..d486d52c1 100644 --- a/tasmota/language/tr-TR.h +++ b/tasmota/language/tr-TR.h @@ -512,6 +512,26 @@ #define D_TX20_SOUTH "S" #define D_TX20_WEST "W" +// xsns_53_sml.ino +#define D_TPWRIN "Total-In" +#define D_TPWROUT "Total-Out" +#define D_TPWRCURR "Current-In/Out" +#define D_TPWRCURR1 "Current-In p1" +#define D_TPWRCURR2 "Current-In p2" +#define D_TPWRCURR3 "Current-In p3" +#define D_Strom_L1 "Current L1" +#define D_Strom_L2 "Current L2" +#define D_Strom_L3 "Current L3" +#define D_Spannung_L1 "Voltage L1" +#define D_Spannung_L2 "Voltage L2" +#define D_Spannung_L3 "Voltage L3" +#define D_METERNR "Meter_number" +#define D_METERSID "Service ID" +#define D_GasIN "Counter" +#define D_H2oIN "Counter" +#define D_StL1L2L3 "Current L1+L2+L3" +#define D_SpL1L2L3 "Voltage L1+L2+L3/3" + // tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box #define D_SENSOR_NONE "None" #define D_SENSOR_USER "User" From d774608196cd5f5334034673e1b0cc8faa386fcd Mon Sep 17 00:00:00 2001 From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com> Date: Sat, 14 Mar 2020 18:33:07 +0000 Subject: [PATCH 23/31] Update uk-UA.h --- tasmota/language/uk-UA.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tasmota/language/uk-UA.h b/tasmota/language/uk-UA.h index fbeb0f782..f0eef8d01 100644 --- a/tasmota/language/uk-UA.h +++ b/tasmota/language/uk-UA.h @@ -512,6 +512,26 @@ #define D_TX20_SOUTH "Пд" #define D_TX20_WEST "Зх" +// xsns_53_sml.ino +#define D_TPWRIN "Total-In" +#define D_TPWROUT "Total-Out" +#define D_TPWRCURR "Current-In/Out" +#define D_TPWRCURR1 "Current-In p1" +#define D_TPWRCURR2 "Current-In p2" +#define D_TPWRCURR3 "Current-In p3" +#define D_Strom_L1 "Current L1" +#define D_Strom_L2 "Current L2" +#define D_Strom_L3 "Current L3" +#define D_Spannung_L1 "Voltage L1" +#define D_Spannung_L2 "Voltage L2" +#define D_Spannung_L3 "Voltage L3" +#define D_METERNR "Meter_number" +#define D_METERSID "Service ID" +#define D_GasIN "Counter" +#define D_H2oIN "Counter" +#define D_StL1L2L3 "Current L1+L2+L3" +#define D_SpL1L2L3 "Voltage L1+L2+L3/3" + // tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box #define D_SENSOR_NONE "Немає" #define D_SENSOR_USER "Користувач" From 89ed5d3a4eb267a75e7d2aee9773105646470a38 Mon Sep 17 00:00:00 2001 From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com> Date: Sat, 14 Mar 2020 18:33:17 +0000 Subject: [PATCH 24/31] Update zh-CN.h --- tasmota/language/zh-CN.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tasmota/language/zh-CN.h b/tasmota/language/zh-CN.h index 95ba59358..cefa902ff 100644 --- a/tasmota/language/zh-CN.h +++ b/tasmota/language/zh-CN.h @@ -512,6 +512,26 @@ #define D_TX20_SOUTH "南" #define D_TX20_WEST "西" +// xsns_53_sml.ino +#define D_TPWRIN "Total-In" +#define D_TPWROUT "Total-Out" +#define D_TPWRCURR "Current-In/Out" +#define D_TPWRCURR1 "Current-In p1" +#define D_TPWRCURR2 "Current-In p2" +#define D_TPWRCURR3 "Current-In p3" +#define D_Strom_L1 "Current L1" +#define D_Strom_L2 "Current L2" +#define D_Strom_L3 "Current L3" +#define D_Spannung_L1 "Voltage L1" +#define D_Spannung_L2 "Voltage L2" +#define D_Spannung_L3 "Voltage L3" +#define D_METERNR "Meter_number" +#define D_METERSID "Service ID" +#define D_GasIN "Counter" +#define D_H2oIN "Counter" +#define D_StL1L2L3 "Current L1+L2+L3" +#define D_SpL1L2L3 "Voltage L1+L2+L3/3" + // tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box #define D_SENSOR_NONE "无" #define D_SENSOR_USER "User" From cad4fb879bf4edc116c923a4e292b7cccfccf0fe Mon Sep 17 00:00:00 2001 From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com> Date: Sat, 14 Mar 2020 18:33:30 +0000 Subject: [PATCH 25/31] Update zh-TW.h --- tasmota/language/zh-TW.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tasmota/language/zh-TW.h b/tasmota/language/zh-TW.h index b2ebcddd5..c366b4653 100644 --- a/tasmota/language/zh-TW.h +++ b/tasmota/language/zh-TW.h @@ -512,6 +512,26 @@ #define D_TX20_SOUTH "S" #define D_TX20_WEST "W" +// xsns_53_sml.ino +#define D_TPWRIN "Total-In" +#define D_TPWROUT "Total-Out" +#define D_TPWRCURR "Current-In/Out" +#define D_TPWRCURR1 "Current-In p1" +#define D_TPWRCURR2 "Current-In p2" +#define D_TPWRCURR3 "Current-In p3" +#define D_Strom_L1 "Current L1" +#define D_Strom_L2 "Current L2" +#define D_Strom_L3 "Current L3" +#define D_Spannung_L1 "Voltage L1" +#define D_Spannung_L2 "Voltage L2" +#define D_Spannung_L3 "Voltage L3" +#define D_METERNR "Meter_number" +#define D_METERSID "Service ID" +#define D_GasIN "Counter" +#define D_H2oIN "Counter" +#define D_StL1L2L3 "Current L1+L2+L3" +#define D_SpL1L2L3 "Voltage L1+L2+L3/3" + // tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box #define D_SENSOR_NONE "None" #define D_SENSOR_USER "User" From 3c610f872d887375dfe45520b035c67d94c306ad Mon Sep 17 00:00:00 2001 From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com> Date: Sat, 14 Mar 2020 19:34:35 +0000 Subject: [PATCH 26/31] Update de-DE.h --- tasmota/language/de-DE.h | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/tasmota/language/de-DE.h b/tasmota/language/de-DE.h index 342895e92..f93c272a7 100644 --- a/tasmota/language/de-DE.h +++ b/tasmota/language/de-DE.h @@ -513,24 +513,24 @@ #define D_TX20_WEST "W" // xsns_53_sml.ino -#define D_TPWRIN "Total-In" -#define D_TPWROUT "Total-Out" -#define D_TPWRCURR "Current-In/Out" -#define D_TPWRCURR1 "Current-In p1" -#define D_TPWRCURR2 "Current-In p2" -#define D_TPWRCURR3 "Current-In p3" -#define D_Strom_L1 "Current L1" -#define D_Strom_L2 "Current L2" -#define D_Strom_L3 "Current L3" -#define D_Spannung_L1 "Voltage L1" -#define D_Spannung_L2 "Voltage L2" -#define D_Spannung_L3 "Voltage L3" -#define D_METERNR "Meter_number" +#define D_TPWRIN "Verbrauch" +#define D_TPWROUT "Einspeisung" +#define D_TPWRCURR "Aktueller Verbrauch" +#define D_TPWRCURR1 "Verbrauch P1" +#define D_TPWRCURR2 "Verbrauch P2" +#define D_TPWRCURR3 "Verbrauch P3" +#define D_Strom_L1 "Strom L1" +#define D_Strom_L2 "Strom L2" +#define D_Strom_L3 "Strom L3" +#define D_Spannung_L1 "Spannung L1" +#define D_Spannung_L2 "Spannung L2" +#define D_Spannung_L3 "Spannung L3" +#define D_METERNR "Zähler Nr" #define D_METERSID "Service ID" -#define D_GasIN "Counter" -#define D_H2oIN "Counter" -#define D_StL1L2L3 "Current L1+L2+L3" -#define D_SpL1L2L3 "Voltage L1+L2+L3/3" +#define D_GasIN "Zählerstand" // Gas-Verbrauch +#define D_H2oIN "Zählerstand" // H2o-Verbrauch +#define D_StL1L2L3 "Ströme L1+L2+L3" +#define D_SpL1L2L3 "Spannung L1+L2+L3/3" // tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box #define D_SENSOR_NONE "None" From ca042bc3d99959ebc14f1dcbef146815f979f412 Mon Sep 17 00:00:00 2001 From: Adrian Scillato <39969427+ascillato2@users.noreply.github.com> Date: Sat, 14 Mar 2020 18:28:03 -0300 Subject: [PATCH 27/31] Fixed duplicated entries on en-GB.h --- tasmota/language/en-GB.h | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/tasmota/language/en-GB.h b/tasmota/language/en-GB.h index 45f202b64..6d3e8da3f 100644 --- a/tasmota/language/en-GB.h +++ b/tasmota/language/en-GB.h @@ -532,26 +532,6 @@ #define D_StL1L2L3 "Current L1+L2+L3" #define D_SpL1L2L3 "Voltage L1+L2+L3/3" -// xsns_53_sml.ino -#define D_TPWRIN "Total-In" -#define D_TPWROUT "Total-Out" -#define D_TPWRCURR "Current-In/Out" -#define D_TPWRCURR1 "Current-In p1" -#define D_TPWRCURR2 "Current-In p2" -#define D_TPWRCURR3 "Current-In p3" -#define D_Strom_L1 "Current L1" -#define D_Strom_L2 "Current L2" -#define D_Strom_L3 "Current L3" -#define D_Spannung_L1 "Voltage L1" -#define D_Spannung_L2 "Voltage L2" -#define D_Spannung_L3 "Voltage L3" -#define D_METERNR "Meter_number" -#define D_METERSID "Service ID" -#define D_GasIN "Counter" -#define D_H2oIN "Counter" -#define D_StL1L2L3 "Current L1+L2+L3" -#define D_SpL1L2L3 "Voltage L1+L2+L3/3" - // tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box #define D_SENSOR_NONE "None" #define D_SENSOR_USER "User" From d0ff0ccba6f3fa27ad9ab7dfe2e0f90e7b9d7afe Mon Sep 17 00:00:00 2001 From: Federico Leoni Date: Sat, 14 Mar 2020 18:36:19 -0300 Subject: [PATCH 28/31] Update xdrv_12_home_assistant.ino --- tasmota/xdrv_12_home_assistant.ino | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/tasmota/xdrv_12_home_assistant.ino b/tasmota/xdrv_12_home_assistant.ino index 4e002a220..6cebcda1d 100644 --- a/tasmota/xdrv_12_home_assistant.ino +++ b/tasmota/xdrv_12_home_assistant.ino @@ -67,6 +67,12 @@ const char HASS_DISCOVER_BIN_SWITCH[] PROGMEM = "\"pl_on\":\"%s\"," // ON "\"pl_off\":\"%s\""; // OFF +const char HASS_DISCOVER_BIN_PIR[] PROGMEM = + ",\"val_tpl\":\"{{value_json.%s}}\"," // STATE + "\"frc_upd\":true," // In ON/OFF case, enable force_update to make automations work + "\"pl_on\":\"%s\"," // ON + "\"off_dly\":1"; // Switchmode13 and Switchmode14 doesn't transmit an OFF state. + const char HASS_DISCOVER_LIGHT_DIMMER[] PROGMEM = ",\"bri_cmd_t\":\"%s\"," // cmnd/led2/Dimmer "\"bri_stat_t\":\"%s\"," // stat/led2/RESULT @@ -292,7 +298,7 @@ void HAssAnnouncerTriggers(uint8_t device, uint8_t present, uint8_t key, uint8_t } } -void HAssAnnouncerBinSensors(uint8_t device, uint8_t present, uint8_t dual, uint8_t toggle) +void HAssAnnouncerBinSensors(uint8_t device, uint8_t present, uint8_t dual, uint8_t toggle, uint8_t pir) { char stopic[TOPSZ]; char stemp1[TOPSZ]; @@ -321,7 +327,11 @@ void HAssAnnouncerBinSensors(uint8_t device, uint8_t present, uint8_t dual, uint snprintf_P(name, sizeof(name), PSTR("%s Switch%d"), SettingsText(SET_FRIENDLYNAME1), device + 1); Response_P(HASS_DISCOVER_BASE, name, state_topic, availability_topic); - TryResponseAppend_P(HASS_DISCOVER_BIN_SWITCH, PSTR(D_RSLT_STATE), SettingsText(SET_STATE_TXT2), SettingsText(SET_STATE_TXT1)); + if (!pir) { + TryResponseAppend_P(HASS_DISCOVER_BIN_SWITCH, PSTR(D_RSLT_STATE), SettingsText(SET_STATE_TXT2), SettingsText(SET_STATE_TXT1)); + } else { + TryResponseAppend_P(HASS_DISCOVER_BIN_PIR, PSTR(D_RSLT_STATE), SettingsText(SET_STATE_TXT2)); + } TryResponseAppend_P(HASS_DISCOVER_DEVICE_INFO_SHORT, unique_id, ESP.getChipId()); TryResponseAppend_P(PSTR("}")); } @@ -337,6 +347,7 @@ void HAssAnnounceSwitches(void) uint8_t dual = 0; uint8_t toggle = 1; uint8_t hold = 0; + uint8_t pir = 0; if (pin[GPIO_SWT1 + switch_index] < 99) { switch_present = 1; } @@ -389,12 +400,16 @@ void HAssAnnounceSwitches(void) toggle = 0; hold = 3; break; + case 13: + case 14: + toggle = 0; + pir = 1; // Binary sensor with only ON state and automatic OFF after 1 second. } } else { switch_present = 0;} HAssAnnouncerTriggers(switch_index, switch_present, 1, toggle, hold); - HAssAnnouncerBinSensors(switch_index, switch_present, dual, toggle); + HAssAnnouncerBinSensors(switch_index, switch_present, dual, toggle, pir); } } @@ -533,6 +548,7 @@ void HAssAnnounceSensors(void) snprintf_P(sensordata, sizeof(sensordata), PSTR("%s}"), sensordata); // {"INA219":{"Voltage":4.494,"Current":0.020,"Power":0.089}} // USE THE FOLLOWING LINE TO TEST JSON //snprintf_P(sensordata, sizeof(sensordata), PSTR("{\"HX711\":{\"Weight\":[22,34,1023.4], \"Battery\":25}}")); + StaticJsonBuffer<500> jsonBuffer; JsonObject &root = jsonBuffer.parseObject(sensordata); if (!root.success()) From adbb37205b0f25a2694186e896c5e81a052dd8e9 Mon Sep 17 00:00:00 2001 From: Adrian Scillato <39969427+ascillato2@users.noreply.github.com> Date: Sat, 14 Mar 2020 18:40:07 -0300 Subject: [PATCH 29/31] Update Spanish Translation --- tasmota/language/es-ES.h | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/tasmota/language/es-ES.h b/tasmota/language/es-ES.h index 4a1bcc3ec..ee09d0928 100644 --- a/tasmota/language/es-ES.h +++ b/tasmota/language/es-ES.h @@ -513,23 +513,23 @@ #define D_TX20_WEST "O" // xsns_53_sml.ino -#define D_TPWRIN "Total-In" -#define D_TPWROUT "Total-Out" -#define D_TPWRCURR "Current-In/Out" -#define D_TPWRCURR1 "Current-In p1" -#define D_TPWRCURR2 "Current-In p2" -#define D_TPWRCURR3 "Current-In p3" -#define D_Strom_L1 "Current L1" -#define D_Strom_L2 "Current L2" -#define D_Strom_L3 "Current L3" -#define D_Spannung_L1 "Voltage L1" -#define D_Spannung_L2 "Voltage L2" -#define D_Spannung_L3 "Voltage L3" -#define D_METERNR "Meter_number" -#define D_METERSID "Service ID" -#define D_GasIN "Counter" -#define D_H2oIN "Counter" -#define D_StL1L2L3 "Current L1+L2+L3" +#define D_TPWRIN "Total de Entrada" +#define D_TPWROUT "Total de Salida" +#define D_TPWRCURR "Corriente-En/Sal" +#define D_TPWRCURR1 "Corriente-Entr p1" +#define D_TPWRCURR2 "Corriente-Entr p2" +#define D_TPWRCURR3 "Corriente-Entr p3" +#define D_Strom_L1 "Corriente L1" +#define D_Strom_L2 "Corriente L2" +#define D_Strom_L3 "Corriente L3" +#define D_Spannung_L1 "Voltaje L1" +#define D_Spannung_L2 "Voltaje L2" +#define D_Spannung_L3 "Voltaje L3" +#define D_METERNR "Número de Medidor" +#define D_METERSID "ID de Servicio" +#define D_GasIN "Contador" +#define D_H2oIN "Contador" +#define D_StL1L2L3 "Corriente L1+L2+L3" #define D_SpL1L2L3 "Voltage L1+L2+L3/3" // tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box From dbf82cf12af25cc8e277242723037f41f2efc231 Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Sun, 15 Mar 2020 11:29:32 +0100 Subject: [PATCH 30/31] Keep language files in sync --- tasmota/language/bg-BG.h | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/tasmota/language/bg-BG.h b/tasmota/language/bg-BG.h index 8b7947be1..0a1c1340b 100644 --- a/tasmota/language/bg-BG.h +++ b/tasmota/language/bg-BG.h @@ -512,6 +512,26 @@ #define D_TX20_SOUTH "Ю" #define D_TX20_WEST "З" +// xsns_53_sml.ino +#define D_TPWRIN "Total-In" +#define D_TPWROUT "Total-Out" +#define D_TPWRCURR "Current-In/Out" +#define D_TPWRCURR1 "Current-In p1" +#define D_TPWRCURR2 "Current-In p2" +#define D_TPWRCURR3 "Current-In p3" +#define D_Strom_L1 "Current L1" +#define D_Strom_L2 "Current L2" +#define D_Strom_L3 "Current L3" +#define D_Spannung_L1 "Voltage L1" +#define D_Spannung_L2 "Voltage L2" +#define D_Spannung_L3 "Voltage L3" +#define D_METERNR "Meter_number" +#define D_METERSID "Service ID" +#define D_GasIN "Counter" +#define D_H2oIN "Counter" +#define D_StL1L2L3 "Current L1+L2+L3" +#define D_SpL1L2L3 "Voltage L1+L2+L3/3" + // tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box #define D_SENSOR_NONE "Няма" #define D_SENSOR_USER "Потребит." @@ -643,26 +663,6 @@ #define D_SENSOR_CC1101_GDO2 "CC1101 GDO2" #define D_SENSOR_HRXL_RX "HRXL Rx" -// xsns_53_sml.ino -#define D_TPWRIN "Total-In" -#define D_TPWROUT "Total-Out" -#define D_TPWRCURR "Current-In/Out" -#define D_TPWRCURR1 "Current-In p1" -#define D_TPWRCURR2 "Current-In p2" -#define D_TPWRCURR3 "Current-In p3" -#define D_Strom_L1 "Current L1" -#define D_Strom_L2 "Current L2" -#define D_Strom_L3 "Current L3" -#define D_Spannung_L1 "Voltage L1" -#define D_Spannung_L2 "Voltage L2" -#define D_Spannung_L3 "Voltage L3" -#define D_METERNR "Meter_number" -#define D_METERSID "Service ID" -#define D_GasIN "Counter" -#define D_H2oIN "Counter" -#define D_StL1L2L3 "Current L1+L2+L3" -#define D_SpL1L2L3 "Voltage L1+L2+L3/3" - // Units #define D_UNIT_AMPERE "A" #define D_UNIT_CENTIMETER "cm" From 79d39af9d34aed7a9a73eb1262e145c634cf58ee Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Sun, 15 Mar 2020 11:41:24 +0100 Subject: [PATCH 31/31] Keep switchmode in sync --- tasmota/xdrv_12_home_assistant.ino | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tasmota/xdrv_12_home_assistant.ino b/tasmota/xdrv_12_home_assistant.ino index 6cebcda1d..323dd8674 100644 --- a/tasmota/xdrv_12_home_assistant.ino +++ b/tasmota/xdrv_12_home_assistant.ino @@ -378,30 +378,30 @@ void HAssAnnounceSwitches(void) uint8_t swmode = Settings.switchmode[switch_index]; switch (swmode) { - case 1: - case 2: + case FOLLOW: + case FOLLOW_INV: toggle = 0; // Binary sensor and no triggers break; - case 3: - case 4: + case PUSHBUTTON: + case PUSHBUTTON_INV: dual = 1; // Binary sensor and TOGGLE (button_short_press) trigger break; - case 5: - case 6: + case PUSHBUTTONHOLD: + case PUSHBUTTONHOLD_INV: dual = 1; // Binary sensor, TOGGLE (button_short_press) and HOLD (button_long_press) triggers hold = 2; break; - case 8: + case TOGGLEMULTI: hold = 3; // TOGGLE (button_short_press) and HOLD (button_double_press) triggers break; - case 9: - case 10: + case FOLLOWMULTI: + case FOLLOWMULTI_INV: dual = 1; // Binary sensor and HOLD (button_long_press) trigger toggle = 0; hold = 3; break; - case 13: - case 14: + case PUSHON: + case PUSHON_INV: toggle = 0; pir = 1; // Binary sensor with only ON state and automatic OFF after 1 second. }