Merge pull request iNavFlight#10029 from manuelilg/bugfix/faulty-dsho…

…t-output-for-some-targets Fix channel selection for DMA2 Stream6.
rmaia3d · Jun 1, 2024 · 2efebc3 · 2efebc3
2 parents 7b21635 + ab07785
commit 2efebc3
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/main/target/DALRCF405/target.c b/src/main/target/DALRCF405/target.c
@@ -26,7 +26,7 @@ timerHardware_t timerHardware[] = {
 
     DEF_TIM(TIM3, CH3, PB0,  TIM_USE_OUTPUT_AUTO, 0, 0),   // S1 (1,7)
     DEF_TIM(TIM8, CH1, PC6,  TIM_USE_OUTPUT_AUTO, 0, 0),   // S2 (2,2)
-    DEF_TIM(TIM1, CH3, PA10, TIM_USE_OUTPUT_AUTO, 0, 0),   // S3 (2,6)
+    DEF_TIM(TIM1, CH3, PA10, TIM_USE_OUTPUT_AUTO, 0, 1),   // S3 (2,6)
     DEF_TIM(TIM1, CH1, PA8,  TIM_USE_OUTPUT_AUTO, 0, 1),   // S4 (2,1)  (2.3 2.6)
     DEF_TIM(TIM8, CH3, PC8,  TIM_USE_OUTPUT_AUTO, 0, 1),   // S5 (2,4)  (2.2)
     DEF_TIM(TIM3, CH4, PB1,  TIM_USE_OUTPUT_AUTO, 0, 0),   // S6 (1,2)

diff --git a/src/main/target/FLYWOOF411/target.c b/src/main/target/FLYWOOF411/target.c
@@ -39,8 +39,8 @@ timerHardware_t timerHardware[] = {
 #else
     DEF_TIM(TIM1, CH1, PA8,  TIM_USE_OUTPUT_AUTO,  0, 1), // S1_OUT 2,1
     DEF_TIM(TIM1, CH2, PA9,  TIM_USE_OUTPUT_AUTO,  0, 1), // S2_OUT 2,2
-    DEF_TIM(TIM1, CH3, PA10, TIM_USE_OUTPUT_AUTO,  0, 0), // S3_OUT 2,6
-    DEF_TIM(TIM3, CH3, PB0,  TIM_USE_MOTOR                ,  0, 0), // S4_OUT 1,7
+    DEF_TIM(TIM1, CH3, PA10, TIM_USE_OUTPUT_AUTO,  0, 1), // S3_OUT 2,6
+    DEF_TIM(TIM3, CH3, PB0,  TIM_USE_MOTOR      ,  0, 0), // S4_OUT 1,7
 
     DEF_TIM(TIM3, CH4, PB1,  TIM_USE_ANY,   0, 0), //  RSSI   1,2
     DEF_TIM(TIM5, CH4, PA3,  TIM_USE_ANY,   0, 1), //  RX2    1,0

diff --git a/src/main/target/HAKRCF405V2/target.c b/src/main/target/HAKRCF405V2/target.c
@@ -26,7 +26,7 @@ timerHardware_t timerHardware[] = {
     DEF_TIM(TIM8, CH4, PC9,  TIM_USE_OUTPUT_AUTO, 0, 0), // S2_OUT D2_ST7
     DEF_TIM(TIM1, CH1, PA8,  TIM_USE_OUTPUT_AUTO, 0, 1), // S3_OUT D2_ST1
     DEF_TIM(TIM1, CH2, PA9,  TIM_USE_OUTPUT_AUTO, 0, 1), // S4_OUT D2_ST2
-    DEF_TIM(TIM1, CH3, PA10, TIM_USE_OUTPUT_AUTO, 0, 0), // S5_OUT D2_ST6
+    DEF_TIM(TIM1, CH3, PA10, TIM_USE_OUTPUT_AUTO, 0, 1), // S5_OUT D2_ST6
     DEF_TIM(TIM3, CH1, PB4,  TIM_USE_OUTPUT_AUTO, 0, 0), // S6_OUT D1_ST4
     DEF_TIM(TIM3, CH3, PB0,  TIM_USE_OUTPUT_AUTO, 0, 0), // S7_OUT D1_ST7
     DEF_TIM(TIM3, CH4, PB1,  TIM_USE_OUTPUT_AUTO, 0, 0), // S8_OUT D1_ST2

diff --git a/src/main/target/HAKRCF722V2/target.c b/src/main/target/HAKRCF722V2/target.c
@@ -39,7 +39,7 @@ timerHardware_t timerHardware[] = {
     DEF_TIM(TIM1, CH2, PA9,  TIM_USE_OUTPUT_AUTO, 0, 1), // S4
     DEF_TIM(TIM3, CH3, PB0,  TIM_USE_OUTPUT_AUTO, 0, 0), // S5
     DEF_TIM(TIM3, CH4, PB1,  TIM_USE_OUTPUT_AUTO, 0, 0), // S6
-    DEF_TIM(TIM1, CH3, PA10, TIM_USE_OUTPUT_AUTO, 0, 0), // S7
+    DEF_TIM(TIM1, CH3, PA10, TIM_USE_OUTPUT_AUTO, 0, 1), // S7
     DEF_TIM(TIM3, CH1, PB4,  TIM_USE_OUTPUT_AUTO, 0, 0), // S8
 
     DEF_TIM(TIM2, CH2, PB3, TIM_USE_LED, 0, 0), // 2812LED