summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryn386 <wf.yn386@gmail.com>2022-08-28 15:40:00 +0900
committerDamien George <damien@micropython.org>2022-09-06 15:22:16 +1000
commit8770cd2f4d24b1ad14c934b4161e42108fe98f84 (patch)
tree1b7a3d5b029e0e41e9f6509f02636ec6786694e2
parent4e4c28bf27ff4a9e1a2ce5b6fffa641d9a332507 (diff)
stm32/adc: Make ADCAll.read_channel reject invalid channels.
pyb.ADC(channel) checks whether specified channel is valid or have ADC capability but pyb.ADCAll().read_channel() does not. This change adds checking whether specified channel is valid and throw ValueError if channel is invalid. This is same as pyb.ADC().
-rw-r--r--ports/stm32/adc.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index 9b7788e59..9d58cf2e7 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -856,6 +856,9 @@ STATIC mp_obj_t adc_all_make_new(const mp_obj_type_t *type, size_t n_args, size_
STATIC mp_obj_t adc_all_read_channel(mp_obj_t self_in, mp_obj_t channel) {
pyb_adc_all_obj_t *self = MP_OBJ_TO_PTR(self_in);
uint32_t chan = adc_get_internal_channel(mp_obj_get_int(channel));
+ if (!is_adcx_channel(chan)) {
+ mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("not a valid ADC Channel: %d"), chan);
+ }
uint32_t data = adc_config_and_read_channel(&self->handle, chan);
return mp_obj_new_int(data);
}