Skip to content

Commit db3b757

Browse files
committed
Merge branch 'fix/delete_deprecated_adc_format' into 'master'
fix(adc): removed deprecated continuous format config See merge request espressif/esp-idf!43079
2 parents ce65a06 + 7a933cd commit db3b757

File tree

4 files changed

+0
-6
lines changed

4 files changed

+0
-6
lines changed

components/esp_adc/test_apps/adc/main/test_adc_driver.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,6 @@ TEST_CASE("ADC continuous big conv_frame_size test", "[adc_continuous]")
168168
adc_continuous_config_t dig_cfg = {
169169
.sample_freq_hz = 50 * 1000,
170170
.conv_mode = ADC_CONV_SINGLE_UNIT_1,
171-
.format = ADC_DRIVER_TEST_OUTPUT_TYPE,
172171
};
173172
adc_digi_pattern_config_t adc_pattern[SOC_ADC_PATT_LEN_MAX] = {0};
174173
adc_pattern[0].atten = ADC_ATTEN_DB_12;
@@ -226,7 +225,6 @@ TEST_CASE("ADC continuous flush internal pool", "[adc_continuous][manual][ignore
226225
adc_continuous_config_t dig_cfg = {
227226
.sample_freq_hz = 50 * 1000,
228227
.conv_mode = ADC_CONV_SINGLE_UNIT_1,
229-
.format = ADC_DRIVER_TEST_OUTPUT_TYPE,
230228
};
231229
adc_digi_pattern_config_t adc_pattern[SOC_ADC_PATT_LEN_MAX] = {0};
232230
adc_pattern[0].atten = ADC_ATTEN_DB_12;
@@ -279,7 +277,6 @@ TEST_CASE("ADC continuous test after restarting", "[adc_continuous][ignore]")
279277
adc_continuous_config_t dig_cfg = {
280278
.sample_freq_hz = 50 * 1000,
281279
.conv_mode = ADC_CONV_SINGLE_UNIT_1,
282-
.format = ADC_DRIVER_TEST_OUTPUT_TYPE,
283280
};
284281
adc_digi_pattern_config_t adc_pattern[SOC_ADC_PATT_LEN_MAX] = {0};
285282
adc_pattern[0].atten = ADC_ATTEN_DB_12;

components/esp_adc/test_apps/adc/main/test_adc_driver_iram.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,6 @@ TEST_CASE("ADC continuous work with ISR and Flash", "[adc_continuous]")
194194
adc_continuous_config_t dig_cfg = {
195195
.sample_freq_hz = ADC_TEST_FREQ_HZ,
196196
.conv_mode = ADC_CONV_SINGLE_UNIT_1,
197-
.format = ADC_TEST_OUTPUT_TYPE,
198197
};
199198
adc_digi_pattern_config_t adc_pattern[SOC_ADC_PATT_LEN_MAX] = {0};
200199
adc_pattern[0].atten = ADC_ATTEN_DB_0;

components/esp_adc/test_apps/adc/main/test_adc_performance.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,6 @@ static float test_adc_continuous_std(adc_atten_t atten, bool filter_en, int filt
182182
adc_continuous_config_t dig_cfg = {
183183
.sample_freq_hz = ADC_TEST_FREQ_HZ,
184184
.conv_mode = ADC_CONV_SINGLE_UNIT_1,
185-
.format = ADC_TEST_OUTPUT_TYPE,
186185
};
187186
adc_digi_pattern_config_t adc_pattern[SOC_ADC_PATT_LEN_MAX] = {0};
188187
adc_pattern[0].atten = atten;

components/esp_adc/test_apps/adc/main/test_adc_tsens.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ TEST_CASE("Test temperature sensor work with ADC continuous", "[adc]")
116116
adc_continuous_config_t dig_cfg = {
117117
.sample_freq_hz = 50 * 1000,
118118
.conv_mode = ADC_CONV_SINGLE_UNIT_1,
119-
.format = ADC_DRIVER_TEST_OUTPUT_TYPE,
120119
};
121120
adc_digi_pattern_config_t adc_pattern[SOC_ADC_PATT_LEN_MAX] = {0};
122121
adc_pattern[0].atten = ADC_ATTEN_DB_12;

0 commit comments

Comments
 (0)