FortiniF4 Camera Control and LED pin fix

betaflight · Oct 21, 2018 · 85c9e1f · 85c9e1f
1 parent 70723bd
commit 85c9e1f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/src/main/target/FF_FORTINIF4/target.c b/src/main/target/FF_FORTINIF4/target.c
@@ -28,20 +28,20 @@
 #include "drivers/timer_def.h"
 
 const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
-    DEF_TIM(TIM3, CH3, PB0, TIM_USE_MOTOR,                        0, 0 ), // S1_OUT - DMA1_ST7
-    DEF_TIM(TIM3, CH4, PB1, TIM_USE_MOTOR,                        0, 0 ), // S2_OUT - DMA1_ST2
+    DEF_TIM(TIM3, CH3, PB0,  TIM_USE_MOTOR,                        0, 0 ), // S1_OUT - DMA1_ST7
+    DEF_TIM(TIM3, CH4, PB1,  TIM_USE_MOTOR,                        0, 0 ), // S2_OUT - DMA1_ST2
 #if defined(FF_FORTINIF4_REV03)
     DEF_TIM(TIM2, CH4, PB11, TIM_USE_MOTOR,                        0, 1 ), // S3_OUT - DMA1_ST6
     DEF_TIM(TIM2, CH3, PB10, TIM_USE_MOTOR,                        0, 0 ), // S4_OUT - DMA1_ST1
 #else
-    DEF_TIM(TIM2, CH4, PA3, TIM_USE_MOTOR,                        0, 1 ), // S3_OUT - DMA1_ST6
-    DEF_TIM(TIM2, CH3, PA2, TIM_USE_MOTOR,                        0, 0 ), // S4_OUT - DMA1_ST1
+    DEF_TIM(TIM2, CH4, PA3,  TIM_USE_MOTOR,                        0, 1 ), // S3_OUT - DMA1_ST6
+    DEF_TIM(TIM2, CH3, PA2,  TIM_USE_MOTOR,                        0, 0 ), // S4_OUT - DMA1_ST1
 #endif
-    DEF_TIM(TIM4, CH4, PB9, TIM_USE_PPM,                          0, 0 ), // PPM IN
+    DEF_TIM(TIM4, CH4, PB9,  TIM_USE_PPM,                          0, 0 ), // PPM IN
 #if defined(FF_FORTINIF4_REV03)
-    DEF_TIM(TIM4, CH2, PB7, TIM_USE_CAMERA_CONTROL,               0, 0 ), // FC CAM - DMA1_ST3
-    DEF_TIM(TIM4, CH1, PB6, TIM_USE_LED,                          0, 0 ), // LED    - DMA1_ST0
+    DEF_TIM(TIM1, CH3, PA10, TIM_USE_CAMERA_CONTROL,               0, 0 ), // FC CAM - DMA1_ST3
+    DEF_TIM(TIM4, CH1, PB6,  TIM_USE_LED,                          0, 0 ), // LED    - DMA1_ST0
 #else
-    DEF_TIM(TIM4, CH2, PB7, TIM_USE_LED | TIM_USE_CAMERA_CONTROL, 0, 0 ), // LED    - DMA1_ST3
+    DEF_TIM(TIM4, CH2, PB7,  TIM_USE_LED | TIM_USE_CAMERA_CONTROL, 0, 0 ), // LED    - DMA1_ST3
 #endif
 };
diff --git a/src/main/target/FF_FORTINIF4/target.h b/src/main/target/FF_FORTINIF4/target.h
@@ -109,7 +109,11 @@
 //#define USE_USB_DETECT
 
 #define USE_UART1
+#if defined(FF_FORTINIF4_REV03)
+#define UART1_RX_PIN            PB7
+#else 
 #define UART1_RX_PIN            PA10
+#endif	
 #define UART1_TX_PIN            PA9
 
 #define USE_UART4
@@ -212,8 +216,9 @@
 /*--------------TIMERS-------------*/
 #if defined(FF_FORTINIF4_REV03)
 #define USABLE_TIMER_CHANNEL_COUNT  7
+#define USED_TIMERS             ( TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(4) )
 #else
 #define USABLE_TIMER_CHANNEL_COUNT  6
-#endif
 #define USED_TIMERS             ( TIM_N(2) | TIM_N(3) | TIM_N(4) )
+#endif
 /*---------------------------------*/