From 9126635c9d69c5a9b777ff85e46389b9fe7117ae Mon Sep 17 00:00:00 2001 From: Charles Date: Fri, 2 Apr 2021 22:57:23 +0200 Subject: [PATCH 1/3] always EnergyUpdateTotal --- tasmota/xnrg_15_teleinfo.ino | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/tasmota/xnrg_15_teleinfo.ino b/tasmota/xnrg_15_teleinfo.ino index aa41e93ff..2431a4abe 100755 --- a/tasmota/xnrg_15_teleinfo.ino +++ b/tasmota/xnrg_15_teleinfo.ino @@ -233,6 +233,7 @@ void DataCallback(struct _ValueList * me, uint8_t flags) // Current I else if (ilabel == LABEL_IINST || ilabel == LABEL_IRMS1) { + Energy.current_available = true; Energy.current[0] = (float) atoi(me->value); AddLog(LOG_LEVEL_DEBUG, PSTR("TIC: Current %s, now %d"), me->value, (int) Energy.current[0]); } @@ -276,18 +277,14 @@ void DataCallback(struct _ValueList * me, uint8_t flags) AddLog(LOG_LEVEL_DEBUG, PSTR("TIC: HC:%u HP:%u Total:%u"), hc, hp, total); } - if (!Settings.flag4.teleinfo_rawdata) { - EnergyUpdateTotal(total/1000.0f, true); - } + EnergyUpdateTotal(total/1000.0f, true); } // Wh total index (standard) else if ( ilabel == LABEL_EAST) { uint32_t total = atoi(me->value); - if (!Settings.flag4.teleinfo_rawdata) { - EnergyUpdateTotal(total/1000.0f, true); - } + EnergyUpdateTotal(total/1000.0f, true); AddLog(LOG_LEVEL_DEBUG, PSTR("TIC: Total:%uWh"), total); } From 35c682a77a1a50f4537f1348c36953e243539d84 Mon Sep 17 00:00:00 2001 From: Charles Date: Sat, 3 Apr 2021 10:20:55 +0200 Subject: [PATCH 2/3] added teleinfo changes --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a89ad0a49..13951d320 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,8 @@ All notable changes to this project will be documented in this file. - ESP32 core library from v1.0.5 to v1.0.6 - Limit number of relay/button columns in GUI to 8 (#11546) - ADC range result from int to float using command ``FreqRes`` for decimal resolution selection (#11545) +- Teleinfo, if raw mode selected also return telemety values in SENSOR data +- Teleinfo, if raw mode selected also always update total energy calculations ### Fixed - HC-SR04 on ESP32 release serial interface if not used (#11507) From c3b1e876772ca41302278eb172de48b7c7803da0 Mon Sep 17 00:00:00 2001 From: Charles Date: Sat, 3 Apr 2021 10:22:18 +0200 Subject: [PATCH 3/3] teleinfo fixed calculation --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 13951d320..534ec5657 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,10 +22,10 @@ All notable changes to this project will be documented in this file. - Limit number of relay/button columns in GUI to 8 (#11546) - ADC range result from int to float using command ``FreqRes`` for decimal resolution selection (#11545) - Teleinfo, if raw mode selected also return telemety values in SENSOR data -- Teleinfo, if raw mode selected also always update total energy calculations ### Fixed - HC-SR04 on ESP32 release serial interface if not used (#11507) +- Teleinfo, if raw mode selected also always update total energy calculations ## [9.3.1.1] ### Added