mirror
/
esp-idf
kopia lustrzana https://github.com/espressif/esp-idf
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

adc: simplify LL on C3

pull/6491/head
Michael (XIAO Xufeng) 2021-01-08 18:44:39 +08:00 zatwierdzone przez Armando
rodzic c257daa950
commit 3d7da2c8ff
5 zmienionych plików z 9 dodań i 28 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

12
components/hal/adc_hal.c
Wyświetl plik

@ -163,20 +163,12 @@ void adc_hal_onetime_start(adc_digi_config_t *adc_digi_config)
void adc_hal_adc1_onetime_sample_enable(bool enable) void adc_hal_adc1_onetime_sample_enable(bool enable)
{ {
if (enable) { adc_ll_adc1_onetime_sample_enable(enable);
adc_ll_adc1_onetime_sample_ena();
} else {
adc_ll_adc1_onetime_sample_dis();
}
} }
void adc_hal_adc2_onetime_sample_enable(bool enable) void adc_hal_adc2_onetime_sample_enable(bool enable)
{ {
if (enable) { adc_ll_adc2_onetime_sample_enable(enable);
adc_ll_adc2_onetime_sample_ena();
} else {
adc_ll_adc2_onetime_sample_dis();
}
} }
void adc_hal_onetime_channel(adc_ll_num_t unit, adc_channel_t channel) void adc_hal_onetime_channel(adc_ll_num_t unit, adc_channel_t channel)

3
components/hal/esp32/include/hal/adc_ll.h
Wyświetl plik

@ -299,9 +299,8 @@ static inline void adc_ll_rtc_enable_channel(adc_ll_num_t adc_n, int channel)
* @note Only one channel can be selected in once measurement. * @note Only one channel can be selected in once measurement.
* *
* @param adc_n ADC unit. * @param adc_n ADC unit.
* @param channel ADC channel number for each ADCn.
*/ */
static inline void adc_ll_rtc_disable_channel(adc_ll_num_t adc_n, int channel) static inline void adc_ll_rtc_disable_channel(adc_ll_num_t adc_n)
{ {
if (adc_n == ADC_NUM_1) { if (adc_n == ADC_NUM_1) {
SENS.sar_meas_start1.sar1_en_pad = 0; //only one channel is selected. SENS.sar_meas_start1.sar1_en_pad = 0; //only one channel is selected.

18
components/hal/esp32c3/include/hal/adc_ll.h
Wyświetl plik

@ -912,14 +912,9 @@ static inline bool adc_ll_intr_get_status(adc_ll_intr_t mask)
} }
//--------------------------------adc1------------------------------// //--------------------------------adc1------------------------------//
static inline void adc_ll_adc1_onetime_sample_ena(void) static inline void adc_ll_adc1_onetime_sample_enable(bool enable)
{ {
APB_SARADC.onetime_sample.adc1_onetime_sample = 1; APB_SARADC.onetime_sample.adc1_onetime_sample = enable;
}
static inline void adc_ll_adc1_onetime_sample_dis(void)
{
APB_SARADC.onetime_sample.adc1_onetime_sample = 0;
} }
static inline uint32_t adc_ll_adc1_read(void) static inline uint32_t adc_ll_adc1_read(void)
@ -929,14 +924,9 @@ static inline uint32_t adc_ll_adc1_read(void)
} }
//--------------------------------adc2------------------------------// //--------------------------------adc2------------------------------//
static inline void adc_ll_adc2_onetime_sample_ena(void) static inline void adc_ll_adc2_onetime_sample_enable(bool enable)
{ {
APB_SARADC.onetime_sample.adc2_onetime_sample = 1; APB_SARADC.onetime_sample.adc2_onetime_sample = enable;
}
static inline void adc_ll_adc2_onetime_sample_dis(void)
{
APB_SARADC.onetime_sample.adc2_onetime_sample = 0;
} }
static inline uint32_t adc_ll_adc2_read(void) static inline uint32_t adc_ll_adc2_read(void)

2
components/hal/esp32s2/include/hal/adc_ll.h
Wyświetl plik

@ -690,7 +690,7 @@ static inline void adc_ll_rtc_enable_channel(adc_ll_num_t adc_n, int channel)
* @param adc_n ADC unit. * @param adc_n ADC unit.
* @param channel ADC channel number for each ADCn. * @param channel ADC channel number for each ADCn.
*/ */
static inline void adc_ll_rtc_disable_channel(adc_ll_num_t adc_n, int channel) static inline void adc_ll_rtc_disable_channel(adc_ll_num_t adc_n)
{ {
if (adc_n == ADC_NUM_1) { if (adc_n == ADC_NUM_1) {
SENS.sar_meas1_ctrl2.sar1_en_pad = 0; //only one channel is selected. SENS.sar_meas1_ctrl2.sar1_en_pad = 0; //only one channel is selected.

2
components/hal/esp32s3/include/hal/adc_ll.h
Wyświetl plik

@ -606,7 +606,7 @@ static inline void adc_ll_rtc_enable_channel(adc_ll_num_t adc_n, int channel)
* @param adc_n ADC unit. * @param adc_n ADC unit.
* @param channel ADC channel number for each ADCn. * @param channel ADC channel number for each ADCn.
*/ */
static inline void adc_ll_rtc_disable_channel(adc_ll_num_t adc_n, int channel) static inline void adc_ll_rtc_disable_channel(adc_ll_num_t adc_n)
{ {
if (adc_n == ADC_NUM_1) { if (adc_n == ADC_NUM_1) {
SENS.sar_meas1_ctrl2.sar1_en_pad = 0; //only one channel is selected. SENS.sar_meas1_ctrl2.sar1_en_pad = 0; //only one channel is selected.