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

Remove redundant code

This commit is contained in:
Theo Arends 2021-08-30 11:09:10 +02:00
parent 3a85922a94
commit 547791058a
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tasmota/xdrv_45_shelly_dimmer.ino
View File

@ -534,18 +534,22 @@ bool ShdPacketProcess(void)
Energy.active_power[0] = wattage;
Energy.voltage[0] = voltage;
Energy.current[0] = current;
/*
// This is duplicated code as it is already services by the Energy driver (xdrv_03_energy.ino)
Energy.apparent_power[0] = voltage * current;
if ((voltage * current) > wattage)
Energy.reactive_power[0] = sqrtf((voltage * current) * (voltage * current) - wattage * wattage);
else
Energy.reactive_power[0] = 0;
if (wattage > (voltage * current))
Energy.power_factor[0] = 1;
else if ((voltage * current) == 0)
Energy.power_factor[0] = 0;
else
Energy.power_factor[0] = wattage / (voltage * current);
*/
if (Shd.last_power_check > 10 && Energy.active_power[0] > 0)
{
float kWhused = (float)Energy.active_power[0] * (Rtc.utc_time - Shd.last_power_check) / 36;