From de12709ed65f313aea943fa6d78cba36a5f401a3 Mon Sep 17 00:00:00 2001 From: Michael Voggenreiter Date: Wed, 28 Apr 2021 07:57:05 +0200 Subject: [PATCH] Added electricity meter easymeter Q3C --- tasmota/language/af_AF.h | 2 ++ tasmota/language/bg_BG.h | 2 ++ tasmota/language/cs_CZ.h | 2 ++ tasmota/language/de_DE.h | 2 ++ tasmota/language/el_GR.h | 2 ++ tasmota/language/en_GB.h | 2 ++ tasmota/language/es_ES.h | 2 ++ tasmota/language/fr_FR.h | 2 ++ tasmota/language/fy_NL.h | 2 ++ tasmota/language/he_HE.h | 2 ++ tasmota/language/hu_HU.h | 2 ++ tasmota/language/it_IT.h | 2 ++ tasmota/language/ko_KO.h | 2 ++ tasmota/language/nl_NL.h | 2 ++ tasmota/language/pl_PL.h | 2 ++ tasmota/language/pt_BR.h | 2 ++ tasmota/language/pt_PT.h | 2 ++ tasmota/language/ro_RO.h | 2 ++ tasmota/language/ru_RU.h | 2 ++ tasmota/language/sk_SK.h | 2 ++ tasmota/language/sv_SE.h | 2 ++ tasmota/language/tr_TR.h | 2 ++ tasmota/language/uk_UA.h | 2 ++ tasmota/language/vi_VN.h | 2 ++ tasmota/language/zh_CN.h | 2 ++ tasmota/language/zh_TW.h | 2 ++ tasmota/xsns_53_sml.ino | 23 +++++++++++++++++++++++ 27 files changed, 75 insertions(+) diff --git a/tasmota/language/af_AF.h b/tasmota/language/af_AF.h index 60ef67c1b..9fd58c6b8 100644 --- a/tasmota/language/af_AF.h +++ b/tasmota/language/af_AF.h @@ -578,6 +578,8 @@ // xsns_53_sml.ino #define D_TPWRIN "Totaal-In" +#define D_TPWRIN0 "Totaal-In T0" +#define D_TPWRIN1 "Totaal-In T1" #define D_TPWROUT "Totaal-Uit" #define D_TPWRCURR "Stroom-In/Uit" #define D_TPWRCURR1 "Stroom-In p1" diff --git a/tasmota/language/bg_BG.h b/tasmota/language/bg_BG.h index 26b2178ce..e72ba7fe3 100644 --- a/tasmota/language/bg_BG.h +++ b/tasmota/language/bg_BG.h @@ -577,6 +577,8 @@ // xsns_53_sml.ino #define D_TPWRIN "Общо енергия - IN" +#define D_TPWRIN0 "Общо енергия - IN T0" +#define D_TPWRIN1 "Общо енергия - IN T1" #define D_TPWROUT "Общо енергия - OUT" #define D_TPWRCURR "Активна мощност - In/Out" #define D_TPWRCURR1 "Активна мощност - In p1" diff --git a/tasmota/language/cs_CZ.h b/tasmota/language/cs_CZ.h index ac2146bff..f4250f311 100644 --- a/tasmota/language/cs_CZ.h +++ b/tasmota/language/cs_CZ.h @@ -578,6 +578,8 @@ // xsns_53_sml.ino #define D_TPWRIN "Energy Total-In" +#define D_TPWRIN0 "Energy Total-In T0" +#define D_TPWRIN1 "Energy Total-In T1" #define D_TPWROUT "Energy Total-Out" #define D_TPWRCURR "Active Power-In/Out" #define D_TPWRCURR1 "Active Power-In p1" diff --git a/tasmota/language/de_DE.h b/tasmota/language/de_DE.h index 6ea3bfbbf..8e9d3638d 100644 --- a/tasmota/language/de_DE.h +++ b/tasmota/language/de_DE.h @@ -578,6 +578,8 @@ // xsns_53_sml.ino #define D_TPWRIN "Verbrauch" +#define D_TPWRIN0 "Verbrauch T0" +#define D_TPWRIN1 "Verbrauch T1" #define D_TPWROUT "Einspeisung" #define D_TPWRCURR "Aktueller Verbrauch" #define D_TPWRCURR1 "Verbrauch P1" diff --git a/tasmota/language/el_GR.h b/tasmota/language/el_GR.h index 3fe1381e0..5dbbbd648 100644 --- a/tasmota/language/el_GR.h +++ b/tasmota/language/el_GR.h @@ -578,6 +578,8 @@ // xsns_53_sml.ino #define D_TPWRIN "Energy Total-In" +#define D_TPWRIN0 "Energy Total-In T0" +#define D_TPWRIN1 "Energy Total-In T1" #define D_TPWROUT "Energy Total-Out" #define D_TPWRCURR "Active Power-In/Out" #define D_TPWRCURR1 "Active Power-In p1" diff --git a/tasmota/language/en_GB.h b/tasmota/language/en_GB.h index 0e1e073fb..a2174fe46 100644 --- a/tasmota/language/en_GB.h +++ b/tasmota/language/en_GB.h @@ -578,6 +578,8 @@ // xsns_53_sml.ino #define D_TPWRIN "Total-In" +#define D_TPWRIN0 "Total-In T0" +#define D_TPWRIN1 "Total-In T1" #define D_TPWROUT "Total-Out" #define D_TPWRCURR "Current-In/Out" #define D_TPWRCURR1 "Current-In p1" diff --git a/tasmota/language/es_ES.h b/tasmota/language/es_ES.h index b170982b4..05ac11707 100644 --- a/tasmota/language/es_ES.h +++ b/tasmota/language/es_ES.h @@ -578,6 +578,8 @@ // xsns_53_sml.ino #define D_TPWRIN "Energía Total-Entrada" +#define D_TPWRIN0 "Energía Total-Entrada T0" +#define D_TPWRIN1 "Energía Total-Entrada T1" #define D_TPWROUT "Energía Total-Salida" #define D_TPWRCURR "Potencia-En/Sal" #define D_TPWRCURR1 "Potencia-Entr p1" diff --git a/tasmota/language/fr_FR.h b/tasmota/language/fr_FR.h index c62163d5d..2495d420f 100644 --- a/tasmota/language/fr_FR.h +++ b/tasmota/language/fr_FR.h @@ -578,6 +578,8 @@ // xsns_53_sml.ino #define D_TPWRIN "Energie totale Entrée" +#define D_TPWRIN0 "Energie totale Entrée T0" +#define D_TPWRIN1 "Energie totale Entrée T1" #define D_TPWROUT "Energie totale Sortie" #define D_TPWRCURR "Puissance active E/S" #define D_TPWRCURR1 "Puissance active Ent Ph1" diff --git a/tasmota/language/fy_NL.h b/tasmota/language/fy_NL.h index 357cf6430..7068a0a00 100644 --- a/tasmota/language/fy_NL.h +++ b/tasmota/language/fy_NL.h @@ -578,6 +578,8 @@ // xsns_53_sml.ino #define D_TPWRIN "Totale enerzjy yn" +#define D_TPWRIN0 "Totale enerzjy yn T0" +#define D_TPWRIN1 "Totale enerzjy yn T1" #define D_TPWROUT "Totale enerzjy út" #define D_TPWRCURR "Eigentlike krêft In/Out" #define D_TPWRCURR1 "Eigentlike krêft In p1" diff --git a/tasmota/language/he_HE.h b/tasmota/language/he_HE.h index b6d0022da..bf2e34b19 100644 --- a/tasmota/language/he_HE.h +++ b/tasmota/language/he_HE.h @@ -578,6 +578,8 @@ // xsns_53_sml.ino #define D_TPWRIN "Energy Total-In" +#define D_TPWRIN0 "Energy Total-In T0" +#define D_TPWRIN1 "Energy Total-In T1" #define D_TPWROUT "Energy Total-Out" #define D_TPWRCURR "Active Power-In/Out" #define D_TPWRCURR1 "Active Power-In p1" diff --git a/tasmota/language/hu_HU.h b/tasmota/language/hu_HU.h index e3352d6d1..1b3e8afe4 100644 --- a/tasmota/language/hu_HU.h +++ b/tasmota/language/hu_HU.h @@ -578,6 +578,8 @@ // xsns_53_sml.ino #define D_TPWRIN "Összes bejövő energia" +#define D_TPWRIN0 "Összes bejövő energia T0" +#define D_TPWRIN1 "Összes bejövő energia T1" #define D_TPWROUT "Összes kimenő energia" #define D_TPWRCURR "Aktív teljesítmény Be/Ki" #define D_TPWRCURR1 "Aktív teljesítmény-Be p1" diff --git a/tasmota/language/it_IT.h b/tasmota/language/it_IT.h index c8f8706bf..1e5066656 100644 --- a/tasmota/language/it_IT.h +++ b/tasmota/language/it_IT.h @@ -578,6 +578,8 @@ // xsns_53_sml.ino #define D_TPWRIN "Energia totale IN" +#define D_TPWRIN0 "Energia totale IN T0" +#define D_TPWRIN1 "Energia totale IN T1" #define D_TPWROUT "Energia totale OUT" #define D_TPWRCURR "Corrente IN/OUT" #define D_TPWRCURR1 "Corrente IN p1" diff --git a/tasmota/language/ko_KO.h b/tasmota/language/ko_KO.h index a6c03e1be..4f40559e7 100644 --- a/tasmota/language/ko_KO.h +++ b/tasmota/language/ko_KO.h @@ -578,6 +578,8 @@ // xsns_53_sml.ino #define D_TPWRIN "Energy Total-In" +#define D_TPWRIN0 "Energy Total-In T0" +#define D_TPWRIN1 "Energy Total-In T1" #define D_TPWROUT "Energy Total-Out" #define D_TPWRCURR "Active Power-In/Out" #define D_TPWRCURR1 "Active Power-In p1" diff --git a/tasmota/language/nl_NL.h b/tasmota/language/nl_NL.h index 646b49be2..c0e6dd81a 100644 --- a/tasmota/language/nl_NL.h +++ b/tasmota/language/nl_NL.h @@ -578,6 +578,8 @@ // xsns_53_sml.ino #define D_TPWRIN "Totaal energie-In" +#define D_TPWRIN0 "Totaal energie-In T0" +#define D_TPWRIN1 "Totaal energie-In T1" #define D_TPWROUT "Totaal energie-Uit" #define D_TPWRCURR "Werkelijk vermogen-In/Uit" #define D_TPWRCURR1 "Werkelijk vermogen-In p1" diff --git a/tasmota/language/pl_PL.h b/tasmota/language/pl_PL.h index 0b9f6f636..3a8069d87 100644 --- a/tasmota/language/pl_PL.h +++ b/tasmota/language/pl_PL.h @@ -578,6 +578,8 @@ // xsns_53_sml.ino #define D_TPWRIN "Energia Całkowita-In" +#define D_TPWRIN0 "Energia Całkowita-In T0" +#define D_TPWRIN1 "Energia Całkowita-In T1" #define D_TPWROUT "Energia Całkowita-Out" #define D_TPWRCURR "Moc Czynna -In/Out" #define D_TPWRCURR1 "Moc Czynna-In p1" diff --git a/tasmota/language/pt_BR.h b/tasmota/language/pt_BR.h index 393a7a24a..582ab2786 100644 --- a/tasmota/language/pt_BR.h +++ b/tasmota/language/pt_BR.h @@ -578,6 +578,8 @@ // xsns_53_sml.ino #define D_TPWRIN "Energy Total-In" +#define D_TPWRIN0 "Energy Total-In T0" +#define D_TPWRIN1 "Energy Total-In T1" #define D_TPWROUT "Energy Total-Out" #define D_TPWRCURR "Active Power-In/Out" #define D_TPWRCURR1 "Active Power-In p1" diff --git a/tasmota/language/pt_PT.h b/tasmota/language/pt_PT.h index 6bbe555ef..626c5c8cc 100644 --- a/tasmota/language/pt_PT.h +++ b/tasmota/language/pt_PT.h @@ -578,6 +578,8 @@ //xsns_53_sml.ino #define D_TPWRIN "Energia-Consumo" +#define D_TPWRIN0 "Energia-Consumo T0" +#define D_TPWRIN1 "Energia-Consumo T1" #define D_TPWROUT "Energia-Geração" #define D_TPWRCURR "Potência Ativa-Consumo/Geração" #define D_TPWRCURR1 "Potência Ativa-Consumo F1" diff --git a/tasmota/language/ro_RO.h b/tasmota/language/ro_RO.h index ed64302af..908782485 100644 --- a/tasmota/language/ro_RO.h +++ b/tasmota/language/ro_RO.h @@ -578,6 +578,8 @@ // xsns_53_sml.ino #define D_TPWRIN "Energy Total-In" +#define D_TPWRIN0 "Energy Total-In T0" +#define D_TPWRIN1 "Energy Total-In T1" #define D_TPWROUT "Energy Total-Out" #define D_TPWRCURR "Active Power-In/Out" #define D_TPWRCURR1 "Active Power-In p1" diff --git a/tasmota/language/ru_RU.h b/tasmota/language/ru_RU.h index 4b2bbafb0..44f1a3249 100644 --- a/tasmota/language/ru_RU.h +++ b/tasmota/language/ru_RU.h @@ -578,6 +578,8 @@ // xsns_53_sml.ino #define D_TPWRIN "Energy Total-In" +#define D_TPWRIN0 "Energy Total-In T0" +#define D_TPWRIN1 "Energy Total-In T1" #define D_TPWROUT "Energy Total-Out" #define D_TPWRCURR "Active Power-In/Out" #define D_TPWRCURR1 "Active Power-In p1" diff --git a/tasmota/language/sk_SK.h b/tasmota/language/sk_SK.h index dc3780cd4..d5febc4df 100644 --- a/tasmota/language/sk_SK.h +++ b/tasmota/language/sk_SK.h @@ -578,6 +578,8 @@ // xsns_53_sml.ino #define D_TPWRIN "Energy Total-In" +#define D_TPWRIN0 "Energy Total-In T0" +#define D_TPWRIN1 "Energy Total-In T1" #define D_TPWROUT "Energy Total-Out" #define D_TPWRCURR "Active Power-In/Out" #define D_TPWRCURR1 "Active Power-In p1" diff --git a/tasmota/language/sv_SE.h b/tasmota/language/sv_SE.h index 05dd62a44..e99a0b44c 100644 --- a/tasmota/language/sv_SE.h +++ b/tasmota/language/sv_SE.h @@ -578,6 +578,8 @@ // xsns_53_sml.ino #define D_TPWRIN "Energy Total-In" +#define D_TPWRIN0 "Energy Total-In T0" +#define D_TPWRIN1 "Energy Total-In T1" #define D_TPWROUT "Energy Total-Out" #define D_TPWRCURR "Active Power-In/Out" #define D_TPWRCURR1 "Active Power-In p1" diff --git a/tasmota/language/tr_TR.h b/tasmota/language/tr_TR.h index d6847012c..bb5e1e285 100644 --- a/tasmota/language/tr_TR.h +++ b/tasmota/language/tr_TR.h @@ -578,6 +578,8 @@ // xsns_53_sml.ino #define D_TPWRIN "Energy Total-In" +#define D_TPWRIN0 "Energy Total-In T0" +#define D_TPWRIN1 "Energy Total-In T1" #define D_TPWROUT "Energy Total-Out" #define D_TPWRCURR "Active Power-In/Out" #define D_TPWRCURR1 "Active Power-In p1" diff --git a/tasmota/language/uk_UA.h b/tasmota/language/uk_UA.h index ddc6cda9d..24533bbea 100644 --- a/tasmota/language/uk_UA.h +++ b/tasmota/language/uk_UA.h @@ -578,6 +578,8 @@ // xsns_53_sml.ino #define D_TPWRIN "Energy Total-In" +#define D_TPWRIN0 "Energy Total-In T0" +#define D_TPWRIN1 "Energy Total-In T1" #define D_TPWROUT "Energy Total-Out" #define D_TPWRCURR "Active Power-In/Out" #define D_TPWRCURR1 "Active Power-In p1" diff --git a/tasmota/language/vi_VN.h b/tasmota/language/vi_VN.h index e7e3f60cf..c25883a72 100644 --- a/tasmota/language/vi_VN.h +++ b/tasmota/language/vi_VN.h @@ -578,6 +578,8 @@ // xsns_53_sml.ino #define D_TPWRIN "Tổng lượng vào" +#define D_TPWRIN0 "Tổng lượng vào T0" +#define D_TPWRIN1 "Tổng lượng vào T1" #define D_TPWROUT "Tổng lượng ra" #define D_TPWRCURR "Dòng vào/ra" #define D_TPWRCURR1 "Dòng vào p1" diff --git a/tasmota/language/zh_CN.h b/tasmota/language/zh_CN.h index fdf3c0729..1b5caf595 100644 --- a/tasmota/language/zh_CN.h +++ b/tasmota/language/zh_CN.h @@ -578,6 +578,8 @@ // xsns_53_sml.ino #define D_TPWRIN "Energy Total-In" +#define D_TPWRIN0 "Energy Total-In T0" +#define D_TPWRIN1 "Energy Total-In T1" #define D_TPWROUT "Energy Total-Out" #define D_TPWRCURR "Active Power-In/Out" #define D_TPWRCURR1 "Active Power-In p1" diff --git a/tasmota/language/zh_TW.h b/tasmota/language/zh_TW.h index e5da67c37..4a9f786c7 100644 --- a/tasmota/language/zh_TW.h +++ b/tasmota/language/zh_TW.h @@ -578,6 +578,8 @@ // xsns_53_sml.ino #define D_TPWRIN "Energy Total-In" +#define D_TPWRIN0 "Energy Total-In T0" +#define D_TPWRIN1 "Energy Total-In T1" #define D_TPWROUT "Energy Total-Out" #define D_TPWRCURR "Active Power-In/Out" #define D_TPWRCURR1 "Active Power-In p1" diff --git a/tasmota/xsns_53_sml.ino b/tasmota/xsns_53_sml.ino index 5288e2dc3..925997c0b 100755 --- a/tasmota/xsns_53_sml.ino +++ b/tasmota/xsns_53_sml.ino @@ -59,6 +59,8 @@ // JSON Strings do not translate // max 23 char #define DJ_TPWRIN "Total_in" +#define DJ_TPWRIN0 "Total_in_0" +#define DJ_TPWRIN1 "Total_in_1" #define DJ_TPWROUT "Total_out" #define DJ_TPWRCURR "Power_curr" #define DJ_TPWRCURR1 "Power_p1" @@ -110,6 +112,7 @@ struct METER_DESC { #define WGS_COMBO 13 #define EBZD_G 14 #define SML_NO_OP 15 +#define Q3C 16 // select this meter // SML_NO_OP ignores hardcoded interface @@ -442,6 +445,26 @@ const uint8_t meter[]= #endif +#if METER==Q3C +#undef METERS_USED +#define METERS_USED 1 +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,77070101010800ff@1000," D_TPWRIN0 ",kWh," DJ_TPWRIN0 ",2|" // Verbrauch T0 +//0x77,0x07,0x01,0x00,0x01,0x08,0x01,0xff +"1,77070101010801ff@1000," D_TPWRIN1 ",kWh," DJ_TPWRIN1 ",2|" // Verbrauch T1 +//0x77,0x07,0x01,0x00,0x01,0x07,0x00,0xff +"1,77070100010700ff@1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|" // Strom Gesamt +//0x77,0x07,0x01,0x00,0x01,0x07,0x00,0xff +"1,77070100150700ff@1," D_TPWRCURR1 ",W," DJ_TPWRCURR1 ",0|" // Strom L1 +//0x77,0x07,0x01,0x00,0x01,0x07,0x00,0xff +"1,77070100290700ff@1," D_TPWRCURR2 ",W," DJ_TPWRCURR2 ",0|" // Strom L2 +//0x77,0x07,0x01,0x00,0x01,0x07,0x00,0xff +"1,770701003D0700ff@1," D_TPWRCURR3 ",W," DJ_TPWRCURR3 ",0"; // Strom L3 +#endif + // this driver uses double because meter vars would not fit in float //=====================================================