Merge pull request betaflight#1565 from kc10kevin/master_furytargetfixes

FuryF3/F4 Conform Timers

Author: martinbudden

src/main/target/FURYF3/target.c

@@ -21,10 +21,11 @@
 #include "drivers/io.h"
 
 #include "drivers/timer.h"
+#include "drivers/timer_def.h"
 #include "drivers/dma.h"
 
 const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
-
+/*
     { TIM2,   IO_TAG(PB3),  TIM_Channel_2, TIM_USE_PPM,   0, GPIO_AF_1,  NULL, 0 }, // PPM IN
     { TIM3,   IO_TAG(PB0),  TIM_Channel_3, TIM_USE_PWM,   0, GPIO_AF_2,  NULL, 0 }, // SS1 - PB0  - *TIM3_CH3, TIM1_CH2N, TIM8_CH2N
     { TIM3,   IO_TAG(PB1),  TIM_Channel_4, TIM_USE_PWM,   0, GPIO_AF_2,  NULL, 0 }, // SS1 - PB1  - *TIM3_CH4, TIM1_CH3N, TIM8_CH3N
@@ -35,5 +36,16 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
     { TIM16,  IO_TAG(PB4),  TIM_Channel_1, TIM_USE_MOTOR, 1, GPIO_AF_1,  DMA1_Channel3, DMA1_CH3_HANDLER }, // PWM7 - S4
 
     { TIM1,   IO_TAG(PA8),  TIM_Channel_1, TIM_USE_LED,   1, GPIO_AF_6,  DMA1_Channel2, DMA1_CH2_HANDLER }, // GPIO TIMER - LED_STRIP
+*/
+    DEF_TIM(TIM2,  CH2, PB3, TIM_USE_PPM,   TIMER_INPUT_ENABLED ), // PPM IN
+    DEF_TIM(TIM3,  CH3, PB0, TIM_USE_PWM,   TIMER_OUTPUT_ENABLED), // SS1 - PB0  - *TIM3_CH3, TIM1_CH2N, TIM8_CH2N
+    DEF_TIM(TIM3,  CH4, PB1, TIM_USE_PWM,   TIMER_OUTPUT_ENABLED), // SS1 - PB1  - *TIM3_CH4, TIM1_CH3N, TIM8_CH3N
+
+    DEF_TIM(TIM4,  CH2, PB7, TIM_USE_MOTOR, TIMER_OUTPUT_ENABLED), // PWM4 - S1
+    DEF_TIM(TIM8,  CH1, PB6, TIM_USE_MOTOR, TIMER_OUTPUT_ENABLED), // PWM5 - S2
+    DEF_TIM(TIM17, CH1, PB5, TIM_USE_MOTOR, TIMER_OUTPUT_ENABLED), // PWM6 - S3
+    DEF_TIM(TIM16, CH1, PB4, TIM_USE_MOTOR, TIMER_OUTPUT_ENABLED), // PWM7 - S4
+    
+    DEF_TIM(TIM1,  CH1, PA8, TIM_USE_LED,   TIMER_OUTPUT_ENABLED), // GPIO TIMER - LED_STRIP
 
 };

src/main/target/FURYF4/target.c

@@ -19,17 +19,28 @@
 
 #include <platform.h>
 #include "drivers/io.h"
+
 #include "drivers/dma.h"
 #include "drivers/timer.h"
+#include "drivers/timer_def.h"
 
 const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
-
+/*
     { TIM8,  IO_TAG(PC9),  TIM_Channel_4, TIM_USE_PPM,   0, GPIO_AF_TIM8,  NULL,         0,             0  },          // PPM_IN
     { TIM2,  IO_TAG(PA3),  TIM_Channel_4, TIM_USE_MOTOR, 1, GPIO_AF_TIM2,  DMA1_Stream6, DMA_Channel_3, DMA1_ST6_HANDLER  },  // S1_OUT
     { TIM3,  IO_TAG(PB0),  TIM_Channel_3, TIM_USE_MOTOR, 1, GPIO_AF_TIM3,  DMA1_Stream7, DMA_Channel_5, DMA1_ST7_HANDLER  },  // S2_OUT
     { TIM3,  IO_TAG(PB1),  TIM_Channel_4, TIM_USE_MOTOR, 1, GPIO_AF_TIM3,  DMA1_Stream2, DMA_Channel_5, DMA1_ST2_HANDLER  },  // S3_OUT
     { TIM2,  IO_TAG(PA2),  TIM_Channel_3, TIM_USE_MOTOR, 1, GPIO_AF_TIM2,  DMA1_Stream1, DMA_Channel_3, DMA1_ST1_HANDLER  },  // S4_OUT
+*/
+//   { TIM5, GPIOA, Pin_0, TIM_Channel_1, TIM5_IRQn, 1, GPIO_Mode_AF, GPIO_PinSource0, GPIO_AF_TIM5 },    // LED Strip
+
+    DEF_TIM(TIM8, CH4, PC9, TIM_USE_PPM,   TIMER_INPUT_ENABLED,  0 ), // PPM IN
+    DEF_TIM(TIM2, CH4, PA3, TIM_USE_MOTOR, TIMER_OUTPUT_ENABLED, 1 ), // S1_OUT - DMA1_ST6_CH3
+    DEF_TIM(TIM3, CH3, PB0, TIM_USE_MOTOR, TIMER_OUTPUT_ENABLED, 0 ), // S2_OUT - DMA1_ST7_CH5
+    DEF_TIM(TIM3, CH4, PB1, TIM_USE_MOTOR, TIMER_OUTPUT_ENABLED, 0 ), // S3_OUT - DMA1_ST2_CH5
+    DEF_TIM(TIM2, CH3, PA2, TIM_USE_MOTOR, TIMER_OUTPUT_ENABLED, 0 ), // S4_OUT - DMA1_ST1_CH3
+
+    DEF_TIM(TIM5, CH1, PA0, TIM_USE_LED,   TIMER_OUTPUT_ENABLED, 0 ), // LED_STRIP - DMA1_ST2_CH6
 
-//  { TIM5, GPIOA, Pin_0, TIM_Channel_1, TIM5_IRQn, 1, GPIO_Mode_AF, GPIO_PinSource0, GPIO_AF_TIM5 },    // LED Strip
 };
 

src/main/target/FURYF4/target.h

@@ -166,14 +166,6 @@
 #define SERIALRX_PROVIDER       SERIALRX_SBUS
 
 #define LED_STRIP
-#define WS2811_PIN                      PA0
-#define WS2811_TIMER                    TIM5
-#define WS2811_DMA_HANDLER_IDENTIFER    DMA1_ST2_HANDLER
-#define WS2811_DMA_STREAM               DMA1_Stream2
-#define WS2811_DMA_IT                   DMA_IT_TCIF2
-#define WS2811_DMA_CHANNEL              DMA_Channel_6
-#define WS2811_TIMER_CHANNEL            TIM_Channel_1
-#define WS2811_TIMER_GPIO_AF            GPIO_AF_TIM5
 
 #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT
 
@@ -190,6 +182,6 @@
 #define TARGET_IO_PORTC         0xffff
 #define TARGET_IO_PORTD         (BIT(2))
 
-#define USABLE_TIMER_CHANNEL_COUNT 5
-#define USED_TIMERS             ( TIM_N(2) | TIM_N(3) | TIM_N(8) )
+#define USABLE_TIMER_CHANNEL_COUNT 6
+#define USED_TIMERS             ( TIM_N(2) | TIM_N(3) | TIM_N(5) | TIM_N(8) )