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

Merge pull request #4844 from jflyper/bfdev-convert-sprf4neo-to-use-TIM_DEF

Browse source 
SPRACINGF4NEO Use DEF_TIM macro
This commit is contained in:
Michael Keller 2017-12-26 11:03:26 +13:00 • committed by GitHub
commit cd3cb6c420
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/main/target/SPRACINGF4NEO/target.c
View file

@ -24,32 +24,31 @@
#include "drivers/timer_def.h" #include "drivers/timer_def.h"
#include "drivers/dma.h" #include "drivers/dma.h"
const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
{ TIM9, IO_TAG(PA3), TIM_Channel_2, TIM_USE_PPM | TIM_USE_PWM, 0, GPIO_AF_TIM9, NULL, 0, 0 }, // PPM / PWM1 / UART2 RX DEF_TIM(TIM9, CH2, PA3, TIM_USE_PPM | TIM_USE_PWM, 0, 0),
{ TIM9, IO_TAG(PA2), TIM_Channel_1, TIM_USE_PWM, 0, GPIO_AF_TIM9, NULL, 0, 0 }, // PPM / PWM2 / UART2 TX DEF_TIM(TIM9, CH1, PA2, TIM_USE_PWM, 0, 0), // PPM / PWM1 / UART2 RX
{ TIM8, IO_TAG(PC8), TIM_Channel_3, TIM_USE_MOTOR, 1, GPIO_AF_TIM8, DMA2_Stream4, DMA_Channel_7, DMA2_ST4_HANDLER }, // ESC 1 DEF_TIM(TIM8, CH3, PC8, TIM_USE_MOTOR, 0, 0), // D(2,4,7) ESC 1
{ TIM8, IO_TAG(PC7), TIM_Channel_2, TIM_USE_MOTOR, 1, GPIO_AF_TIM8, DMA2_Stream3, DMA_Channel_7, DMA2_ST3_HANDLER }, // ESC 2 DEF_TIM(TIM8, CH2, PC7, TIM_USE_MOTOR, 0, 0), // D(2,3,7) ESC 2
{ TIM8, IO_TAG(PC9), TIM_Channel_4, TIM_USE_MOTOR, 1, GPIO_AF_TIM8, DMA2_Stream7, DMA_Channel_7, DMA2_ST7_HANDLER }, // ESC 3 DEF_TIM(TIM8, CH4, PC9, TIM_USE_MOTOR, 0, 0), // D(2,7,7) ESC 3
{ TIM8, IO_TAG(PC6), TIM_Channel_1, TIM_USE_MOTOR, 1, GPIO_AF_TIM8, DMA2_Stream2, DMA_Channel_7, DMA2_ST2_HANDLER }, // ESC 4 DEF_TIM(TIM8, CH1, PC6, TIM_USE_MOTOR, 0, 0), // D(2,2,7) ESC 4
#if (SPRACINGF4NEO_REV >= 3) #if (SPRACINGF4NEO_REV >= 3)
{ TIM4, IO_TAG(PB6), TIM_Channel_1, TIM_USE_MOTOR, 1, GPIO_AF_TIM4, DMA1_Stream0, DMA_Channel_2, DMA1_ST0_HANDLER }, // ESC 5 / Conflicts with USART5_RX / SPI3_RX - SPI3_RX can be mapped to DMA1_ST3_CH0 DEF_TIM(TIM4, CH1, PB6, TIM_USE_MOTOR, 0, 0), // D(1,0,2) ESC 5 / Conflicts with USART5_RX / SPI3_RX - SPI3_RX can be mapped to DMA1_ST3_CH0
{ TIM4, IO_TAG(PB7), TIM_Channel_2, TIM_USE_MOTOR, 1, GPIO_AF_TIM4, DMA1_Stream3, DMA_Channel_2, DMA1_ST3_HANDLER }, // ESC 6 / Conflicts with USART3_RX DEF_TIM(TIM4, CH2, PB7, TIM_USE_MOTOR, 0, 0), // D(1,3,2) ESC 6 / Conflicts with USART3_RX
#else #else
{ TIM3, IO_TAG(PB0), TIM_Channel_3, TIM_USE_MOTOR, 1, GPIO_AF_TIM3, DMA1_Stream7, DMA_Channel_5, DMA1_ST7_HANDLER }, // ESC 5 DEF_TIM(TIM3, CH3, PB0, TIM_USE_MOTOR, 0, 0), // D(1,7,5) ESC 5
{ TIM3, IO_TAG(PB1), TIM_Channel_4, TIM_USE_MOTOR, 1, GPIO_AF_TIM3, DMA1_Stream2, DMA_Channel_5, DMA1_ST2_HANDLER }, // ESC 6 DEF_TIM(TIM3, CH4, PB1, TIM_USE_MOTOR, 0, 0), // D(1,2,5) ESC 6
#endif #endif
{ TIM2, IO_TAG(PA1), TIM_Channel_2, TIM_USE_LED, 1, GPIO_AF_TIM2, DMA1_Stream6, DMA_Channel_3, DMA1_ST6_HANDLER }, // LED Strip DEF_TIM(TIM2, CH2, PA1, TIM_USE_LED, 0, 0), // D(1,6,3) LED Strip
// Additional 2 PWM channels available on UART3 RX/TX pins // Additional 2 PWM channels available on UART3 RX/TX pins
// However, when using led strip the timer cannot be used, but no code appears to prevent that right now // However, when using led strip the timer cannot be used, but no code appears to prevent that right now
{ TIM2, IO_TAG(PB10), TIM_Channel_3, TIM_USE_MOTOR, 1, GPIO_AF_TIM2, DMA1_Stream1, DMA_Channel_3, DMA1_ST1_HANDLER }, // ESC 7 / Shared with UART3 TX PIN and SPI3 TX (OSD) DEF_TIM(TIM2, CH3, PB10, TIM_USE_MOTOR, 0, 0), // D(1,1,3) ESC 7 / Shared with UART3 TX PIN and SPI3 TX (OSD)
{ TIM2, IO_TAG(PB11), TIM_Channel_4, TIM_USE_MOTOR, 1, GPIO_AF_TIM2, DMA1_Stream6, DMA_Channel_3, DMA1_ST6_HANDLER }, // ESC 8 / Shared with UART3 RX PIN DEF_TIM(TIM2, CH4, PB11, TIM_USE_MOTOR, 0, 1), // D(1,6,3) ESC 8 / Shared with UART3 RX PIN
{ TIM1, IO_TAG(PA8), TIM_Channel_1, TIM_USE_TRANSPONDER, 1, GPIO_AF_TIM1, DMA2_Stream6, DMA_Channel_0, DMA2_ST6_HANDLER }, // Transponder DEF_TIM(TIM1, CH1, PA8, TIM_USE_TRANSPONDER, 0, 0), // D(2,6,0) Transponder
// Additional 2 PWM channels available on UART1 RX/TX pins // Additional 2 PWM channels available on UART1 RX/TX pins
// However, when using transponder the timer cannot be used, but no code appears to prevent that right now // However, when using transponder the timer cannot be used, but no code appears to prevent that right now
{ TIM1, IO_TAG(PA9), TIM_Channel_2, TIM_USE_SERVO | TIM_USE_PWM, 1, GPIO_AF_TIM1, NULL, 0, 0 }, // PWM 3 DEF_TIM(TIM1, CH2, PA9, TIM_USE_SERVO | TIM_USE_PWM, 0, 0), // PWM3
{ TIM1, IO_TAG(PA10), TIM_Channel_3, TIM_USE_SERVO | TIM_USE_PWM, 1, GPIO_AF_TIM1, NULL, 0, 0 }, // PWM 4 DEF_TIM(TIM1, CH3, PA10, TIM_USE_SERVO | TIM_USE_PWM, 0, 0), // PWM3
}; };