Merge branch 'bugfix/rtc_clk_cal_cycles_add_default_vals_for_all_sources' into 'master'

esp32xx: Fix default values for all RTC sources in RTC_CLK_CAL_CYCLES option

Closes IDFGH-4176

See merge request espressif/esp-idf!11011
pull/4512/merge
Ivan Grokhotkov 2020-10-30 03:33:40 +08:00
commit 754e73b39a
3 zmienionych plików z 3 dodań i 3 usunięć

Wyświetl plik

@ -585,7 +585,7 @@ menu "ESP32-specific"
config ESP32_RTC_CLK_CAL_CYCLES config ESP32_RTC_CLK_CAL_CYCLES
int "Number of cycles for RTC_SLOW_CLK calibration" int "Number of cycles for RTC_SLOW_CLK calibration"
default 3000 if ESP32_RTC_CLK_SRC_EXT_CRYS default 3000 if ESP32_RTC_CLK_SRC_EXT_CRYS || ESP32_RTC_CLK_SRC_EXT_OSC || ESP32_RTC_CLK_SRC_INT_8MD256
default 1024 if ESP32_RTC_CLK_SRC_INT_RC default 1024 if ESP32_RTC_CLK_SRC_INT_RC
range 0 27000 if ESP32_RTC_CLK_SRC_EXT_CRYS || ESP32_RTC_CLK_SRC_EXT_OSC || ESP32_RTC_CLK_SRC_INT_8MD256 range 0 27000 if ESP32_RTC_CLK_SRC_EXT_CRYS || ESP32_RTC_CLK_SRC_EXT_OSC || ESP32_RTC_CLK_SRC_INT_8MD256
range 0 32766 if ESP32_RTC_CLK_SRC_INT_RC range 0 32766 if ESP32_RTC_CLK_SRC_INT_RC

Wyświetl plik

@ -441,7 +441,7 @@ menu "ESP32S2-specific"
config ESP32S2_RTC_CLK_CAL_CYCLES config ESP32S2_RTC_CLK_CAL_CYCLES
int "Number of cycles for RTC_SLOW_CLK calibration" int "Number of cycles for RTC_SLOW_CLK calibration"
default 3000 if ESP32S2_RTC_CLK_SRC_EXT_CRYS default 3000 if ESP32S2_RTC_CLK_SRC_EXT_CRYS || ESP32S2_RTC_CLK_SRC_EXT_OSC || ESP32S2_RTC_CLK_SRC_INT_8MD256
default 576 if ESP32S2_RTC_CLK_SRC_INT_RC default 576 if ESP32S2_RTC_CLK_SRC_INT_RC
range 0 125000 range 0 125000
help help

Wyświetl plik

@ -462,7 +462,7 @@ menu "ESP32S3-Specific"
config ESP32S3_RTC_CLK_CAL_CYCLES config ESP32S3_RTC_CLK_CAL_CYCLES
int "Number of cycles for RTC_SLOW_CLK calibration" int "Number of cycles for RTC_SLOW_CLK calibration"
default 3000 if ESP32S3_RTC_CLK_SRC_EXT_CRYS default 3000 if ESP32S3_RTC_CLK_SRC_EXT_CRYS || ESP32S3_RTC_CLK_SRC_EXT_OSC || ESP32S3_RTC_CLK_SRC_INT_8MD256
default 1024 if ESP32S3_RTC_CLK_SRC_INT_RC default 1024 if ESP32S3_RTC_CLK_SRC_INT_RC
range 0 125000 range 0 125000
help help