diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2009-12-18 11:57:43 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2009-12-18 11:57:43 +0000 |
| commit | 511d0b242849e9e6e202f9fb726d4935695b06af (patch) | |
| tree | 94f47553c168ab83b2060b90b4959bd317419831 | |
| parent | f27c5d296844f858b3026ee6f1a63641c0d98fb1 (diff) | |
| download | ChibiOS-511d0b242849e9e6e202f9fb726d4935695b06af.tar.gz ChibiOS-511d0b242849e9e6e202f9fb726d4935695b06af.tar.bz2 ChibiOS-511d0b242849e9e6e202f9fb726d4935695b06af.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1430 35acf78f-673a-0410-8e92-d51de3d6d3f4
| -rw-r--r-- | os/hal/platforms/STM32/pwm_lld.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/os/hal/platforms/STM32/pwm_lld.c b/os/hal/platforms/STM32/pwm_lld.c index 6b5d7d71c..76199e48a 100644 --- a/os/hal/platforms/STM32/pwm_lld.c +++ b/os/hal/platforms/STM32/pwm_lld.c @@ -268,33 +268,33 @@ void pwm_lld_enable_channel(PWMDriver *pwmp, pwmp->pd_tim->CCMR1 = (pwmp->pd_tim->CCMR1 & 0xFF00) |
TIM_CCMR1_OC1M_1 | TIM_CCMR1_OC1M_2 |
TIM_CCMR1_OC1PE;
+ pwmp->pd_tim->SR = ~TIM_SR_CC1IF;
pwmp->pd_tim->DIER |= pwmp->pd_config->pc_channels[0].pcc_callback == NULL
? 0 : TIM_DIER_CC1IE;
- pwmp->pd_tim->SR = ~TIM_SR_CC1IF;
break;
case 1:
pwmp->pd_tim->CCMR1 = (pwmp->pd_tim->CCMR1 & 0x00FF) |
TIM_CCMR1_OC2M_1 | TIM_CCMR1_OC2M_2 |
TIM_CCMR1_OC2PE;
+ pwmp->pd_tim->SR = ~TIM_SR_CC2IF;
pwmp->pd_tim->DIER |= pwmp->pd_config->pc_channels[1].pcc_callback == NULL
? 0 : TIM_DIER_CC2IE;
- pwmp->pd_tim->SR = ~TIM_SR_CC2IF;
break;
case 2:
pwmp->pd_tim->CCMR2 = (pwmp->pd_tim->CCMR2 & 0xFF00) |
TIM_CCMR2_OC3M_1 | TIM_CCMR2_OC3M_2 |
TIM_CCMR2_OC3PE;
+ pwmp->pd_tim->SR = ~TIM_SR_CC3IF;
pwmp->pd_tim->DIER |= pwmp->pd_config->pc_channels[2].pcc_callback == NULL
? 0 : TIM_DIER_CC3IE;
- pwmp->pd_tim->SR = ~TIM_SR_CC3IF;
break;
case 3:
pwmp->pd_tim->CCMR2 = (pwmp->pd_tim->CCMR2 & 0x00FF) |
TIM_CCMR2_OC4M_1 | TIM_CCMR2_OC4M_2 |
TIM_CCMR2_OC4PE;
+ pwmp->pd_tim->SR = ~TIM_SR_CC4IF;
pwmp->pd_tim->DIER |= pwmp->pd_config->pc_channels[3].pcc_callback == NULL
? 0 : TIM_DIER_CC4IE;
- pwmp->pd_tim->SR = ~TIM_SR_CC4IF;
break;
}
}
@@ -316,25 +316,21 @@ void pwm_lld_disable_channel(PWMDriver *pwmp, pwmchannel_t channel) { pwmp->pd_tim->CCR1 = 0;
pwmp->pd_tim->CCMR1 = pwmp->pd_tim->CCMR1 & 0xFF00;
pwmp->pd_tim->DIER &= ~TIM_DIER_CC1IE;
- pwmp->pd_tim->SR = ~TIM_SR_CC1IF;
break;
case 1:
pwmp->pd_tim->CCR2 = 0;
pwmp->pd_tim->CCMR1 = pwmp->pd_tim->CCMR1 & 0x00FF;
pwmp->pd_tim->DIER &= ~TIM_DIER_CC2IE;
- pwmp->pd_tim->SR = ~TIM_SR_CC2IF;
break;
case 2:
pwmp->pd_tim->CCR3 = 0;
pwmp->pd_tim->CCMR2 = pwmp->pd_tim->CCMR2 & 0xFF00;
pwmp->pd_tim->DIER &= ~TIM_DIER_CC3IE;
- pwmp->pd_tim->SR = ~TIM_SR_CC3IF;
break;
case 3:
pwmp->pd_tim->CCR4 = 0;
pwmp->pd_tim->CCMR2 = pwmp->pd_tim->CCMR2 & 0x00FF;
pwmp->pd_tim->DIER &= ~TIM_DIER_CC4IE;
- pwmp->pd_tim->SR = ~TIM_SR_CC4IF;
break;
}
}
|