djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nrf: Correct index checking of ADC/PWM/RTCounter instances. 

Avoid trying to use ADC, PWM and RTCounter instances which is
one past last available, because this will give a HardFault.
This commit is contained in:
Stig Bjørlykke 2018-07-31 22:19:31 +02:00 committed by Glenn Ruben Bakke
parent 7f0c5f2ef9
commit 0c161691b4
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/nrf/modules/machine/adc.c
View File

@ -96,7 +96,7 @@ STATIC int adc_find(mp_obj_t id) {
int adc_idx = adc_id; int adc_idx = adc_id;
if (adc_idx >= 0 && adc_idx <= MP_ARRAY_SIZE(machine_adc_obj) if (adc_idx >= 0 && adc_idx < MP_ARRAY_SIZE(machine_adc_obj)
&& machine_adc_obj[adc_idx].id != (uint8_t)-1) { && machine_adc_obj[adc_idx].id != (uint8_t)-1) {
return adc_idx; return adc_idx;
} }

2
ports/nrf/modules/machine/pwm.c
View File

@ -97,7 +97,7 @@ STATIC int hard_pwm_find(mp_obj_t id) {
if (MP_OBJ_IS_INT(id)) { if (MP_OBJ_IS_INT(id)) {
// given an integer id // given an integer id
int pwm_id = mp_obj_get_int(id); int pwm_id = mp_obj_get_int(id);
if (pwm_id >= 0 && pwm_id <= MP_ARRAY_SIZE(machine_hard_pwm_obj)) { if (pwm_id >= 0 && pwm_id < MP_ARRAY_SIZE(machine_hard_pwm_obj)) {
return pwm_id; return pwm_id;
} }
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,

2
ports/nrf/modules/machine/rtcounter.c
View File

@ -113,7 +113,7 @@ void rtc_init0(void) {
STATIC int rtc_find(mp_obj_t id) { STATIC int rtc_find(mp_obj_t id) {
// given an integer id // given an integer id
int rtc_id = mp_obj_get_int(id); int rtc_id = mp_obj_get_int(id);
if (rtc_id >= 0 && rtc_id <= MP_ARRAY_SIZE(machine_rtc_obj)) { if (rtc_id >= 0 && rtc_id < MP_ARRAY_SIZE(machine_rtc_obj)) {
return rtc_id; return rtc_id;
} }
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,