Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-15 20:35:33 +03:00
Code Issues Wiki Activity

Code cleanup / fixed missing TIM8_UP handler

Browse source
This commit is contained in:
Petr Ledvina 2014-11-08 15:25:16 +01:00
parent cd88c561a6
commit 98c0d0b5dd
2 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -62,7 +62,7 @@ USBFS_DIR = $(ROOT)/lib/main/STM32_USB-FS-Device_Driver
USBPERIPH_SRC = $(notdir $(wildcard $(USBFS_DIR)/src/*.c)) USBPERIPH_SRC = $(notdir $(wildcard $(USBFS_DIR)/src/*.c))
STDPERIPH_SRC = $(notdir $(wildcard $(STDPERIPH_DIR)/src/*.c)) STDPERIPH_SRC = $(notdir $(wildcard $(STDPERIPH_DIR)/src/*.c))
EXCLUDES= stm32f30x_crc.c \ EXCLUDES = stm32f30x_crc.c \
stm32f30x_can.c stm32f30x_can.c
STDPERIPH_SRC := $(filter-out ${EXCLUDES}, $(STDPERIPH_SRC)) STDPERIPH_SRC := $(filter-out ${EXCLUDES}, $(STDPERIPH_SRC))

27
src/main/drivers/timer.c
View file

@ -210,12 +210,12 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
#define USED_TIMER_COUNT BITCOUNT(USED_TIMERS) #define USED_TIMER_COUNT BITCOUNT(USED_TIMERS)
#define CC_CHANNELS_PER_TIMER 4 // TIM_Channel_1..4 #define CC_CHANNELS_PER_TIMER 4 // TIM_Channel_1..4
#define TIM_IT_CCx(ch) (TIM_IT_CC1<<((ch)/4)) #define TIM_IT_CCx(ch) (TIM_IT_CC1 << ((ch) / 4))
typedef struct timerConfig_s { typedef struct timerConfig_s {
timerCCHandlerRec_t* edgeCallback[CC_CHANNELS_PER_TIMER]; timerCCHandlerRec_t *edgeCallback[CC_CHANNELS_PER_TIMER];
timerOvrHandlerRec_t* overflowCallback[CC_CHANNELS_PER_TIMER]; timerOvrHandlerRec_t *overflowCallback[CC_CHANNELS_PER_TIMER];
timerOvrHandlerRec_t* overflowCallbackActive; // null-terminated linkded list of active overflow callbacks timerOvrHandlerRec_t *overflowCallbackActive; // null-terminated linkded list of active overflow callbacks
} timerConfig_t; } timerConfig_t;
timerConfig_t timerConfig[USED_TIMER_COUNT]; timerConfig_t timerConfig[USED_TIMER_COUNT];
@ -230,7 +230,7 @@ typedef struct {
timerInfo_t timerInfo[USED_TIMER_COUNT]; timerInfo_t timerInfo[USED_TIMER_COUNT];
// return index of timer in timer table. Lowest timer has index 0 // return index of timer in timer table. Lowest timer has index 0
#define TIMER_INDEX(i) BITCOUNT((TIM_N(i)-1)&USED_TIMERS) #define TIMER_INDEX(i) BITCOUNT((TIM_N(i) - 1) & USED_TIMERS)
static uint8_t lookupTimerIndex(const TIM_TypeDef *tim) static uint8_t lookupTimerIndex(const TIM_TypeDef *tim)
{ {
@ -264,7 +264,7 @@ static uint8_t lookupTimerIndex(const TIM_TypeDef *tim)
#if USED_TIMERS & TIM_N(17) #if USED_TIMERS & TIM_N(17)
_CASE(17); _CASE(17);
#endif #endif
default: return -1; // make sure final index is out of range default: return ~1; // make sure final index is out of range
} }
#undef _CASE #undef _CASE
#undef _CASE_ #undef _CASE_
@ -302,7 +302,7 @@ TIM_TypeDef * const usedTimers[USED_TIMER_COUNT] = {
static inline uint8_t lookupChannelIndex(const uint16_t channel) static inline uint8_t lookupChannelIndex(const uint16_t channel)
{ {
return channel>>2; return channel >> 2;
} }
void timerNVICConfigure(uint8_t irq) void timerNVICConfigure(uint8_t irq)
@ -340,7 +340,7 @@ void timerConfigure(const timerHardware_t *timerHardwarePtr, uint16_t period, ui
timerNVICConfigure(timerHardwarePtr->irq); timerNVICConfigure(timerHardwarePtr->irq);
} }
// allocate and configure timer channel. Timer priority is set to highest priority of channels // allocate and configure timer channel. Timer priority is set to highest priority of its channels
void timerChInit(const timerHardware_t *timHw, channelType_t type, int irqPriority) void timerChInit(const timerHardware_t *timHw, channelType_t type, int irqPriority)
{ {
unsigned channel = timHw - timerHardware; unsigned channel = timHw - timerHardware;
@ -516,7 +516,7 @@ void timerChConfigIC(const timerHardware_t* timHw, bool polarityRising, unsigned
} }
// configure dual channel input channel for capture // configure dual channel input channel for capture
// polarity is for first Low channel (capture order is always Lo - Hi) // polarity is for Low channel (capture order is always Lo - Hi)
void timerChConfigICDual(const timerHardware_t* timHw, bool polarityRising, unsigned inputFilterTicks) void timerChConfigICDual(const timerHardware_t* timHw, bool polarityRising, unsigned inputFilterTicks)
{ {
TIM_ICInitTypeDef TIM_ICInitStructure; TIM_ICInitTypeDef TIM_ICInitStructure;
@ -605,7 +605,9 @@ static void timCCxHandler(TIM_TypeDef *tim, timerConfig_t* timerConfig)
unsigned tim_status; unsigned tim_status;
tim_status = tim->SR & tim->DIER; tim_status = tim->SR & tim->DIER;
#if 1 #if 1
while(tim_status) { // flags will be cleared by reading CCR in dual capture, make sure we call handler correctly while(tim_status) {
// flags will be cleared by reading CCR in dual capture, make sure we call handler correctly
// currrent order is highest bit first. Code should not rely on specific order (it will introduce race conditions anyway)
unsigned bit = __builtin_clz(tim_status); unsigned bit = __builtin_clz(tim_status);
unsigned mask = ~(0x80000000 >> bit); unsigned mask = ~(0x80000000 >> bit);
tim->SR = mask; tim->SR = mask;
@ -700,6 +702,11 @@ _TIM_IRQ_HANDLER(TIM4_IRQHandler, 4);
#endif #endif
#if USED_TIMERS & TIM_N(8) #if USED_TIMERS & TIM_N(8)
_TIM_IRQ_HANDLER(TIM8_CC_IRQHandler, 8); _TIM_IRQ_HANDLER(TIM8_CC_IRQHandler, 8);
# if defined(STM32F10X_XL)
_TIM_IRQ_HANDLER(TIM8_UP_TIM13_IRQHandler, 8);
# else // f10x_hd, f30x
_TIM_IRQ_HANDLER(TIM8_UP_IRQHandler, 8);
# endif
#endif #endif
#if USED_TIMERS & TIM_N(15) #if USED_TIMERS & TIM_N(15)
_TIM_IRQ_HANDLER(TIM1_BRK_TIM15_IRQHandler, 15); _TIM_IRQ_HANDLER(TIM1_BRK_TIM15_IRQHandler, 15);