jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-25 19:56:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix KNX compile error

Browse Source
This commit is contained in:
Theo Arends 2018-09-28 17:02:55 +02:00
parent 4b7c797fb7
commit f05a471e48
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sonoff/xdrv_03_energy.ino
View File

@ -560,6 +560,8 @@ void EnergyShow(boolean json)
bool show_energy_period = (0 == tele_period); bool show_energy_period = (0 == tele_period);
float power_factor = energy_power_factor;
if (!energy_type_dc) { if (!energy_type_dc) {
float apparent_power = energy_apparent_power; float apparent_power = energy_apparent_power;
if (isnan(apparent_power)) { if (isnan(apparent_power)) {
@ -569,7 +571,6 @@ void EnergyShow(boolean json)
energy_active_power = apparent_power; energy_active_power = apparent_power;
} }
float power_factor = energy_power_factor;
if (isnan(power_factor)) { if (isnan(power_factor)) {
power_factor = (energy_active_power && apparent_power) ? energy_active_power / apparent_power : 0; power_factor = (energy_active_power && apparent_power) ? energy_active_power / apparent_power : 0;
if (power_factor > 1) power_factor = 1; if (power_factor > 1) power_factor = 1;