Merge branch 'master' into 20240930_FLYSPARKF4

emuflight · Oct 7, 2024 · d1d1ee1 · d1d1ee1
2 parents ce7614d + 301eb22
commit d1d1ee1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/src/main/target/JHEF411HD/target.h b/src/main/target/JHEF411HD/target.h
@@ -44,6 +44,7 @@
 #define USE_OSD
 
 #define LED_STRIP_PIN PA8
+#define LED0_PIN PC13
 #define USE_BEEPER
 #define BEEPER_PIN PB2
 #define BEEPER_INVERTED

diff --git a/src/main/target/TMOTORF7/target.c b/src/main/target/TMOTORF7/target.c
@@ -27,7 +27,7 @@
 const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
     DEF_TIM(TIM3, CH1, PC6, TIM_USE_MOTOR, 0, 0),  // motor 1
     DEF_TIM(TIM3, CH2, PC7, TIM_USE_MOTOR, 0, 0),  // motor 2
-    DEF_TIM(TIM8, CH2N, PB0, TIM_USE_MOTOR, 0, 0), // motor 3
+    DEF_TIM(TIM3, CH3, PB0, TIM_USE_MOTOR, 0, 0), // motor 3
     DEF_TIM(TIM3, CH4, PB1, TIM_USE_MOTOR, 0, 0),  // motor 4
     DEF_TIM(TIM4, CH1, PB6, TIM_USE_MOTOR, 0, 0),  // motor 5
     DEF_TIM(TIM4, CH3, PB8, TIM_USE_MOTOR, 0, 0),  // motor 6

diff --git a/src/main/target/TMOTORF7_AIO/target.c b/src/main/target/TMOTORF7_AIO/target.c
@@ -32,7 +32,7 @@
 const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
     DEF_TIM(TIM3, CH1, PC6, TIM_USE_MOTOR, 0, 0), // motor 1
     DEF_TIM(TIM3, CH2, PC7, TIM_USE_MOTOR, 0, 0), // motor 2
-    DEF_TIM(TIM8, CH2N, PB0, TIM_USE_MOTOR, 0, 0), // motor 3
+    DEF_TIM(TIM3, CH3, PB0, TIM_USE_MOTOR, 0, 0), // motor 3
     DEF_TIM(TIM3, CH4, PB1, TIM_USE_MOTOR, 0, 0), // motor 4
     DEF_TIM(TIM4, CH1, PB6, TIM_USE_MOTOR, 0, 0), // motor 5
     DEF_TIM(TIM4, CH3, PB8, TIM_USE_MOTOR, 0, 0), // motor 6