Allow LED pin to be reassigned as MOTOR or SERVO

.vimrc

@@ -5,5 +5,6 @@ set expandtab
 set bs=2
 set sw=4
 set ts=4
+syn on
 
 

src/main/drivers/light_ws2811strip.c

@@ -124,6 +124,10 @@ void ws2811LedStripInit(void)
 {
     const timerHardware_t * timHw = timerGetByTag(IO_TAG(WS2811_PIN), TIM_USE_ANY);
 
+    if (!(timHw->usageFlags & TIM_USE_LED)) { // Check if it has not been reassigned
+        timHw = timerGetByUsageFlag(TIM_USE_LED); // Get first pin marked as LED
+    }
+
     if (timHw == NULL) {
         return;
     }
@@ -133,14 +137,14 @@ void ws2811LedStripInit(void)
         return;
     }
 
-    ws2811IO = IOGetByTag(IO_TAG(WS2811_PIN));
+    ws2811IO = IOGetByTag(timHw->tag); //IOGetByTag(IO_TAG(WS2811_PIN));
     IOInit(ws2811IO, OWNER_LED_STRIP, RESOURCE_OUTPUT, 0);
     IOConfigGPIOAF(ws2811IO, IOCFG_AF_PP_FAST, timHw->alternateFunction);
 
