andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #722. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9014 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
Giovanni Di Sirio 2016-03-05 10:36:34 +00:00
parent 7bd5e87189
commit 712ecf57f9
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
os/hal/ports/STM32/LLD/TIMv1/pwm_lld.c
View File

@ -708,7 +708,7 @@ void pwm_lld_enable_channel(PWMDriver *pwmp,
#if STM32_TIM_MAX_CHANNELS <= 4 #if STM32_TIM_MAX_CHANNELS <= 4
pwmp->tim->CCR[channel] = width; pwmp->tim->CCR[channel] = width;
#else #else
if (channel <= 4) if (channel < 4)
pwmp->tim->CCR[channel] = width; pwmp->tim->CCR[channel] = width;
else else
pwmp->tim->CCXR[channel - 4] = width; pwmp->tim->CCXR[channel - 4] = width;
@ -733,7 +733,7 @@ void pwm_lld_disable_channel(PWMDriver *pwmp, pwmchannel_t channel) {
pwmp->tim->CCR[channel] = 0; pwmp->tim->CCR[channel] = 0;
pwmp->tim->DIER &= ~(2 << channel); pwmp->tim->DIER &= ~(2 << channel);
#else #else
if (channel <= 4) { if (channel < 4) {
pwmp->tim->CCR[channel] = 0; pwmp->tim->CCR[channel] = 0;
pwmp->tim->DIER &= ~(2 << channel); pwmp->tim->DIER &= ~(2 << channel);
} }

2
readme.txt
View File

@ -95,6 +95,8 @@
- RT: Merged RT4. - RT: Merged RT4.
- NIL: Merged NIL2. - NIL: Merged NIL2.
- NIL: Added STM32F7 demo. - NIL: Added STM32F7 demo.
- VAR: Fixed error in STM32 PWM driver regarding channels 4 and 5 (bug #722)
(backported to 3.0.6 and 16.1.4).
- VAR: Fixed wrong flash and ram size in linker script for maple mini - VAR: Fixed wrong flash and ram size in linker script for maple mini
(bug #719). (bug #719).
- VAR: Fixed GCC 5.2 crashes while compiling ChibiOS (bug #718)(backported - VAR: Fixed GCC 5.2 crashes while compiling ChibiOS (bug #718)(backported