Merge pull request #9563 from jepler/issue9504

tannewt · web-flow · commit 30a4bd12f9a1 · 2024-08-27T12:35:04.000-07:00
espressif: Validate sample rate
diff --git a/ports/espressif/common-hal/analogbufio/BufferedIn.c b/ports/espressif/common-hal/analogbufio/BufferedIn.c
@@ -71,6 +71,8 @@ void common_hal_analogbufio_bufferedin_construct(analogbufio_bufferedin_obj_t *s
     }
     #endif
 
+    mp_arg_validate_int_range(sample_rate, SOC_ADC_SAMPLE_FREQ_THRES_LOW, SOC_ADC_SAMPLE_FREQ_THRES_HIGH, MP_QSTR_sample_rate);
+
     common_hal_mcu_pin_claim(pin);
 }
 
@@ -109,7 +111,7 @@ static void start_dma(analogbufio_bufferedin_obj_t *self, adc_digi_convert_mode_
     };
 
     #if defined(DEBUG_ANALOGBUFIO)
-    mp_printf(&mp_plat_print, "pin:%d, ADC channel:%d, ADC index:%d, adc1_chan_mask:0x%x, adc2_chan_mask:0x%x\n", pin->number, pin->adc_channel, pin->adc_index, adc1_chan_mask, adc2_chan_mask);
+    mp_printf(&mp_plat_print, "pin:%d, ADC channel:%d, ADC index:%d\n", pin->number, pin->adc_channel, pin->adc_index);
     #endif // DEBUG_ANALOGBUFIO
     esp_err_t err = adc_continuous_new_handle(&adc_dma_config, &self->handle);
     if (ESP_OK != err) {

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,8 @@ void common_hal_analogbufio_bufferedin_construct(analogbufio_bufferedin_obj_t *s`
`71`	`71`	`}`
`72`	`72`	`#endif`
`73`	`73`
	`74`	`+ mp_arg_validate_int_range(sample_rate, SOC_ADC_SAMPLE_FREQ_THRES_LOW, SOC_ADC_SAMPLE_FREQ_THRES_HIGH, MP_QSTR_sample_rate);`
	`75`	`+`
`74`	`76`	`common_hal_mcu_pin_claim(pin);`
`75`	`77`	`}`
`76`	`78`
`@@ -109,7 +111,7 @@ static void start_dma(analogbufio_bufferedin_obj_t *self, adc_digi_convert_mode_`
`109`	`111`	`};`
`110`	`112`
`111`	`113`	`#if defined(DEBUG_ANALOGBUFIO)`
`112`		`- mp_printf(&mp_plat_print, "pin:%d, ADC channel:%d, ADC index:%d, adc1_chan_mask:0x%x, adc2_chan_mask:0x%x\n", pin->number, pin->adc_channel, pin->adc_index, adc1_chan_mask, adc2_chan_mask);`
	`114`	`+ mp_printf(&mp_plat_print, "pin:%d, ADC channel:%d, ADC index:%d\n", pin->number, pin->adc_channel, pin->adc_index);`
`113`	`115`	`#endif // DEBUG_ANALOGBUFIO`
`114`	`116`	`esp_err_t err = adc_continuous_new_handle(&adc_dma_config, &self->handle);`
`115`	`117`	`if (ESP_OK != err) {`