From e26999f3006673933313c669f4dfb8b41cc558c0 Mon Sep 17 00:00:00 2001 From: saper-2 Date: Thu, 23 Jan 2020 17:18:44 +0100 Subject: [PATCH] Updated lang files with new defines + comments --- tasmota/language/bg-BG.h | 5 ++++- tasmota/language/cs-CZ.h | 5 ++++- tasmota/language/de-DE.h | 5 ++++- tasmota/language/el-GR.h | 5 ++++- tasmota/language/es-ES.h | 5 ++++- tasmota/language/fr-FR.h | 5 ++++- tasmota/language/he-HE.h | 5 ++++- tasmota/language/hu-HU.h | 5 ++++- tasmota/language/it-IT.h | 5 ++++- tasmota/language/ko-KO.h | 5 ++++- tasmota/language/nl-NL.h | 5 ++++- tasmota/language/pl-PL.h | 5 ++++- tasmota/language/pt-BR.h | 5 ++++- tasmota/language/pt-PT.h | 5 ++++- tasmota/language/ru-RU.h | 5 ++++- tasmota/language/sk-SK.h | 5 ++++- tasmota/language/sv-SE.h | 5 ++++- tasmota/language/tr-TR.h | 5 ++++- tasmota/language/uk-UA.h | 5 ++++- tasmota/language/zh-CN.h | 5 ++++- tasmota/language/zh-TW.h | 5 ++++- tasmota/my_user_config.h | 2 +- tasmota/tasmota_post.h | 10 +++++----- 23 files changed, 90 insertions(+), 27 deletions(-) diff --git a/tasmota/language/bg-BG.h b/tasmota/language/bg-BG.h index 8f1c82bc3..b91a2e6e4 100644 --- a/tasmota/language/bg-BG.h +++ b/tasmota/language/bg-BG.h @@ -634,6 +634,8 @@ #define D_SENSOR_SLAVE_RESET "Slave RST" #define D_SENSOR_GPS_RX "GPS RX" #define D_SENSOR_GPS_TX "GPS TX" +#define D_SENSOR_LE01MR_RX "LE-01MR Rx" +#define D_SENSOR_LE01MR_TX "LE-01MR Tx" // Units #define D_UNIT_AMPERE "A" @@ -669,7 +671,7 @@ #define D_UNIT_WATTHOUR "Wh" #define D_UNIT_WATT_METER_QUADRAT "W/m²" -//SDM220 +//SDM220, SDM120, LE01MR #define D_PHASE_ANGLE "Фазов ъгъл" #define D_IMPORT_ACTIVE "Входна активна мощност" #define D_EXPORT_ACTIVE "Изходна активна мощност" @@ -678,6 +680,7 @@ #define D_TOTAL_REACTIVE "Общо реактивна мощност" #define D_UNIT_KWARH "kVArh" #define D_UNIT_ANGLE "°" +#define D_TOTAL_ACTIVE "Total Active" //SOLAXX1 #define D_PV1_VOLTAGE "Напрежение на PV1" diff --git a/tasmota/language/cs-CZ.h b/tasmota/language/cs-CZ.h index 3b11a7ebc..4bf6a8355 100644 --- a/tasmota/language/cs-CZ.h +++ b/tasmota/language/cs-CZ.h @@ -634,6 +634,8 @@ #define D_SENSOR_SLAVE_RESET "Slave RST" #define D_SENSOR_GPS_RX "GPS RX" #define D_SENSOR_GPS_TX "GPS TX" +#define D_SENSOR_LE01MR_RX "LE-01MR Rx" +#define D_SENSOR_LE01MR_TX "LE-01MR Tx" // Units #define D_UNIT_AMPERE "A" @@ -669,7 +671,7 @@ #define D_UNIT_WATTHOUR "Wh" #define D_UNIT_WATT_METER_QUADRAT "W/m²" -//SDM220 +//SDM220, SDM120, LE01MR #define D_PHASE_ANGLE "Phase Angle" #define D_IMPORT_ACTIVE "Import Active" #define D_EXPORT_ACTIVE "Export Active" @@ -678,6 +680,7 @@ #define D_TOTAL_REACTIVE "Total Reactive" #define D_UNIT_KWARH "kVArh" #define D_UNIT_ANGLE "Deg" +#define D_TOTAL_ACTIVE "Total Active" //SOLAXX1 #define D_PV1_VOLTAGE "PV1 Voltage" diff --git a/tasmota/language/de-DE.h b/tasmota/language/de-DE.h index e09278526..944ce7123 100644 --- a/tasmota/language/de-DE.h +++ b/tasmota/language/de-DE.h @@ -634,6 +634,8 @@ #define D_SENSOR_SLAVE_RESET "Slave RST" #define D_SENSOR_GPS_RX "GPS RX" #define D_SENSOR_GPS_TX "GPS TX" +#define D_SENSOR_LE01MR_RX "LE-01MR Rx" +#define D_SENSOR_LE01MR_TX "LE-01MR Tx" // Units #define D_UNIT_AMPERE "A" @@ -669,7 +671,7 @@ #define D_UNIT_WATTHOUR "Wh" #define D_UNIT_WATT_METER_QUADRAT "W/m²" -//SDM220 +//SDM220, SDM120, LE01MR #define D_PHASE_ANGLE "Phasenwinkel" #define D_IMPORT_ACTIVE "Importiere Wirk" #define D_EXPORT_ACTIVE "Exportiere Wirk" @@ -678,6 +680,7 @@ #define D_TOTAL_REACTIVE "Total Blind" #define D_UNIT_KWARH "kVArh" #define D_UNIT_ANGLE "Grad" +#define D_TOTAL_ACTIVE "Total Active" //SOLAXX1 #define D_PV1_VOLTAGE "PV1 Spannung" diff --git a/tasmota/language/el-GR.h b/tasmota/language/el-GR.h index 070267215..82def9666 100644 --- a/tasmota/language/el-GR.h +++ b/tasmota/language/el-GR.h @@ -634,6 +634,8 @@ #define D_SENSOR_SLAVE_RESET "Slave RST" #define D_SENSOR_GPS_RX "GPS RX" #define D_SENSOR_GPS_TX "GPS TX" +#define D_SENSOR_LE01MR_RX "LE-01MR Rx" +#define D_SENSOR_LE01MR_TX "LE-01MR Tx" // Units #define D_UNIT_AMPERE "A" @@ -669,7 +671,7 @@ #define D_UNIT_WATTHOUR "Wh" #define D_UNIT_WATT_METER_QUADRAT "W/m²" -//SDM220 +//SDM220, SDM120, LE01MR #define D_PHASE_ANGLE "Phase Angle" #define D_IMPORT_ACTIVE "Import Active" #define D_EXPORT_ACTIVE "Export Active" @@ -678,6 +680,7 @@ #define D_TOTAL_REACTIVE "Total Reactive" #define D_UNIT_KWARH "kVArh" #define D_UNIT_ANGLE "Deg" +#define D_TOTAL_ACTIVE "Total Active" //SOLAXX1 #define D_PV1_VOLTAGE "PV1 Voltage" diff --git a/tasmota/language/es-ES.h b/tasmota/language/es-ES.h index 8ff2b415f..48d0f26e0 100644 --- a/tasmota/language/es-ES.h +++ b/tasmota/language/es-ES.h @@ -634,6 +634,8 @@ #define D_SENSOR_SLAVE_RESET "Slave RST" #define D_SENSOR_GPS_RX "GPS RX" #define D_SENSOR_GPS_TX "GPS TX" +#define D_SENSOR_LE01MR_RX "LE-01MR Rx" +#define D_SENSOR_LE01MR_TX "LE-01MR Tx" // Units #define D_UNIT_AMPERE "A" @@ -669,7 +671,7 @@ #define D_UNIT_WATTHOUR "Wh" #define D_UNIT_WATT_METER_QUADRAT "W/m²" -//SDM220 +//SDM220, SDM120, LE01MR #define D_PHASE_ANGLE "Ángulo de Fase" #define D_IMPORT_ACTIVE "P. Activa Entrante" #define D_EXPORT_ACTIVE "P. Activa Saliente" @@ -678,6 +680,7 @@ #define D_TOTAL_REACTIVE "P. Reactiva Total" #define D_UNIT_KWARH "kVArH" #define D_UNIT_ANGLE "Grados" +#define D_TOTAL_ACTIVE "Total Active" //SOLAXX1 #define D_PV1_VOLTAGE "PV1 Voltaje" diff --git a/tasmota/language/fr-FR.h b/tasmota/language/fr-FR.h index 3829a8681..c5f7dcc38 100644 --- a/tasmota/language/fr-FR.h +++ b/tasmota/language/fr-FR.h @@ -634,6 +634,8 @@ #define D_SENSOR_SLAVE_RESET "Esclave Rst" #define D_SENSOR_GPS_TX "GPS TX" #define D_SENSOR_GPS_RX "GPS RX" +#define D_SENSOR_LE01MR_RX "LE-01MR Rx" +#define D_SENSOR_LE01MR_TX "LE-01MR Tx" // Units #define D_UNIT_AMPERE "A" @@ -669,7 +671,7 @@ #define D_UNIT_WATTHOUR "Wh" #define D_UNIT_WATT_METER_QUADRAT "W/m²" -//SDM220 +//SDM220, SDM120, LE01MR #define D_PHASE_ANGLE "Angle de phase" #define D_IMPORT_ACTIVE "Énergie act conso" #define D_EXPORT_ACTIVE "Énergie act fournie" @@ -678,6 +680,7 @@ #define D_TOTAL_REACTIVE "Énergie réa totale" #define D_UNIT_KWARH "kVArh" #define D_UNIT_ANGLE "°" +#define D_TOTAL_ACTIVE "Total Active" //SOLAXX1 #define D_PV1_VOLTAGE "Tension PV1" diff --git a/tasmota/language/he-HE.h b/tasmota/language/he-HE.h index d0c5e364b..491e85192 100644 --- a/tasmota/language/he-HE.h +++ b/tasmota/language/he-HE.h @@ -634,6 +634,8 @@ #define D_SENSOR_SLAVE_RESET "Slave RST" #define D_SENSOR_GPS_RX "GPS RX" #define D_SENSOR_GPS_TX "GPS TX" +#define D_SENSOR_LE01MR_RX "LE-01MR Rx" +#define D_SENSOR_LE01MR_TX "LE-01MR Tx" // Units #define D_UNIT_AMPERE "A" @@ -669,7 +671,7 @@ #define D_UNIT_WATTHOUR "Wh" #define D_UNIT_WATT_METER_QUADRAT "W/m²" -//SDM220 +//SDM220, SDM120, LE01MR #define D_PHASE_ANGLE "Phase Angle" #define D_IMPORT_ACTIVE "Import Active" #define D_EXPORT_ACTIVE "Export Active" @@ -678,6 +680,7 @@ #define D_TOTAL_REACTIVE "Total Reactive" #define D_UNIT_KWARH "kVArh" #define D_UNIT_ANGLE "Deg" +#define D_TOTAL_ACTIVE "Total Active" //SOLAXX1 #define D_PV1_VOLTAGE "PV1 Voltage" diff --git a/tasmota/language/hu-HU.h b/tasmota/language/hu-HU.h index 70f219c98..eb0b6d6b4 100644 --- a/tasmota/language/hu-HU.h +++ b/tasmota/language/hu-HU.h @@ -634,6 +634,8 @@ #define D_SENSOR_SLAVE_RESET "Slave RST" #define D_SENSOR_GPS_RX "GPS RX" #define D_SENSOR_GPS_TX "GPS TX" +#define D_SENSOR_LE01MR_RX "LE-01MR Rx" +#define D_SENSOR_LE01MR_TX "LE-01MR Tx" // Units #define D_UNIT_AMPERE "A" @@ -669,7 +671,7 @@ #define D_UNIT_WATTHOUR "Wh" #define D_UNIT_WATT_METER_QUADRAT "W/m²" -//SDM220 +//SDM220, SDM120, LE01MR #define D_PHASE_ANGLE "Fázisszög" #define D_IMPORT_ACTIVE "Bejövő aktív" #define D_EXPORT_ACTIVE "Kimenő aktív" @@ -678,6 +680,7 @@ #define D_TOTAL_REACTIVE "Összes reaktív" #define D_UNIT_KWARH "kVArh" #define D_UNIT_ANGLE "fok" +#define D_TOTAL_ACTIVE "Total Active" //SOLAXX1 #define D_PV1_VOLTAGE "PV1 Voltage" diff --git a/tasmota/language/it-IT.h b/tasmota/language/it-IT.h index 73830deca..a5255e9ed 100644 --- a/tasmota/language/it-IT.h +++ b/tasmota/language/it-IT.h @@ -634,6 +634,8 @@ #define D_SENSOR_SLAVE_RESET "Slave RST" #define D_SENSOR_GPS_RX "GPS RX" #define D_SENSOR_GPS_TX "GPS TX" +#define D_SENSOR_LE01MR_RX "LE-01MR Rx" +#define D_SENSOR_LE01MR_TX "LE-01MR Tx" // Units #define D_UNIT_AMPERE "A" @@ -669,7 +671,7 @@ #define D_UNIT_WATTHOUR "Wh" #define D_UNIT_WATT_METER_QUADRAT "W/m²" -//SDM220 +//SDM220, SDM120, LE01MR #define D_PHASE_ANGLE "Angolo Fase" #define D_IMPORT_ACTIVE "Potenza Attiva Importata" #define D_EXPORT_ACTIVE "Potenza Attiva Esportata" @@ -678,6 +680,7 @@ #define D_TOTAL_REACTIVE "Potenza Reattiva Totale" #define D_UNIT_KWARH "kVArh" #define D_UNIT_ANGLE "°" +#define D_TOTAL_ACTIVE "Total Active" //SOLAXX1 #define D_PV1_VOLTAGE "PV1 Voltaggio" diff --git a/tasmota/language/ko-KO.h b/tasmota/language/ko-KO.h index 328acc568..036f4adbb 100644 --- a/tasmota/language/ko-KO.h +++ b/tasmota/language/ko-KO.h @@ -634,6 +634,8 @@ #define D_SENSOR_SLAVE_RESET "Slave RST" #define D_SENSOR_GPS_RX "GPS RX" #define D_SENSOR_GPS_TX "GPS TX" +#define D_SENSOR_LE01MR_RX "LE-01MR Rx" +#define D_SENSOR_LE01MR_TX "LE-01MR Tx" // Units #define D_UNIT_AMPERE "A" @@ -669,7 +671,7 @@ #define D_UNIT_WATTHOUR "Wh" #define D_UNIT_WATT_METER_QUADRAT "W/m²" -//SDM220 +//SDM220, SDM120, LE01MR #define D_PHASE_ANGLE "Phase Angle" #define D_IMPORT_ACTIVE "Import Active" #define D_EXPORT_ACTIVE "Export Active" @@ -678,6 +680,7 @@ #define D_TOTAL_REACTIVE "Total Reactive" #define D_UNIT_KWARH "kVArh" #define D_UNIT_ANGLE "Deg" +#define D_TOTAL_ACTIVE "Total Active" //SOLAXX1 #define D_PV1_VOLTAGE "PV1 Voltage" diff --git a/tasmota/language/nl-NL.h b/tasmota/language/nl-NL.h index 3d5ec8b7d..de15f5d05 100644 --- a/tasmota/language/nl-NL.h +++ b/tasmota/language/nl-NL.h @@ -634,6 +634,8 @@ #define D_SENSOR_SLAVE_RESET "Slave RST" #define D_SENSOR_GPS_RX "GPS RX" #define D_SENSOR_GPS_TX "GPS TX" +#define D_SENSOR_LE01MR_RX "LE-01MR Rx" +#define D_SENSOR_LE01MR_TX "LE-01MR Tx" // Units #define D_UNIT_AMPERE "A" @@ -669,7 +671,7 @@ #define D_UNIT_WATTHOUR "Wh" #define D_UNIT_WATT_METER_QUADRAT "W/m²" -//SDM220 +//SDM220, SDM120, LE01MR #define D_PHASE_ANGLE "Fase hoek" #define D_IMPORT_ACTIVE "Import werkelijk" #define D_EXPORT_ACTIVE "Export werkelijk" @@ -678,6 +680,7 @@ #define D_TOTAL_REACTIVE "Totaal blind" #define D_UNIT_KWARH "kVArh" #define D_UNIT_ANGLE "Deg" +#define D_TOTAL_ACTIVE "Total Active" //SOLAXX1 #define D_PV1_VOLTAGE "PV1 spanning" diff --git a/tasmota/language/pl-PL.h b/tasmota/language/pl-PL.h index 63fe6fcad..ac2da9524 100644 --- a/tasmota/language/pl-PL.h +++ b/tasmota/language/pl-PL.h @@ -634,6 +634,8 @@ #define D_SENSOR_SLAVE_RESET "Slave RST" #define D_SENSOR_GPS_RX "GPS RX" #define D_SENSOR_GPS_TX "GPS TX" +#define D_SENSOR_LE01MR_RX "LE-01MR Rx" +#define D_SENSOR_LE01MR_TX "LE-01MR Tx" // Units #define D_UNIT_AMPERE "A" @@ -669,7 +671,7 @@ #define D_UNIT_WATTHOUR "Wh" #define D_UNIT_WATT_METER_QUADRAT "W/m²" -//SDM220 +//SDM220, SDM120, LE01MR #define D_PHASE_ANGLE "Przesunięcie faz" #define D_IMPORT_ACTIVE "Czynna pobrana" #define D_EXPORT_ACTIVE "Czynna oddana" @@ -678,6 +680,7 @@ #define D_TOTAL_REACTIVE "Bierna całkowita" #define D_UNIT_KWARH "kVArh" #define D_UNIT_ANGLE "Deg" +#define D_TOTAL_ACTIVE "Całkowita czynna" //SOLAXX1 #define D_PV1_VOLTAGE "Napięcie PV1" diff --git a/tasmota/language/pt-BR.h b/tasmota/language/pt-BR.h index da6e8ca1b..6695e144d 100644 --- a/tasmota/language/pt-BR.h +++ b/tasmota/language/pt-BR.h @@ -634,6 +634,8 @@ #define D_SENSOR_SLAVE_RESET "Slave RST" #define D_SENSOR_GPS_RX "GPS RX" #define D_SENSOR_GPS_TX "GPS TX" +#define D_SENSOR_LE01MR_RX "LE-01MR Rx" +#define D_SENSOR_LE01MR_TX "LE-01MR Tx" // Units #define D_UNIT_AMPERE "A" @@ -669,7 +671,7 @@ #define D_UNIT_WATTHOUR "W/h" #define D_UNIT_WATT_METER_QUADRAT "W/m²" -//SDM220 +//SDM220, SDM120, LE01MR #define D_PHASE_ANGLE "Ângulo de Fase" #define D_IMPORT_ACTIVE "Importar Ativo" #define D_EXPORT_ACTIVE "Exportar Ativo" @@ -678,6 +680,7 @@ #define D_TOTAL_REACTIVE "Reativo total" #define D_UNIT_KWARH "kVArh" #define D_UNIT_ANGLE "Deg" +#define D_TOTAL_ACTIVE "Total Active" //SOLAXX1 #define D_PV1_VOLTAGE "PV1 Voltagem" diff --git a/tasmota/language/pt-PT.h b/tasmota/language/pt-PT.h index 47137b90b..53e31cb5a 100644 --- a/tasmota/language/pt-PT.h +++ b/tasmota/language/pt-PT.h @@ -634,6 +634,8 @@ #define D_SENSOR_SLAVE_RESET "Slave RST" #define D_SENSOR_GPS_RX "GPS RX" #define D_SENSOR_GPS_TX "GPS TX" +#define D_SENSOR_LE01MR_RX "LE-01MR Rx" +#define D_SENSOR_LE01MR_TX "LE-01MR Tx" // Units #define D_UNIT_AMPERE "A" @@ -669,7 +671,7 @@ #define D_UNIT_WATTHOUR "Wh" #define D_UNIT_WATT_METER_QUADRAT "W/m²" -//SDM220 +//SDM220, SDM120, LE01MR #define D_PHASE_ANGLE "Ângulo de fase" #define D_IMPORT_ACTIVE "Ativo importado" #define D_EXPORT_ACTIVE "Ativo exportado" @@ -678,6 +680,7 @@ #define D_TOTAL_REACTIVE "Reactivo total" #define D_UNIT_KWARH "kVArh" #define D_UNIT_ANGLE "Deg" +#define D_TOTAL_ACTIVE "Total Active" //SOLAXX1 #define D_PV1_VOLTAGE "Voltagem PV1" diff --git a/tasmota/language/ru-RU.h b/tasmota/language/ru-RU.h index 31c295059..3cf388240 100644 --- a/tasmota/language/ru-RU.h +++ b/tasmota/language/ru-RU.h @@ -634,6 +634,8 @@ #define D_SENSOR_SLAVE_RESET "Slave RST" #define D_SENSOR_GPS_RX "GPS RX" #define D_SENSOR_GPS_TX "GPS TX" +#define D_SENSOR_LE01MR_RX "LE-01MR Rx" +#define D_SENSOR_LE01MR_TX "LE-01MR Tx" // Units #define D_UNIT_AMPERE "А" @@ -669,7 +671,7 @@ #define D_UNIT_WATTHOUR "ВтЧ" #define D_UNIT_WATT_METER_QUADRAT "W/m²" -//SDM220 +//SDM220, SDM120, LE01MR #define D_PHASE_ANGLE "Угол фазы" #define D_IMPORT_ACTIVE "Импорт активной мощности" #define D_EXPORT_ACTIVE "Экспорт активной мощности" @@ -678,6 +680,7 @@ #define D_TOTAL_REACTIVE "Итого реактивная мощность" #define D_UNIT_KWARH "kVArh" #define D_UNIT_ANGLE "Град" +#define D_TOTAL_ACTIVE "Total Active" //SOLAXX1 #define D_PV1_VOLTAGE "PV1 Voltage" diff --git a/tasmota/language/sk-SK.h b/tasmota/language/sk-SK.h index 89f3d7353..b3d007214 100644 --- a/tasmota/language/sk-SK.h +++ b/tasmota/language/sk-SK.h @@ -634,6 +634,8 @@ #define D_SENSOR_SLAVE_RESET "Slave RST" #define D_SENSOR_GPS_RX "GPS RX" #define D_SENSOR_GPS_TX "GPS TX" +#define D_SENSOR_LE01MR_RX "LE-01MR Rx" +#define D_SENSOR_LE01MR_TX "LE-01MR Tx" // Units #define D_UNIT_AMPERE "A" @@ -669,7 +671,7 @@ #define D_UNIT_WATTHOUR "Wh" #define D_UNIT_WATT_METER_QUADRAT "W/m²" -//SDM220 +//SDM220, SDM120, LE01MR #define D_PHASE_ANGLE "Phase Angle" #define D_IMPORT_ACTIVE "Import Active" #define D_EXPORT_ACTIVE "Export Active" @@ -678,6 +680,7 @@ #define D_TOTAL_REACTIVE "Total Reactive" #define D_UNIT_KWARH "kVArh" #define D_UNIT_ANGLE "Deg" +#define D_TOTAL_ACTIVE "Total Active" //SOLAXX1 #define D_PV1_VOLTAGE "PV1 Voltage" diff --git a/tasmota/language/sv-SE.h b/tasmota/language/sv-SE.h index ddc2307b4..23badaeed 100644 --- a/tasmota/language/sv-SE.h +++ b/tasmota/language/sv-SE.h @@ -634,6 +634,8 @@ #define D_SENSOR_SLAVE_RESET "Slave RST" #define D_SENSOR_GPS_RX "GPS RX" #define D_SENSOR_GPS_TX "GPS TX" +#define D_SENSOR_LE01MR_RX "LE-01MR Rx" +#define D_SENSOR_LE01MR_TX "LE-01MR Tx" // Units #define D_UNIT_AMPERE "A" @@ -669,7 +671,7 @@ #define D_UNIT_WATTHOUR "Wh" #define D_UNIT_WATT_METER_QUADRAT "W/m²" -//SDM220 +//SDM220, SDM120, LE01MR #define D_PHASE_ANGLE "Fasvinkel" #define D_IMPORT_ACTIVE "Import aktiv" #define D_EXPORT_ACTIVE "Export aktiv" @@ -678,6 +680,7 @@ #define D_TOTAL_REACTIVE "Total reaktiv" #define D_UNIT_KWARH "kVArh" #define D_UNIT_ANGLE "Deg" +#define D_TOTAL_ACTIVE "Total aktiv" //SOLAXX1 #define D_PV1_VOLTAGE "PV1 Voltage" diff --git a/tasmota/language/tr-TR.h b/tasmota/language/tr-TR.h index 38f125d6c..03b49afc1 100644 --- a/tasmota/language/tr-TR.h +++ b/tasmota/language/tr-TR.h @@ -634,6 +634,8 @@ #define D_SENSOR_SLAVE_RESET "Slave RST" #define D_SENSOR_GPS_RX "GPS RX" #define D_SENSOR_GPS_TX "GPS TX" +#define D_SENSOR_LE01MR_RX "LE-01MR Rx" +#define D_SENSOR_LE01MR_TX "LE-01MR Tx" // Units #define D_UNIT_AMPERE "A" @@ -669,7 +671,7 @@ #define D_UNIT_WATTHOUR "Wh" #define D_UNIT_WATT_METER_QUADRAT "W/m²" -//SDM220 +//SDM220, SDM120, LE01MR #define D_PHASE_ANGLE "Phase Angle" #define D_IMPORT_ACTIVE "Import Active" #define D_EXPORT_ACTIVE "Export Active" @@ -678,6 +680,7 @@ #define D_TOTAL_REACTIVE "Total Reactive" #define D_UNIT_KWARH "kVArh" #define D_UNIT_ANGLE "Deg" +#define D_TOTAL_ACTIVE "Total Active" //SOLAXX1 #define D_PV1_VOLTAGE "PV1 Voltage" diff --git a/tasmota/language/uk-UA.h b/tasmota/language/uk-UA.h index b634935cf..067a50c31 100644 --- a/tasmota/language/uk-UA.h +++ b/tasmota/language/uk-UA.h @@ -634,6 +634,8 @@ #define D_SENSOR_SLAVE_RESET "Slave RST" #define D_SENSOR_GPS_RX "GPS RX" #define D_SENSOR_GPS_TX "GPS TX" +#define D_SENSOR_LE01MR_RX "LE-01MR Rx" +#define D_SENSOR_LE01MR_TX "LE-01MR Tx" // Units #define D_UNIT_AMPERE "А" @@ -669,7 +671,7 @@ #define D_UNIT_WATTHOUR "Вт/г" #define D_UNIT_WATT_METER_QUADRAT "Вт/м²" -//SDM220 +//SDM220, SDM120, LE01MR #define D_PHASE_ANGLE "Кут фази" #define D_IMPORT_ACTIVE "Активна вхід" #define D_EXPORT_ACTIVE "Активна вихід" @@ -678,6 +680,7 @@ #define D_TOTAL_REACTIVE "Всього реактивна" #define D_UNIT_KWARH "кВАр/г" #define D_UNIT_ANGLE "Град" +#define D_TOTAL_ACTIVE "Total Active" //SOLAXX1 #define D_PV1_VOLTAGE "PV1 Напруга" diff --git a/tasmota/language/zh-CN.h b/tasmota/language/zh-CN.h index 97b41a29a..0c9d56922 100644 --- a/tasmota/language/zh-CN.h +++ b/tasmota/language/zh-CN.h @@ -634,6 +634,8 @@ #define D_SENSOR_SLAVE_RESET "Slave RST" #define D_SENSOR_GPS_RX "GPS RX" #define D_SENSOR_GPS_TX "GPS TX" +#define D_SENSOR_LE01MR_RX "LE-01MR Rx" +#define D_SENSOR_LE01MR_TX "LE-01MR Tx" // Units #define D_UNIT_AMPERE "安" @@ -669,7 +671,7 @@ #define D_UNIT_WATTHOUR "瓦时" #define D_UNIT_WATT_METER_QUADRAT "瓦/平米" -//SDM220 +//SDM220, SDM120, LE01MR #define D_PHASE_ANGLE "相位角" #define D_IMPORT_ACTIVE "有功输入" #define D_EXPORT_ACTIVE "有功输出" @@ -678,6 +680,7 @@ #define D_TOTAL_REACTIVE "总无功功率" #define D_UNIT_KWARH "千乏时" #define D_UNIT_ANGLE "度" +#define D_TOTAL_ACTIVE "Total Active" //SOLAXX1 #define D_PV1_VOLTAGE "PV1 Voltage" diff --git a/tasmota/language/zh-TW.h b/tasmota/language/zh-TW.h index 1fd30e6e4..6f1033c54 100644 --- a/tasmota/language/zh-TW.h +++ b/tasmota/language/zh-TW.h @@ -634,6 +634,8 @@ #define D_SENSOR_SLAVE_RESET "Slave RST" #define D_SENSOR_GPS_RX "GPS RX" #define D_SENSOR_GPS_TX "GPS TX" +#define D_SENSOR_LE01MR_RX "LE-01MR Rx" +#define D_SENSOR_LE01MR_TX "LE-01MR Tx" // Units #define D_UNIT_AMPERE "安" @@ -669,7 +671,7 @@ #define D_UNIT_WATTHOUR "瓦時" #define D_UNIT_WATT_METER_QUADRAT "W/m²" -//SDM220 +//SDM220, SDM120, LE01MR #define D_PHASE_ANGLE "Phase Angle" #define D_IMPORT_ACTIVE "Import Active" #define D_EXPORT_ACTIVE "Export Active" @@ -678,6 +680,7 @@ #define D_TOTAL_REACTIVE "Total Reactive" #define D_UNIT_KWARH "kVArh" #define D_UNIT_ANGLE "Deg" +#define D_TOTAL_ACTIVE "Total Active" //SOLAXX1 #define D_PV1_VOLTAGE "PV1 Voltage" diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h index 8a709c2dd..d72e8cce9 100644 --- a/tasmota/my_user_config.h +++ b/tasmota/my_user_config.h @@ -499,7 +499,7 @@ #define SOLAXX1_SPEED 9600 // Solax X1 Modbus RS485 serial speed (default: 9600 baud) #define SOLAXX1_PV2 // Solax X1 using second PV //#define USE_LE01MR // Add support for F&F LE-01MR modbus energy meter - #define LE01MR_SPEED 2400 // LE-01MR modbus baudrate (9600 default) (+2k code, +36 RAM) + #define LE01MR_SPEED 9600 // LE-01MR modbus baudrate (9600 default) (+2k code, +36 RAM) #define LE01MR_ADDR 1 // LE-01MR modbus address (0x01 default) // -- Low level interface devices ----------------- #define USE_DHT // Add support for DHT11, AM2301 (DHT21, DHT22, AM2302, AM2321) and SI7021 Temperature and Humidity sensor (1k6 code) diff --git a/tasmota/tasmota_post.h b/tasmota/tasmota_post.h index 8a16ffead..c1b897920 100644 --- a/tasmota/tasmota_post.h +++ b/tasmota/tasmota_post.h @@ -194,7 +194,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack #define USE_DDS2382 // Add support for Hiking DDS2382 Modbus energy monitor (+0k6 code) #define USE_DDSU666 // Add support for Chint DDSU666 Modbus energy monitor (+0k6 code) //#define USE_SOLAX_X1 // Add support for Solax X1 series Modbus log info (+3k1 code) -//#define USE_LE01MR // Add support for F&F LE-01MR modbus energy meter +//#define USE_LE01MR // Add support for F&F LE-01MR modbus energy meter (+2k code) #define USE_DHT // Add support for DHT11, AM2301 (DHT21, DHT22, AM2302, AM2321) and SI7021 Temperature and Humidity sensor #define USE_MAX31855 // Add support for MAX31855 K-Type thermocouple sensor using softSPI @@ -282,7 +282,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack #undef USE_DDS2382 // Disable support for Hiking DDS2382 Modbus energy monitor (+0k6 code) #undef USE_DDSU666 // Disable support for Chint DDSU666 Modbus energy monitor (+0k6 code) #undef USE_SOLAX_X1 // Disable support for Solax X1 series Modbus log info (+3k1 code) - #undef USE_LE01MR // Disable support for F&F LE-01MR Modbus energy meter + #undef USE_LE01MR // Disable support for F&F LE-01MR Modbus energy meter (+2k code) #define USE_I2C // I2C using library wire (+10k code, 0k2 mem, 124 iram) #define USE_DISPLAY // Add I2C Display Support (+2k code) @@ -364,7 +364,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack #undef USE_DDS2382 // Disable support for Hiking DDS2382 Modbus energy monitor (+0k6 code) #undef USE_DDSU666 // Disable support for Chint DDSU666 Modbus energy monitor (+0k6 code) #undef USE_SOLAX_X1 // Disable support for Solax X1 series Modbus log info (+3k1 code) - #undef USE_LE01MR // Disable support for F&F LE-01MR Modbus energy meter + #undef USE_LE01MR // Disable support for F&F LE-01MR Modbus energy meter (+2k code) //#undef USE_DS18x20 // Disable support for DS18x20 sensors with id sort, single scan and read retry (+1k3 code) @@ -484,7 +484,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack #undef USE_DDS2382 // Disable support for Hiking DDS2382 Modbus energy monitor (+0k6 code) #undef USE_DDSU666 // Disable support for Chint DDSU666 Modbus energy monitor (+0k6 code) #undef USE_SOLAX_X1 // Disable support for Solax X1 series Modbus log info (+3k1 code) -#undef USE_LE01MR // Disable support for F&F LE-01MR Modbus energy meter +#undef USE_LE01MR // Disable support for F&F LE-01MR Modbus energy meter (+2k code) #undef USE_DHT // Disable support for DHT11, AM2301 (DHT21, DHT22, AM2302, AM2321) and SI7021 Temperature and Humidity sensor #undef USE_MAX31855 // Disable MAX31855 K-Type thermocouple sensor using softSPI @@ -596,7 +596,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack #undef USE_DDS2382 // Disable support for Hiking DDS2382 Modbus energy monitor (+0k6 code) #undef USE_DDSU666 // Disable support for Chint DDSU666 Modbus energy monitor (+0k6 code) #undef USE_SOLAX_X1 // Disable support for Solax X1 series Modbus log info (+3k1 code) -#undef USE_LE01MR // Disable support for F&F LE-01MR Modbus energy meter +#undef USE_LE01MR // Disable support for F&F LE-01MR Modbus energy meter (+2k code) #undef USE_DHT // Disable support for DHT11, AM2301 (DHT21, DHT22, AM2302, AM2321) and SI7021 Temperature and Humidity sensor #undef USE_MAX31855 // Disable MAX31855 K-Type thermocouple sensor using softSPI