examples: update app_trace pins for esp32s2

This commit is contained in:
Renz Bagaporo
2020-04-14 16:12:43 +08:00
parent 7c09cb1739
commit 666ee00ebe
2 changed files with 13 additions and 11 deletions

View File

@@ -1,6 +1,3 @@
| Supported Targets | ESP32 |
| ----------------- | ----- |
# Application Level Tracing Example (Logging to Host) # Application Level Tracing Example (Logging to Host)
(See the README.md file in the upper level 'examples' directory for more information about examples.) (See the README.md file in the upper level 'examples' directory for more information about examples.)
@@ -30,11 +27,13 @@ This example will assume that that an ESP-WROVER-KIT is used.
#### Pin Assignment: #### Pin Assignment:
The sinusoidal signal of 50 to 60 Hz ranging from 0 V ~ 3.1 V should be input into `GPIO34` (`ADC1_CHANNEL_6`). Users may provide this signal themselves, our use the DAC generated signal by bridging GPIO34 with `GPIO25` (`DAC_CHANNEL_1`). The sinusoidal signal of 50 to 60 Hz ranging from 0 V ~ 3.1 V should be input into `ADC1_CHANNEL_6`. Users may provide this signal themselves, or use the example-generated signal in `DAC_CHANNEL_1`. Listed below are the corresponding DAC/ADC channel pins
for supported targets.
| DAC Output | ADC Input | | Target | DAC Output | ADC Input |
| ------------------ | ------------------ | | ------------------ | ------------------ | ------------------ |
| Channel 1 (GPIO25) | Channel 6 (GPIO34) | | ESP32 | Channel 1 (GPIO25) | Channel 6 (GPIO34) |
| ESP32S2 | Channel 1 (GPIO17) | Channel 6 (GPIO7) |
#### Extra Connections: #### Extra Connections:

View File

@@ -16,8 +16,11 @@
#include "soc/sens_periph.h" #include "soc/sens_periph.h"
#include "driver/adc.h" #include "driver/adc.h"
#include "driver/dac.h" #include "driver/dac.h"
#include "soc/adc_channel.h"
#include "soc/dac_channel.h"
#define ADC1_TEST_CHANNEL (ADC1_CHANNEL_6) #define ADC1_TEST_CHANNEL (ADC1_CHANNEL_6)
#define TEST_SAMPLING_PERIOD 20 #define TEST_SAMPLING_PERIOD 20
/* /*
@@ -41,7 +44,7 @@ static const char *TAG = "example";
/* /*
* Enable cosine waveform generator (CW) * Enable cosine waveform generator (CW)
* on channel 1 / GPIO25 to provide sinusoidal signal * on DAC channel 1 to provide sinusoidal signal
* It can be used instead of a live signal for testing * It can be used instead of a live signal for testing
* of speed of logging to the host * of speed of logging to the host
* sequentially with data retrieval from ADC * sequentially with data retrieval from ADC
@@ -65,7 +68,7 @@ static void enable_cosine_generator(void)
} }
/* /*
* Sample data an ADC1 channel 6 / GPIO34 * Sample data an ADC1 channel 6
* over specific 'sampling_period' in milliseconds. * over specific 'sampling_period' in milliseconds.
* Print out sampling result using standard ESP_LOGI() function. * Print out sampling result using standard ESP_LOGI() function.
* Return the number of samples collected. * Return the number of samples collected.
@@ -87,7 +90,7 @@ static int adc1_sample_and_show(int sampling_period)
*/ */
void app_main(void) void app_main(void)
{ {
ESP_LOGI(TAG, "Enabling ADC1 on channel 6 / GPIO34."); ESP_LOGI(TAG, "Enabling ADC1 on channel 6 / GPIO%d.", ADC1_CHANNEL_6_GPIO_NUM);
#if CONFIG_IDF_TARGET_ESP32 #if CONFIG_IDF_TARGET_ESP32
adc1_config_width(ADC_WIDTH_BIT_12); adc1_config_width(ADC_WIDTH_BIT_12);
#elif CONFIG_IDF_TARGET_ESP32S2 #elif CONFIG_IDF_TARGET_ESP32S2
@@ -95,7 +98,7 @@ void app_main(void)
#endif #endif
adc1_config_channel_atten(ADC1_TEST_CHANNEL, ADC_ATTEN_DB_11); adc1_config_channel_atten(ADC1_TEST_CHANNEL, ADC_ATTEN_DB_11);
ESP_LOGI(TAG, "Enabling CW generator on DAC channel 1 / GPIO25."); ESP_LOGI(TAG, "Enabling CW generator on DAC channel 1 / GPIO%d.", DAC_CHANNEL_1_GPIO_NUM);
enable_cosine_generator(); enable_cosine_generator();
while (1) { while (1) {