jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-29 05:36:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6445 from pablozg/development

Browse Source 
Autoupdate Energy.total with the value reported by hardware (sdm120, …
This commit is contained in:
Theo Arends 2019-09-18 16:21:28 +02:00 committed by GitHub
commit 13290eb14a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sonoff/xdrv_03_energy.ino
View File

@ -190,6 +190,13 @@ void EnergyUpdateTotal(float value, bool kwh)
else if (value != Energy.start_energy) { else if (value != Energy.start_energy) {
Energy.kWhtoday = (unsigned long)((value - Energy.start_energy) * multiplier); Energy.kWhtoday = (unsigned long)((value - Energy.start_energy) * multiplier);
} }
if (Energy.total < value){
RtcSettings.energy_kWhtotal = (unsigned long)((value * multiplier) - Energy.kWhtoday_offset - Energy.kWhtoday);
Settings.energy_kWhtotal = RtcSettings.energy_kWhtotal;
Energy.total = (float)(RtcSettings.energy_kWhtotal + Energy.kWhtoday_offset + Energy.kWhtoday) / 100000;
Settings.energy_kWhtotal_time = (!Energy.kWhtoday_offset) ? LocalTime() : Midnight();
}
EnergyUpdateToday(); EnergyUpdateToday();
} }