Merge branch 'bugfix/ulp_fsm_wake_in_normal_mode' into 'master'

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
espressif · Oct 17, 2022 · b0ae3dd · b0ae3dd
2 parents 79007e4 + a28791d
commit b0ae3dd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/docs/en/api-reference/system/ulp_instruction_set.rst b/docs/en/api-reference/system/ulp_instruction_set.rst
@@ -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.
 
   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
             READ_RTC_FIELD(RTC_CNTL_LOW_POWER_ST_REG, RTC_CNTL_RDY_FOR_WAKEUP)
             OR r0, r0, r1

diff --git a/examples/system/ulp_fsm/ulp/main/ulp/wake_up.S b/examples/system/ulp_fsm/ulp/main/ulp/wake_up.S
@@ -14,7 +14,7 @@
 wake_up:
 	/* Check if the system is in sleep mode */
 #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
 	READ_RTC_FIELD(RTC_CNTL_LOW_POWER_ST_REG, RTC_CNTL_MAIN_STATE_IN_IDLE)
 #endif