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

Fix exception 0 on power delta 

Fix exception 0 on power delta (#6741)
This commit is contained in:
Theo Arends 2019-10-25 18:16:09 +02:00
parent e4b032315b
commit 958ddcad91
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sonoff/xdrv_03_energy.ino
View File

@ -292,11 +292,13 @@ void EnergyMarginCheck(void)
DEBUG_DRIVER_LOG(PSTR("NRG: Delta %d, Power %d"), delta, min_power); DEBUG_DRIVER_LOG(PSTR("NRG: Delta %d, Power %d"), delta, min_power);
if ( ((Settings.energy_power_delta < 101) && (((delta * 100) / min_power) > Settings.energy_power_delta)) || // 1..100 = Percentage if (delta) { // Fix divide by 0 exception (#6741)
((Settings.energy_power_delta > 100) && (delta > (Settings.energy_power_delta -100))) ) { // 101..32000 = Absolute if (((Settings.energy_power_delta < 101) && (((delta * 100) / min_power) > Settings.energy_power_delta)) || // 1..100 = Percentage
Energy.power_delta = true; ((Settings.energy_power_delta > 100) && (delta > (Settings.energy_power_delta -100)))) { // 101..32000 = Absolute
Energy.power_history[1] = Energy.active_power[0]; // We only want one report so reset history Energy.power_delta = true;
Energy.power_history[2] = Energy.active_power[0]; Energy.power_history[1] = Energy.active_power[0]; // We only want one report so reset history
Energy.power_history[2] = Energy.active_power[0];
}
} }
} }
Energy.power_history[0] = Energy.power_history[1]; // Shift in history every second allowing power changes to settle for up to three seconds Energy.power_history[0] = Energy.power_history[1]; // Shift in history every second allowing power changes to settle for up to three seconds