summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien George <damien@micropython.org>2020-06-29 16:06:30 +1000
committerDamien George <damien@micropython.org>2020-06-29 17:35:42 +1000
commit048a1d675dc92ff49b1a00adedba0a0dea8d5ea0 (patch)
treec14bf932ebc60b06553590d6a303524f84e951bb
parente4fcd216e02eef0b389c84ecd67be3114aac0a5d (diff)
stm32/timer: Properly initialise timer deadtime/brk on WB MCUs.
Signed-off-by: Damien George <damien@micropython.org>
-rw-r--r--ports/stm32/timer.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/ports/stm32/timer.c b/ports/stm32/timer.c
index c6f3d21f8..9b8c14c0d 100644
--- a/ports/stm32/timer.c
+++ b/ports/stm32/timer.c
@@ -477,7 +477,7 @@ STATIC void config_deadtime(pyb_timer_obj_t *self, mp_int_t ticks, mp_int_t brk)
deadTimeConfig.DeadTime = compute_dtg_from_ticks(ticks);
deadTimeConfig.BreakState = brk == BRK_OFF ? TIM_BREAK_DISABLE : TIM_BREAK_ENABLE;
deadTimeConfig.BreakPolarity = brk == BRK_LOW ? TIM_BREAKPOLARITY_LOW : TIM_BREAKPOLARITY_HIGH;
- #if defined(STM32F7) || defined(STM32H7) | defined(STM32L4)
+ #if defined(STM32F7) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
deadTimeConfig.BreakFilter = 0;
deadTimeConfig.Break2State = TIM_BREAK_DISABLE;
deadTimeConfig.Break2Polarity = TIM_BREAKPOLARITY_LOW;
@@ -769,14 +769,14 @@ STATIC mp_obj_t pyb_timer_init_helper(pyb_timer_obj_t *self, size_t n_args, cons
HAL_TIM_Base_Init(&self->tim);
#if !defined(STM32L0)
#if defined(IS_TIM_ADVANCED_INSTANCE)
- if (IS_TIM_ADVANCED_INSTANCE(self->tim.Instance)) {
+ if (IS_TIM_ADVANCED_INSTANCE(self->tim.Instance))
#elif defined(IS_TIM_BREAK_INSTANCE)
- if (IS_TIM_BREAK_INSTANCE(self->tim.Instance)) {
+ if (IS_TIM_BREAK_INSTANCE(self->tim.Instance))
#else
- if (0) {
- #endif
+ if (0)
+ #endif
+ {
config_deadtime(self, args[ARG_deadtime].u_int, args[ARG_brk].u_int);
-
}
#endif