From 718f2d0cd19fa854b859fc5390930c2c5c3c5216 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Sun, 28 Nov 2010 12:21:49 +0000 Subject: Fixed bug 3121246. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2447 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/hal/platforms/STM32/pwm_lld.c | 2 +- readme.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/os/hal/platforms/STM32/pwm_lld.c b/os/hal/platforms/STM32/pwm_lld.c index 56273b5a6..8c8f56920 100644 --- a/os/hal/platforms/STM32/pwm_lld.c +++ b/os/hal/platforms/STM32/pwm_lld.c @@ -535,7 +535,7 @@ void pwm_lld_enable_channel(PWMDriver *pwmp, void pwm_lld_disable_channel(PWMDriver *pwmp, pwmchannel_t channel) { *(&pwmp->pd_tim->CCR1 + (channel * 2)) = 0; - pwmp->pd_tim->DIER = ~(2 << channel); + pwmp->pd_tim->DIER &= ~(2 << channel); pwmp->pd_enabled_channels &= ~(1 << channel); } diff --git a/readme.txt b/readme.txt index cacb20149..4e4daad49 100644 --- a/readme.txt +++ b/readme.txt @@ -65,6 +65,7 @@ ***************************************************************************** *** 2.1.5 *** +- FIX: Fixed pwmDisableChannel() now working in STM32 PWM driver (bug 3121246). - FIX: Fixed problem with PWM channel callbacks (bug 3120785). - NEW: Added support for TIM5 in the STM32 PWM driver. - CHANGE: Modified the STM32_PWM_PWMx_IRQ_PRIORITY macros in the STM32 -- cgit v1.2.3