alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-10-16 17:02:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/adc_power_issue_4.3' into 'release/v4.3'

Browse Source 
adc: fix adc power issue (v4.3)

See merge request espressif/esp-idf!12921
This commit is contained in:
Michael (XIAO Xufeng)
2021-03-30 17:15:09 +00:00
parent cbf2858450 f48346f22f
commit b75a5fd03a
35 changed files with 569 additions and 1061 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/en/api-reference/peripherals/adc.rst
View File

@@ -76,7 +76,7 @@ Reading voltage on ADC1 channel 0 ({IDF_TARGET_ADC1_CH0})::
int val = adc1_get_raw(ADC1_CHANNEL_0);
The input voltage in the above example is from 0 to 1.1 V (0 dB attenuation). The input range can be extended by setting a higher attenuation, see :cpp:type:`adc_atten_t`.
An example of using the ADC driver including calibration (discussed below) is available at esp-idf: :example:`peripherals/adc/adc`
An example of using the ADC driver including calibration (discussed below) is available at esp-idf: :example:`peripherals/adc`
Reading voltage on ADC2 channel 7 ({IDF_TARGET_ADC2_CH7})::
@@ -95,7 +95,7 @@ Reading voltage on ADC2 channel 7 ({IDF_TARGET_ADC2_CH7})::
}
The reading may fail due to collision with Wi-Fi, should check it.
An example using the ADC2 driver to read the output of DAC is available in esp-idf: :example:`peripherals/adc/adc2`
An example using the ADC2 driver to read the output of DAC is available in esp-idf: :example:`peripherals/adc`
.. only:: esp32