pioduino/esp-idf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/i2s_built_in_adc' into 'master'

Browse Source 
feature(I2S-ADC): add ADC mode for I2S.

See merge request !1077
This commit is contained in:
Ivan Grokhotkov
2017-10-20 15:52:56 +08:00
parent 477ed8ce62 2fceec4d85
commit b6f37bda97
24 changed files with 6242 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/system/app_trace_to_host/main/app_trace_to_host_test.c
+2 -2
View File
@@ -101,8 +101,8 @@ int adc1_sample_and_show(int sampling_period)
void test_task(void *arg)
{
ESP_LOGI(TAG, "Enabling ADC1 on channel 6 / GPIO34.");
adc1_config_width(ADC_WIDTH_12Bit);
adc1_config_channel_atten(ADC1_TEST_CHANNEL, ADC_ATTEN_11db);
adc1_config_width(ADC_WIDTH_BIT_12);
adc1_config_channel_atten(ADC1_TEST_CHANNEL, ADC_ATTEN_DB_11);
ESP_LOGI(TAG, "Enabling CW generator on DAC channel 1 / GPIO25.");
enable_cosine_generator();
examples/system/ulp_adc/main/ulp_adc_example_main.c
+2 -2
View File
@@ -63,8 +63,8 @@ static void init_ulp_program()
/* Configure ADC channel */
/* Note: when changing channel here, also change 'adc_channel' constant
in adc.S */
adc1_config_channel_atten(ADC1_CHANNEL_6, ADC_ATTEN_11db);
adc1_config_width(ADC_WIDTH_12Bit);
adc1_config_channel_atten(ADC1_CHANNEL_6, ADC_ATTEN_DB_11);
adc1_config_width(ADC_WIDTH_BIT_12);
adc1_ulp_enable();
/* Set low and high thresholds, approx. 1.35V - 1.75V*/