jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-24 11:16:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Energy] Fix frequency handling (#20626)

Browse Source 
* [Energy] Prepare MQTT subscribe

- Prepare energy driver for using MQTT subscribe
- Fix handling of frequency

* MQTT in xnrg

* Revert MQTT
This commit is contained in:
SteWers 2024-02-03 12:37:57 +01:00 committed by GitHub
parent 478bd0ce17
commit 55259aa8c5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tasmota/tasmota_xdrv_driver/xdrv_03_energy.ino
View File

@ -673,10 +673,9 @@ void EnergyEverySecond(void) {
Energy->active_power[i] = 0;
if (!isnan(Energy->apparent_power[i])) { Energy->apparent_power[i] = 0; }
if (!isnan(Energy->reactive_power[i])) { Energy->reactive_power[i] = 0; }
if (!isnan(Energy->frequency[i]) && !Energy->type_dc) { Energy->frequency[i] = 0; }
if (!isnan(Energy->power_factor[i])) { Energy->power_factor[i] = 0; }
if (!isnan(Energy->export_active[i])) { Energy->export_active[i] = 0; }
if (!isnan(Energy->frequency[i])) { Energy->frequency[i] = 0; }
if (!isnan(Energy->power_factor[i])) { Energy->power_factor[i] = 0; }
if (!isnan(Energy->export_active[i])) { Energy->export_active[i] = 0; }
data_valid--;
}
}

7
tasmota/tasmota_xdrv_driver/xdrv_03_esp32_energy.ino
View File

@ -893,10 +893,9 @@ void EnergyEverySecond(void) {
Energy->active_power[i] = 0;
if (!isnan(Energy->apparent_power[i])) { Energy->apparent_power[i] = 0; }
if (!isnan(Energy->reactive_power[i])) { Energy->reactive_power[i] = 0; }
if (!isnan(Energy->frequency[i]) && !Energy->type_dc) { Energy->frequency[i] = 0; }
if (!isnan(Energy->power_factor[i])) { Energy->power_factor[i] = 0; }
if (!isnan(Energy->export_active[i])) { Energy->export_active[i] = 0; }
if (!isnan(Energy->frequency[i])) { Energy->frequency[i] = 0; }
if (!isnan(Energy->power_factor[i])) { Energy->power_factor[i] = 0; }
if (!isnan(Energy->export_active[i])) { Energy->export_active[i] = 0; }
data_valid--;
}
}