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

Add RTC time save

This commit is contained in:
Theo Arends 2022-06-16 16:15:54 +02:00
parent dca2837285
commit 6a0c4b281e
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tasmota/tasmota.ino
View File

@ -125,8 +125,7 @@ typedef struct {
int32_t energy_kWhtoday_ph[3]; // 2D8 int32_t energy_kWhtoday_ph[3]; // 2D8
int32_t energy_kWhtotal_ph[3]; // 2E4 int32_t energy_kWhtotal_ph[3]; // 2E4
int32_t energy_kWhexport_ph[3]; // 2F0 int32_t energy_kWhexport_ph[3]; // 2F0
uint32_t utc_time; // 2FC
uint8_t free_2fc[4]; // 2FC
} TRtcSettings; } TRtcSettings;
TRtcSettings RtcSettings; TRtcSettings RtcSettings;
#ifdef ESP32 #ifdef ESP32

3
tasmota/tasmota_support/settings.ino
View File

@ -37,6 +37,9 @@ uint32_t GetRtcSettingsCrc(void) {
void RtcSettingsSave(void) { void RtcSettingsSave(void) {
RtcSettings.baudrate = Settings->baudrate * 300; RtcSettings.baudrate = Settings->baudrate * 300;
if (UtcTime() > START_VALID_TIME) { // 2016-01-01
RtcSettings.utc_time = UtcTime();
}
if (GetRtcSettingsCrc() != rtc_settings_crc) { if (GetRtcSettingsCrc() != rtc_settings_crc) {
if (RTC_MEM_VALID != RtcSettings.valid) { if (RTC_MEM_VALID != RtcSettings.valid) {

11
tasmota/tasmota_support/support_rtc.ino
View File

@ -489,10 +489,15 @@ void RtcInit(void) {
if (Settings->cfg_timestamp > START_VALID_TIME) { if (Settings->cfg_timestamp > START_VALID_TIME) {
// Fix file timestamp while utctime is not synced // Fix file timestamp while utctime is not synced
uint32_t local_time = Settings->cfg_timestamp +1; uint32_t utc_time = Settings->cfg_timestamp;
RtcGetDaylightSavingTimes(local_time); if (RtcSettings.utc_time > utc_time) {
local_time += RtcTimeZoneOffset(local_time); utc_time = RtcSettings.utc_time;
}
utc_time++;
RtcGetDaylightSavingTimes(utc_time);
uint32_t local_time = utc_time + RtcTimeZoneOffset(utc_time);
RtcSetTimeOfDay(local_time); RtcSetTimeOfDay(local_time);
// AddLog(LOG_LEVEL_DEBUG, PSTR("RTC: Timestamp %s"), GetDT(local_time).c_str());
} }
} }