Skip to content

Commit c117c14

Browse files
xcguangxcguang
committed
Merge branch 'fix/prevent_periph_power_down' into 'master'
fix: Fixed gpio wakeup issue from light-sleep See merge request application/esp-at!1928
2 parents 803f80c + 3780e0f commit c117c14

File tree

6 files changed

+30
-12
lines changed

6 files changed

+30
-12
lines changed

‎module_config/module_esp32c5-sdio/sdkconfig.defaults‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,14 @@ CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=240
3232
CONFIG_PM_ENABLE=y
3333
CONFIG_PM_DFS_INIT_AUTO=y
3434
CONFIG_PM_POWER_DOWN_CPU_IN_LIGHT_SLEEP=y
35+
CONFIG_PM_POWER_DOWN_PERIPHERAL_IN_LIGHT_SLEEP=n
3536
### Disable all GPIO at light sleep
3637
CONFIG_PM_SLP_DISABLE_GPIO=y
3738

39+
# Sleep Config
40+
CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION=n
41+
CONFIG_ESP_SLEEP_FLASH_LEAKAGE_WORKAROUND=y
42+
3843
# Wi-Fi
3944
CONFIG_ESP_COEX_SW_COEXIST_ENABLE=y
4045
CONFIG_ESP_WIFI_SLP_IRAM_OPT=y
@@ -175,6 +180,3 @@ CONFIG_ESP_HTTPS_OTA_ALLOW_HTTP=y
175180
# Bluetooth Low Power Config
176181
CONFIG_BT_LE_SLEEP_ENABLE=y
177182
CONFIG_BT_LE_LP_CLK_SRC_DEFAULT=y
178-
CONFIG_PM_POWER_DOWN_PERIPHERAL_IN_LIGHT_SLEEP=y
179-
CONFIG_ESP_SLEEP_FLASH_LEAKAGE_WORKAROUND=y
180-
CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION=y

‎module_config/module_esp32c5-sdio/sdkconfig_silence.defaults‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,14 @@ CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=240
3232
CONFIG_PM_ENABLE=y
3333
CONFIG_PM_DFS_INIT_AUTO=y
3434
CONFIG_PM_POWER_DOWN_CPU_IN_LIGHT_SLEEP=y
35+
CONFIG_PM_POWER_DOWN_PERIPHERAL_IN_LIGHT_SLEEP=n
3536
### Disable all GPIO at light sleep
3637
CONFIG_PM_SLP_DISABLE_GPIO=y
3738

39+
# Sleep Config
40+
CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION=n
41+
CONFIG_ESP_SLEEP_FLASH_LEAKAGE_WORKAROUND=y
42+
3843
# Wi-Fi
3944
CONFIG_ESP_COEX_SW_COEXIST_ENABLE=y
4045
CONFIG_ESP_WIFI_SLP_IRAM_OPT=y
@@ -178,6 +183,3 @@ CONFIG_ESP_HTTPS_OTA_ALLOW_HTTP=y
178183
# Bluetooth Low Power Config
179184
CONFIG_BT_LE_SLEEP_ENABLE=y
180185
CONFIG_BT_LE_LP_CLK_SRC_DEFAULT=y
181-
CONFIG_PM_POWER_DOWN_PERIPHERAL_IN_LIGHT_SLEEP=y
182-
CONFIG_ESP_SLEEP_FLASH_LEAKAGE_WORKAROUND=y
183-
CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION=y

‎module_config/module_esp32c5_default/sdkconfig.defaults‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,14 @@ CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=80
3232
CONFIG_PM_ENABLE=y
3333
CONFIG_PM_DFS_INIT_AUTO=y
3434
CONFIG_PM_POWER_DOWN_CPU_IN_LIGHT_SLEEP=y
35+
CONFIG_PM_POWER_DOWN_PERIPHERAL_IN_LIGHT_SLEEP=n
3536
### Disable all GPIO at light sleep
3637
CONFIG_PM_SLP_DISABLE_GPIO=y
3738

