Sfoglia il codice sorgente

Merge branch 'bugfix/deep_sleep_example_stub_delay' into 'master'

sdkconfig: set CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY=2000 by default

See merge request !758

Angus Gratton 8 anni fa
parent
commit
d718cbd873

+ 6 - 6
components/esp32/Kconfig

@@ -548,18 +548,18 @@ config ESP32_RTC_CLK_CAL_CYCLES
 
 config ESP32_DEEP_SLEEP_WAKEUP_DELAY
     int "Extra delay in deep sleep wake stub (in us)"
-    default 0
+    default 2000
     range 0 5000
     help
         When ESP32 exits deep sleep, the CPU and the flash chip are powered on
         at the same time. CPU will run deep sleep stub first, and then
         proceed to load code from flash. Some flash chips need sufficient
         time to pass between power on and first read operation. By default,
-        without any extra delay, this time is approximately 900us.
-
-        If you are using a flash chip which needs more than 900us to become
-        ready after power on, set this parameter to add extra delay
-        to the default deep sleep stub.
+        without any extra delay, this time is approximately 900us, although
+        some flash chip types need more than that.
+        
+        By default extra delay is set to 2000us. When optimizing startup time
+        for applications which require it, this value may be reduced. 
 
         If you are seeing "flash read err, 1000" message printed to the
         console after deep sleep reset, try increasing this value.

+ 0 - 1
examples/system/deep_sleep/sdkconfig.defaults

@@ -4,4 +4,3 @@ CONFIG_ULP_COPROC_ENABLED=y
 CONFIG_ULP_COPROC_RESERVE_MEM=512
 CONFIG_ESP32_TIME_SYSCALL_USE_RTC_FRC1=y
 CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC=y
-CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY=500

+ 0 - 3
examples/system/ulp/sdkconfig.defaults

@@ -1,9 +1,6 @@
 # Enable ULP
 CONFIG_ULP_COPROC_ENABLED=y
 CONFIG_ULP_COPROC_RESERVE_MEM=1024
-# Some flash chips need extra time to wake up
-# Set this a bit higher to improve out-of-the-box experience
-CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY=500
 # Set log level to Warning to produce clean output
 CONFIG_LOG_BOOTLOADER_LEVEL_WARN=y
 CONFIG_LOG_BOOTLOADER_LEVEL=2

+ 0 - 3
examples/system/ulp_adc/sdkconfig.defaults

@@ -1,9 +1,6 @@
 # Enable ULP
 CONFIG_ULP_COPROC_ENABLED=y
 CONFIG_ULP_COPROC_RESERVE_MEM=1024
-# Some flash chips need extra time to wake up
-# Set this a bit higher to improve out-of-the-box experience
-CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY=1000
 # Set log level to Warning to produce clean output
 CONFIG_LOG_BOOTLOADER_LEVEL_WARN=y
 CONFIG_LOG_BOOTLOADER_LEVEL=2