espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-06 06:04:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/ulp_fsm_wake_in_normal_mode' into 'master'

Browse Source 
ulp: fix incorrect bit-width operator while reading RTC_CNTL_LOW_POWER_ST_REG during wakeup

Closes DOC-3721

See merge request espressif/esp-idf!20646
This commit is contained in:
Sudeep Mohanty
2022-10-17 19:40:42 +08:00
parent 79007e41f1 a28791dbed
commit b0ae3dd409
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/en/api-reference/system/ulp_instruction_set.rst
View File

@@ -1001,7 +1001,7 @@ The detailed description of all instructions is presented below:
// and ULP will not run again until started by the main program. // and ULP will not run again until started by the main program.
1: check_wakeup: // Read RTC_CNTL_RDY_FOR_WAKEUP and RTC_CNTL_MAIN_STATE_IN_IDLE bit 1: check_wakeup: // Read RTC_CNTL_RDY_FOR_WAKEUP and RTC_CNTL_MAIN_STATE_IN_IDLE bit
READ_RTC_REG(RTC_CNTL_LOW_POWER_ST_REG, 27, 0) READ_RTC_REG(RTC_CNTL_LOW_POWER_ST_REG, 27, 1)
MOVE r1, r0 // Copy result in to r1 MOVE r1, r0 // Copy result in to r1
READ_RTC_FIELD(RTC_CNTL_LOW_POWER_ST_REG, RTC_CNTL_RDY_FOR_WAKEUP) READ_RTC_FIELD(RTC_CNTL_LOW_POWER_ST_REG, RTC_CNTL_RDY_FOR_WAKEUP)
OR r0, r0, r1 OR r0, r0, r1

2
examples/system/ulp_fsm/ulp/main/ulp/wake_up.S
View File

@@ -14,7 +14,7 @@
wake_up: wake_up:
/* Check if the system is in sleep mode */ /* Check if the system is in sleep mode */
#if CONFIG_IDF_TARGET_ESP32 #if CONFIG_IDF_TARGET_ESP32
READ_RTC_REG(RTC_CNTL_LOW_POWER_ST_REG, 27, 0) READ_RTC_REG(RTC_CNTL_LOW_POWER_ST_REG, 27, 1)
#else #else
READ_RTC_FIELD(RTC_CNTL_LOW_POWER_ST_REG, RTC_CNTL_MAIN_STATE_IN_IDLE) READ_RTC_FIELD(RTC_CNTL_LOW_POWER_ST_REG, RTC_CNTL_MAIN_STATE_IN_IDLE)
#endif #endif