diff options
| author | Stig Bjørlykke | 2018-09-25 21:41:17 +0200 |
|---|---|---|
| committer | Stig Bjørlykke | 2019-02-02 11:15:52 +0100 |
| commit | 98f790b03aeba3fca6b87716ecadd076bed0c506 (patch) | |
| tree | 9708db6bb8521caa4653a690da80781a69352879 | |
| parent | 67689bfd7e28df8d4fa23c8f25065aeb0b9d9658 (diff) | |
nrf/timer: Fix disabling Timer 1 when using soft PWM.
Don't exclude the Timer instance 1 entry from machine_timer_obj[] when
using soft PWM. The usage is already checked when creating the Timer,
so just create an empty entry.
| -rw-r--r-- | ports/nrf/modules/machine/timer.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ports/nrf/modules/machine/timer.c b/ports/nrf/modules/machine/timer.c index e5e84a688..4b7c99539 100644 --- a/ports/nrf/modules/machine/timer.c +++ b/ports/nrf/modules/machine/timer.c @@ -53,7 +53,9 @@ STATIC mp_obj_t machine_timer_callbacks[] = { STATIC const machine_timer_obj_t machine_timer_obj[] = { {{&machine_timer_type}, NRFX_TIMER_INSTANCE(0)}, -#if !defined(MICROPY_PY_MACHINE_SOFT_PWM) || (MICROPY_PY_MACHINE_SOFT_PWM == 0) +#if MICROPY_PY_MACHINE_SOFT_PWM + { }, +#else {{&machine_timer_type}, NRFX_TIMER_INSTANCE(1)}, #endif {{&machine_timer_type}, NRFX_TIMER_INSTANCE(2)}, |