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

Fix energy total counters 

Fix energy total counters (#9263, #9266)
This commit is contained in:
Theo Arends 2020-09-09 11:38:18 +02:00
parent a89f208da0
commit 8bac4981ea
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
RELEASENOTES.md
View File

@ -61,6 +61,7 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
- Change White blend mode to using command ``SetOption 105`` instead of ``RGBWWTable`` - Change White blend mode to using command ``SetOption 105`` instead of ``RGBWWTable``
- Fix ESP32 PWM range - Fix ESP32 PWM range
- Fix display power control (#9114) - Fix display power control (#9114)
- Fix energy total counters (#9263, #9266)
- Add command ``SetOption102 0/1`` to set Baud rate for Teleinfo communication (0 = 1200 or 1 = 9600) - Add command ``SetOption102 0/1`` to set Baud rate for Teleinfo communication (0 = 1200 or 1 = 9600)
- Add command ``SetOption103 0/1`` to set TLS mode when TLS is selected - Add command ``SetOption103 0/1`` to set TLS mode when TLS is selected
- Add command ``SetOption104 1`` to disable all MQTT retained messages - Add command ``SetOption104 1`` to disable all MQTT retained messages

1
tasmota/CHANGELOG.md
View File

@ -8,6 +8,7 @@
### 8.4.0.3 20200823 ### 8.4.0.3 20200823
- Fix energy total counters (#9263, #9266)
- Change references from http://thehackbox.org/tasmota/ to http://ota.tasmota.com/tasmota/ - Change references from http://thehackbox.org/tasmota/ to http://ota.tasmota.com/tasmota/
- Add command ``PowerDelta1`` to ``PowerDelta3`` to trigger on up to three phases (#9134) - Add command ``PowerDelta1`` to ``PowerDelta3`` to trigger on up to three phases (#9134)
- Add Zigbee web ui widget for Lights - Add Zigbee web ui widget for Lights

4
tasmota/xnrg_01_hlw8012.ino
View File

@ -205,10 +205,10 @@ void HlwEverySecond(void)
unsigned long hlw_len; unsigned long hlw_len;
if (Hlw.energy_period_counter) { if (Hlw.energy_period_counter) {
hlw_len = 10000 * 1000 / Hlw.energy_period_counter; // Add *1000 to fix rounding on loads at 3.6kW (#9160) hlw_len = 10000 * 100 / Hlw.energy_period_counter; // Add *100 to fix rounding on loads at 3.6kW (#9160)
Hlw.energy_period_counter = 0; Hlw.energy_period_counter = 0;
if (hlw_len) { if (hlw_len) {
Energy.kWhtoday_delta += ((Hlw.power_ratio * Settings.energy_power_calibration) * 1000 / hlw_len) / 36; Energy.kWhtoday_delta += (((Hlw.power_ratio * Settings.energy_power_calibration) / 36) * 100) / hlw_len;
EnergyUpdateToday(); EnergyUpdateToday();
} }
} }