|
|
@ -3,13 +3,11 @@
|
|
|
|
|
|
|
|
|
|
|
|
#define BASE ((TIM_TypeDef *)timerBase_Addr_List[timer])
|
|
|
|
#define BASE ((TIM_TypeDef *)timerBase_Addr_List[timer])
|
|
|
|
|
|
|
|
|
|
|
|
#define HANDLE_INT_FLAG(flagReg, flagMask, intType)( \
|
|
|
|
#define HANDLE_INT_FLAG(flagReg, flagMask, intType)\
|
|
|
|
do {\
|
|
|
|
do {if ((flagReg) & (flagMask)) {\
|
|
|
|
if ((flagReg) & (flagMask)) {\
|
|
|
|
|
|
|
|
(flagReg) &= ~(flagMask);\
|
|
|
|
(flagReg) &= ~(flagMask);\
|
|
|
|
((intHandler_t)(intHandlerList[(intType)]))();)\
|
|
|
|
((intHandler_t)(intHandlerList[(intType)]))();\
|
|
|
|
}\
|
|
|
|
}} while (0)
|
|
|
|
} while (0)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void timerReset(timerNo_t timer)
|
|
|
|
void timerReset(timerNo_t timer)
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -260,11 +258,13 @@ void timerThrowError(timerError_t error)
|
|
|
|
|
|
|
|
|
|
|
|
void TIM1_BRK_UP_TRG_COM_IRQHandler()
|
|
|
|
void TIM1_BRK_UP_TRG_COM_IRQHandler()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|
|
|
|
HANDLE_INT_FLAG(TIM1->SR,TIM_SR_BIF,TIM1_BREAK);
|
|
|
|
|
|
|
|
/*
|
|
|
|
if(TIM1->SR & TIM_SR_BIF) {
|
|
|
|
if(TIM1->SR & TIM_SR_BIF) {
|
|
|
|
TIM1->SR &= ~TIM_SR_BIF;
|
|
|
|
TIM1->SR &= ~TIM_SR_BIF;
|
|
|
|
((intHandler_t)(intHandlerList[TIM1_BREAK]))();
|
|
|
|
((intHandler_t)(intHandlerList[TIM1_BREAK]))();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
*/
|
|
|
|
if(TIM1->SR & TIM_SR_UIF) {
|
|
|
|
if(TIM1->SR & TIM_SR_UIF) {
|
|
|
|
TIM1->SR &= ~TIM_SR_UIF;
|
|
|
|
TIM1->SR &= ~TIM_SR_UIF;
|
|
|
|
((intHandler_t)(intHandlerList[TIM1_UPDATE]))();
|
|
|
|
((intHandler_t)(intHandlerList[TIM1_UPDATE]))();
|
|
|
|