diff --git a/src/main/drivers/pwm_output.c b/src/main/drivers/pwm_output.c
index 4a19e7e539..53ae693e95 100644
--- a/src/main/drivers/pwm_output.c
+++ b/src/main/drivers/pwm_output.c
@@ -104,7 +104,10 @@ static void pwmOutConfig(pwmOutputPort_t *port, const timerHardware_t *timerHard
         inversion ? timerHardware->output ^ TIMER_OUTPUT_INVERTED : timerHardware->output);
 
 #if defined(USE_HAL_DRIVER)
-    HAL_TIM_PWM_Start(Handle, timerHardware->channel);
+    if(timerHardware->output & TIMER_OUTPUT_N_CHANNEL)
+        HAL_TIMEx_PWMN_Start(Handle, timerHardware->channel);
+    else
+        HAL_TIM_PWM_Start(Handle, timerHardware->channel);
     HAL_TIM_Base_Start(Handle);
 #else
     TIM_CtrlPWMOutputs(timerHardware->tim, ENABLE);
diff --git a/src/main/drivers/pwm_output_stm32f7xx.c b/src/main/drivers/pwm_output_stm32f7xx.c
index c68da856ae..7a8d540b1a 100644
--- a/src/main/drivers/pwm_output_stm32f7xx.c
+++ b/src/main/drivers/pwm_output_stm32f7xx.c
@@ -81,10 +81,21 @@ void pwmWriteDigital(uint8_t index, uint16_t value)
         packet <<= 1;
     }
 
-    if(HAL_TIM_PWM_Start_DMA(&motor->TimHandle, motor->timerHardware->channel, motor->dmaBuffer, MOTOR_DMA_BUFFER_SIZE) != HAL_OK)
+    if(motor->timerHardware->output & TIMER_OUTPUT_N_CHANNEL)
     {
-      /* Starting PWM generation Error */
-        return;
+        if(HAL_TIMEx_PWMN_Start_DMA(&motor->TimHandle, motor->timerHardware->channel, motor->dmaBuffer, MOTOR_DMA_BUFFER_SIZE) != HAL_OK)
+        {
+            /* Starting PWM generation Error */
+            return;
+        }
+    }
+    else
+    {
+        if(HAL_TIM_PWM_Start_DMA(&motor->TimHandle, motor->timerHardware->channel, motor->dmaBuffer, MOTOR_DMA_BUFFER_SIZE) != HAL_OK)
+        {
+            /* Starting PWM generation Error */
+            return;
+        }
     }
 }
 