-    if ( ledPinConfig()->led_pin_pwm_mode == LED_PIN_PWM_MODE_LOW ) {
+    if (ledPinConfig()->led_pin_pwm_mode == LED_PIN_PWM_MODE_LOW) {
         ledConfigurePWM();
         *timerCCR(ws2811TCH) = 0;
-    } else if ( ledPinConfig()->led_pin_pwm_mode == LED_PIN_PWM_MODE_HIGH ) {
+    } else if (ledPinConfig()->led_pin_pwm_mode == LED_PIN_PWM_MODE_HIGH) {
         ledConfigurePWM();
         *timerCCR(ws2811TCH) = 100;
     } else {

src/main/drivers/pwm_mapping.c

@@ -47,6 +47,7 @@ enum {
     MAP_TO_NONE,
     MAP_TO_MOTOR_OUTPUT,
     MAP_TO_SERVO_OUTPUT,
+    MAP_TO_LED_OUTPUT
 };
 
 typedef struct {
@@ -167,10 +168,16 @@ static bool checkPwmTimerConflicts(const timerHardware_t *timHw)
 
 #if defined(USE_LED_STRIP)
     if (feature(FEATURE_LED_STRIP)) {
-        const timerHardware_t * ledTimHw = timerGetByTag(IO_TAG(WS2811_PIN), TIM_USE_ANY);
-        if (ledTimHw != NULL && timHw->tim == ledTimHw->tim) {
-            return true;
+        for (int i = 0; i < timerHardwareCount; i++) {
+            if (timHw->tim == timerHardware[i].tim && timerHardware[i].usageFlags & TIM_USE_LED) {
+				return true;
+            }
         }
+
+        //const timerHardware_t * ledTimHw = timerGetByTag(IO_TAG(WS2811_PIN), TIM_USE_ANY);
+        //if (ledTimHw != NULL && timHw->tim == ledTimHw->tim) {
+        //    return true;
+        //}
     }
 #endif
 
@@ -213,16 +220,16 @@ static bool checkPwmTimerConflicts(const timerHardware_t *timHw)
 static void timerHardwareOverride(timerHardware_t * timer) {
     switch (timerOverrides(timer2id(timer->tim))->outputMode) {
         case OUTPUT_MODE_MOTORS:
-            if (TIM_IS_SERVO(timer->usageFlags)) {
-                timer->usageFlags &= ~TIM_USE_SERVO;
-                timer->usageFlags |= TIM_USE_MOTOR;
-            }
+            timer->usageFlags &= ~(TIM_USE_SERVO|TIM_USE_LED);
+            timer->usageFlags |= TIM_USE_MOTOR;
             break;
         case OUTPUT_MODE_SERVOS:
-            if (TIM_IS_MOTOR(timer->usageFlags)) {
-                timer->usageFlags &= ~TIM_USE_MOTOR;
-                timer->usageFlags |= TIM_USE_SERVO;
-            }
+            timer->usageFlags &= ~(TIM_USE_MOTOR|TIM_USE_LED);
+            timer->usageFlags |= TIM_USE_SERVO;
+            break;
+        case OUTPUT_MODE_LED:
+            timer->usageFlags &= ~(TIM_USE_MOTOR|TIM_USE_SERVO);
+            timer->usageFlags |= TIM_USE_LED;
             break;
     }
 }
@@ -335,6 +342,8 @@ void pwmBuildTimerOutputList(timMotorServoHardware_t * timOutputs, bool isMixerU
             type = MAP_TO_SERVO_OUTPUT;
         } else if (TIM_IS_MOTOR(timHw->usageFlags) && !pwmHasServoOnTimer(timOutputs, timHw->tim)) {
             type = MAP_TO_MOTOR_OUTPUT;
+        } else if (TIM_IS_LED(timHw->usageFlags) && !pwmHasMotorOnTimer(timOutputs, timHw->tim) && !pwmHasServoOnTimer(timOutputs, timHw->tim)) {
+            type = MAP_TO_LED_OUTPUT;
         }
 
         switch(type) {
@@ -348,6 +357,10 @@ void pwmBuildTimerOutputList(timMotorServoHardware_t * timOutputs, bool isMixerU
                 timOutputs->timServos[timOutputs->maxTimServoCount++] = timHw;
                 pwmClaimTimer(timHw->tim, timHw->usageFlags);
                 break;
+            case MAP_TO_LED_OUTPUT:
+                timHw->usageFlags &= TIM_USE_LED;
+                pwmClaimTimer(timHw->tim, timHw->usageFlags);
+                break;
             default:
                 break;
         }

src/main/drivers/pwm_mapping.h

@@ -53,6 +53,11 @@ typedef enum {
     SERVO_TYPE_SBUS_PWM
 } servoProtocolType_e;
 
+typedef enum {
+    PIN_LABEL_NONE = 0,
+    PIN_LABEL_LED
+} pinLabel_e;
+
 typedef enum {
     PWM_INIT_ERROR_NONE = 0,
     PWM_INIT_ERROR_TOO_MANY_MOTORS,

src/main/drivers/timer.h

@@ -113,16 +113,17 @@ typedef enum {
     TIM_USE_MOTOR           = (1 << 2),     // Motor output
     TIM_USE_SERVO           = (1 << 3),     // Servo output
     TIM_USE_MC_CHNFW        = (1 << 4),     // Deprecated and not used after removal of CHANNEL_FORWARDING feature
-    //TIM_USE_FW_MOTOR        = (1 << 5),   // We no longer differentiate mc from fw on pwm allocation
-    //TIM_USE_FW_SERVO        = (1 << 6),
-    TIM_USE_LED             = (1 << 24),
+    //TIM_USE_FW_MOTOR      = (1 << 5),     // We no longer differentiate mc from fw on pwm allocation
+    //TIM_USE_FW_SERVO      = (1 << 6),
+    TIM_USE_LED             = (1 << 24),    // Remapping needs to be in the lower 8 bits.
     TIM_USE_BEEPER          = (1 << 25),
 } timerUsageFlag_e;
 
 #define TIM_USE_OUTPUT_AUTO (TIM_USE_MOTOR | TIM_USE_SERVO)
 
 #define TIM_IS_MOTOR(flags) ((flags) & TIM_USE_MOTOR)
 #define TIM_IS_SERVO(flags) ((flags) & TIM_USE_SERVO)
+#define TIM_IS_LED(flags) ((flags) & TIM_USE_LED)
 
 #define TIM_IS_MOTOR_ONLY(flags) (TIM_IS_MOTOR(flags) && !TIM_IS_SERVO(flags))
 #define TIM_IS_SERVO_ONLY(flags) (!TIM_IS_MOTOR(flags) && TIM_IS_SERVO(flags))

src/main/fc/cli.c

@@ -163,6 +163,7 @@ static const char * outputModeNames[] = {
     "AUTO",
     "MOTORS",
     "SERVOS",
+    "LED",
     NULL
 };
 
@@ -2821,6 +2822,8 @@ static void cliTimerOutputMode(char *cmdline)
                     mode = OUTPUT_MODE_MOTORS;
                 } else if(!sl_strcasecmp("SERVOS", tok)) {
                     mode = OUTPUT_MODE_SERVOS;
+                } else if(!sl_strcasecmp("LED", tok)) {
+                    mode = OUTPUT_MODE_LED;
                 } else {
                     cliShowParseError();
                     return;

src/main/fc/fc_msp.c

@@ -1575,6 +1575,7 @@ static bool mspFcProcessOutCommand(uint16_t cmdMSP, sbuf_t *dst, mspPostProcessF
             }
         break;
 
+    // Obsolete, replaced by MSP2_INAV_OUTPUT_MAPPING_EXT2
     case MSP2_INAV_OUTPUT_MAPPING_EXT:
         for (uint8_t i = 0; i < timerHardwareCount; ++i)
             if (!(timerHardware[i].usageFlags & (TIM_USE_PPM | TIM_USE_PWM))) {
@@ -1583,9 +1584,35 @@ static bool mspFcProcessOutCommand(uint16_t cmdMSP, sbuf_t *dst, mspPostProcessF
                 #else
                 sbufWriteU8(dst, timer2id(timerHardware[i].tim));
                 #endif
+                // usageFlags is u32, cuts out the higher 24bits
                 sbufWriteU8(dst, timerHardware[i].usageFlags);
             }
         break;
+    case MSP2_INAV_OUTPUT_MAPPING_EXT2:
+        {
+            #if !defined(SITL_BUILD) && defined(WS2811_PIN)
+            ioTag_t led_tag = IO_TAG(WS2811_PIN);
+            #endif
+            for (uint8_t i = 0; i < timerHardwareCount; ++i)
+
+                if (!(timerHardware[i].usageFlags & (TIM_USE_PPM | TIM_USE_PWM))) {
+                    #if defined(SITL_BUILD)
+                    sbufWriteU8(dst, i);
+                    #else
+                    sbufWriteU8(dst, timer2id(timerHardware[i].tim));
+                    #endif
+                    sbufWriteU32(dst, timerHardware[i].usageFlags);
+                    #if defined(SITL_BUILD) || !defined(WS2811_PIN)
+                    sbufWriteU8(dst, 0);
+                    #else
+                    // Extra label to help identify repurposed PINs.
+                    // Eventually, we can try to add more labels for PPM pins, etc.
+                    sbufWriteU8(dst, timerHardware[i].tag == led_tag ? PIN_LABEL_LED : PIN_LABEL_NONE);
+                    #endif
+            }
+        }
+        break;
+
 
     case MSP2_INAV_MC_BRAKING:
 #ifdef USE_MR_BRAKING_MODE

src/main/flight/mixer.h

@@ -48,7 +48,8 @@ typedef enum {
 typedef enum {
     OUTPUT_MODE_AUTO     = 0,
     OUTPUT_MODE_MOTORS,
-    OUTPUT_MODE_SERVOS
+    OUTPUT_MODE_SERVOS,
+    OUTPUT_MODE_LED
 } outputMode_e;
 
 typedef struct motorAxisCorrectionLimits_s {

src/main/msp/msp_protocol_v2_inav.h

@@ -31,9 +31,10 @@
 #define MSP2_INAV_OUTPUT_MAPPING                0x200A
 #define MSP2_INAV_MC_BRAKING                    0x200B
 #define MSP2_INAV_SET_MC_BRAKING                0x200C
-#define MSP2_INAV_OUTPUT_MAPPING_EXT            0x200D
+#define MSP2_INAV_OUTPUT_MAPPING_EXT            0x200D // Obsolete, replaced by MSP2_INAV_OUTPUT_MAPPING_EXT2
 #define MSP2_INAV_TIMER_OUTPUT_MODE             0x200E
 #define MSP2_INAV_SET_TIMER_OUTPUT_MODE         0x200F
+#define MSP2_INAV_OUTPUT_MAPPING_EXT2           0x210D
 
 #define MSP2_INAV_MIXER                         0x2010
 #define MSP2_INAV_SET_MIXER                     0x2011

src/main/target/AIRBOTF7/target.c

@@ -42,13 +42,13 @@ BUSDEV_REGISTER_SPI_TAG(busdev_imu1_mpu6500,    DEVHW_MPU6500,  GYRO_1_SPI_BUS,
 #endif
 
 timerHardware_t timerHardware[] = {
-    DEF_TIM(TIM2,  CH1, PA15, TIM_USE_LED,                   0, 0), // LED
-    DEF_TIM(TIM1,  CH1, PA8,  TIM_USE_ANY,                   0, 0), // Cam control, SS, UNUSED
-
     DEF_TIM(TIM8,  CH3, PC8,  TIM_USE_OUTPUT_AUTO, 0, 0), //S1
     DEF_TIM(TIM4,  CH1, PB6,  TIM_USE_OUTPUT_AUTO, 0, 0), //S2
     DEF_TIM(TIM8,  CH4, PC9,  TIM_USE_OUTPUT_AUTO, 0, 0), //S3
     DEF_TIM(TIM4,  CH2, PB7,  TIM_USE_OUTPUT_AUTO, 0, 0), //S4
+							  //
+    DEF_TIM(TIM2,  CH1, PA15, TIM_USE_LED,                   0, 0), // LED
+    DEF_TIM(TIM1,  CH1, PA8,  TIM_USE_ANY,                   0, 0), // Cam control, SS, UNUSED
 };
 
 const int timerHardwareCount = sizeof(timerHardware) / sizeof(timerHardware[0]);

src/main/target/ANYFCM7/target.c

@@ -26,23 +26,24 @@
 #define TIM_EN_N    TIMER_OUTPUT_ENABLED | TIMER_OUTPUT_N_CHANNEL
 
 timerHardware_t timerHardware[] = {
-    // DEF_TIM(TIM12, CH1, PB14, TIM_USE_PWM | TIM_USE_PPM,   0, 0 ), // S1_IN
-    // DEF_TIM(TIM12, CH2, PB15, TIM_USE_PWM,                 0, 0 ), // S2_IN
-    // DEF_TIM(TIM8,  CH1, PC6,  TIM_USE_PWM,                 0, 0 ), // S3_IN DMA2_ST2 DMA2_ST2
-    // DEF_TIM(TIM8,  CH2, PC7,  TIM_USE_PWM,                 0, 0 ), // S4_IN DMA2_ST3 DMA2_ST2
-    // DEF_TIM(TIM8,  CH3, PC8,  TIM_USE_PWM,                 0, 0 ), // S5_IN DMA2_ST4 DMA2_ST2
-    // DEF_TIM(TIM8,  CH4, PC9,  TIM_USE_PWM,                 0, 0 ), // S6_IN DMA2_ST7
 
     DEF_TIM(TIM4,  CH3,  PB8,  TIM_USE_OUTPUT_AUTO,               0, 0 ), // S10_OUT 1 DMA1_ST7
     DEF_TIM(TIM2,  CH3,  PA2,  TIM_USE_OUTPUT_AUTO,               0, 0 ), // S6_OUT  2 DMA1_ST1
     DEF_TIM(TIM4,  CH2,  PB7,  TIM_USE_OUTPUT_AUTO,               0, 0 ), // S5_OUT  3 DMA1_ST3
     DEF_TIM(TIM2,  CH4,  PA3,  TIM_USE_OUTPUT_AUTO,               0, 1 ), // S1_OUT  4 DMA1_ST7 DMA1_ST6
     DEF_TIM(TIM5,  CH2,  PA1,  TIM_USE_OUTPUT_AUTO,               0, 0 ), // S2_OUT DMA1_ST4
     DEF_TIM(TIM1,  CH2N, PB0,  TIM_USE_OUTPUT_AUTO,               0, 1 ), // S3_OUT DMA2_ST6 DMA2_ST2
-    DEF_TIM(TIM3,  CH2,  PB5,  TIM_USE_OUTPUT_AUTO | TIM_USE_LED, 0, 0 ), // S4_OUT DMA1_ST5
+    DEF_TIM(TIM3,  CH2,  PB5,  TIM_USE_OUTPUT_AUTO,               0, 0 ), // S4_OUT DMA1_ST5 -- Used to have TIM_USE_LED
     DEF_TIM(TIM5,  CH1,  PA0,  TIM_USE_OUTPUT_AUTO,               0, 0 ), // S7_OUT DMA1_ST2
     DEF_TIM(TIM1,  CH3N, PB1,  TIM_USE_OUTPUT_AUTO,               0, 0 ), // S8_OUT DMA2_ST6
     DEF_TIM(TIM3,  CH1,  PB4,  TIM_USE_OUTPUT_AUTO,               0, 0 ), // S9_OUT DMA1_ST4
+
+    // DEF_TIM(TIM12, CH1, PB14, TIM_USE_PWM | TIM_USE_PPM,   0, 0 ), // S1_IN
+    // DEF_TIM(TIM12, CH2, PB15, TIM_USE_PWM,                 0, 0 ), // S2_IN
+    // DEF_TIM(TIM8,  CH1, PC6,  TIM_USE_PWM,                 0, 0 ), // S3_IN DMA2_ST2 DMA2_ST2
+    // DEF_TIM(TIM8,  CH2, PC7,  TIM_USE_PWM,                 0, 0 ), // S4_IN DMA2_ST3 DMA2_ST2
+    // DEF_TIM(TIM8,  CH3, PC8,  TIM_USE_PWM,                 0, 0 ), // S5_IN DMA2_ST4 DMA2_ST2
+    // DEF_TIM(TIM8,  CH4, PC9,  TIM_USE_PWM,                 0, 0 ), // S6_IN DMA2_ST7
 };
 
 const int timerHardwareCount = sizeof(timerHardware) / sizeof(timerHardware[0]);

src/main/target/BLUEJAYF4/target.c

@@ -29,8 +29,8 @@ timerHardware_t timerHardware[] = {
     DEF_TIM(TIM5, CH2,  PA1, TIM_USE_OUTPUT_AUTO,               0, 0 ), // S2_OUT - DMA1_ST4
     DEF_TIM(TIM2, CH3,  PA2, TIM_USE_OUTPUT_AUTO,               0, 0 ), // S3_OUT - DMA1_ST1
     DEF_TIM(TIM9, CH2,  PA3, TIM_USE_OUTPUT_AUTO,               0, 0 ), // S4_OUT - no DMA
-    //DEF_TIM(TIM5, CH4,  PA3, TIM_USE_OUTPUT_AUTO,               0, 1 ), // S4_OUT - DMA1_ST3 (Could be DMA1_ST1 with dmaopt=0)
-    DEF_TIM(TIM3, CH4,  PB0, TIM_USE_OUTPUT_AUTO | TIM_USE_LED, 0, 0 ), // S5_OUT - DMA1_ST2
+    //DEF_TIM(TIM5, CH4,  PA3, TIM_USE_OUTPUT_AUTO,             0, 1 ), // S4_OUT - DMA1_ST3 (Could be DMA1_ST1 with dmaopt=0)
+    DEF_TIM(TIM3, CH4,  PB0, TIM_USE_OUTPUT_AUTO, 		0, 0 ), // S5_OUT - DMA1_ST2 -- used to be TIM_USE_LED
     DEF_TIM(TIM3, CH3,  PB1, TIM_USE_OUTPUT_AUTO,               0, 0 ), // S6_OUT - DMA1_ST7
 };
 

src/main/target/F4BY/target.c

@@ -6,14 +6,6 @@
 #include "drivers/timer.h"
 
 timerHardware_t timerHardware[] = {
-    // DEF_TIM(TIM3, CH4, PC9,  TIM_USE_PPM | TIM_USE_PWM,   0, 0), // S1_IN
-    // DEF_TIM(TIM3, CH3, PC8,  TIM_USE_PWM,   0, 0), // S2_IN
-    // DEF_TIM(TIM3, CH1, PC6,  TIM_USE_PWM,   0, 0), // S3_IN
-    // DEF_TIM(TIM3, CH2, PC7,  TIM_USE_PWM,   0, 0), // S4_IN
-    // DEF_TIM(TIM4, CH4, PD15, TIM_USE_PWM,   0, 0), // S5_IN
-    // DEF_TIM(TIM4, CH3, PD14, TIM_USE_PWM,   0, 0), // S6_IN
-    // DEF_TIM(TIM4, CH2, PD13, TIM_USE_PWM,   0, 0), // S7_IN
-    // DEF_TIM(TIM4, CH1, PD12, TIM_USE_PWM,   0, 0), // S8_IN
 
     DEF_TIM(TIM2, CH1, PA0,  TIM_USE_OUTPUT_AUTO, 0, 0), // S1_OUT
     DEF_TIM(TIM2, CH2, PA1,  TIM_USE_OUTPUT_AUTO, 0, 0), // S2_OUT
@@ -25,6 +17,16 @@ timerHardware_t timerHardware[] = {
     DEF_TIM(TIM1, CH4, PE14, TIM_USE_OUTPUT_AUTO, 0, 0), // S8_OUT
 
     DEF_TIM(TIM9, CH2, PE6,  TIM_USE_ANY, 0, 0), // sonar echo if needed
+
+
+    // DEF_TIM(TIM3, CH4, PC9,  TIM_USE_PPM | TIM_USE_PWM,   0, 0), // S1_IN
+    // DEF_TIM(TIM3, CH3, PC8,  TIM_USE_PWM,   0, 0), // S2_IN
+    // DEF_TIM(TIM3, CH1, PC6,  TIM_USE_PWM,   0, 0), // S3_IN
+    // DEF_TIM(TIM3, CH2, PC7,  TIM_USE_PWM,   0, 0), // S4_IN
+    // DEF_TIM(TIM4, CH4, PD15, TIM_USE_PWM,   0, 0), // S5_IN
+    // DEF_TIM(TIM4, CH3, PD14, TIM_USE_PWM,   0, 0), // S6_IN
+    // DEF_TIM(TIM4, CH2, PD13, TIM_USE_PWM,   0, 0), // S7_IN
+    // DEF_TIM(TIM4, CH1, PD12, TIM_USE_PWM,   0, 0), // S8_IN
 };
 
 const int timerHardwareCount = sizeof(timerHardware) / sizeof(timerHardware[0]);

src/main/target/FOXEERF745AIO/target.c

@@ -25,12 +25,12 @@
 
 timerHardware_t timerHardware[] = {
 
-    DEF_TIM(TIM1,  CH1, PA8, TIM_USE_LED, 0, 0),      // LED STRIP - D(2, 6, 0)
-
     DEF_TIM(TIM3, CH1, PB4,  TIM_USE_MOTOR, 0, 0), // M1 - D(1, 4, 5)
     DEF_TIM(TIM3, CH2, PB5,  TIM_USE_MOTOR, 0, 0), // M2 - D(1, 5, 5)
     DEF_TIM(TIM3, CH4, PB1,  TIM_USE_MOTOR, 0, 0), // M3 - D(1, 2, 5)
     DEF_TIM(TIM3, CH3, PB0,  TIM_USE_MOTOR, 0, 0), // M4 - D(1, 7, 5)
+						   //
+    DEF_TIM(TIM1,  CH1, PA8, TIM_USE_LED, 0, 0),      // LED STRIP - D(2, 6, 0)
 
 };
 

src/main/target/FRSKYPILOT/target.c

@@ -39,13 +39,9 @@ timerHardware_t timerHardware[] = {
     DEF_TIM(TIM4,  CH2, PB7,  TIM_USE_OUTPUT_AUTO, 0, 0), // S7
     DEF_TIM(TIM4,  CH3, PB8,  TIM_USE_OUTPUT_AUTO, 0, 0), // S8
     DEF_TIM(TIM4,  CH4, PB9,  TIM_USE_OUTPUT_AUTO, 0, 0), // S9
-#ifdef FRSKYPILOT_LED
-    DEF_TIM(TIM2,  CH2, PA1,  TIM_USE_LED | TIM_USE_LED, 0, 0), // S10 now LED, S11 & S12 UART 3 only
-#else
     DEF_TIM(TIM2,  CH2, PA1,  TIM_USE_OUTPUT_AUTO, 0, 0), // S10
     DEF_TIM(TIM2,  CH3, PB10, TIM_USE_OUTPUT_AUTO, 0, 0), // S11
     DEF_TIM(TIM2,  CH4, PB11, TIM_USE_OUTPUT_AUTO, 0, 0), // S12
-#endif
 
     DEF_TIM(TIM5, CH1,  PA0,  TIM_USE_BEEPER, 0, 0),    // beeper
 };

src/main/target/IFLIGHT_BLITZ_ATF435/target.c

@@ -41,7 +41,7 @@ timerHardware_t timerHardware[] = {
     DEF_TIM(TMR4, CH1, PB6,  TIM_USE_OUTPUT_AUTO, 0,11),    // S5
     DEF_TIM(TMR4, CH2, PB7,  TIM_USE_OUTPUT_AUTO, 0,10),    // S6
     DEF_TIM(TMR2, CH3, PB10, TIM_USE_OUTPUT_AUTO, 0,5),     //S7
-	DEF_TIM(TMR2, CH4, PB11, TIM_USE_OUTPUT_AUTO, 0,6),     //S8
+    DEF_TIM(TMR2, CH4, PB11, TIM_USE_OUTPUT_AUTO, 0,6),     //S8
 
     DEF_TIM(TMR1, CH1, PA8,   TIM_USE_LED, 0, 0),  // LED STRIP
 };

src/main/target/MATEKF405/target.c

@@ -29,7 +29,7 @@ timerHardware_t timerHardware[] = {
     DEF_TIM(TIM8, CH3, PC8,  TIM_USE_OUTPUT_AUTO, 0, 1), // S3  UP(2,1)
     DEF_TIM(TIM8, CH4, PC9,  TIM_USE_OUTPUT_AUTO, 0, 0), // S4  UP(2,1)
 
-    DEF_TIM(TIM2, CH1, PA15, TIM_USE_OUTPUT_AUTO | TIM_USE_LED                        , 0, 0), // S5  UP(1,7)
+    DEF_TIM(TIM2, CH1, PA15, TIM_USE_OUTPUT_AUTO, 0, 0), // S5  UP(1,7) -- LED
 
     DEF_TIM(TIM1, CH1, PA8,  TIM_USE_OUTPUT_AUTO, 0, 0), // S6  UP(2,5)
     DEF_TIM(TIM4, CH3, PB8,  TIM_USE_OUTPUT_AUTO, 0, 0), // S7  D(1,7)!S5 UP(2,6)

src/main/target/NEUTRONRCF435MINI/target.c

@@ -26,13 +26,13 @@
 
 timerHardware_t timerHardware[] = {
 
-    DEF_TIM(TMR1, CH1, PA8,  TIM_USE_ANY |TIM_USE_LED, 0,6),            // PWM1 - LED MCO1 DMA1 CH2
-
     DEF_TIM(TMR4, CH1, PB6,  TIM_USE_OUTPUT_AUTO, 0,0),   // motor1 DMA2 CH7
     DEF_TIM(TMR4, CH2, PB7,  TIM_USE_OUTPUT_AUTO, 0,2),   // motor2 DMA2 CH6
     DEF_TIM(TMR2, CH4, PA3,  TIM_USE_OUTPUT_AUTO, 0,1),   // motor3 DMA2 CH5
     DEF_TIM(TMR3, CH4, PB1,  TIM_USE_OUTPUT_AUTO, 0,3),   // motor4 DMA2 CH4
-
+							  //
+    DEF_TIM(TMR1, CH1, PA8,  TIM_USE_ANY |TIM_USE_LED, 0,6),            // PWM1 - LED MCO1 DMA1 CH2
+									//
 };
 
 const int timerHardwareCount = sizeof(timerHardware) / sizeof(timerHardware[0]);

src/main/target/NEUTRONRCF435WING/target.c

@@ -26,8 +26,6 @@
 
 timerHardware_t timerHardware[] = {
 
-    DEF_TIM(TMR1, CH1, PA8,  TIM_USE_ANY |TIM_USE_LED, 0,7),            // PWM1 - LED MCO1 DMA1 CH2
-
     DEF_TIM(TMR4, CH1, PB6,  TIM_USE_OUTPUT_AUTO, 0,0),   // motor1 DMA2 CH7
     DEF_TIM(TMR1, CH3, PA10, TIM_USE_OUTPUT_AUTO, 0,2),   // motor2 DMA2 CH6
     DEF_TIM(TMR2, CH4, PA3,  TIM_USE_OUTPUT_AUTO, 0,1),   // motor3 DMA2 CH5
@@ -38,6 +36,7 @@ timerHardware_t timerHardware[] = {
     DEF_TIM(TMR3, CH3, PB0,  TIM_USE_OUTPUT_AUTO, 0,8),  // PWM3 - OUT7  DMA2 CH3
     DEF_TIM(TMR2, CH3, PA2,  TIM_USE_OUTPUT_AUTO, 0,11), // PWM4 - OUT8  DMA1 CH7
 
+    DEF_TIM(TMR1, CH1, PA8,  TIM_USE_ANY |TIM_USE_LED, 0,7),            // PWM1 - LED MCO1 DMA1 CH2
 };
 
 const int timerHardwareCount = sizeof(timerHardware) / sizeof(timerHardware[0]);