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

Fix initial ESP32 Energy kWh total time

Browse Source
This commit is contained in:
Theo Arends 2023-05-29 16:19:55 +02:00
parent bf2982854b
commit 07b7a7ee9a
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
RELEASENOTES.md
View File

@ -131,6 +131,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm
### Breaking Changed ### Breaking Changed
- Change command ``FileUpload`` index binary data detection from >199 to >299 - Change command ``FileUpload`` index binary data detection from >199 to >299
- Matter relay number starts at 1 instead of 0 to match Tasmota numbering
### Changed ### Changed
- AdafruitFingerprint library from v2.0.4 to v2.1.0 - AdafruitFingerprint library from v2.0.4 to v2.1.0

10
tasmota/tasmota_support/support_rtc.ino
View File

@ -442,17 +442,15 @@ void RtcSecond(void) {
last_sync = Rtc.utc_time; last_sync = Rtc.utc_time;
} }
Rtc.local_time = Rtc.utc_time; if (Rtc.utc_time > START_VALID_TIME) { // 2016-01-01
if (Rtc.local_time > START_VALID_TIME) { // 2016-01-01
Rtc.time_timezone = RtcTimeZoneOffset(Rtc.utc_time); Rtc.time_timezone = RtcTimeZoneOffset(Rtc.utc_time);
Rtc.local_time += Rtc.time_timezone; Rtc.local_time = Rtc.utc_time + Rtc.time_timezone;
Rtc.time_timezone /= 60; Rtc.time_timezone /= 60;
if (!Settings->energy_kWhtotal_time) {
Settings->energy_kWhtotal_time = Rtc.local_time;
}
if (Settings->bootcount_reset_time < START_VALID_TIME) { if (Settings->bootcount_reset_time < START_VALID_TIME) {
Settings->bootcount_reset_time = Rtc.local_time; Settings->bootcount_reset_time = Rtc.local_time;
} }
} else {
Rtc.local_time = Rtc.utc_time;
} }
BreakNanoTime(Rtc.local_time, Rtc.nanos, RtcTime); BreakNanoTime(Rtc.local_time, Rtc.nanos, RtcTime);

3
tasmota/tasmota_xdrv_driver/xdrv_03_energy.ino
View File

@ -389,6 +389,9 @@ void Energy200ms(void) {
XnrgCall(FUNC_ENERGY_EVERY_SECOND); XnrgCall(FUNC_ENERGY_EVERY_SECOND);
if (RtcTime.valid) { if (RtcTime.valid) {
if (!Settings->energy_kWhtotal_time) {
Settings->energy_kWhtotal_time = LocalTime();
}
if (!Energy->kWhtoday_offset_init && (RtcTime.day_of_year == Settings->energy_kWhdoy)) { if (!Energy->kWhtoday_offset_init && (RtcTime.day_of_year == Settings->energy_kWhdoy)) {
Energy->kWhtoday_offset_init = true; Energy->kWhtoday_offset_init = true;

4
tasmota/tasmota_xdrv_driver/xdrv_03_esp32_energy.ino
View File

@ -309,6 +309,7 @@ void EnergySettingsLoad(bool erase) {
// Settings->energy_kWhtoday_ph[i], &Energy->Settings.energy_today_kWh[i], // Settings->energy_kWhtoday_ph[i], &Energy->Settings.energy_today_kWh[i],
// Settings->energy_kWhyesterday_ph[i], &Energy->Settings.energy_yesterday_kWh[i]); // Settings->energy_kWhyesterday_ph[i], &Energy->Settings.energy_yesterday_kWh[i]);
} }
Energy->Settings.energy_kWhtotal_time = Settings->energy_kWhtotal_time;
// v0102 additions // v0102 additions
Energy->Settings.gui_display = ENERGY_GUI_DISPLAY_MODE; Energy->Settings.gui_display = ENERGY_GUI_DISPLAY_MODE;
@ -609,6 +610,9 @@ void Energy200ms(void) {
XnrgCall(FUNC_ENERGY_EVERY_SECOND); XnrgCall(FUNC_ENERGY_EVERY_SECOND);
if (RtcTime.valid) { if (RtcTime.valid) {
if (!Energy->Settings.energy_kWhtotal_time) {
Energy->Settings.energy_kWhtotal_time = LocalTime();
}
if (!Energy->kWhtoday_offset_init && (RtcTime.day_of_year == Energy->Settings.energy_kWhdoy)) { if (!Energy->kWhtoday_offset_init && (RtcTime.day_of_year == Energy->Settings.energy_kWhdoy)) {
Energy->kWhtoday_offset_init = true; Energy->kWhtoday_offset_init = true;