djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

esp32/modmachine: Fix machine.reset_cause to use IDF's esp_reset_reason.

Browse Source 
The code previously called rtc_get_reset_reason which is a "raw" reset
cause.  The ESP-IDF massages that for the proper reset cause available from
esp_reset_reason.

Fixes issue #5134.
This commit is contained in:
Thorsten von Eicken 2020-05-02 01:36:53 -07:00 committed by Damien George
parent 1662a0b06f
commit 50a7ba2348
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ports/esp32/modmachine.c
View File

@ -146,36 +146,30 @@ STATIC mp_obj_t machine_deepsleep(size_t n_args, const mp_obj_t *pos_args, mp_ma
STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_deepsleep_obj, 0, machine_deepsleep); STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_deepsleep_obj, 0, machine_deepsleep);
STATIC mp_obj_t machine_reset_cause(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { STATIC mp_obj_t machine_reset_cause(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
switch (rtc_get_reset_reason(0)) { switch (esp_reset_reason()) {
case POWERON_RESET: case ESP_RST_POWERON:
case ESP_RST_BROWNOUT:
return MP_OBJ_NEW_SMALL_INT(MP_PWRON_RESET); return MP_OBJ_NEW_SMALL_INT(MP_PWRON_RESET);
break; break;
case SW_RESET:
case SW_CPU_RESET: case ESP_RST_INT_WDT:
return MP_OBJ_NEW_SMALL_INT(MP_SOFT_RESET); case ESP_RST_TASK_WDT:
break; case ESP_RST_WDT:
case OWDT_RESET:
case TG0WDT_SYS_RESET:
case TG1WDT_SYS_RESET:
case RTCWDT_SYS_RESET:
case RTCWDT_BROWN_OUT_RESET:
case RTCWDT_CPU_RESET:
case RTCWDT_RTC_RESET:
case TGWDT_CPU_RESET:
return MP_OBJ_NEW_SMALL_INT(MP_WDT_RESET); return MP_OBJ_NEW_SMALL_INT(MP_WDT_RESET);
break; break;
case DEEPSLEEP_RESET: case ESP_RST_DEEPSLEEP:
return MP_OBJ_NEW_SMALL_INT(MP_DEEPSLEEP_RESET); return MP_OBJ_NEW_SMALL_INT(MP_DEEPSLEEP_RESET);
break; break;
case EXT_CPU_RESET: case ESP_RST_SW:
case ESP_RST_PANIC:
case ESP_RST_EXT: // Comment in ESP-IDF: "For ESP32, ESP_RST_EXT is never returned"
return MP_OBJ_NEW_SMALL_INT(MP_HARD_RESET); return MP_OBJ_NEW_SMALL_INT(MP_HARD_RESET);
break; break;
case NO_MEAN: case ESP_RST_SDIO:
case SDIO_RESET: case ESP_RST_UNKNOWN:
case INTRUSION_RESET:
default: default:
return MP_OBJ_NEW_SMALL_INT(0); return MP_OBJ_NEW_SMALL_INT(0);
break; break;