DigitalInfinity/ESP32-PaxCounter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfix reset loop after OTA update

Browse Source
This commit is contained in:
cyberman54 2021-03-20 20:13:34 +01:00
parent 4bb8cdf2ca
commit 79b96a75c7
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/reset.cpp
View File

@ -8,10 +8,13 @@ static const char TAG[] = __FILE__;
// Conversion factor for micro seconds to seconds // Conversion factor for micro seconds to seconds
#define uS_TO_S_FACTOR 1000000ULL #define uS_TO_S_FACTOR 1000000ULL
// variables keep its values after a wakeup from sleep // RTC_NOINIT_ATTR -> keep value after a software restart or system crash
RTC_NOINIT_ATTR runmode_t RTC_runmode = RUNMODE_POWERCYCLE; RTC_NOINIT_ATTR runmode_t RTC_runmode;
// RTC_DATA_ATTR -> keep values after a wakeup from sleep
RTC_DATA_ATTR struct timeval RTC_sleep_start_time; RTC_DATA_ATTR struct timeval RTC_sleep_start_time;
RTC_DATA_ATTR unsigned long long RTC_millis = 0; RTC_DATA_ATTR unsigned long long RTC_millis = 0;
timeval sleep_stop_time; timeval sleep_stop_time;
const char *runmode[6] = {"powercycle", "normal", "wakeup", const char *runmode[6] = {"powercycle", "normal", "wakeup",
@ -46,8 +49,10 @@ void do_after_reset(void) {
break; break;
case SW_CPU_RESET: // 0x0c Software reset CPU case SW_CPU_RESET: // 0x0c Software reset CPU
// keep previous runmode // keep previous runmode, if RTC_runmode has valid value
// (i.e. RUNMODE_UPDATE or RUNMODE_MAINTENANCE) // sets runmode, if RTC_runmode is invalid (i.e. not initialized)
if ((RTC_runmode != RUNMODE_UPDATE) && (RTC_runmode != RUNMODE_NORMAL))
RTC_runmode = RUNMODE_POWERCYCLE;
break; break;
case DEEPSLEEP_RESET: // 0x05 Deep Sleep reset digital core case DEEPSLEEP_RESET: // 0x05 Deep Sleep reset digital core