From 952c14c4bf0c4247bef68544b8646019acff19aa Mon Sep 17 00:00:00 2001 From: Glenn Ruben Bakke Date: Wed, 17 May 2017 19:54:08 +0200 Subject: [PATCH] nrf5/modules/machine: Quickfix. Update timer object to not allow instanciation of Timer(0) if SOFT_PWM is enabled by board. --- nrf5/modules/machine/timer.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nrf5/modules/machine/timer.c b/nrf5/modules/machine/timer.c index d22f808751..a8284cd741 100644 --- a/nrf5/modules/machine/timer.c +++ b/nrf5/modules/machine/timer.c @@ -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 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]; hal_timer_init(self->p_config);