Skip to content

Commit 8cd4b9f

Browse files
committed
fix espressif run modes
1 parent 6a06a2d commit 8cd4b9f

File tree

1 file changed

+6
-4
lines changed
  • ports/espressif/common-hal/microcontroller

1 file changed

+6
-4
lines changed

ports/espressif/common-hal/microcontroller/__init__.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,12 @@ void common_hal_mcu_on_next_reset(mcu_runmode_t runmode) {
9797
#endif
9898
break;
9999
case RUNMODE_NORMAL:
100-
#if defined(CONFIG_IDF_TARGET_ESP32)
101-
safe_mode_on_next_reset(NO_SAFE_MODE);
102-
#else
103100
// revert back to normal boot
101+
#if defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3)
104102
REG_WRITE(RTC_RESET_CAUSE_REG, 0); // reset uf2
103+
#endif
105104
REG_WRITE(RTC_CNTL_STORE0_REG, 0); // reset safe mode
105+
#if !defined(CONFIG_IDF_TARGET_ESP32)
106106
REG_WRITE(RTC_CNTL_OPTION1_REG, 0); // reset bootloader
107107
#endif
108108
break;
@@ -112,10 +112,12 @@ void common_hal_mcu_on_next_reset(mcu_runmode_t runmode) {
112112
break;
113113
case RUNMODE_BOOTLOADER:
114114
// DFU download
115-
#if defined(CONFIG_IDF_TARGET_ESP32) || defined(CONFIG_IDF_TARGET_ESP32C3)
115+
#if defined(CONFIG_IDF_TARGET_ESP32)
116116
mp_arg_error_invalid(MP_QSTR_run_mode);
117117
#else
118+
#if defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3)
118119
chip_usb_set_persist_flags(USBDC_BOOT_DFU);
120+
#endif
119121
REG_WRITE(RTC_CNTL_OPTION1_REG, RTC_CNTL_FORCE_DOWNLOAD_BOOT);
120122
#endif
121123
break;

0 commit comments

Comments
 (0)