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

Add RTC logging to energy

Browse Source
This commit is contained in:
Theo Arends 2022-11-14 17:11:38 +01:00
parent c92d51f050
commit 5b1aff5141
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tasmota/tasmota.ino
View File

@ -127,7 +127,7 @@ typedef struct {
} TRtcReboot; } TRtcReboot;
TRtcReboot RtcReboot; TRtcReboot RtcReboot;
#ifdef ESP32 #ifdef ESP32
RTC_NOINIT_ATTR TRtcReboot RtcDataReboot; static RTC_NOINIT_ATTR TRtcReboot RtcDataReboot;
#endif // ESP32 #endif // ESP32
typedef struct { typedef struct {
@ -154,7 +154,7 @@ typedef struct {
} TRtcSettings; } TRtcSettings;
TRtcSettings RtcSettings; TRtcSettings RtcSettings;
#ifdef ESP32 #ifdef ESP32
RTC_NOINIT_ATTR TRtcSettings RtcDataSettings; static RTC_NOINIT_ATTR TRtcSettings RtcDataSettings;
#endif // ESP32 #endif // ESP32
struct TIME_T { struct TIME_T {

8
tasmota/tasmota_xdrv_driver/xdrv_03_energy.ino
View File

@ -347,6 +347,7 @@ void Energy200ms(void)
if (!Energy.kWhtoday_offset_init && (RtcTime.day_of_year == Settings->energy_kWhdoy)) { if (!Energy.kWhtoday_offset_init && (RtcTime.day_of_year == Settings->energy_kWhdoy)) {
for (uint32_t i = 0; i < 3; i++) { for (uint32_t i = 0; i < 3; i++) {
Energy.kWhtoday_offset[i] = Settings->energy_kWhtoday_ph[i]; Energy.kWhtoday_offset[i] = Settings->energy_kWhtoday_ph[i];
// RtcSettings.energy_kWhtoday_ph[i] = 0;
} }
Energy.kWhtoday_offset_init = true; Energy.kWhtoday_offset_init = true;
} }
@ -1107,6 +1108,13 @@ void EnergySnsInit(void)
XnrgCall(FUNC_INIT); XnrgCall(FUNC_INIT);
if (TasmotaGlobal.energy_driver) { if (TasmotaGlobal.energy_driver) {
AddLog(LOG_LEVEL_DEBUG, PSTR("NRG: Rtc valid %d, kWhtoday_ph Rtc %d/%d/%d, Set %d/%d/%d"),
RtcSettingsValid(),
RtcSettings.energy_kWhtoday_ph[0],RtcSettings.energy_kWhtoday_ph[1],RtcSettings.energy_kWhtoday_ph[2],
Settings->energy_kWhtoday_ph[0],Settings->energy_kWhtoday_ph[1],Settings->energy_kWhtoday_ph[2]
);
for (uint32_t i = 0; i < 3; i++) { for (uint32_t i = 0; i < 3; i++) {
// Energy.kWhtoday_offset[i] = 0; // Reset by EnergyDrvInit() // Energy.kWhtoday_offset[i] = 0; // Reset by EnergyDrvInit()
// 20220805 - Change from https://github.com/arendst/Tasmota/issues/16118 // 20220805 - Change from https://github.com/arendst/Tasmota/issues/16118