Merge pull request iNavFlight#9991 from iNavFlight/mmosca-cherrypick-…

…flywoof745fixes Cherry pick flywoof745 fixes from master
breadoven · Apr 29, 2024 · 6f8e32f · 6f8e32f
2 parents ef5a0dd + 0bf3d3c
commit 6f8e32f
Showing 1 changed file with 19 additions and 10 deletions.
diff --git a/src/main/target/FLYWOOF745/target.c b/src/main/target/FLYWOOF745/target.c
@@ -30,17 +30,26 @@
 #include "drivers/pinio.h"
 
 timerHardware_t timerHardware[] = {
-    // DEF_TIM(TIM1, CH3, PE13, TIM_USE_PPM,                      0, 1), // PPM, DMA2_ST6
+// DEF_TIM(TIM1, CH3, PE13, TIM_USE_PPM,                      0, 1), // PPM,
+// DMA2_ST6
 
-    DEF_TIM(TIM3, CH4, PB1,  TIM_USE_OUTPUT_AUTO,    0, 0), // M1 , DMA1_ST2
-    DEF_TIM(TIM8, CH4, PC9,  TIM_USE_OUTPUT_AUTO,    0, 0), // M2 , DMA2_ST7
-    DEF_TIM(TIM3, CH3, PB0,  TIM_USE_OUTPUT_AUTO,    0, 0), // M3 , DMA1_ST7
-    DEF_TIM(TIM1, CH2, PE11, TIM_USE_OUTPUT_AUTO,    0, 1), // M4 , DMA2_ST4
-    DEF_TIM(TIM1, CH1, PE9,  TIM_USE_OUTPUT_AUTO,    0, 2), // M5 , DMA2_ST2
-    DEF_TIM(TIM5, CH4, PA3,  TIM_USE_OUTPUT_AUTO,    0, 0), // M6 , DMA1_ST1
-    DEF_TIM(TIM3, CH1, PB4,  TIM_USE_OUTPUT_AUTO,    0, 0), // M7 , DMA1_ST4
-    DEF_TIM(TIM3, CH2, PB5,  TIM_USE_OUTPUT_AUTO,    0, 0), // M8 , DMA1_ST5
-    DEF_TIM(TIM4, CH1, PD12, TIM_USE_LED,            0, 0), // LED_STRIP, DMA1_ST0
+#ifdef FLYWOOF745
+    DEF_TIM(TIM3, CH4, PB1,  TIM_USE_OUTPUT_AUTO, 0, 0),   // M1 , DMA1_ST2
+    DEF_TIM(TIM8, CH4, PC9,  TIM_USE_OUTPUT_AUTO, 0, 0),   // M2 , DMA2_ST7
+    DEF_TIM(TIM3, CH3, PB0,  TIM_USE_OUTPUT_AUTO, 0, 0),   // M3 , DMA1_ST7
+    DEF_TIM(TIM1, CH2, PE11, TIM_USE_OUTPUT_AUTO, 0, 1),  // M4 , DMA2_ST4
+    DEF_TIM(TIM1, CH1, PE9,  TIM_USE_OUTPUT_AUTO, 0, 2),   // M5 , DMA2_ST2
+#else /* FLYWOOF745NANO */
+    DEF_TIM(TIM3, CH3, PB0,  TIM_USE_OUTPUT_AUTO, 0, 0),   // M1 , DMA1_ST7
+    DEF_TIM(TIM3, CH4, PB1,  TIM_USE_OUTPUT_AUTO, 0, 0),   // M2 , DMA1_ST2
+    DEF_TIM(TIM1, CH1, PE9,  TIM_USE_OUTPUT_AUTO, 0, 2),   // M3 , DMA2_ST2
+    DEF_TIM(TIM1, CH2, PE11, TIM_USE_OUTPUT_AUTO, 0, 1),  // M4 , DMA2_ST4
+    DEF_TIM(TIM8, CH4, PC9,  TIM_USE_OUTPUT_AUTO, 0, 0),   // M5 , DMA2_ST7
+#endif
+    DEF_TIM(TIM5, CH4, PA3,  TIM_USE_OUTPUT_AUTO, 0, 0),  // M6 , DMA1_ST1
+    DEF_TIM(TIM3, CH1, PB4,  TIM_USE_OUTPUT_AUTO, 0, 0),  // M7 , DMA1_ST4
+    DEF_TIM(TIM3, CH2, PB5,  TIM_USE_OUTPUT_AUTO, 0, 0),  // M8 , DMA1_ST5
+    DEF_TIM(TIM4, CH1, PD12, TIM_USE_LED, 0, 0),         // LED_STRIP, DMA1_ST0
 };
 
 const int timerHardwareCount = sizeof(timerHardware) / sizeof(timerHardware[0]);