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

Merge branch 'bugfix/example_adc_pin' into 'master'

Browse Source 
Changed adc GPIO pin 32, that is not jumped to header in ESP-WROVER-KIT,
to 34

See merge request !1020
This commit is contained in:
Ivan Grokhotkov
2017-07-20 12:15:43 +08:00
parent b9f660524c c0cd79c9a9
commit f6193a68a5
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
examples/peripherals/adc/README.md
View File

@@ -1,17 +1,14 @@
# Example: ADC1 # Example: ADC1
This test code shows how to configure ADC1 and how to use ADC1 get the voltage. This test code shows how to configure ADC1 and read the voltage connected to GPIO pin.
####ADC1 functions: ### ADC1 functions:
* ADC1,CHANNEL_4:GPIO32, voltage range [0v,3.1v],the Data range [0,4095]
####Test:
* Please connect the test voltage to GPIO32
ADC1_CHANNEL_6: GPIO34, voltage range [0V..3.1V], the data range [0..4095]
### Test:
Please connect the test voltage to GPIO34

2
examples/peripherals/adc/main/adc1_test.c
View File

@@ -15,7 +15,7 @@
#include "driver/gpio.h" #include "driver/gpio.h"
#include "driver/adc.h" #include "driver/adc.h"
#define ADC1_TEST_CHANNEL (4) #define ADC1_TEST_CHANNEL (ADC1_CHANNEL_6)
void adc1task(void* arg) void adc1task(void* arg)
{ {