diff --git a/tasmota/energy_modbus_configs/value_pairs_description.md b/tasmota/energy_modbus_configs/value_pairs_description.md index 67a73dee2..3b7bfedcc 100644 --- a/tasmota/energy_modbus_configs/value_pairs_description.md +++ b/tasmota/energy_modbus_configs/value_pairs_description.md @@ -90,8 +90,8 @@ D - Number of decimals for floating point presentation (0 to 20) or a code correspondig to Tasmota resolution command settings: 21 - VoltRes (V) 22 - AmpRes (A) - 23 - WattRes (W, VA, VAr) - 24 - EnergyRes (kWh, kVAh, kVArh) + 23 - WattRes (W, VA, var) + 24 - EnergyRes (kWh, kVAh, kvarh) 25 - FreqRes (Hz) 26 - TempRes (C, F) 27 - HumRes (%) diff --git a/tasmota/language/af_AF.h b/tasmota/language/af_AF.h index cad4d22a4..8efd1ff09 100644 --- a/tasmota/language/af_AF.h +++ b/tasmota/language/af_AF.h @@ -1059,7 +1059,7 @@ #define D_UNIT_SECOND "sec" #define D_UNIT_SECTORS "sectors" #define D_UNIT_VA "VA" -#define D_UNIT_VAR "VAr" +#define D_UNIT_VAR "var" #define D_UNIT_VOLT "V" #define D_UNIT_WATT "W" #define D_UNIT_WATTHOUR "Wh" @@ -1081,7 +1081,7 @@ #define D_IMPORT_REACTIVE "Import reaktief" #define D_EXPORT_REACTIVE "Uitvoer reaktief" #define D_TOTAL_REACTIVE "Totaal reaktief" -#define D_UNIT_KWARH "kVArh" +#define D_UNIT_KWARH "kvarh" #define D_UNIT_ANGLE "Deg" #define D_TOTAL_ACTIVE "Totaal aktief" #define D_RESETTABLE_TOTAL_ACTIVE "Totaal aktief (RST)" diff --git a/tasmota/language/ca_AD.h b/tasmota/language/ca_AD.h index fe0ffe9f5..54880bebe 100644 --- a/tasmota/language/ca_AD.h +++ b/tasmota/language/ca_AD.h @@ -1059,7 +1059,7 @@ #define D_UNIT_SECOND "sec" #define D_UNIT_SECTORS "sectors" #define D_UNIT_VA "VA" -#define D_UNIT_VAR "VAr" +#define D_UNIT_VAR "var" #define D_UNIT_VOLT "V" #define D_UNIT_WATT "W" #define D_UNIT_WATTHOUR "Wh" @@ -1081,7 +1081,7 @@ #define D_IMPORT_REACTIVE "Importat Reactiva" #define D_EXPORT_REACTIVE "Exportat Reactiva" #define D_TOTAL_REACTIVE "Total Reactiva" -#define D_UNIT_KWARH "kVArh" +#define D_UNIT_KWARH "kvarh" #define D_UNIT_ANGLE "Graus" #define D_TOTAL_ACTIVE "Total Activa" #define D_RESETTABLE_TOTAL_ACTIVE "Total Activa (RST)" diff --git a/tasmota/language/cs_CZ.h b/tasmota/language/cs_CZ.h index 6685140f2..ae48211ef 100644 --- a/tasmota/language/cs_CZ.h +++ b/tasmota/language/cs_CZ.h @@ -1059,7 +1059,7 @@ #define D_UNIT_SECOND "sec" #define D_UNIT_SECTORS "sektory" #define D_UNIT_VA "VA" -#define D_UNIT_VAR "VAr" +#define D_UNIT_VAR "var" #define D_UNIT_VOLT "V" #define D_UNIT_WATT "W" #define D_UNIT_WATTHOUR "Wh" @@ -1081,7 +1081,7 @@ #define D_IMPORT_REACTIVE "Import Reactive" #define D_EXPORT_REACTIVE "Export Reactive" #define D_TOTAL_REACTIVE "Total Reactive" -#define D_UNIT_KWARH "kVArh" +#define D_UNIT_KWARH "kvarh" #define D_UNIT_ANGLE "Deg" #define D_TOTAL_ACTIVE "Total Active" #define D_RESETTABLE_TOTAL_ACTIVE "Total Active (RST)" diff --git a/tasmota/language/de_DE.h b/tasmota/language/de_DE.h index c6d46dad0..e186de688 100644 --- a/tasmota/language/de_DE.h +++ b/tasmota/language/de_DE.h @@ -1059,7 +1059,7 @@ #define D_UNIT_SECOND "s" #define D_UNIT_SECTORS "Sektoren" #define D_UNIT_VA "VA" -#define D_UNIT_VAR "VAr" +#define D_UNIT_VAR "var" #define D_UNIT_VOLT "V" #define D_UNIT_WATT "W" #define D_UNIT_WATTHOUR "Wh" @@ -1081,7 +1081,7 @@ #define D_IMPORT_REACTIVE "Importiere Blind" #define D_EXPORT_REACTIVE "Exportiere Blind" #define D_TOTAL_REACTIVE "Total Blind" -#define D_UNIT_KWARH "kVArh" +#define D_UNIT_KWARH "kvarh" #define D_UNIT_ANGLE "Grad" #define D_TOTAL_ACTIVE "Total Wirk" #define D_RESETTABLE_TOTAL_ACTIVE "Total Wirk (RST)" diff --git a/tasmota/language/el_GR.h b/tasmota/language/el_GR.h index 4933d5f37..782b1acb9 100644 --- a/tasmota/language/el_GR.h +++ b/tasmota/language/el_GR.h @@ -1059,7 +1059,7 @@ #define D_UNIT_SECOND "sec" #define D_UNIT_SECTORS "sectors" #define D_UNIT_VA "VA" -#define D_UNIT_VAR "VAr" +#define D_UNIT_VAR "var" #define D_UNIT_VOLT "V" #define D_UNIT_WATT "W" #define D_UNIT_WATTHOUR "Wh" @@ -1081,7 +1081,7 @@ #define D_IMPORT_REACTIVE "Import Reactive" #define D_EXPORT_REACTIVE "Export Reactive" #define D_TOTAL_REACTIVE "Total Reactive" -#define D_UNIT_KWARH "kVArh" +#define D_UNIT_KWARH "kvarh" #define D_UNIT_ANGLE "Deg" #define D_TOTAL_ACTIVE "Total Active" #define D_RESETTABLE_TOTAL_ACTIVE "Total Active (RST)" diff --git a/tasmota/language/en_GB.h b/tasmota/language/en_GB.h index 2377cd87b..c66232eaa 100644 --- a/tasmota/language/en_GB.h +++ b/tasmota/language/en_GB.h @@ -1059,7 +1059,7 @@ #define D_UNIT_SECOND "sec" #define D_UNIT_SECTORS "sectors" #define D_UNIT_VA "VA" -#define D_UNIT_VAR "VAr" +#define D_UNIT_VAR "var" #define D_UNIT_VOLT "V" #define D_UNIT_WATT "W" #define D_UNIT_WATTHOUR "Wh" @@ -1081,7 +1081,7 @@ #define D_IMPORT_REACTIVE "Import Reactive" #define D_EXPORT_REACTIVE "Export Reactive" #define D_TOTAL_REACTIVE "Total Reactive" -#define D_UNIT_KWARH "kVArh" +#define D_UNIT_KWARH "kvarh" #define D_UNIT_ANGLE "Deg" #define D_TOTAL_ACTIVE "Total Active" #define D_RESETTABLE_TOTAL_ACTIVE "Total Active (RST)" diff --git a/tasmota/language/es_ES.h b/tasmota/language/es_ES.h index 7616129c9..dba5a1d54 100644 --- a/tasmota/language/es_ES.h +++ b/tasmota/language/es_ES.h @@ -1059,7 +1059,7 @@ #define D_UNIT_SECOND "seg" #define D_UNIT_SECTORS "sectores" #define D_UNIT_VA "VA" -#define D_UNIT_VAR "VAr" +#define D_UNIT_VAR "var" #define D_UNIT_VOLT "V" #define D_UNIT_WATT "W" #define D_UNIT_WATTHOUR "Wh" @@ -1081,7 +1081,7 @@ #define D_IMPORT_REACTIVE "P. Reactiva Entrante" #define D_EXPORT_REACTIVE "P. Reactiva Saliente" #define D_TOTAL_REACTIVE "P. Reactiva Total" -#define D_UNIT_KWARH "kVArH" +#define D_UNIT_KWARH "kvarh" #define D_UNIT_ANGLE "Grados" #define D_TOTAL_ACTIVE "P. Total Activa" #define D_RESETTABLE_TOTAL_ACTIVE "P. Total Activa (RST)" diff --git a/tasmota/language/fr_FR.h b/tasmota/language/fr_FR.h index 47d768b6f..2a0b293d9 100644 --- a/tasmota/language/fr_FR.h +++ b/tasmota/language/fr_FR.h @@ -1060,7 +1060,7 @@ #define D_UNIT_SECOND "s" #define D_UNIT_SECTORS "secteurs" #define D_UNIT_VA "VA" -#define D_UNIT_VAR "VAr" +#define D_UNIT_VAR "var" #define D_UNIT_VOLT "V" #define D_UNIT_WATT "W" #define D_UNIT_WATTHOUR "Wh" @@ -1082,7 +1082,7 @@ #define D_IMPORT_REACTIVE "Énergie réa conso" #define D_EXPORT_REACTIVE "Énergie réa fournie" #define D_TOTAL_REACTIVE "Énergie réa totale" -#define D_UNIT_KWARH "kVArh" +#define D_UNIT_KWARH "kvarh" #define D_UNIT_ANGLE "°" #define D_TOTAL_ACTIVE "Total Active" #define D_RESETTABLE_TOTAL_ACTIVE "Total Active (RST)" diff --git a/tasmota/language/fy_NL.h b/tasmota/language/fy_NL.h index 1a7e8c27a..b461da25f 100644 --- a/tasmota/language/fy_NL.h +++ b/tasmota/language/fy_NL.h @@ -1059,7 +1059,7 @@ #define D_UNIT_SECOND "sec" #define D_UNIT_SECTORS "sectoren" #define D_UNIT_VA "VA" -#define D_UNIT_VAR "VAr" +#define D_UNIT_VAR "var" #define D_UNIT_VOLT "V" #define D_UNIT_WATT "W" #define D_UNIT_WATTHOUR "Wh" @@ -1081,7 +1081,7 @@ #define D_IMPORT_REACTIVE "Blind ymportearje" #define D_EXPORT_REACTIVE "Blind eksportearje" #define D_TOTAL_REACTIVE "Hielendal blyn" -#define D_UNIT_KWARH "kVArh" +#define D_UNIT_KWARH "kvarh" #define D_UNIT_ANGLE "Deg" #define D_TOTAL_ACTIVE "Hielendal wier" #define D_RESETTABLE_TOTAL_ACTIVE "Hielendal wier (RST)" diff --git a/tasmota/language/he_HE.h b/tasmota/language/he_HE.h index 38289725a..b501c6978 100644 --- a/tasmota/language/he_HE.h +++ b/tasmota/language/he_HE.h @@ -1059,7 +1059,7 @@ #define D_UNIT_SECOND "sec" #define D_UNIT_SECTORS "sectors" #define D_UNIT_VA "VA" -#define D_UNIT_VAR "VAr" +#define D_UNIT_VAR "var" #define D_UNIT_VOLT "V" #define D_UNIT_WATT "W" #define D_UNIT_WATTHOUR "Wh" @@ -1081,7 +1081,7 @@ #define D_IMPORT_REACTIVE "Import Reactive" #define D_EXPORT_REACTIVE "Export Reactive" #define D_TOTAL_REACTIVE "Total Reactive" -#define D_UNIT_KWARH "kVArh" +#define D_UNIT_KWARH "kvarh" #define D_UNIT_ANGLE "Deg" #define D_TOTAL_ACTIVE "Total Active" #define D_RESETTABLE_TOTAL_ACTIVE "Total Active (RST)" diff --git a/tasmota/language/hu_HU.h b/tasmota/language/hu_HU.h index b9e5d5b62..8530e60c3 100644 --- a/tasmota/language/hu_HU.h +++ b/tasmota/language/hu_HU.h @@ -1062,7 +1062,7 @@ #define D_UNIT_SECOND "s" #define D_UNIT_SECTORS "szektorok" #define D_UNIT_VA "VA" -#define D_UNIT_VAR "VAr" +#define D_UNIT_VAR "var" #define D_UNIT_VOLT "V" #define D_UNIT_WATT "W" #define D_UNIT_WATTHOUR "Wh" @@ -1084,7 +1084,7 @@ #define D_IMPORT_REACTIVE "Bejövő reaktív" #define D_EXPORT_REACTIVE "Kimenő reaktív" #define D_TOTAL_REACTIVE "Összes reaktív" -#define D_UNIT_KWARH "kVArh" +#define D_UNIT_KWARH "kvarh" #define D_UNIT_ANGLE "fok" #define D_TOTAL_ACTIVE "Összes aktív" #define D_RESETTABLE_TOTAL_ACTIVE "Összes aktív (RST)" diff --git a/tasmota/language/it_IT.h b/tasmota/language/it_IT.h index 6f7895b06..d12030865 100644 --- a/tasmota/language/it_IT.h +++ b/tasmota/language/it_IT.h @@ -1059,7 +1059,7 @@ #define D_UNIT_SECOND "sec" #define D_UNIT_SECTORS "settori" #define D_UNIT_VA "VA" -#define D_UNIT_VAR "VAr" +#define D_UNIT_VAR "var" #define D_UNIT_VOLT "V" #define D_UNIT_WATT "W" #define D_UNIT_WATTHOUR "Wh" @@ -1081,7 +1081,7 @@ #define D_IMPORT_REACTIVE "Potenza reattiva importata" #define D_EXPORT_REACTIVE "Potenza reattiva esportata" #define D_TOTAL_REACTIVE "Potenza reattiva totale" -#define D_UNIT_KWARH "kVArh" +#define D_UNIT_KWARH "kvarh" #define D_UNIT_ANGLE "°" #define D_TOTAL_ACTIVE "Potenza attiva totale" #define D_RESETTABLE_TOTAL_ACTIVE "Potenza attiva totale (RST)" diff --git a/tasmota/language/ko_KO.h b/tasmota/language/ko_KO.h index 063ff973a..4404b3b18 100644 --- a/tasmota/language/ko_KO.h +++ b/tasmota/language/ko_KO.h @@ -1059,7 +1059,7 @@ #define D_UNIT_SECOND "초" #define D_UNIT_SECTORS "섹터" #define D_UNIT_VA "VA" -#define D_UNIT_VAR "VAr" +#define D_UNIT_VAR "var" #define D_UNIT_VOLT "V" #define D_UNIT_WATT "W" #define D_UNIT_WATTHOUR "Wh" @@ -1081,7 +1081,7 @@ #define D_IMPORT_REACTIVE "Import Reactive" #define D_EXPORT_REACTIVE "Export Reactive" #define D_TOTAL_REACTIVE "Total Reactive" -#define D_UNIT_KWARH "kVArh" +#define D_UNIT_KWARH "kvarh" #define D_UNIT_ANGLE "Deg" #define D_TOTAL_ACTIVE "Total Active" #define D_RESETTABLE_TOTAL_ACTIVE "Total Active (RST)" diff --git a/tasmota/language/nl_NL.h b/tasmota/language/nl_NL.h index f253566eb..527389197 100644 --- a/tasmota/language/nl_NL.h +++ b/tasmota/language/nl_NL.h @@ -1059,7 +1059,7 @@ #define D_UNIT_SECOND "sec" #define D_UNIT_SECTORS "sectoren" #define D_UNIT_VA "VA" -#define D_UNIT_VAR "VAr" +#define D_UNIT_VAR "var" #define D_UNIT_VOLT "V" #define D_UNIT_WATT "W" #define D_UNIT_WATTHOUR "Wh" @@ -1081,7 +1081,7 @@ #define D_IMPORT_REACTIVE "Import blind" #define D_EXPORT_REACTIVE "Export blind" #define D_TOTAL_REACTIVE "Totaal blind" -#define D_UNIT_KWARH "kVArh" +#define D_UNIT_KWARH "kvarh" #define D_UNIT_ANGLE "Deg" #define D_TOTAL_ACTIVE "Totaal werkelijk" #define D_RESETTABLE_TOTAL_ACTIVE "Totaal werkelijk (RST)" diff --git a/tasmota/language/pl_PL.h b/tasmota/language/pl_PL.h index e117468e4..2be37fe0b 100644 --- a/tasmota/language/pl_PL.h +++ b/tasmota/language/pl_PL.h @@ -1059,7 +1059,7 @@ #define D_UNIT_SECOND "sec" #define D_UNIT_SECTORS "sektory" #define D_UNIT_VA "VA" -#define D_UNIT_VAR "VAr" +#define D_UNIT_VAR "var" #define D_UNIT_VOLT "V" #define D_UNIT_WATT "W" #define D_UNIT_WATTHOUR "Wh" @@ -1081,7 +1081,7 @@ #define D_IMPORT_REACTIVE "Bierna pobrana" #define D_EXPORT_REACTIVE "Bierna oddana" #define D_TOTAL_REACTIVE "Bierna całkowita" -#define D_UNIT_KWARH "kVArh" +#define D_UNIT_KWARH "kvarh" #define D_UNIT_ANGLE "Stopni" #define D_TOTAL_ACTIVE "Całkowita czynna" #define D_RESETTABLE_TOTAL_ACTIVE "Całkowita czynna (RST)" diff --git a/tasmota/language/pt_BR.h b/tasmota/language/pt_BR.h index 32a0fed1c..4327aec5b 100644 --- a/tasmota/language/pt_BR.h +++ b/tasmota/language/pt_BR.h @@ -1059,7 +1059,7 @@ #define D_UNIT_SECOND "s" #define D_UNIT_SECTORS "setores" #define D_UNIT_VA "VA" -#define D_UNIT_VAR "VAr" +#define D_UNIT_VAR "var" #define D_UNIT_VOLT "V" #define D_UNIT_WATT "W" #define D_UNIT_WATTHOUR "W/h" @@ -1081,7 +1081,7 @@ #define D_IMPORT_REACTIVE "Importar Reativo" #define D_EXPORT_REACTIVE "Exportar Reativo" #define D_TOTAL_REACTIVE "Reativo total" -#define D_UNIT_KWARH "kVArh" +#define D_UNIT_KWARH "kvarh" #define D_UNIT_ANGLE "Deg" #define D_TOTAL_ACTIVE "Total Ativo" #define D_RESETTABLE_TOTAL_ACTIVE "Total Activo (RST)" diff --git a/tasmota/language/pt_PT.h b/tasmota/language/pt_PT.h index 2add60210..f659ed236 100644 --- a/tasmota/language/pt_PT.h +++ b/tasmota/language/pt_PT.h @@ -1059,7 +1059,7 @@ #define D_UNIT_SECOND "sec" #define D_UNIT_SECTORS "setores" #define D_UNIT_VA "VA" -#define D_UNIT_VAR "VAr" +#define D_UNIT_VAR "var" #define D_UNIT_VOLT "V" #define D_UNIT_WATT "W" #define D_UNIT_WATTHOUR "Wh" @@ -1081,7 +1081,7 @@ #define D_IMPORT_REACTIVE "Reativo importado" #define D_EXPORT_REACTIVE "Reativo exportado" #define D_TOTAL_REACTIVE "Reactivo total" -#define D_UNIT_KWARH "kVArh" +#define D_UNIT_KWARH "kvarh" #define D_UNIT_ANGLE "Deg" #define D_TOTAL_ACTIVE "Total Ativo" #define D_RESETTABLE_TOTAL_ACTIVE "Total Ativo (RST)" diff --git a/tasmota/language/ro_RO.h b/tasmota/language/ro_RO.h index 7cca75c10..d0be73bd4 100644 --- a/tasmota/language/ro_RO.h +++ b/tasmota/language/ro_RO.h @@ -1059,7 +1059,7 @@ #define D_UNIT_SECOND "sec" #define D_UNIT_SECTORS "sectors" #define D_UNIT_VA "VA" -#define D_UNIT_VAR "VAr" +#define D_UNIT_VAR "var" #define D_UNIT_VOLT "V" #define D_UNIT_WATT "W" #define D_UNIT_WATTHOUR "Wh" @@ -1081,7 +1081,7 @@ #define D_IMPORT_REACTIVE "Import Reactiv" #define D_EXPORT_REACTIVE "Export Reactiv" #define D_TOTAL_REACTIVE "Total Reactiv" -#define D_UNIT_KWARH "kVArh" +#define D_UNIT_KWARH "kvarh" #define D_UNIT_ANGLE "Deg" #define D_TOTAL_ACTIVE "Total Activ" #define D_RESETTABLE_TOTAL_ACTIVE "Total Activ (RST)" diff --git a/tasmota/language/sk_SK.h b/tasmota/language/sk_SK.h index 949758bdf..3bb13d21a 100644 --- a/tasmota/language/sk_SK.h +++ b/tasmota/language/sk_SK.h @@ -1059,7 +1059,7 @@ #define D_UNIT_SECOND "sek" #define D_UNIT_SECTORS "sektory" #define D_UNIT_VA "VA" -#define D_UNIT_VAR "VAr" +#define D_UNIT_VAR "var" #define D_UNIT_VOLT "V" #define D_UNIT_WATT "W" #define D_UNIT_WATTHOUR "Wh" @@ -1081,7 +1081,7 @@ #define D_IMPORT_REACTIVE "Import Reactive" #define D_EXPORT_REACTIVE "Export Reactive" #define D_TOTAL_REACTIVE "Total Reactive" -#define D_UNIT_KWARH "kVArh" +#define D_UNIT_KWARH "kvarh" #define D_UNIT_ANGLE "Deg" #define D_TOTAL_ACTIVE "Total Active" #define D_RESETTABLE_TOTAL_ACTIVE "Total Active (RST)" diff --git a/tasmota/language/sv_SE.h b/tasmota/language/sv_SE.h index 9025ebdbb..2c0ddedaa 100644 --- a/tasmota/language/sv_SE.h +++ b/tasmota/language/sv_SE.h @@ -1059,7 +1059,7 @@ #define D_UNIT_SECOND "sek" #define D_UNIT_SECTORS "sektorer" #define D_UNIT_VA "VA" -#define D_UNIT_VAR "VAr" +#define D_UNIT_VAR "var" #define D_UNIT_VOLT "V" #define D_UNIT_WATT "W" #define D_UNIT_WATTHOUR "Wh" @@ -1081,7 +1081,7 @@ #define D_IMPORT_REACTIVE "Import reaktiv" #define D_EXPORT_REACTIVE "Export reaktiv" #define D_TOTAL_REACTIVE "Total reaktiv" -#define D_UNIT_KWARH "kVArh" +#define D_UNIT_KWARH "kvarh" #define D_UNIT_ANGLE "Deg" #define D_TOTAL_ACTIVE "Total aktiv" #define D_RESETTABLE_TOTAL_ACTIVE "Total aktiv (RST)" diff --git a/tasmota/language/tr_TR.h b/tasmota/language/tr_TR.h index c1b0b462e..3c8a01f11 100644 --- a/tasmota/language/tr_TR.h +++ b/tasmota/language/tr_TR.h @@ -1059,7 +1059,7 @@ #define D_UNIT_SECOND "sec" #define D_UNIT_SECTORS "sectors" #define D_UNIT_VA "VA" -#define D_UNIT_VAR "VAr" +#define D_UNIT_VAR "var" #define D_UNIT_VOLT "V" #define D_UNIT_WATT "W" #define D_UNIT_WATTHOUR "Wh" @@ -1081,7 +1081,7 @@ #define D_IMPORT_REACTIVE "Import Reactive" #define D_EXPORT_REACTIVE "Export Reactive" #define D_TOTAL_REACTIVE "Total Reactive" -#define D_UNIT_KWARH "kVArh" +#define D_UNIT_KWARH "kvarh" #define D_UNIT_ANGLE "Deg" #define D_TOTAL_ACTIVE "Total Active" #define D_RESETTABLE_TOTAL_ACTIVE "Total Active (RST)" diff --git a/tasmota/language/vi_VN.h b/tasmota/language/vi_VN.h index caa1075ba..5cc64f7f3 100644 --- a/tasmota/language/vi_VN.h +++ b/tasmota/language/vi_VN.h @@ -1059,7 +1059,7 @@ #define D_UNIT_SECOND "sec" #define D_UNIT_SECTORS "sectors" #define D_UNIT_VA "VA" -#define D_UNIT_VAR "VAr" +#define D_UNIT_VAR "var" #define D_UNIT_VOLT "V" #define D_UNIT_WATT "W" #define D_UNIT_WATTHOUR "Wh" @@ -1081,7 +1081,7 @@ #define D_IMPORT_REACTIVE "Import Reactive" #define D_EXPORT_REACTIVE "Export Reactive" #define D_TOTAL_REACTIVE "Total Reactive" -#define D_UNIT_KWARH "kVArh" +#define D_UNIT_KWARH "kvarh" #define D_UNIT_ANGLE "Deg" #define D_TOTAL_ACTIVE "Total Active" #define D_RESETTABLE_TOTAL_ACTIVE "Total Active (RST)" diff --git a/tasmota/language/zh_CN.h b/tasmota/language/zh_CN.h index 6a1166f9f..3f6742a79 100644 --- a/tasmota/language/zh_CN.h +++ b/tasmota/language/zh_CN.h @@ -1059,7 +1059,7 @@ #define D_UNIT_SECOND "秒" #define D_UNIT_SECTORS "扇区" #define D_UNIT_VA "VA" -#define D_UNIT_VAR "VAr" +#define D_UNIT_VAR "var" #define D_UNIT_VOLT "V" #define D_UNIT_WATT "W" #define D_UNIT_WATTHOUR "Wh" diff --git a/tasmota/language/zh_TW.h b/tasmota/language/zh_TW.h index e6254ce49..dd6e80fcd 100644 --- a/tasmota/language/zh_TW.h +++ b/tasmota/language/zh_TW.h @@ -1059,7 +1059,7 @@ #define D_UNIT_SECOND "秒" #define D_UNIT_SECTORS "磁區" #define D_UNIT_VA "伏安(VA)" -#define D_UNIT_VAR "乏爾(VAr)" +#define D_UNIT_VAR "乏爾(var)" #define D_UNIT_VOLT "伏特" #define D_UNIT_WATT "瓦特" #define D_UNIT_WATTHOUR "瓦小時" @@ -1081,7 +1081,7 @@ #define D_IMPORT_REACTIVE "Import Reactive" #define D_EXPORT_REACTIVE "Export Reactive" #define D_TOTAL_REACTIVE "Total Reactive" -#define D_UNIT_KWARH "kVArh" +#define D_UNIT_KWARH "kvarh" #define D_UNIT_ANGLE "Deg" #define D_TOTAL_ACTIVE "Total Active" #define D_RESETTABLE_TOTAL_ACTIVE "Total Active (RST)" diff --git a/tasmota/tasmota_xdrv_driver/xdrv_03_energy.ino b/tasmota/tasmota_xdrv_driver/xdrv_03_energy.ino index eb07c4fb2..a26644832 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_03_energy.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_03_energy.ino @@ -80,7 +80,7 @@ typedef struct { float current[ENERGY_MAX_PHASES]; // 123.123 A float active_power[ENERGY_MAX_PHASES]; // 123.1 W float apparent_power[ENERGY_MAX_PHASES]; // 123.1 VA - float reactive_power[ENERGY_MAX_PHASES]; // 123.1 VAr + float reactive_power[ENERGY_MAX_PHASES]; // 123.1 var float power_factor[ENERGY_MAX_PHASES]; // 0.12 float frequency[ENERGY_MAX_PHASES]; // 123.1 Hz float import_active[ENERGY_MAX_PHASES]; // 123.123 kWh diff --git a/tasmota/tasmota_xdrv_driver/xdrv_03_esp32_energy.ino b/tasmota/tasmota_xdrv_driver/xdrv_03_esp32_energy.ino index 5d03055b7..6b7423329 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_03_esp32_energy.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_03_esp32_energy.ino @@ -157,7 +157,7 @@ typedef struct { float current[ENERGY_MAX_PHASES]; // 123.123 A float active_power[ENERGY_MAX_PHASES]; // 123.1 W float apparent_power[ENERGY_MAX_PHASES]; // 123.1 VA - float reactive_power[ENERGY_MAX_PHASES]; // 123.1 VAr + float reactive_power[ENERGY_MAX_PHASES]; // 123.1 var float power_factor[ENERGY_MAX_PHASES]; // 0.12 float frequency[ENERGY_MAX_PHASES]; // 123.1 Hz float import_active[ENERGY_MAX_PHASES]; // 123.123 kWh diff --git a/tasmota/tasmota_xdrv_driver/xdrv_12_home_assistant.ino b/tasmota/tasmota_xdrv_driver/xdrv_12_home_assistant.ino index d65d6a22f..b5442a452 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_12_home_assistant.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_12_home_assistant.ino @@ -48,7 +48,7 @@ const char kHAssJsonSensorUnits[] PROGMEM = "||||" "VA|%|A|cm|Hz|%|lux|" "%|ppd|ppd|ppd|ppd|ppd|ppd|µg/m³|µg/m³|µg/m³|Cos φ|W| |" - "VAr|kWh|kWh|V|kg|kWh|" + "var|kWh|kWh|V|kg|kWh|" "ppm|ppm|ppb|R|G|B|" D_UNIT_KELVIN "| |"; const char kHAssJsonSensorDevCla[] PROGMEM = diff --git a/tasmota/tasmota_xdrv_driver/xdrv_86_esp32_sonoff_spm.ino b/tasmota/tasmota_xdrv_driver/xdrv_86_esp32_sonoff_spm.ino index 657c53660..592856851 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_86_esp32_sonoff_spm.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_86_esp32_sonoff_spm.ino @@ -247,7 +247,7 @@ typedef struct { float current[SSPM_MAX_MODULES][4]; // 123.12 A float active_power[SSPM_MAX_MODULES][4]; // 123.12 W float apparent_power[SSPM_MAX_MODULES][4]; // 123.12 VA - float reactive_power[SSPM_MAX_MODULES][4]; // 123.12 VAr + float reactive_power[SSPM_MAX_MODULES][4]; // 123.12 var float power_factor[SSPM_MAX_MODULES][4]; // 0.12 float energy_today[SSPM_MAX_MODULES][4]; // 12345 kWh float energy_total[SSPM_MAX_MODULES][4]; // 12345 kWh total energy since last 6 month!!! @@ -1561,7 +1561,7 @@ void SSPMHandleReceivedData(void) { Sspm->current[module][channel] = SspmBuffer[offset] + (float)SspmBuffer[offset +1] / 100; // x.xxA Sspm->voltage[module][channel] = SSPMGetValue(&SspmBuffer[offset +2]); // x.xxV Sspm->active_power[module][channel] = SSPMGetValue(&SspmBuffer[offset +5]); // x.xxW - Sspm->reactive_power[module][channel] = SSPMGetValue(&SspmBuffer[offset +8]); // x.xxVAr + Sspm->reactive_power[module][channel] = SSPMGetValue(&SspmBuffer[offset +8]); // x.xxvar Sspm->apparent_power[module][channel] = SSPMGetValue(&SspmBuffer[offset +11]); // x.xxVA float power_factor = (Sspm->active_power[module][channel] && Sspm->apparent_power[module][channel]) ? Sspm->active_power[module][channel] / Sspm->apparent_power[module][channel] : 0; if (power_factor > 1) { power_factor = 1; } diff --git a/tasmota/tasmota_xdrv_driver/xdrv_87_esp32_sonoff_tm1621.ino b/tasmota/tasmota_xdrv_driver/xdrv_87_esp32_sonoff_tm1621.ino index 327b0d855..e986fab40 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_87_esp32_sonoff_tm1621.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_87_esp32_sonoff_tm1621.ino @@ -599,7 +599,7 @@ void CmndDspLine(void) { // Example 2: PZEM016 serial connected (GPIO25 = PZEM0XX Tx, GPIO26 = PZEM016 Rx) // {"ENERGY":{"TotalStartTime":"2022-07-05T16:01:39","Total":0.000,"Yesterday":0.000,"Today":0.000,"Power":0.00,"ApparentPower":0.00,"ReactivePower":0.00,"Factor":0.00,"Frequency":50,"Voltage":231.7,"Current":0.000}} // index: 1 2 3 4 5 6 7 8 9 10 11 12 - // unit: 0 0 4 (kWh) 4 (kWh) 4 (kWh) 4 (W) 0 (VA) 0 (VAr) 0 0 3 (V) 3 (A) + // unit: 0 0 4 (kWh) 4 (kWh) 4 (kWh) 4 (W) 0 (VA) 0 (var) 0 0 3 (V) 3 (A) TM1621GetSensors(1); } } diff --git a/tasmota/tasmota_xnrg_energy/xnrg_07_ade7953.ino b/tasmota/tasmota_xnrg_energy/xnrg_07_ade7953.ino index 30330d1fe..26f5f61ec 100644 --- a/tasmota/tasmota_xnrg_energy/xnrg_07_ade7953.ino +++ b/tasmota/tasmota_xnrg_energy/xnrg_07_ade7953.ino @@ -462,10 +462,10 @@ void Ade7953Init(void) { } } #ifdef USE_ESP32_SPI - AddLog(LOG_LEVEL_DEBUG_MORE, PSTR("ADE: Chip%d CalibRegs%c V %d, I %d, W %d, VA %d, VAr %d, Ph %d"), + AddLog(LOG_LEVEL_DEBUG_MORE, PSTR("ADE: Chip%d CalibRegs%c V %d, I %d, W %d, VA %d, var %d, Ph %d"), chip +1, 'A'+channel, regs[0], regs[1], regs[2], regs[3], regs[4], regs[5]); #else - AddLog(LOG_LEVEL_DEBUG_MORE, PSTR("ADE: CalibRegs%c V %d, I %d, W %d, VA %d, VAr %d, Ph %d"), + AddLog(LOG_LEVEL_DEBUG_MORE, PSTR("ADE: CalibRegs%c V %d, I %d, W %d, VA %d, var %d, Ph %d"), 'A'+channel, regs[0], regs[1], regs[2], regs[3], regs[4], regs[5]); #endif // USE_ESP32_SPI } diff --git a/tasmota/tasmota_xnrg_energy/xnrg_08_sdm120.ino b/tasmota/tasmota_xnrg_energy/xnrg_08_sdm120.ino index 9264be095..21c436a77 100644 --- a/tasmota/tasmota_xnrg_energy/xnrg_08_sdm120.ino +++ b/tasmota/tasmota_xnrg_energy/xnrg_08_sdm120.ino @@ -54,8 +54,8 @@ const uint16_t sdm120_start_addresses[] { 0X0048, // SDM220_IMPORT_ACTIVE [kWh] 0X004A, // SDM220_EXPORT_ACTIVE [kWh] - 0X004C, // SDM220_IMPORT_REACTIVE [kVArh] - 0X004E, // SDM220_EXPORT_REACTIVE [kVArh] + 0X004C, // SDM220_IMPORT_REACTIVE [kvarh] + 0X004E, // SDM220_EXPORT_REACTIVE [kvarh] 0X0024 // SDM220_PHASE_ANGLE [Degree] }; @@ -138,11 +138,11 @@ void SDM120Every250ms(void) break; case 10: - Sdm120.import_reactive = value; // 172.750 kVArh + Sdm120.import_reactive = value; // 172.750 kvarh break; case 11: - Sdm120.export_reactive = value; // 2.844 kVArh + Sdm120.export_reactive = value; // 2.844 kvarh break; case 12: diff --git a/tasmota/tasmota_xnrg_energy/xnrg_10_sdm630.ino b/tasmota/tasmota_xnrg_energy/xnrg_10_sdm630.ino index 45174c976..38d708ebc 100644 --- a/tasmota/tasmota_xnrg_energy/xnrg_10_sdm630.ino +++ b/tasmota/tasmota_xnrg_energy/xnrg_10_sdm630.ino @@ -80,9 +80,9 @@ const uint16_t sdm630_start_addresses[] { 0x000C, // + - + W Phase 1 power 0x000E, // + - + W Phase 2 power 0x0010, // + - - W Phase 3 power - 0x0018, // + - + VAr Phase 1 volt amps reactive - 0x001A, // + - - VAr Phase 2 volt amps reactive - 0x001C, // + - - VAr Phase 3 volt amps reactive + 0x0018, // + - + var Phase 1 volt amps reactive + 0x001A, // + - - var Phase 2 volt amps reactive + 0x001C, // + - - var Phase 3 volt amps reactive 0x001E, // + - + Phase 1 power factor 0x0020, // + - - Phase 2 power factor 0x0022, // + - - Phase 3 power factor @@ -165,9 +165,9 @@ void SDM630Every250ms(void) Energy->apparent_power[2] = convBufToFloat(&buffer[47]); // + - - VA Phase 3 volt amps //0x0018 - Energy->reactive_power[0] = convBufToFloat(&buffer[51]); // + - + VAr Phase 1 volt amps reactive - Energy->reactive_power[1] = convBufToFloat(&buffer[55]); // + - - VAr Phase 2 volt amps reactive - Energy->reactive_power[2] = convBufToFloat(&buffer[59]); // + - - VAr Phase 3 volt amps reactive + Energy->reactive_power[0] = convBufToFloat(&buffer[51]); // + - + var Phase 1 volt amps reactive + Energy->reactive_power[1] = convBufToFloat(&buffer[55]); // + - - var Phase 2 volt amps reactive + Energy->reactive_power[2] = convBufToFloat(&buffer[59]); // + - - var Phase 3 volt amps reactive //0x001E Energy->power_factor[0] = convBufToFloat(&buffer[63]); // + - + Phase 1 power factor diff --git a/tasmota/tasmota_xnrg_energy/xnrg_13_fif_le01mr.ino b/tasmota/tasmota_xnrg_energy/xnrg_13_fif_le01mr.ino index 9d56c7b08..7d8a08144 100644 --- a/tasmota/tasmota_xnrg_energy/xnrg_13_fif_le01mr.ino +++ b/tasmota/tasmota_xnrg_energy/xnrg_13_fif_le01mr.ino @@ -24,7 +24,7 @@ * (and bidirectional energy counting - enabled by RS485). * It measure: Active energy imported AE+ [kWh] , Reactive energy imported RE+ [kvarh], * Voltage V [V], Current I [A], Frequency F [Hz], power factor (aka "cos-phi"), - * Active power P [kW], Reactive power Q [kVAr], Apparent power S [kVA], + * Active power P [kW], Reactive power Q [kvar], Apparent power S [kVA], * *Active energy exported AE- [kWh] (when meter is switched to bi-directional counting then * reactive energy imported register contains value of Active energy exported). * diff --git a/tasmota/tasmota_xnrg_energy/xnrg_17_ornowe517.ino b/tasmota/tasmota_xnrg_energy/xnrg_17_ornowe517.ino index de67879a7..3dbb082da 100644 --- a/tasmota/tasmota_xnrg_energy/xnrg_17_ornowe517.ino +++ b/tasmota/tasmota_xnrg_energy/xnrg_17_ornowe517.ino @@ -54,9 +54,9 @@ const uint16_t we517_start_addresses[] { /* 6 */ 0x001E, // + - + kW Phase 1 power /* 7 */ 0x0020, // + - + kW Phase 2 power /* 8 */ 0x0022, // + - - kW Phase 3 power - /* 9 */ 0x0026, // + - + VAr Phase 1 volt amps reactive - /* 10 */ 0x0028, // + - - VAr Phase 2 volt amps reactive - /* 11 */ 0x002A, // + - - VAr Phase 3 volt amps reactive + /* 9 */ 0x0026, // + - + var Phase 1 volt amps reactive + /* 10 */ 0x0028, // + - - var Phase 2 volt amps reactive + /* 11 */ 0x002A, // + - - var Phase 3 volt amps reactive /* 12 */ 0x0036, // + - + Phase 1 power factor /* 13 */ 0x0038, // + - - Phase 2 power factor /* 14 */ 0x003A, // + - - Phase 3 power factor diff --git a/tasmota/tasmota_xnrg_energy/xnrg_21_sdm230.ino b/tasmota/tasmota_xnrg_energy/xnrg_21_sdm230.ino index 5c6cd19ab..18054e175 100644 --- a/tasmota/tasmota_xnrg_energy/xnrg_21_sdm230.ino +++ b/tasmota/tasmota_xnrg_energy/xnrg_21_sdm230.ino @@ -53,7 +53,7 @@ const uint16_t sdm230_start_addresses[] { 0x0006, // SDM230_CURRENT [A] 0x000C, // SDM230_POWER (Active) [W] 0x0012, // SDM230_POWER (Apparent) G [VA] - 0x0018, // SDM230_POWER (Reactive) [VAr] + 0x0018, // SDM230_POWER (Reactive) [var] 0x001E, // SDM230_POWER_FACTOR 0x0046, // SDM230_FREQUENCY [Hz] 0X0048, // SDM230_IMPORT_ACTIVE [kWh] @@ -68,10 +68,10 @@ const uint16_t sdm230_start_addresses[] { #endif // SDM230_MORE_REGS // for documentation / further use or implementation -// 0X0158, // SDM230_TOTAL_ENERGY_REACTIVE [kVArh] -// 0X0182, // SDM230_RESETTABLE_TOTAL_ENERGY_REACTIVE [kVArh] -// 0X004C, // SDM230_IMPORT_REACTIVE [kVArh] -// 0X004E, // SDM230_EXPORT_REACTIVE [kVArh] +// 0X0158, // SDM230_TOTAL_ENERGY_REACTIVE [kvarh] +// 0X0182, // SDM230_RESETTABLE_TOTAL_ENERGY_REACTIVE [kvarh] +// 0X004C, // SDM230_IMPORT_REACTIVE [kvarh] +// 0X004E, // SDM230_EXPORT_REACTIVE [kvarh] // 0X0054, // SDM230_TOTAL_DEMAND_POWER_ACTIVE [W] // 0X0058, // SDM230_IMPORT_DEMAND_POWER_ACTIVE [W] // 0X005A, // SDM230_MAXIMUM_IMPORT_DEMAND_POWER_ACTIVE [W]