Merge branch 'fix/adc-sample-freq-kconfig-v5.5' into 'release/v5.5'

fix(soc): correct ESP32 ADC sample frequency thresholds

See merge request espressif/esp-idf!51786
This commit is contained in:
morris
2026-09-11 17:58:18 +08:00
2 changed files with 4 additions and 4 deletions
@@ -249,11 +249,11 @@ config SOC_ADC_DIGI_MONITOR_NUM
config SOC_ADC_SAMPLE_FREQ_THRES_HIGH config SOC_ADC_SAMPLE_FREQ_THRES_HIGH
int int
default 2 default 2000000
config SOC_ADC_SAMPLE_FREQ_THRES_LOW config SOC_ADC_SAMPLE_FREQ_THRES_LOW
int int
default 20 default 20000
config SOC_ADC_RTC_MIN_BITWIDTH config SOC_ADC_RTC_MIN_BITWIDTH
int int
+2 -2
View File
@@ -135,8 +135,8 @@
#define SOC_ADC_DIGI_RESULT_BYTES (2) #define SOC_ADC_DIGI_RESULT_BYTES (2)
#define SOC_ADC_DIGI_DATA_BYTES_PER_CONV (4) #define SOC_ADC_DIGI_DATA_BYTES_PER_CONV (4)
#define SOC_ADC_DIGI_MONITOR_NUM (0U) // to reference `IDF_TARGET_SOC_ADC_DIGI_MONITOR_NUM` in document #define SOC_ADC_DIGI_MONITOR_NUM (0U) // to reference `IDF_TARGET_SOC_ADC_DIGI_MONITOR_NUM` in document
#define SOC_ADC_SAMPLE_FREQ_THRES_HIGH (2*1000*1000) #define SOC_ADC_SAMPLE_FREQ_THRES_HIGH (2000000)
#define SOC_ADC_SAMPLE_FREQ_THRES_LOW (20*1000) #define SOC_ADC_SAMPLE_FREQ_THRES_LOW (20000)
/*!< RTC */ /*!< RTC */
#define SOC_ADC_RTC_MIN_BITWIDTH (9) #define SOC_ADC_RTC_MIN_BITWIDTH (9)