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

Fix init of Energy Offset after power cycle 

Fix init of Energy Offset after power cycle (#8356)
This commit is contained in:
Theo Arends 2020-05-10 12:59:13 +02:00
parent 02f61a5259
commit bdc0934cb8
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tasmota/xdrv_03_energy.ino
View File

@ -96,6 +96,7 @@ struct ENERGY {
uint8_t phase_count = 1; // Number of phases active uint8_t phase_count = 1; // Number of phases active
bool voltage_common = false; // Use single voltage and frequency bool voltage_common = false; // Use single voltage and frequency
bool kWhtoday_offset_init = false;
bool voltage_available = true; // Enable if voltage is measured bool voltage_available = true; // Enable if voltage is measured
bool current_available = true; // Enable if current is measured bool current_available = true; // Enable if current is measured
@ -223,6 +224,12 @@ void Energy200ms(void)
XnrgCall(FUNC_ENERGY_EVERY_SECOND); XnrgCall(FUNC_ENERGY_EVERY_SECOND);
if (RtcTime.valid) { if (RtcTime.valid) {
if (!Energy.kWhtoday_offset_init && (RtcTime.day_of_year == Settings.energy_kWhdoy)) {
Energy.kWhtoday_offset = Settings.energy_kWhtoday;
Energy.kWhtoday_offset_init = true;
}
if (LocalTime() == Midnight()) { if (LocalTime() == Midnight()) {
Settings.energy_kWhyesterday = RtcSettings.energy_kWhtoday; Settings.energy_kWhyesterday = RtcSettings.energy_kWhtoday;
@ -827,14 +834,11 @@ void EnergySnsInit(void)
XnrgCall(FUNC_INIT); XnrgCall(FUNC_INIT);
if (energy_flg) { if (energy_flg) {
if (RtcSettingsValid()) { Energy.kWhtoday_offset = 0;
// Do not use at Power On as Rtc was invalid (but has been restored from Settings already)
if ((ResetReason() != REASON_DEFAULT_RST) && RtcSettingsValid()) {
Energy.kWhtoday_offset = RtcSettings.energy_kWhtoday; Energy.kWhtoday_offset = RtcSettings.energy_kWhtoday;
} Energy.kWhtoday_offset_init = true;
else if (RtcTime.day_of_year == Settings.energy_kWhdoy) {
Energy.kWhtoday_offset = Settings.energy_kWhtoday;
}
else {
Energy.kWhtoday_offset = 0;
} }
Energy.kWhtoday = 0; Energy.kWhtoday = 0;
Energy.kWhtoday_delta = 0; Energy.kWhtoday_delta = 0;