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

Driver(adc): Disable the synchronization operation function of ADC1 and DAC

Browse Source 
Closes IDF-1585
This commit is contained in:
fuzhibo
2020-06-28 15:53:49 +08:00
committed by bot
parent 021e23ebf7
commit 44887f5fde
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
components/driver/rtc_module.c
View File

@@ -132,7 +132,7 @@ static const char TAG[] = "adc";
static inline void dac_output_set_enable(dac_channel_t channel, bool enable); static inline void dac_output_set_enable(dac_channel_t channel, bool enable);
static inline void adc1_hall_enable(bool enable); static inline void adc1_hall_enable(bool enable);
static inline void dac_rtc_sync_by_adc(bool enable);
/*--------------------------------------------------------------- /*---------------------------------------------------------------
RTC IO RTC IO
@@ -1465,6 +1465,9 @@ esp_err_t adc1_config_channel_atten(adc1_channel_t channel, adc_atten_t atten)
RTC_MODULE_CHECK(atten < ADC_ATTEN_MAX, "ADC Atten Err", ESP_ERR_INVALID_ARG); RTC_MODULE_CHECK(atten < ADC_ATTEN_MAX, "ADC Atten Err", ESP_ERR_INVALID_ARG);
adc_gpio_init(ADC_UNIT_1, channel); adc_gpio_init(ADC_UNIT_1, channel);
adc_set_atten(ADC_UNIT_1, channel, atten); adc_set_atten(ADC_UNIT_1, channel, atten);
/* Workaround: Disable the synchronization operation function of ADC1 and DAC.
If enabled(default), ADC RTC controller sampling will cause the DAC channel output voltage. */
dac_rtc_sync_by_adc(false);
return ESP_OK; return ESP_OK;
} }
@@ -1806,12 +1809,25 @@ static inline void dac_output_set_enable(dac_channel_t channel, bool enable)
RTCIO.pad_dac[channel-DAC_CHANNEL_1].xpd_dac = enable; RTCIO.pad_dac[channel-DAC_CHANNEL_1].xpd_dac = enable;
} }
/**
* Enable/disable the synchronization operation function of ADC1 and DAC.
*
* @note If enabled(default), ADC RTC controller sampling will cause the DAC channel output voltage.
*
* @param enable Enable or disable adc and dac synchronization function.
*/
static inline void dac_rtc_sync_by_adc(bool enable)
{
SENS.sar_meas_ctrl2.sar1_dac_xpd_fsm = enable;
}
esp_err_t dac_output_enable(dac_channel_t channel) esp_err_t dac_output_enable(dac_channel_t channel)
{ {
RTC_MODULE_CHECK((channel >= DAC_CHANNEL_1) && (channel < DAC_CHANNEL_MAX), DAC_ERR_STR_CHANNEL_ERROR, ESP_ERR_INVALID_ARG); RTC_MODULE_CHECK((channel >= DAC_CHANNEL_1) && (channel < DAC_CHANNEL_MAX), DAC_ERR_STR_CHANNEL_ERROR, ESP_ERR_INVALID_ARG);
dac_rtc_pad_init(channel); dac_rtc_pad_init(channel);
portENTER_CRITICAL(&rtc_spinlock); portENTER_CRITICAL(&rtc_spinlock);
dac_output_set_enable(channel, true); dac_output_set_enable(channel, true);
dac_rtc_sync_by_adc(false);
portEXIT_CRITICAL(&rtc_spinlock); portEXIT_CRITICAL(&rtc_spinlock);
return ESP_OK; return ESP_OK;