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

nrf5/modules/machine: Quickfix. Update timer object to not allow instanciation of Timer(0) if SOFT_PWM is enabled by board.

This commit is contained in:
Glenn Ruben Bakke 2017-05-17 19:54:08 +02:00 committed by glennrub
parent 6f72e73137
commit 952c14c4bf
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nrf5/modules/machine/timer.c
View File

@ -97,6 +97,14 @@ STATIC mp_obj_t machine_timer_make_new(const mp_obj_type_t *type, size_t n_args,
// get static peripheral object // get static peripheral object
int timer_id = timer_find(args[ARG_NEW_id].u_obj); int timer_id = timer_find(args[ARG_NEW_id].u_obj);
#if MICROPY_PY_MACHINE_SOFT_PWM
if (timer_id == 0) {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
"Timer(%d) reserved by ticker driver.", timer_id));
}
#endif
const machine_timer_obj_t *self = &machine_timer_obj[timer_id]; const machine_timer_obj_t *self = &machine_timer_obj[timer_id];
hal_timer_init(self->p_config); hal_timer_init(self->p_config);