espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-03 04:34:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_s3_adc1_wrong_clk_div_v4.4' into 'release/v4.4'

Browse Source 
fix(adc): fixed esp32, esp32s2,esp32s3 adc oneshot mode clk div issue (v4.4)

See merge request espressif/esp-idf!24745
This commit is contained in:
morris
2023-07-13 15:48:39 +08:00
parent 330f8cbee8 8bf4cb3eee
commit 703e116225
5 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/hal/esp32/include/hal/adc_hal_conf.h
View File

@@ -26,6 +26,6 @@
#define SOC_ADC_PWDET_CCT_DEFAULT (4) #define SOC_ADC_PWDET_CCT_DEFAULT (4)
#define SOC_ADC_SAR_CLK_DIV_DEFAULT(PERIPH_NUM) (2) #define SOC_ADC_SAR_CLK_DIV_DEFAULT(PERIPH_NUM) (1)
#define SOC_ADC_DIGI_SAR_CLK_DIV_DEFAULT (16) #define SOC_ADC_DIGI_SAR_CLK_DIV_DEFAULT (16)

2
components/hal/esp32c3/include/hal/adc_hal_conf.h
View File

@@ -26,6 +26,4 @@
#define SOC_ADC_PWDET_CCT_DEFAULT (4) #define SOC_ADC_PWDET_CCT_DEFAULT (4)
#define SOC_ADC_SAR_CLK_DIV_DEFAULT(PERIPH_NUM) ((PERIPH_NUM==0)? 2 : 1)
#define SOC_ADC_DIGI_SAR_CLK_DIV_DEFAULT (1) #define SOC_ADC_DIGI_SAR_CLK_DIV_DEFAULT (1)

2
components/hal/esp32h2/include/hal/adc_hal_conf.h
View File

@@ -26,6 +26,4 @@
#define SOC_ADC_PWDET_CCT_DEFAULT (4) #define SOC_ADC_PWDET_CCT_DEFAULT (4)
#define SOC_ADC_SAR_CLK_DIV_DEFAULT(PERIPH_NUM) ((PERIPH_NUM==0)? 2 : 1)
#define SOC_ADC_DIGI_SAR_CLK_DIV_DEFAULT (1) #define SOC_ADC_DIGI_SAR_CLK_DIV_DEFAULT (1)

2
components/hal/esp32s2/include/hal/adc_hal_conf.h
View File

@@ -26,6 +26,6 @@
#define SOC_ADC_PWDET_CCT_DEFAULT (4) #define SOC_ADC_PWDET_CCT_DEFAULT (4)
#define SOC_ADC_SAR_CLK_DIV_DEFAULT(PERIPH_NUM) ((PERIPH_NUM==0)? 2 : 1) #define SOC_ADC_SAR_CLK_DIV_DEFAULT(PERIPH_NUM) (1)
#define SOC_ADC_DIGI_SAR_CLK_DIV_DEFAULT (2) #define SOC_ADC_DIGI_SAR_CLK_DIV_DEFAULT (2)

2
components/hal/esp32s3/include/hal/adc_hal_conf.h
View File

@@ -26,6 +26,6 @@
#define SOC_ADC_PWDET_CCT_DEFAULT (4) #define SOC_ADC_PWDET_CCT_DEFAULT (4)
#define SOC_ADC_SAR_CLK_DIV_DEFAULT(PERIPH_NUM) ((PERIPH_NUM==0)? 2 : 1) #define SOC_ADC_SAR_CLK_DIV_DEFAULT(PERIPH_NUM) (1)
#define SOC_ADC_DIGI_SAR_CLK_DIV_DEFAULT (1) #define SOC_ADC_DIGI_SAR_CLK_DIV_DEFAULT (1)