Merge pull request #6696 from Tygrys-1/Tygrys-1-DALRC-Target-fix

Fix the timer and DMA conflicts in the target, resolves #6303
iNavFlight · Mar 19, 2021 · abce845 · abce845
2 parents 3c97e91 + 7fa82f0
commit abce845
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/main/target/DALRCF405/target.c b/src/main/target/DALRCF405/target.c
@@ -28,9 +28,9 @@ const timerHardware_t timerHardware[] = {
     DEF_TIM(TIM8, CH1, PC6,  TIM_USE_MC_MOTOR |                    TIM_USE_FW_SERVO, 0, 0),   // S2 (2,2)
     DEF_TIM(TIM1, CH3, PA10, TIM_USE_MC_MOTOR |                    TIM_USE_FW_SERVO, 0, 0),   // S3 (2,6)
     DEF_TIM(TIM1, CH1, PA8,  TIM_USE_MC_MOTOR |                    TIM_USE_FW_SERVO, 0, 1),   // S4 (2,1)  (2.3 2.6)
-    DEF_TIM(TIM8, CH3, PC8,  TIM_USE_MC_MOTOR |                    TIM_USE_FW_SERVO, 0, 0),   // S5 (2,4)  (2.2)
-    DEF_TIM(TIM3, CH4, PB1,  TIM_USE_MC_MOTOR |                    TIM_USE_FW_SERVO, 0, 0),   // S6 (1,2)
-    DEF_TIM(TIM3, CH2, PC7,  TIM_USE_MC_MOTOR |                    TIM_USE_FW_SERVO, 0, 0),   // S7 (1,5)
+    DEF_TIM(TIM8, CH3, PC8,  TIM_USE_MC_MOTOR |                    TIM_USE_FW_SERVO, 0, 1),   // S5 (2,4)  (2.2)
+    DEF_TIM(TIM3, CH4, PB1,  TIM_USE_MC_MOTOR |                    TIM_USE_FW_MOTOR, 0, 0),   // S6 (1,2)
+    DEF_TIM(TIM8, CH2, PC7,  TIM_USE_MC_MOTOR |                    TIM_USE_FW_SERVO, 0, 1),   // S7 (2,3)
     DEF_TIM(TIM8, CH4, PC9,  TIM_USE_MC_MOTOR |                    TIM_USE_FW_SERVO, 0, 0),   // S8 (2,7)
     DEF_TIM(TIM4, CH1, PB6,  TIM_USE_LED,                                            0, 0),     // LED STRIP(1,0)