diff --git a/src/main/target/SPRACINGF3EVO/target.c b/src/main/target/SPRACINGF3EVO/target.c
index 247082280..526fa029e 100644
--- a/src/main/target/SPRACINGF3EVO/target.c
+++ b/src/main/target/SPRACINGF3EVO/target.c
@@ -21,20 +21,21 @@
 #include "drivers/io.h"
 
 #include "drivers/timer.h"
+#include "drivers/timer_def.h"
 #include "drivers/dma.h"
 
 const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
     // PPM / UART2 RX
-    { TIM8,  IO_TAG(PA15), TIM_Channel_1, TIM_USE_PPM,   0, GPIO_AF_2, NULL, 0 },  // PPM
-    { TIM2,  IO_TAG(PA0),  TIM_Channel_1, TIM_USE_MOTOR, 1, GPIO_AF_1, NULL, 0 },  // PWM1
-    { TIM2,  IO_TAG(PA1),  TIM_Channel_2, TIM_USE_MOTOR, 1, GPIO_AF_1, NULL, 0 },  // PWM2
-    { TIM15, IO_TAG(PA2),  TIM_Channel_1, TIM_USE_MOTOR, 1, GPIO_AF_9, NULL, 0 },  // PWM3
-    { TIM15, IO_TAG(PA3),  TIM_Channel_2, TIM_USE_MOTOR, 1, GPIO_AF_9, NULL, 0 },  // PWM4
-    { TIM3,  IO_TAG(PA6),  TIM_Channel_1, TIM_USE_MOTOR, 1, GPIO_AF_2, NULL, 0 },  // PWM5
-    { TIM3,  IO_TAG(PA7),  TIM_Channel_2, TIM_USE_MOTOR, 1, GPIO_AF_2, NULL, 0 },  // PWM6
-    { TIM3,  IO_TAG(PB0),  TIM_Channel_3, TIM_USE_MOTOR, 1, GPIO_AF_2, NULL, 0 },  // PWM7
-    { TIM3,  IO_TAG(PB1),  TIM_Channel_4, TIM_USE_MOTOR, 1, GPIO_AF_2, NULL, 0 },  // PWM8
-    { TIM2,  IO_TAG(PB10), TIM_Channel_3, TIM_USE_MOTOR, 1, GPIO_AF_1, NULL, 0 }, // RC_CH4 - PB10 - *TIM2_CH3, UART3_TX (AF7)
-    { TIM2,  IO_TAG(PB11), TIM_Channel_4, TIM_USE_MOTOR, 1, GPIO_AF_1, NULL, 0 }, // RC_CH3 - PB11 - *TIM2_CH4, UART3_RX (AF7)
-    { TIM1,  IO_TAG(PA8),  TIM_Channel_1, TIM_USE_LED,   1, GPIO_AF_6, DMA1_Channel2, DMA1_CH2_HANDLER },  // GPIO_TIMER / LED_STRIP
+    DEF_TIM(TIM8,  CH1, PA15, TIM_USE_PPM,   0 ),  // PPM
+    DEF_TIM(TIM2,  CH1, PA0,  TIM_USE_MOTOR, 1 ),  // PWM1
+    DEF_TIM(TIM2,  CH2, PA1,  TIM_USE_MOTOR, 1 ),  // PWM2
+    DEF_TIM(TIM15, CH1, PA2,  TIM_USE_MOTOR, 1 ),  // PWM3
+    DEF_TIM(TIM15, CH2, PA3,  TIM_USE_MOTOR, 1 ),  // PWM4
+    DEF_TIM(TIM3,  CH1, PA6,  TIM_USE_MOTOR, 1 ),  // PWM5
+    DEF_TIM(TIM3,  CH2, PA7,  TIM_USE_MOTOR, 1 ),  // PWM6
+    DEF_TIM(TIM3,  CH3, PB0,  TIM_USE_MOTOR, 1 ),  // PWM7
+    DEF_TIM(TIM3,  CH4, PB1,  TIM_USE_MOTOR, 1 ),  // PWM8
+    DEF_TIM(TIM2,  CH3, PB10, TIM_USE_MOTOR, 1 ),  // RC_CH4 - PB10 - *TIM2_CH3, UART3_TX (AF7)
+    DEF_TIM(TIM2,  CH4, PB11, TIM_USE_MOTOR, 1 ),  // RC_CH3 - PB11 - *TIM2_CH4, UART3_RX (AF7)
+    DEF_TIM(TIM1,  CH1, PA8,  TIM_USE_LED,   1 ),  // GPIO_TIMER / LED_STRIP
 };
diff --git a/src/main/target/SPRACINGF3EVO/target.h b/src/main/target/SPRACINGF3EVO/target.h
index 280af8c8a..516d023db 100755
--- a/src/main/target/SPRACINGF3EVO/target.h
+++ b/src/main/target/SPRACINGF3EVO/target.h
@@ -35,6 +35,7 @@
 #define USE_MAG_DATA_READY_SIGNAL
 #define ENSURE_MAG_DATA_READY_IS_HIGH
 
+#define USE_DSHOT
 
 #define GYRO
 #define USE_GYRO_SPI_MPU6500