jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-23 10:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

always EnergyUpdateTotal

Browse Source
This commit is contained in:
Charles 2021-04-02 22:57:23 +02:00
parent 1ab0a2f05c
commit 9126635c9d
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tasmota/xnrg_15_teleinfo.ino
View File

@ -233,6 +233,7 @@ void DataCallback(struct _ValueList * me, uint8_t flags)
// Current I // Current I
else if (ilabel == LABEL_IINST || ilabel == LABEL_IRMS1) else if (ilabel == LABEL_IINST || ilabel == LABEL_IRMS1)
{ {
Energy.current_available = true;
Energy.current[0] = (float) atoi(me->value); Energy.current[0] = (float) atoi(me->value);
AddLog(LOG_LEVEL_DEBUG, PSTR("TIC: Current %s, now %d"), me->value, (int) Energy.current[0]); 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); 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) // Wh total index (standard)
else if ( ilabel == LABEL_EAST) else if ( ilabel == LABEL_EAST)
{ {
uint32_t total = atoi(me->value); 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); AddLog(LOG_LEVEL_DEBUG, PSTR("TIC: Total:%uWh"), total);
} }