39+
# Sleep Config
40+
CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION=n
41+
CONFIG_ESP_SLEEP_FLASH_LEAKAGE_WORKAROUND=y
42+
3843
# Wi-Fi
3944
CONFIG_ESP_COEX_SW_COEXIST_ENABLE=y
4045
CONFIG_ESP_WIFI_SLP_IRAM_OPT=y
@@ -174,6 +179,3 @@ CONFIG_ESP_HTTPS_OTA_ALLOW_HTTP=y
174179
# Bluetooth Low Power Config
175180
CONFIG_BT_LE_SLEEP_ENABLE=y
176181
CONFIG_BT_LE_LP_CLK_SRC_DEFAULT=y
177-
CONFIG_PM_POWER_DOWN_PERIPHERAL_IN_LIGHT_SLEEP=y
178-
CONFIG_ESP_SLEEP_FLASH_LEAKAGE_WORKAROUND=y
179-
CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION=y

‎module_config/module_esp32c5_default/sdkconfig_silence.defaults‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,14 @@ CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=80
3232
CONFIG_PM_ENABLE=y
3333
CONFIG_PM_DFS_INIT_AUTO=y
3434
CONFIG_PM_POWER_DOWN_CPU_IN_LIGHT_SLEEP=y
35+
CONFIG_PM_POWER_DOWN_PERIPHERAL_IN_LIGHT_SLEEP=n
3536
### Disable all GPIO at light sleep
3637
CONFIG_PM_SLP_DISABLE_GPIO=y
3738

39+
# Sleep Config
40+
CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION=n
41+
CONFIG_ESP_SLEEP_FLASH_LEAKAGE_WORKAROUND=y
42+
3843
# Wi-Fi
3944
CONFIG_ESP_COEX_SW_COEXIST_ENABLE=y
4045
CONFIG_ESP_WIFI_SLP_IRAM_OPT=y
@@ -177,6 +182,3 @@ CONFIG_ESP_HTTPS_OTA_ALLOW_HTTP=y
177182
# Bluetooth Low Power Config
178183
CONFIG_BT_LE_SLEEP_ENABLE=y
179184
CONFIG_BT_LE_LP_CLK_SRC_DEFAULT=y
180-
CONFIG_PM_POWER_DOWN_PERIPHERAL_IN_LIGHT_SLEEP=y
181-
CONFIG_ESP_SLEEP_FLASH_LEAKAGE_WORKAROUND=y
182-
CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION=y

‎module_config/module_esp32c61_default/sdkconfig.defaults‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,14 @@ CONFIG_ESP_PHY_MAC_BB_PD=y
2929
CONFIG_PM_ENABLE=y
3030
CONFIG_PM_DFS_INIT_AUTO=y
3131
CONFIG_PM_POWER_DOWN_CPU_IN_LIGHT_SLEEP=y
32+
CONFIG_PM_POWER_DOWN_PERIPHERAL_IN_LIGHT_SLEEP=n
3233
### Disable all GPIO at light sleep
3334
CONFIG_PM_SLP_DISABLE_GPIO=y
3435

36+
# Sleep Config
37+
CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION=n
38+
CONFIG_ESP_SLEEP_FLASH_LEAKAGE_WORKAROUND=y
39+
3540
# ESP Ringbuf
3641
CONFIG_RINGBUF_PLACE_FUNCTIONS_INTO_FLASH=y
3742
CONFIG_RINGBUF_PLACE_ISR_FUNCTIONS_INTO_FLASH=y

‎module_config/module_esp32c61_default/sdkconfig_silence.defaults‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,14 @@ CONFIG_ESP_PHY_MAC_BB_PD=y
2929
CONFIG_PM_ENABLE=y
3030
CONFIG_PM_DFS_INIT_AUTO=y
3131
CONFIG_PM_POWER_DOWN_CPU_IN_LIGHT_SLEEP=y
32+
CONFIG_PM_POWER_DOWN_PERIPHERAL_IN_LIGHT_SLEEP=n
3233
### Disable all GPIO at light sleep
3334
CONFIG_PM_SLP_DISABLE_GPIO=y
3435

36+
# Sleep Config
37+
CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION=n
38+
CONFIG_ESP_SLEEP_FLASH_LEAKAGE_WORKAROUND=y
39+
3540
# ESP Ringbuf
3641
CONFIG_RINGBUF_PLACE_FUNCTIONS_INTO_FLASH=y
3742
CONFIG_RINGBUF_PLACE_ISR_FUNCTIONS_INTO_FLASH=y

0 commit comments

Comments
 (0)