mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix SSPM energy yesterday when zero

This commit is contained in:
Theo Arends 2022-02-12 16:37:48 +01:00
parent 5e15cd2396
commit 3d2c9945a8
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -8,6 +8,7 @@ All notable changes to this project will be documented in this file.
### Changed
### Fixed
- SSPM energy yesterday when zero
## [Released]

13
tasmota/xdrv_86_esp32_sonoff_spm.ino
View File

@ -252,6 +252,7 @@ typedef struct {
uint16_t expected_bytes;
uint8_t module[SSPM_MAX_MODULES][SSPM_MODULE_NAME_SIZE];
uint8_t history_day[SSPM_MAX_MODULES][4];
uint8_t allow_updates;
uint8_t get_energy_relay;
uint8_t get_totals;
@ -1136,16 +1137,22 @@ void SSPMHandleReceivedData(void) {
energy_total += energy;
}
}
uint8_t history_day = SspmBuffer[36]; // Date of last entry
if (0 == Sspm->history_day[module][channel]) { // Initial setting
Sspm->history_day[module][channel] = history_day;
}
if ((0 == Sspm->Settings.energy_total[module][channel]) && energy_total) {
Sspm->Settings.energy_yesterday[module][channel] = energy_yesterday; // Inital setting
Sspm->Settings.energy_yesterday[module][channel] = energy_yesterday; // Initial setting
Sspm->Settings.energy_total[module][channel] = energy_total; // Initial setting
if (Settings->save_data) {
TasmotaGlobal.save_data_counter = Settings->save_data +2; // Postpone flash write until all relays are updated
}
}
// If received daily energy is below last daily energy then update total energy
// If received daily energy date is changed then update total energy
// This happens around midnight in normal situations
else if (Sspm->energy_today[module][channel] < last_energy_today) {
else if (Sspm->history_day[module][channel] != history_day) {
Sspm->history_day[module][channel] = history_day;
Sspm->Settings.energy_yesterday[module][channel] = last_energy_today; // Daily save
Sspm->Settings.energy_total[module][channel] += last_energy_today; // Daily incremental save
if (Settings->save_data) {