@@ -198,7 +209,7 @@ void pwmDigitalMotorHardwareConfig(const timerHardware_t *timerHardware, uint8_t
     /* PWM1 Mode configuration: Channel1 */
     TIM_OCInitStructure.OCMode = TIM_OCMODE_PWM1;
     if (output & TIMER_OUTPUT_N_CHANNEL) {
-        TIM_OCInitStructure.OCNPolarity = (output & TIMER_OUTPUT_INVERTED) ? TIM_OCNPOLARITY_HIGH : TIM_OCNPOLARITY_LOW;
+        TIM_OCInitStructure.OCNPolarity = (output & TIMER_OUTPUT_INVERTED) ? TIM_OCNPOLARITY_LOW : TIM_OCPOLARITY_HIGH;
         TIM_OCInitStructure.OCNIdleState = TIM_OCNIDLESTATE_RESET;
     } else {
         TIM_OCInitStructure.OCPolarity = (output & TIMER_OUTPUT_INVERTED) ? TIM_OCPOLARITY_LOW : TIM_OCPOLARITY_HIGH;
diff --git a/src/main/target/ANYFCF7/target.c b/src/main/target/ANYFCF7/target.c
index 90fdc3ad12..749a2a86d4 100644
--- a/src/main/target/ANYFCF7/target.c
+++ b/src/main/target/ANYFCF7/target.c
@@ -24,67 +24,22 @@
 #include "drivers/timer.h"
 #include "drivers/timer_def.h"
 
-#if defined(USE_DSHOT)
-// DSHOT TEST
 const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
-    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
-    DEF_TIM(TIM8,  CH2, PC7,  TIM_USE_PWM,   0,  0 ), // S4_IN
-    DEF_TIM(TIM8,  CH3, PC8,  TIM_USE_PWM,   0,  0 ), // S5_IN
-    DEF_TIM(TIM8,  CH4, PC9,  TIM_USE_PWM,   0,  0 ), // S6_IN
+    DEF_TIM(TIM12, CH1, PB14, TIM_USE_PWM | TIM_USE_PPM,  TIMER_INPUT_ENABLED,  0 ), // S1_IN
+    DEF_TIM(TIM12, CH2, PB15, TIM_USE_PWM,                TIMER_INPUT_ENABLED,  0 ), // S2_IN
+    DEF_TIM(TIM8,  CH1, PC6,  TIM_USE_PWM,                TIMER_INPUT_ENABLED,  0 ), // S3_IN
+    DEF_TIM(TIM8,  CH2, PC7,  TIM_USE_PWM,                TIMER_INPUT_ENABLED,  0 ), // S4_IN
+    DEF_TIM(TIM8,  CH3, PC8,  TIM_USE_PWM,                TIMER_INPUT_ENABLED,  0 ), // S5_IN
+    DEF_TIM(TIM8,  CH4, PC9,  TIM_USE_PWM,                TIMER_INPUT_ENABLED,  0 ), // S6_IN
 
-    DEF_TIM(TIM4, CH3, PB8, TIM_USE_MOTOR,   1,  0 ), // S10_OUT 1 DMA1_ST7
-    DEF_TIM(TIM2, CH3, PA2, TIM_USE_MOTOR,   1,  0 ), // S6_OUT  2 DMA1_ST1
-    DEF_TIM(TIM5, CH2, PA1, TIM_USE_MOTOR,   1,  0 ), // S2_OUT  3 DMA1_ST4
-    DEF_TIM(TIM2, CH4, PA3, TIM_USE_MOTOR,   1,  1 ), // S1_OUT  4 DMA1_ST7 DMA1_ST6
-    DEF_TIM(TIM3, CH2, PB5, TIM_USE_MOTOR | TIM_USE_LED,   1,  0 ), // S4_OUT DMA1_ST5
-    DEF_TIM(TIM5, CH1, PA0, TIM_USE_MOTOR,   1,  0 ), // S7_OUT DMA1_ST2
-    DEF_TIM(TIM4, CH4, PB9, TIM_USE_MOTOR,   1,  0 ), // S5_OUT
-    DEF_TIM(TIM9, CH2, PE6, TIM_USE_MOTOR,   1,  0 ), // S3_OUT
-    DEF_TIM(TIM2, CH2, PB3, TIM_USE_MOTOR,   1,  0 ), // S8_OUT DMA1_ST6
-    DEF_TIM(TIM3, CH1, PB4, TIM_USE_MOTOR,   1,  0 ), // S9_OUT DMA1_ST4
+    DEF_TIM(TIM4, CH3, PB8, TIM_USE_MOTOR,               TIMER_OUTPUT_ENABLED,  0 ), // S10_OUT 1 DMA1_ST7
+    DEF_TIM(TIM2, CH3, PA2, TIM_USE_MOTOR,               TIMER_OUTPUT_ENABLED,  0 ), // S6_OUT  2 DMA1_ST1
+    DEF_TIM(TIM5, CH2, PA1, TIM_USE_MOTOR,               TIMER_OUTPUT_ENABLED,  0 ), // S2_OUT  3 DMA1_ST4
+    DEF_TIM(TIM2, CH4, PA3, TIM_USE_MOTOR,               TIMER_OUTPUT_ENABLED,  1 ), // S1_OUT  4 DMA1_ST7 DMA1_ST6
+    DEF_TIM(TIM3, CH2, PB5, TIM_USE_MOTOR | TIM_USE_LED, TIMER_OUTPUT_ENABLED,  0 ), // S4_OUT DMA1_ST5
+    DEF_TIM(TIM5, CH1, PA0, TIM_USE_MOTOR,               TIMER_OUTPUT_ENABLED,  0 ), // S7_OUT DMA1_ST2
+    DEF_TIM(TIM4, CH4, PB9, TIM_USE_MOTOR,               TIMER_OUTPUT_ENABLED,  0 ), // S5_OUT
+    DEF_TIM(TIM9, CH2, PE6, TIM_USE_MOTOR,               TIMER_OUTPUT_ENABLED,  0 ), // S3_OUT
+    DEF_TIM(TIM2, CH2, PB3, TIM_USE_MOTOR,               TIMER_OUTPUT_ENABLED,  0 ), // S8_OUT DMA1_ST6
+    DEF_TIM(TIM3, CH1, PB4, TIM_USE_MOTOR,               TIMER_OUTPUT_ENABLED,  0 ), // S9_OUT DMA1_ST4
 };
-#else
-// STANDARD LAYOUT
-const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
-    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
-    DEF_TIM(TIM8,  CH2, PC7,  TIM_USE_PWM,   0,  0 ), // S4_IN
-    DEF_TIM(TIM8,  CH4, PC9,  TIM_USE_PWM,   0,  0 ), // S5_IN
-    DEF_TIM(TIM8,  CH3, PC8,  TIM_USE_PWM,   0,  0 ), // S6_IN
-
-    DEF_TIM(TIM4, CH3, PB8, TIM_USE_MOTOR,   1,  0 ), // S10_OUT 1
-    DEF_TIM(TIM2, CH3, PA2, TIM_USE_MOTOR,   1,  0 ), // S6_OUT  2
-    DEF_TIM(TIM4, CH4, PB9, TIM_USE_MOTOR,   1,  0 ), // S5_OUT  3
-    DEF_TIM(TIM2, CH4, PA3, TIM_USE_MOTOR,   1,  0 ), // S1_OUT  4
-    DEF_TIM(TIM5, CH2, PA1, TIM_USE_MOTOR | TIM_USE_LED,   1,  0 ), // S2_OUT
-    DEF_TIM(TIM9, CH2, PE6, TIM_USE_MOTOR,   1,  0 ), // S3_OUT
-    DEF_TIM(TIM3, CH2, PB5, TIM_USE_MOTOR,   1,  0 ), // S4_OUT
-    DEF_TIM(TIM5, CH1, PA0, TIM_USE_MOTOR,   1,  0 ), // S7_OUT
-    DEF_TIM(TIM2, CH2, PB3, TIM_USE_MOTOR,   1,  0 ), // S8_OUT
-    DEF_TIM(TIM3, CH1, PB4, TIM_USE_MOTOR,   1,  0 ), // S9_OUT
-};
-#endif
-
-// ALTERNATE LAYOUT
-//const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
-//    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
-//    DEF_TIM(TIM8,  CH2, PC7,  TIM_USE_PWM,   0,  0 ), // S4_IN
-//    DEF_TIM(TIM8,  CH4, PC9,  TIM_USE_PWM,   0,  0 ), // S5_IN
-//    DEF_TIM(TIM8,  CH3, PC8,  TIM_USE_PWM,   0,  0 ), // S6_IN
-//
-//    DEF_TIM(TIM10, CH1, PB8, TIM_USE_MOTOR,   1,  0 ), // S10_OUT 1
-//    DEF_TIM(TIM9,  CH1, PA2, TIM_USE_MOTOR,   1,  0 ), // S6_OUT  2
-//    DEF_TIM(TIM11, CH1, PB9, TIM_USE_MOTOR,   1,  0 ), // S5_OUT  3
-//    DEF_TIM(TIM2,  CH4, PA3, TIM_USE_MOTOR,   1,  0 ), // S1_OUT  4
-//    DEF_TIM(TIM5,  CH2, PA1, TIM_USE_MOTOR | TIM_USE_LED,   1,  0 ), // S2_OUT
-//    DEF_TIM(TIM9,  CH2, PE6, TIM_USE_MOTOR,   1,  0 ), // S3_OUT
-//    DEF_TIM(TIM3,  CH2, PB5, TIM_USE_MOTOR,   1,  0 ), // S4_OUT
-//    DEF_TIM(TIM5,  CH1, PA0, TIM_USE_MOTOR,   1,  0 ), // S7_OUT
-//    DEF_TIM(TIM2,  CH2, PB3, TIM_USE_MOTOR,   1,  0 ), // S8_OUT
-//    DEF_TIM(TIM3,  CH1, PB4, TIM_USE_MOTOR,   1,  0 ), // S9_OUT
-//};