feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'bugfix/fix_s3_adc1_wrong_clk_div_v5.0' into 'release/v5.0'

Browse Source 
adc: fix adc oneshot mode clk div issue on esp32, esp32s2 and esp32s3 (v5.0)

See merge request espressif/esp-idf!24744
This commit is contained in:
morris
2023-07-13 21:41:16 +08:00
parent 0fbddcb991 abd0fca51a
commit 9f2fe912e4
6 changed files with 3 additions and 6 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

@@ -10,7 +10,7 @@
Single Read
---------------------------------------------------------------*/
#define ADC_HAL_DATA_INVERT_DEFAULT(PERIPH_NUM) (1)
#define ADC_HAL_SAR_CLK_DIV_DEFAULT(PERIPH_NUM) (2)
#define ADC_HAL_SAR_CLK_DIV_DEFAULT(PERIPH_NUM) (1)
/*---------------------------------------------------------------
DMA Read

1
components/hal/esp32c2/include/hal/adc_hal_conf.h
View File

@@ -10,7 +10,6 @@
Single Read
---------------------------------------------------------------*/
#define ADC_HAL_DATA_INVERT_DEFAULT(PERIPH_NUM) (0)
#define ADC_HAL_SAR_CLK_DIV_DEFAULT(PERIPH_NUM) ((PERIPH_NUM==0)? 2 : 1)
/*---------------------------------------------------------------
DMA Read

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

@@ -10,7 +10,6 @@
Single Read
---------------------------------------------------------------*/
#define ADC_HAL_DATA_INVERT_DEFAULT(PERIPH_NUM) (0)
#define ADC_HAL_SAR_CLK_DIV_DEFAULT(PERIPH_NUM) ((PERIPH_NUM==0)? 2 : 1)
/*---------------------------------------------------------------
DMA Read

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

@@ -10,7 +10,6 @@
Single Read
---------------------------------------------------------------*/
#define ADC_HAL_DATA_INVERT_DEFAULT(PERIPH_NUM) (0)
#define ADC_HAL_SAR_CLK_DIV_DEFAULT(PERIPH_NUM) ((PERIPH_NUM==0)? 2 : 1)
/*---------------------------------------------------------------
DMA Read

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

@@ -10,7 +10,7 @@
Single Read
---------------------------------------------------------------*/
#define ADC_HAL_DATA_INVERT_DEFAULT(PERIPH_NUM) (0)
#define ADC_HAL_SAR_CLK_DIV_DEFAULT(PERIPH_NUM) ((PERIPH_NUM==0)? 2 : 1)
#define ADC_HAL_SAR_CLK_DIV_DEFAULT(PERIPH_NUM) (1)
/*---------------------------------------------------------------
DMA Read

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

@@ -10,7 +10,7 @@
Single Read
---------------------------------------------------------------*/
#define ADC_HAL_DATA_INVERT_DEFAULT(PERIPH_NUM) (0)
#define ADC_HAL_SAR_CLK_DIV_DEFAULT(PERIPH_NUM) ((PERIPH_NUM==0)? 2 : 1)
#define ADC_HAL_SAR_CLK_DIV_DEFAULT(PERIPH_NUM) (1)
/*---------------------------------------------------------------
DMA Read