Skip to content

fix: WB32 Timer Fixes #436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
emolitor wants to merge 1 commit into
base: chibios-21.11.x
Choose a base branch
from
Open

fix: WB32 Timer Fixes #436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions os/hal/ports/WB32/LLD/TIMv1/hal_pwm_lld.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,11 +433,13 @@ void pwm_lld_start(PWMDriver *pwmp) {
/* DMA-related DIER settings. */
pwmp->tim->DIER = pwmp->config->dier & ~WB32_TIM_DIER_IRQ_MASK;
#if WB32_PWM_USE_TIM1
if (&PWMD1 == pwmp) {
#if WB32_PWM_USE_ADVANCED
pwmp->tim->BDTR = pwmp->config->bdtr | WB32_TIM_BDTR_MOE;
pwmp->tim->BDTR = pwmp->config->bdtr | WB32_TIM_BDTR_MOE;
#else
pwmp->tim->BDTR = WB32_TIM_BDTR_MOE;
pwmp->tim->BDTR = WB32_TIM_BDTR_MOE;
#endif
}
#endif
/* Timer configured and started.*/
pwmp->tim->CR1 = WB32_TIM_CR1_ARPE | WB32_TIM_CR1_URS | WB32_TIM_CR1_CEN;
Expand All @@ -460,8 +462,10 @@ void pwm_lld_stop(PWMDriver *pwmp) {
pwmp->tim->DIER = 0;
/* Clear eventual pending IRQs.*/
pwmp->tim->SR = 0;
#if WB32_PWM_USE_TIM1 || WB32_PWM_USE_TIM8 || WB32_PWM_USE_TIM20
pwmp->tim->BDTR = 0;
#if WB32_PWM_USE_TIM1
if (&PWMD1 == pwmp) {
pwmp->tim->BDTR = 0;
}
#endif

#if WB32_PWM_USE_TIM1
Expand Down
4 changes: 2 additions & 2 deletions os/hal/ports/WB32/LLD/TIMv1/wb32_tim.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@

#define WB32_TIM_CCMR3_OC5M_MASK ((7U << 4) | (1U << 16))
#define WB32_TIM_CCMR3_OC5M(n) ((((n) & 7) << 4) | \
(((n) >> 2) << 16))
(((n) >> 3) << 16))

#define WB32_TIM_CCMR3_OC5CE (1U << 7)

Expand All @@ -365,7 +365,7 @@

#define WB32_TIM_CCMR3_OC6M_MASK ((7U << 12) | (1U << 24))
#define WB32_TIM_CCMR3_OC6M(n) ((((n) & 7) << 12) | \
(((n) >> 2) << 24))
(((n) >> 3) << 24))

#define WB32_TIM_CCMR3_OC6CE (1U << 15)
/** @} */
Expand Down