espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-31 19:24:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

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

See merge request espressif/esp-idf!24743
This commit is contained in:
morris
2023-07-13 21:40:54 +08:00
parent aba746cdc2 d21e332281
commit f195d48764
7 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_ll.h
View File

@@ -29,7 +29,7 @@ extern "C" {
Oneshot Oneshot
---------------------------------------------------------------*/ ---------------------------------------------------------------*/
#define ADC_LL_DATA_INVERT_DEFAULT(PERIPH_NUM) (1) #define ADC_LL_DATA_INVERT_DEFAULT(PERIPH_NUM) (1)
#define ADC_LL_SAR_CLK_DIV_DEFAULT(PERIPH_NUM) (2) #define ADC_LL_SAR_CLK_DIV_DEFAULT(PERIPH_NUM) (1)
/*--------------------------------------------------------------- /*---------------------------------------------------------------
DMA DMA

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

@@ -33,7 +33,6 @@ extern "C" {
Oneshot Oneshot
---------------------------------------------------------------*/ ---------------------------------------------------------------*/
#define ADC_LL_DATA_INVERT_DEFAULT(PERIPH_NUM) (0) #define ADC_LL_DATA_INVERT_DEFAULT(PERIPH_NUM) (0)
#define ADC_LL_SAR_CLK_DIV_DEFAULT(PERIPH_NUM) ((PERIPH_NUM==0)? 2 : 1)
/*--------------------------------------------------------------- /*---------------------------------------------------------------
DMA DMA

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

@@ -38,7 +38,6 @@ extern "C" {
Oneshot Oneshot
---------------------------------------------------------------*/ ---------------------------------------------------------------*/
#define ADC_LL_DATA_INVERT_DEFAULT(PERIPH_NUM) (0) #define ADC_LL_DATA_INVERT_DEFAULT(PERIPH_NUM) (0)
#define ADC_LL_SAR_CLK_DIV_DEFAULT(PERIPH_NUM) ((PERIPH_NUM==0)? 2 : 1)
/*--------------------------------------------------------------- /*---------------------------------------------------------------
DMA DMA

1
components/hal/esp32c6/include/hal/adc_ll.h
View File

@@ -39,7 +39,6 @@ extern "C" {
Oneshot Oneshot
---------------------------------------------------------------*/ ---------------------------------------------------------------*/
#define ADC_LL_DATA_INVERT_DEFAULT(PERIPH_NUM) (0) #define ADC_LL_DATA_INVERT_DEFAULT(PERIPH_NUM) (0)
#define ADC_LL_SAR_CLK_DIV_DEFAULT(PERIPH_NUM) (2)
/*--------------------------------------------------------------- /*---------------------------------------------------------------
DMA DMA

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

@@ -39,7 +39,6 @@ extern "C" {
Oneshot Oneshot
---------------------------------------------------------------*/ ---------------------------------------------------------------*/
#define ADC_LL_DATA_INVERT_DEFAULT(PERIPH_NUM) (0) #define ADC_LL_DATA_INVERT_DEFAULT(PERIPH_NUM) (0)
#define ADC_LL_SAR_CLK_DIV_DEFAULT(PERIPH_NUM) (2)
/*--------------------------------------------------------------- /*---------------------------------------------------------------
DMA DMA

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

@@ -34,7 +34,7 @@ extern "C" {
Oneshot Oneshot
---------------------------------------------------------------*/ ---------------------------------------------------------------*/
#define ADC_LL_DATA_INVERT_DEFAULT(PERIPH_NUM) (0) #define ADC_LL_DATA_INVERT_DEFAULT(PERIPH_NUM) (0)
#define ADC_LL_SAR_CLK_DIV_DEFAULT(PERIPH_NUM) ((PERIPH_NUM==0)? 2 : 1) #define ADC_LL_SAR_CLK_DIV_DEFAULT(PERIPH_NUM) (1)
/*--------------------------------------------------------------- /*---------------------------------------------------------------
DMA DMA

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

@@ -34,7 +34,7 @@ extern "C" {
Oneshot Oneshot
---------------------------------------------------------------*/ ---------------------------------------------------------------*/
#define ADC_LL_DATA_INVERT_DEFAULT(PERIPH_NUM) (0) #define ADC_LL_DATA_INVERT_DEFAULT(PERIPH_NUM) (0)
#define ADC_LL_SAR_CLK_DIV_DEFAULT(PERIPH_NUM) ((PERIPH_NUM==0)? 2 : 1) #define ADC_LL_SAR_CLK_DIV_DEFAULT(PERIPH_NUM) (1)
/*--------------------------------------------------------------- /*---------------------------------------------------------------
DMA DMA