From 03c1ff82119c8c3b4d22fcb9d2b2c9c102f3f8a1 Mon Sep 17 00:00:00 2001 From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com> Date: Sun, 15 Mar 2020 11:57:04 +0000 Subject: [PATCH 01/25] Update bg-BG.h --- tasmota/language/bg-BG.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tasmota/language/bg-BG.h b/tasmota/language/bg-BG.h index 0a1c1340b..9adc5c820 100644 --- a/tasmota/language/bg-BG.h +++ b/tasmota/language/bg-BG.h @@ -512,13 +512,13 @@ #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" +// xsns_53_sml.ino +#define D_TPWRIN "Energy Total-In" +#define D_TPWROUT "Energy Total-Out" +#define D_TPWRCURR "Active Power-In/Out" +#define D_TPWRCURR1 "Active Power-In p1" +#define D_TPWRCURR2 "Active Power-In p2" +#define D_TPWRCURR3 "Active Power-In p3" #define D_Strom_L1 "Current L1" #define D_Strom_L2 "Current L2" #define D_Strom_L3 "Current L3" From b6b40532a60d0d7ebd8ef3496cff5909ca4a75ff Mon Sep 17 00:00:00 2001 From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com> Date: Sun, 15 Mar 2020 11:57:24 +0000 Subject: [PATCH 02/25] Update cs-CZ.h --- tasmota/language/cs-CZ.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tasmota/language/cs-CZ.h b/tasmota/language/cs-CZ.h index f9674fca3..94e58067f 100644 --- a/tasmota/language/cs-CZ.h +++ b/tasmota/language/cs-CZ.h @@ -513,12 +513,12 @@ #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_TPWRIN "Energy Total-In" +#define D_TPWROUT "Energy Total-Out" +#define D_TPWRCURR "Active Power-In/Out" +#define D_TPWRCURR1 "Active Power-In p1" +#define D_TPWRCURR2 "Active Power-In p2" +#define D_TPWRCURR3 "Active Power-In p3" #define D_Strom_L1 "Current L1" #define D_Strom_L2 "Current L2" #define D_Strom_L3 "Current L3" From b7e19652ba6dd04344e4d63ffe523ef23586d99f Mon Sep 17 00:00:00 2001 From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com> Date: Sun, 15 Mar 2020 11:58:08 +0000 Subject: [PATCH 03/25] Update el-GR.h --- tasmota/language/el-GR.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tasmota/language/el-GR.h b/tasmota/language/el-GR.h index 5cd99ee6c..acb1cedd8 100644 --- a/tasmota/language/el-GR.h +++ b/tasmota/language/el-GR.h @@ -513,12 +513,12 @@ #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_TPWRIN "Energy Total-In" +#define D_TPWROUT "Energy Total-Out" +#define D_TPWRCURR "Active Power-In/Out" +#define D_TPWRCURR1 "Active Power-In p1" +#define D_TPWRCURR2 "Active Power-In p2" +#define D_TPWRCURR3 "Active Power-In p3" #define D_Strom_L1 "Current L1" #define D_Strom_L2 "Current L2" #define D_Strom_L3 "Current L3" From 55f62c3abb2f263bad39c6aad5341ac5678f99c3 Mon Sep 17 00:00:00 2001 From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com> Date: Sun, 15 Mar 2020 11:58:21 +0000 Subject: [PATCH 04/25] Update fr-FR.h --- tasmota/language/fr-FR.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tasmota/language/fr-FR.h b/tasmota/language/fr-FR.h index 01081312f..8eea225ad 100644 --- a/tasmota/language/fr-FR.h +++ b/tasmota/language/fr-FR.h @@ -513,12 +513,12 @@ #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_TPWRIN "Energy Total-In" +#define D_TPWROUT "Energy Total-Out" +#define D_TPWRCURR "Active Power-In/Out" +#define D_TPWRCURR1 "Active Power-In p1" +#define D_TPWRCURR2 "Active Power-In p2" +#define D_TPWRCURR3 "Active Power-In p3" #define D_Strom_L1 "Current L1" #define D_Strom_L2 "Current L2" #define D_Strom_L3 "Current L3" From 8d52ff44e62fea7872c289ebe5773f9b4ce5f950 Mon Sep 17 00:00:00 2001 From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com> Date: Sun, 15 Mar 2020 11:58:37 +0000 Subject: [PATCH 05/25] Update he-HE.h --- tasmota/language/he-HE.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tasmota/language/he-HE.h b/tasmota/language/he-HE.h index 46f52a72d..5463f6ba1 100644 --- a/tasmota/language/he-HE.h +++ b/tasmota/language/he-HE.h @@ -513,12 +513,12 @@ #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_TPWRIN "Energy Total-In" +#define D_TPWROUT "Energy Total-Out" +#define D_TPWRCURR "Active Power-In/Out" +#define D_TPWRCURR1 "Active Power-In p1" +#define D_TPWRCURR2 "Active Power-In p2" +#define D_TPWRCURR3 "Active Power-In p3" #define D_Strom_L1 "Current L1" #define D_Strom_L2 "Current L2" #define D_Strom_L3 "Current L3" From cdfac65671746c519b37fe24f83bc178c5cc99fb Mon Sep 17 00:00:00 2001 From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com> Date: Sun, 15 Mar 2020 11:58:50 +0000 Subject: [PATCH 06/25] Update hu-HU.h --- tasmota/language/hu-HU.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tasmota/language/hu-HU.h b/tasmota/language/hu-HU.h index 5f3e29e35..16762b19a 100644 --- a/tasmota/language/hu-HU.h +++ b/tasmota/language/hu-HU.h @@ -513,12 +513,12 @@ #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_TPWRIN "Energy Total-In" +#define D_TPWROUT "Energy Total-Out" +#define D_TPWRCURR "Active Power-In/Out" +#define D_TPWRCURR1 "Active Power-In p1" +#define D_TPWRCURR2 "Active Power-In p2" +#define D_TPWRCURR3 "Active Power-In p3" #define D_Strom_L1 "Current L1" #define D_Strom_L2 "Current L2" #define D_Strom_L3 "Current L3" From a01ee95af1d0a6d908a0b2d678380fec78af5d95 Mon Sep 17 00:00:00 2001 From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com> Date: Sun, 15 Mar 2020 11:59:03 +0000 Subject: [PATCH 07/25] Update it-IT.h --- tasmota/language/it-IT.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tasmota/language/it-IT.h b/tasmota/language/it-IT.h index 2a5e1d565..1c13a8679 100644 --- a/tasmota/language/it-IT.h +++ b/tasmota/language/it-IT.h @@ -513,12 +513,12 @@ #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_TPWRIN "Energy Total-In" +#define D_TPWROUT "Energy Total-Out" +#define D_TPWRCURR "Active Power-In/Out" +#define D_TPWRCURR1 "Active Power-In p1" +#define D_TPWRCURR2 "Active Power-In p2" +#define D_TPWRCURR3 "Active Power-In p3" #define D_Strom_L1 "Current L1" #define D_Strom_L2 "Current L2" #define D_Strom_L3 "Current L3" From 84292ff3d258a7685d74592b595dd4f628467d71 Mon Sep 17 00:00:00 2001 From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com> Date: Sun, 15 Mar 2020 11:59:24 +0000 Subject: [PATCH 08/25] Update ko-KO.h --- tasmota/language/ko-KO.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tasmota/language/ko-KO.h b/tasmota/language/ko-KO.h index f650bf93a..e586f70a8 100644 --- a/tasmota/language/ko-KO.h +++ b/tasmota/language/ko-KO.h @@ -513,12 +513,12 @@ #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_TPWRIN "Energy Total-In" +#define D_TPWROUT "Energy Total-Out" +#define D_TPWRCURR "Active Power-In/Out" +#define D_TPWRCURR1 "Active Power-In p1" +#define D_TPWRCURR2 "Active Power-In p2" +#define D_TPWRCURR3 "Active Power-In p3" #define D_Strom_L1 "Current L1" #define D_Strom_L2 "Current L2" #define D_Strom_L3 "Current L3" From a68339e7202360448f6d7bdcf8ad7cef78e02b9b Mon Sep 17 00:00:00 2001 From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com> Date: Sun, 15 Mar 2020 11:59:41 +0000 Subject: [PATCH 09/25] Update nl-NL.h --- tasmota/language/nl-NL.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tasmota/language/nl-NL.h b/tasmota/language/nl-NL.h index f2c23af78..c97c0d3cc 100644 --- a/tasmota/language/nl-NL.h +++ b/tasmota/language/nl-NL.h @@ -513,12 +513,12 @@ #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_TPWRIN "Energy Total-In" +#define D_TPWROUT "Energy Total-Out" +#define D_TPWRCURR "Active Power-In/Out" +#define D_TPWRCURR1 "Active Power-In p1" +#define D_TPWRCURR2 "Active Power-In p2" +#define D_TPWRCURR3 "Active Power-In p3" #define D_Strom_L1 "Current L1" #define D_Strom_L2 "Current L2" #define D_Strom_L3 "Current L3" From 7b3b0bf0ac99a11715646650c97da01b41a01dc7 Mon Sep 17 00:00:00 2001 From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com> Date: Sun, 15 Mar 2020 11:59:53 +0000 Subject: [PATCH 10/25] Update pl-PL.h --- tasmota/language/pl-PL.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tasmota/language/pl-PL.h b/tasmota/language/pl-PL.h index 2ca5a08c5..ce1926694 100644 --- a/tasmota/language/pl-PL.h +++ b/tasmota/language/pl-PL.h @@ -513,12 +513,12 @@ #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_TPWRIN "Energy Total-In" +#define D_TPWROUT "Energy Total-Out" +#define D_TPWRCURR "Active Power-In/Out" +#define D_TPWRCURR1 "Active Power-In p1" +#define D_TPWRCURR2 "Active Power-In p2" +#define D_TPWRCURR3 "Active Power-In p3" #define D_Strom_L1 "Current L1" #define D_Strom_L2 "Current L2" #define D_Strom_L3 "Current L3" From 52df47dd4495e25a4c76c04b1c15b2ecab11d32a Mon Sep 17 00:00:00 2001 From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com> Date: Sun, 15 Mar 2020 12:00:04 +0000 Subject: [PATCH 11/25] Update pt-BR.h --- tasmota/language/pt-BR.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tasmota/language/pt-BR.h b/tasmota/language/pt-BR.h index 6b97ae380..880057472 100644 --- a/tasmota/language/pt-BR.h +++ b/tasmota/language/pt-BR.h @@ -513,12 +513,12 @@ #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_TPWRIN "Energy Total-In" +#define D_TPWROUT "Energy Total-Out" +#define D_TPWRCURR "Active Power-In/Out" +#define D_TPWRCURR1 "Active Power-In p1" +#define D_TPWRCURR2 "Active Power-In p2" +#define D_TPWRCURR3 "Active Power-In p3" #define D_Strom_L1 "Current L1" #define D_Strom_L2 "Current L2" #define D_Strom_L3 "Current L3" From 600d4921c5776feff42ffbc607d751caa7df89f7 Mon Sep 17 00:00:00 2001 From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com> Date: Sun, 15 Mar 2020 12:00:16 +0000 Subject: [PATCH 12/25] Update ro-RO.h --- tasmota/language/ro-RO.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tasmota/language/ro-RO.h b/tasmota/language/ro-RO.h index 3c1a79b3b..2d010317d 100644 --- a/tasmota/language/ro-RO.h +++ b/tasmota/language/ro-RO.h @@ -513,12 +513,12 @@ #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_TPWRIN "Energy Total-In" +#define D_TPWROUT "Energy Total-Out" +#define D_TPWRCURR "Active Power-In/Out" +#define D_TPWRCURR1 "Active Power-In p1" +#define D_TPWRCURR2 "Active Power-In p2" +#define D_TPWRCURR3 "Active Power-In p3" #define D_Strom_L1 "Current L1" #define D_Strom_L2 "Current L2" #define D_Strom_L3 "Current L3" From 60ea3e342f41058d9aa3d081931ff0b1d1b0f04c Mon Sep 17 00:00:00 2001 From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com> Date: Sun, 15 Mar 2020 12:00:31 +0000 Subject: [PATCH 13/25] Update ru-RU.h --- tasmota/language/ru-RU.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tasmota/language/ru-RU.h b/tasmota/language/ru-RU.h index d23b699b1..1e2de831f 100644 --- a/tasmota/language/ru-RU.h +++ b/tasmota/language/ru-RU.h @@ -513,12 +513,12 @@ #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_TPWRIN "Energy Total-In" +#define D_TPWROUT "Energy Total-Out" +#define D_TPWRCURR "Active Power-In/Out" +#define D_TPWRCURR1 "Active Power-In p1" +#define D_TPWRCURR2 "Active Power-In p2" +#define D_TPWRCURR3 "Active Power-In p3" #define D_Strom_L1 "Current L1" #define D_Strom_L2 "Current L2" #define D_Strom_L3 "Current L3" From ac54afa69a82605d7389ceb129e13ba845e34cdd Mon Sep 17 00:00:00 2001 From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com> Date: Sun, 15 Mar 2020 12:00:48 +0000 Subject: [PATCH 14/25] Update sk-SK.h --- tasmota/language/sk-SK.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tasmota/language/sk-SK.h b/tasmota/language/sk-SK.h index b5f5cf01e..54391e41f 100644 --- a/tasmota/language/sk-SK.h +++ b/tasmota/language/sk-SK.h @@ -513,12 +513,12 @@ #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_TPWRIN "Energy Total-In" +#define D_TPWROUT "Energy Total-Out" +#define D_TPWRCURR "Active Power-In/Out" +#define D_TPWRCURR1 "Active Power-In p1" +#define D_TPWRCURR2 "Active Power-In p2" +#define D_TPWRCURR3 "Active Power-In p3" #define D_Strom_L1 "Current L1" #define D_Strom_L2 "Current L2" #define D_Strom_L3 "Current L3" From a4cf1e89edeb609440ea23f13d253933cd51e065 Mon Sep 17 00:00:00 2001 From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com> Date: Sun, 15 Mar 2020 12:01:06 +0000 Subject: [PATCH 15/25] Update sv-SE.h --- tasmota/language/sv-SE.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tasmota/language/sv-SE.h b/tasmota/language/sv-SE.h index 713864440..490636206 100644 --- a/tasmota/language/sv-SE.h +++ b/tasmota/language/sv-SE.h @@ -513,12 +513,12 @@ #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_TPWRIN "Energy Total-In" +#define D_TPWROUT "Energy Total-Out" +#define D_TPWRCURR "Active Power-In/Out" +#define D_TPWRCURR1 "Active Power-In p1" +#define D_TPWRCURR2 "Active Power-In p2" +#define D_TPWRCURR3 "Active Power-In p3" #define D_Strom_L1 "Current L1" #define D_Strom_L2 "Current L2" #define D_Strom_L3 "Current L3" From 8c124a32bd07f70fdc2ad401a742aba8d48d8904 Mon Sep 17 00:00:00 2001 From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com> Date: Sun, 15 Mar 2020 12:01:27 +0000 Subject: [PATCH 16/25] Update tr-TR.h --- tasmota/language/tr-TR.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tasmota/language/tr-TR.h b/tasmota/language/tr-TR.h index d486d52c1..16d3e8a80 100644 --- a/tasmota/language/tr-TR.h +++ b/tasmota/language/tr-TR.h @@ -513,12 +513,12 @@ #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_TPWRIN "Energy Total-In" +#define D_TPWROUT "Energy Total-Out" +#define D_TPWRCURR "Active Power-In/Out" +#define D_TPWRCURR1 "Active Power-In p1" +#define D_TPWRCURR2 "Active Power-In p2" +#define D_TPWRCURR3 "Active Power-In p3" #define D_Strom_L1 "Current L1" #define D_Strom_L2 "Current L2" #define D_Strom_L3 "Current L3" From 0ce12f3fa2e08351ef0a99c723a204ba9bc7c244 Mon Sep 17 00:00:00 2001 From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com> Date: Sun, 15 Mar 2020 12:01:57 +0000 Subject: [PATCH 17/25] Update uk-UA.h --- tasmota/language/uk-UA.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tasmota/language/uk-UA.h b/tasmota/language/uk-UA.h index f0eef8d01..a9bfd503f 100644 --- a/tasmota/language/uk-UA.h +++ b/tasmota/language/uk-UA.h @@ -513,12 +513,12 @@ #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_TPWRIN "Energy Total-In" +#define D_TPWROUT "Energy Total-Out" +#define D_TPWRCURR "Active Power-In/Out" +#define D_TPWRCURR1 "Active Power-In p1" +#define D_TPWRCURR2 "Active Power-In p2" +#define D_TPWRCURR3 "Active Power-In p3" #define D_Strom_L1 "Current L1" #define D_Strom_L2 "Current L2" #define D_Strom_L3 "Current L3" From 30f59e3a8f1317d02a98bb7db948698cc4106e7d Mon Sep 17 00:00:00 2001 From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com> Date: Sun, 15 Mar 2020 12:02:14 +0000 Subject: [PATCH 18/25] Update zh-CN.h --- tasmota/language/zh-CN.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tasmota/language/zh-CN.h b/tasmota/language/zh-CN.h index cefa902ff..bd424d921 100644 --- a/tasmota/language/zh-CN.h +++ b/tasmota/language/zh-CN.h @@ -513,12 +513,12 @@ #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_TPWRIN "Energy Total-In" +#define D_TPWROUT "Energy Total-Out" +#define D_TPWRCURR "Active Power-In/Out" +#define D_TPWRCURR1 "Active Power-In p1" +#define D_TPWRCURR2 "Active Power-In p2" +#define D_TPWRCURR3 "Active Power-In p3" #define D_Strom_L1 "Current L1" #define D_Strom_L2 "Current L2" #define D_Strom_L3 "Current L3" From 7fcfbdb61c3465b45b2e5e8033aa4282d7c15913 Mon Sep 17 00:00:00 2001 From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com> Date: Sun, 15 Mar 2020 12:02:27 +0000 Subject: [PATCH 19/25] Update zh-TW.h --- tasmota/language/zh-TW.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tasmota/language/zh-TW.h b/tasmota/language/zh-TW.h index c366b4653..04bcea868 100644 --- a/tasmota/language/zh-TW.h +++ b/tasmota/language/zh-TW.h @@ -513,12 +513,12 @@ #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_TPWRIN "Energy Total-In" +#define D_TPWROUT "Energy Total-Out" +#define D_TPWRCURR "Active Power-In/Out" +#define D_TPWRCURR1 "Active Power-In p1" +#define D_TPWRCURR2 "Active Power-In p2" +#define D_TPWRCURR3 "Active Power-In p3" #define D_Strom_L1 "Current L1" #define D_Strom_L2 "Current L2" #define D_Strom_L3 "Current L3" From 60c42433c60beea434ffdf96add73316a356fdf8 Mon Sep 17 00:00:00 2001 From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com> Date: Sun, 15 Mar 2020 12:04:07 +0000 Subject: [PATCH 20/25] Update pt-PT.h --- tasmota/language/pt-PT.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tasmota/language/pt-PT.h b/tasmota/language/pt-PT.h index ddaf0692f..2648198ef 100644 --- a/tasmota/language/pt-PT.h +++ b/tasmota/language/pt-PT.h @@ -513,12 +513,12 @@ #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_TPWRIN "Energia-Consumo" +#define D_TPWROUT "Energia-Geração" +#define D_TPWRCURR "Potência Ativa-Consumo/Geração" +#define D_TPWRCURR1 "Potência Ativa-Consumo F1" +#define D_TPWRCURR2 "Potência Ativa-Consumo F2" +#define D_TPWRCURR3 "Potência Ativa-Consumo F3" #define D_Strom_L1 "Corrente F1" #define D_Strom_L2 "Corrente F2" #define D_Strom_L3 "Corrente F3" @@ -527,8 +527,8 @@ #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_GasIN "Contagem" +#define D_H2oIN "Contagem" #define D_StL1L2L3 "Corrente F1+F2+F3" #define D_SpL1L2L3 "Tensão F1+F2+F3/3" From 25dc3aa732b409f2872a764e2f5ca35bbbcc6d15 Mon Sep 17 00:00:00 2001 From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com> Date: Sun, 15 Mar 2020 12:05:47 +0000 Subject: [PATCH 21/25] Correting dimensions from KWh to kWh --- tasmota/xsns_53_sml.ino | 82 ++++++++++++++++++++--------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/tasmota/xsns_53_sml.ino b/tasmota/xsns_53_sml.ino index feb634bf0..53e6fff25 100755 --- a/tasmota/xsns_53_sml.ino +++ b/tasmota/xsns_53_sml.ino @@ -113,8 +113,8 @@ struct METER_DESC { struct METER_DESC const meter_desc[METERS_USED]={ [0]={3,'o',0,SML_BAUDRATE,"OBIS",-1,1,0}}; const uint8_t meter[]= -"1,1-0:1.8.0*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|" -"1,1-0:2.8.0*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|" +"1,1-0:1.8.0*255(@1," D_TPWRIN ",kWh," DJ_TPWRIN ",4|" +"1,1-0:2.8.0*255(@1," D_TPWROUT ",kWh," DJ_TPWROUT ",4|" "1,1-0:21.7.0*255(@1," D_TPWRCURR1 ",W," DJ_TPWRCURR1 ",0|" "1,1-0:41.7.0*255(@1," D_TPWRCURR2 ",W," DJ_TPWRCURR2 ",0|" "1,1-0:61.7.0*255(@1," D_TPWRCURR3 ",W," DJ_TPWRCURR3 ",0|" @@ -131,8 +131,8 @@ const uint8_t meter[]= struct METER_DESC const meter_desc[METERS_USED]={ [0]={3,'o',0,SML_BAUDRATE,"OBIS",-1,1,0}}; const uint8_t meter[]= -"1,1-0:1.8.1*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|" -"1,1-0:2.8.1*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|" +"1,1-0:1.8.1*255(@1," D_TPWRIN ",kWh," DJ_TPWRIN ",4|" +"1,1-0:2.8.1*255(@1," D_TPWROUT ",kWh," DJ_TPWROUT ",4|" "1,=d 2 10 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|" "1,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0"; #endif @@ -147,9 +147,9 @@ struct METER_DESC const meter_desc[METERS_USED]={ // 2 Richtungszähler EHZ SML 8 bit 9600 baud, binär const uint8_t meter[]= //0x77,0x07,0x01,0x00,0x01,0x08,0x00,0xff -"1,77070100010800ff@1000," D_TPWRIN ",KWh," DJ_TPWRIN ",4|" +"1,77070100010800ff@1000," D_TPWRIN ",kWh," DJ_TPWRIN ",4|" //0x77,0x07,0x01,0x00,0x02,0x08,0x00,0xff -"1,77070100020800ff@1000," D_TPWROUT ",KWh," DJ_TPWROUT ",4|" +"1,77070100020800ff@1000," D_TPWROUT ",kWh," DJ_TPWROUT ",4|" //0x77,0x07,0x01,0x00,0x10,0x07,0x00,0xff "1,77070100100700ff@1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|" //0x77,0x07,0x01,0x00,0x00,0x00,0x09,0xff @@ -167,9 +167,9 @@ struct METER_DESC const meter_desc[METERS_USED]={ // verbrauch total const uint8_t meter[]= //0x77,0x07,0x01,0x00,0x01,0x08,0x00,0xff -"1,77070100010800ff@1000," D_TPWRIN ",KWh," DJ_TPWRIN ",4|" +"1,77070100010800ff@1000," D_TPWRIN ",kWh," DJ_TPWRIN ",4|" //0x77,0x07,0x01,0x00,0x01,0x08,0x01,0xff -"1,77070100020800ff@1000," D_TPWROUT ",KWh," DJ_TPWROUT ",4|" +"1,77070100020800ff@1000," D_TPWROUT ",kWh," DJ_TPWROUT ",4|" //0x77,0x07,0x01,0x00,0x0f,0x07,0x00,0xff "1,770701000f0700ff@1," D_TPWRCURR ",W," DJ_TPWRCURR ",0"; #endif @@ -185,9 +185,9 @@ struct METER_DESC const meter_desc[METERS_USED]={ // verbrauch total const uint8_t meter[]= //0x77,0x07,0x01,0x00,0x01,0x08,0x00,0xff -"1,77070100010800ff@1000," D_TPWRIN ",KWh," DJ_TPWRIN ",4|" +"1,77070100010800ff@1000," D_TPWRIN ",kWh," DJ_TPWRIN ",4|" //0x77,0x07,0x01,0x00,0x01,0x08,0x01,0xff -"1,77070100020801ff@1000," D_TPWROUT ",KWh," DJ_TPWROUT ",4|" +"1,77070100020801ff@1000," D_TPWROUT ",kWh," DJ_TPWROUT ",4|" //0x77,0x07,0x01,0x00,0x0f,0x07,0x00,0xff "1,770701000f0700ff@1," D_TPWRCURR ",W," DJ_TPWRCURR ",0"; #endif @@ -199,13 +199,13 @@ struct METER_DESC const meter_desc[METERS_USED]={ [0]={3,'s',0,SML_BAUDRATE,"strom",-1,1,0}}; const uint8_t meter[]= //0x77,0x07,0x01,0x00,0x01,0x08,0x00,0xff -"1,77070100010800ff@1000," D_TPWRIN ",KWh," DJ_TPWRIN ",4|" +"1,77070100010800ff@1000," D_TPWRIN ",kWh," DJ_TPWRIN ",4|" // .. -"1,77070100020800ff@1000," D_TPWROUT ",KWh," DJ_TPWROUT ",4|" +"1,77070100020800ff@1000," D_TPWROUT ",kWh," DJ_TPWROUT ",4|" //0x77,0x07,0x01,0x00,0x01,0x08,0x01,0xff -"1,77070100010801ff@1000," D_TPWRCURR1 ",KWh," DJ_TPWRCURR1 ",4|" +"1,77070100010801ff@1000," D_TPWRCURR1 ",kWh," DJ_TPWRCURR1 ",4|" //0x77,0x07,0x01,0x00,0x01,0x08,0x02,0xff -"1,77070100010802ff@1000," D_TPWRCURR2 ",KWh," DJ_TPWRCURR2 ",4|" +"1,77070100010802ff@1000," D_TPWRCURR2 ",kWh," DJ_TPWRCURR2 ",4|" // 77 07 01 00 10 07 00 FF "1,77070100100700ff@1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|" // .. @@ -222,9 +222,9 @@ struct METER_DESC const meter_desc[METERS_USED]={ [0]={3,'s',0,SML_BAUDRATE,"SML",-1,1,0}}; const uint8_t meter[]= //0x77,0x07,0x01,0x00,0x01,0x08,0x01,0xff -"1,77070100010800ff@1000," D_TPWRIN ",KWh," DJ_TPWRIN ",4|" +"1,77070100010800ff@1000," D_TPWRIN ",kWh," DJ_TPWRIN ",4|" //0x77,0x07,0x01,0x00,0x02,0x08,0x01,0xff -"1,77070100020801ff@1000," D_TPWROUT ",KWh," DJ_TPWROUT ",4|" +"1,77070100020801ff@1000," D_TPWROUT ",kWh," DJ_TPWROUT ",4|" //0x77,0x07,0x01,0x00,0x01,0x07,0x00,0xff "1,77070100010700ff@1," D_TPWRCURR ",W," DJ_TPWRCURR ",0"; #endif @@ -241,18 +241,18 @@ struct METER_DESC const meter_desc[METERS_USED]={ // 3 Zähler definiert const uint8_t meter[]= -"1,1-0:1.8.0*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|" -"1,1-0:2.8.0*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|" +"1,1-0:1.8.0*255(@1," D_TPWRIN ",kWh," DJ_TPWRIN ",4|" +"1,1-0:2.8.0*255(@1," D_TPWROUT ",kWh," DJ_TPWROUT ",4|" "1,1-0:21.7.0*255(@1," D_TPWRCURR1 ",W," DJ_TPWRCURR1 ",0|" "1,1-0:41.7.0*255(@1," D_TPWRCURR2 ",W," DJ_TPWRCURR2 ",0|" "1,1-0:61.7.0*255(@1," D_TPWRCURR3 ",W," DJ_TPWRCURR3 ",0|" "1,=m 3+4+5 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|" "1,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0|" -"2,77070100010800ff@1000," D_TPWRIN ",KWh," DJ_TPWRIN ",4|" -"2,77070100020800ff@1000," D_TPWROUT ",KWh," DJ_TPWROUT ",4|" +"2,77070100010800ff@1000," D_TPWRIN ",kWh," DJ_TPWRIN ",4|" +"2,77070100020800ff@1000," D_TPWROUT ",kWh," DJ_TPWROUT ",4|" "2,77070100100700ff@1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|" -"3,1-0:1.8.1*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|" -"3,1-0:2.8.1*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|" +"3,1-0:1.8.1*255(@1," D_TPWRIN ",kWh," DJ_TPWRIN ",4|" +"3,1-0:2.8.1*255(@1," D_TPWROUT ",kWh," DJ_TPWROUT ",4|" "3,=d 2 10 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|" "3,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0"; @@ -269,13 +269,13 @@ struct METER_DESC const meter_desc[METERS_USED]={ // 2 Zähler definiert const uint8_t meter[]= -"1,1-0:1.8.1*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|" -"1,1-0:2.8.1*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|" +"1,1-0:1.8.1*255(@1," D_TPWRIN ",kWh," DJ_TPWRIN ",4|" +"1,1-0:2.8.1*255(@1," D_TPWROUT ",kWh," DJ_TPWROUT ",4|" "1,=d 2 10 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|" "1,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0|" -"2,1-0:1.8.1*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|" -"2,1-0:2.8.1*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|" +"2,1-0:1.8.1*255(@1," D_TPWRIN ",kWh," DJ_TPWRIN ",4|" +"2,1-0:2.8.1*255(@1," D_TPWROUT ",kWh," DJ_TPWROUT ",4|" "2,=d 6 10 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|" "2,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0"; @@ -293,18 +293,18 @@ struct METER_DESC const meter_desc[METERS_USED]={ // 3 Zähler definiert const uint8_t meter[]= "1,=h --- Zähler Nr 1 ---|" -"1,1-0:1.8.1*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|" -"1,1-0:2.8.1*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|" +"1,1-0:1.8.1*255(@1," D_TPWRIN ",kWh," DJ_TPWRIN ",4|" +"1,1-0:2.8.1*255(@1," D_TPWROUT ",kWh," DJ_TPWROUT ",4|" "1,=d 2 10 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|" "1,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0|" "2,=h --- Zähler Nr 2 ---|" -"2,1-0:1.8.1*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|" -"2,1-0:2.8.1*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|" +"2,1-0:1.8.1*255(@1," D_TPWRIN ",kWh," DJ_TPWRIN ",4|" +"2,1-0:2.8.1*255(@1," D_TPWROUT ",kWh," DJ_TPWROUT ",4|" "2,=d 6 10 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|" "2,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0|" "3,=h --- Zähler Nr 3 ---|" -"3,1-0:1.8.1*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|" -"3,1-0:2.8.1*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|" +"3,1-0:1.8.1*255(@1," D_TPWRIN ",kWh," DJ_TPWRIN ",4|" +"3,1-0:2.8.1*255(@1," D_TPWROUT ",kWh," DJ_TPWROUT ",4|" "3,=d 10 10 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|" "3,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0"; @@ -318,7 +318,7 @@ const uint8_t meter[]= struct METER_DESC const meter_desc[METERS_USED]={ [0]={3,'o',0,SML_BAUDRATE,"OBIS",-1,1,0}}; const uint8_t meter[]= -"1,1-0:1.8.1*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|" +"1,1-0:1.8.1*255(@1," D_TPWRIN ",kWh," DJ_TPWRIN ",4|" "1,=d 1 10 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|" "1,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0"; #endif @@ -333,13 +333,13 @@ struct METER_DESC const meter_desc[METERS_USED]={ // 2 direction meter EHZ SML 8 bit 9600 baud, binary const uint8_t meter[]= //0x77,0x07,0x01,0x00,0x01,0x08,0x00,0xff -"1,77070100010800ff@1000," D_TPWRIN ",KWh," DJ_TPWRIN ",4|" +"1,77070100010800ff@1000," D_TPWRIN ",kWh," DJ_TPWRIN ",4|" //0x77,0x07,0x01,0x00,0x02,0x08,0x00,0xff -"1,77070100020800ff@1000," D_TPWROUT ",KWh," DJ_TPWROUT ",4|" +"1,77070100020800ff@1000," D_TPWROUT ",kWh," DJ_TPWROUT ",4|" //0x77,0x07,0x01,0x00,0x01,0x08,0x01,0xff -"1,77070100010801ff@1000," D_TPWRCURR1 ",KWh," DJ_TPWRCURR1 ",4|" +"1,77070100010801ff@1000," D_TPWRCURR1 ",kWh," DJ_TPWRCURR1 ",4|" //0x77,0x07,0x01,0x00,0x01,0x08,0x02,0xff -"1,77070100010802ff@1000," D_TPWRCURR2 ",KWh," DJ_TPWRCURR2 ",4|" +"1,77070100010802ff@1000," D_TPWRCURR2 ",kWh," DJ_TPWRCURR2 ",4|" //0x77,0x07,0x01,0x00,0x10,0x07,0x00,0xff "1,77070100100700ff@1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|" //0x77,0x07,0x01,0x00,0x00,0x00,0x09,0xff @@ -357,8 +357,8 @@ struct METER_DESC const meter_desc[METERS_USED]={ // 3 meters defined const uint8_t meter[]= -"1,1-0:1.8.1*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|" -"1,1-0:2.8.1*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|" +"1,1-0:1.8.1*255(@1," D_TPWRIN ",kWh," DJ_TPWRIN ",4|" +"1,1-0:2.8.1*255(@1," D_TPWROUT ",kWh," DJ_TPWROUT ",4|" "1,=d 2 10 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|" "1,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0|" @@ -389,7 +389,7 @@ const uint8_t meter[]= //----------------------------Stromzähler-EHZ363W5--sensor53 d0---------------------------- "3,=h==================|" //0x77,0x07,0x01,0x00,0x01,0x08,0x00,0xff -"3,77070100010800ff@1000," D_TPWRIN ",KWh," DJ_TPWRIN ",3|" // 3 Zählerstand Total +"3,77070100010800ff@1000," D_TPWRIN ",kWh," DJ_TPWRIN ",3|" // 3 Zählerstand Total "3,=h==================|" //0x77,0x07,0x01,0x00,0x10,0x07,0x00,0xff "3,77070100100700ff@1," D_TPWRCURR ",W," DJ_TPWRCURR ",2|" // 4 Aktuelle Leistung @@ -1548,7 +1548,7 @@ nextsect: } } -//"1-0:1.8.0*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|" +//"1-0:1.8.0*255(@1," D_TPWRIN ",kWh," DJ_TPWRIN ",4|" void SML_Immediate_MQTT(const char *mp,uint8_t index,uint8_t mindex) { char tpowstr[32]; char jname[24]; From 6080cde23e356f66458468494222091745a1e6f1 Mon Sep 17 00:00:00 2001 From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com> Date: Sun, 15 Mar 2020 12:10:24 +0000 Subject: [PATCH 22/25] Update es-ES.h --- tasmota/language/es-ES.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tasmota/language/es-ES.h b/tasmota/language/es-ES.h index ee09d0928..3f1c1c934 100644 --- a/tasmota/language/es-ES.h +++ b/tasmota/language/es-ES.h @@ -513,12 +513,12 @@ #define D_TX20_WEST "O" // xsns_53_sml.ino -#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_TPWRIN "Energía Total-Entrada" +#define D_TPWROUT "Energía Total-Salida" +#define D_TPWRCURR "Potencia-En/Sal" +#define D_TPWRCURR1 "Potencia-Entr p1" +#define D_TPWRCURR2 "Potencia-Entr p2" +#define D_TPWRCURR3 "Potencia-Entr p3" #define D_Strom_L1 "Corriente L1" #define D_Strom_L2 "Corriente L2" #define D_Strom_L3 "Corriente L3" @@ -530,7 +530,7 @@ #define D_GasIN "Contador" #define D_H2oIN "Contador" #define D_StL1L2L3 "Corriente L1+L2+L3" -#define D_SpL1L2L3 "Voltage L1+L2+L3/3" +#define D_SpL1L2L3 "Voltaje 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" From 566bc47af4eb96cf6b6fbc45313752c77afdf5f5 Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Mon, 16 Mar 2020 16:52:22 +0100 Subject: [PATCH 23/25] Add Dewpoint to Temp/Hum sensors Prt. 1 - Add Dewpoint to Temp/Hum sensors Prt. 1 - Update AHT10 driver (#7930) --- tasmota/i18n.h | 3 + tasmota/language/bg-BG.h | 3 +- tasmota/language/cs-CZ.h | 3 +- tasmota/language/de-DE.h | 3 +- tasmota/language/el-GR.h | 3 +- tasmota/language/en-GB.h | 3 +- tasmota/language/es-ES.h | 3 +- tasmota/language/fr-FR.h | 3 +- tasmota/language/he-HE.h | 3 +- tasmota/language/hu-HU.h | 3 +- tasmota/language/it-IT.h | 3 +- tasmota/language/ko-KO.h | 3 +- tasmota/language/nl-NL.h | 3 +- tasmota/language/pl-PL.h | 3 +- tasmota/language/pt-BR.h | 3 +- tasmota/language/pt-PT.h | 5 +- tasmota/language/ro-RO.h | 3 +- tasmota/language/ru-RU.h | 3 +- tasmota/language/sk-SK.h | 3 +- tasmota/language/sv-SE.h | 3 +- tasmota/language/tr-TR.h | 3 +- tasmota/language/uk-UA.h | 3 +- tasmota/language/zh-CN.h | 3 +- tasmota/language/zh-TW.h | 3 +- tasmota/support.ino | 18 +++ tasmota/support_tasmota.ino | 32 +++++ tasmota/xsns_06_dht.ino | 9 +- tasmota/xsns_07_sht1x.ino | 9 +- tasmota/xsns_08_htu21.ino | 9 +- tasmota/xsns_14_sht3x.ino | 15 +- tasmota/xsns_55_hih_series.ino | 9 +- tasmota/xsns_63_aht1x.ino | 254 ++++++++++++++++++++------------- 32 files changed, 297 insertions(+), 132 deletions(-) diff --git a/tasmota/i18n.h b/tasmota/i18n.h index 7b6d50fe1..580f68d5d 100644 --- a/tasmota/i18n.h +++ b/tasmota/i18n.h @@ -52,6 +52,7 @@ #define D_JSON_CURRENT "Current" // As in Voltage and Current #define D_JSON_DARKNESS "Darkness" #define D_JSON_DATA "Data" +#define D_JSON_DEWPOINT "DewPoint" #define D_JSON_DISTANCE "Distance" #define D_JSON_DNSSERVER "DNSServer" #define D_JSON_DONE "Done" @@ -631,6 +632,7 @@ const char S_JSON_DRIVER_INDEX_SVALUE[] PROGMEM = "{\"" D_CMND_DRIVE const char JSON_SNS_TEMP[] PROGMEM = ",\"%s\":{\"" D_JSON_TEMPERATURE "\":%s}"; const char JSON_SNS_TEMPHUM[] PROGMEM = ",\"%s\":{\"" D_JSON_TEMPERATURE "\":%s,\"" D_JSON_HUMIDITY "\":%s}"; +const char JSON_SNS_TEMPHUMDEW[] PROGMEM = ",\"%s\":{\"" D_JSON_TEMPERATURE "\":%s,\"" D_JSON_HUMIDITY "\":%s,\"" D_JSON_DEWPOINT "\":%s}"; const char JSON_SNS_ILLUMINANCE[] PROGMEM = ",\"%s\":{\"" D_JSON_ILLUMINANCE "\":%d}"; const char JSON_SNS_MOISTURE[] PROGMEM = ",\"%s\":{\"" D_JSON_MOISTURE "\":%d}"; @@ -667,6 +669,7 @@ const float kSpeedConversionFactor[] = {1, // none // {s} =