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

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1428 35acf78f-673a-0410-8e92-d51de3d6d3f4

This commit is contained in:
gdisirio 2009-12-18 09:24:29 +00:00
parent ebcb2909b2
commit 65f23fc65f
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
os/hal/platforms/STM32/hal_lld.h
View File

@ -76,6 +76,8 @@
#define APB1CLK (SYSCLK / 2) #define APB1CLK (SYSCLK / 2)
#define APB2CLK (SYSCLK / 2) #define APB2CLK (SYSCLK / 2)
#define AHB1CLK (SYSCLK / 1) #define AHB1CLK (SYSCLK / 1)
#define TIMCLK2 (APB2CLK * 2)
#define TIMCLK1 (APB1CLK * 2)
/* /*
* Values derived from the clock settings. * Values derived from the clock settings.

3
os/hal/platforms/STM32/pwm_lld.c
View File

@ -78,6 +78,7 @@ CH_IRQ_HANDLER(VectorA4) {
CH_IRQ_PROLOGUE(); CH_IRQ_PROLOGUE();
TIM1->SR = ~TIM_SR_UIF;
PWMD1.pd_config->pc_callback(); PWMD1.pd_config->pc_callback();
CH_IRQ_EPILOGUE(); CH_IRQ_EPILOGUE();
@ -95,7 +96,7 @@ CH_IRQ_HANDLER(VectorAC) {
CH_IRQ_PROLOGUE(); CH_IRQ_PROLOGUE();
sr = TIM1->SR; sr = TIM1->SR;
TIM1->SR &= ~(TIM_SR_CC1IF | TIM_SR_CC2IF | TIM_SR_CC3IF | TIM_SR_CC4IF); TIM1->SR = ~(TIM_SR_CC1IF | TIM_SR_CC2IF | TIM_SR_CC3IF | TIM_SR_CC4IF);
if ((sr & TIM_SR_CC1IF) != 0) if ((sr & TIM_SR_CC1IF) != 0)
PWMD1.pd_config->pc_channels[0].pcc_callback(); PWMD1.pd_config->pc_channels[0].pcc_callback();
if ((sr & TIM_SR_CC2IF) != 0) if ((sr & TIM_SR_CC2IF) != 0)