فهرست منبع

Merge branch 'bugfix/example_adc_pin' into 'master'

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

See merge request !1020

Ivan Grokhotkov 8 سال پیش
والد
کامیت
f6193a68a5
2فایلهای تغییر یافته به همراه7 افزوده شده و 10 حذف شده
  1. 5 8
      examples/peripherals/adc/README.md
  2. 2 2
      examples/peripherals/adc/main/adc1_test.c

+ 5 - 8
examples/peripherals/adc/README.md

@@ -1,17 +1,14 @@
 # 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]
+ADC1_CHANNEL_6: GPIO34, voltage range [0V..3.1V], the data range [0..4095]
 
  
-####Test:
- * Please connect the test voltage to GPIO32
-
- 
-
+### Test:
 
+Please connect the test voltage to GPIO34
 

+ 2 - 2
examples/peripherals/adc/main/adc1_test.c

@@ -15,13 +15,13 @@
 #include "driver/gpio.h"
 #include "driver/adc.h"
 
-#define ADC1_TEST_CHANNEL (4)
+#define ADC1_TEST_CHANNEL (ADC1_CHANNEL_6)
 
 void adc1task(void* arg)
 {
     // initialize ADC
     adc1_config_width(ADC_WIDTH_12Bit);
-    adc1_config_channel_atten(ADC1_TEST_CHANNEL,ADC_ATTEN_11db);
+    adc1_config_channel_atten(ADC1_TEST_CHANNEL, ADC_ATTEN_11db);
     while(1){
         printf("The adc1 value:%d\n",adc1_get_voltage(ADC1_TEST_CHANNEL));
         vTaskDelay(1000/portTICK_PERIOD_MS);