diff --git a/src/main/drivers/tim_def.h b/src/main/drivers/timer_def.h
similarity index 99%
rename from src/main/drivers/tim_def.h
rename to src/main/drivers/timer_def.h
index e41260f86e..81d1c810f3 100644
--- a/src/main/drivers/tim_def.h
+++ b/src/main/drivers/timer_def.h
@@ -29,8 +29,8 @@
     flags,\
     (DEF_CHAN_ ## chan ## _OUTPUT | out),\
     EXPAND(GPIO_AF__ ## pin ## _ ## tim ## _ ## chan),\
-    CONCAT(EXPAND(DEF_TIM_DMACHAN_ ## tim ## _ ## chan), _TYPE),\
-    CONCAT(EXPAND(DEF_TIM_DMACHAN_ ## tim ## _ ## chan), _HANDLER)\
+    CONCAT(EXPAND(DEF_TIM_DMA__ ## tim ## _ ## chan), _CHANNEL),\
+    CONCAT(EXPAND(DEF_TIM_DMA__ ## tim ## _ ## chan), _HANDLER)\
     }
 
 #define DEF_DMA_CHANNEL(tim, chan) CONCAT(EXPAND(DEF_TIM_DMA__ ## tim ## _ ## chan), _CHANNEL)
diff --git a/src/main/target/BLUEJAYF4/target.c b/src/main/target/BLUEJAYF4/target.c
index 6ab553f5fa..8bbbe806a9 100644
--- a/src/main/target/BLUEJAYF4/target.c
+++ b/src/main/target/BLUEJAYF4/target.c
@@ -22,7 +22,7 @@
 #include "drivers/timer.h"
 #include "drivers/dma.h"
 
-#include "drivers/tim_def.h"
+#include "drivers/timer_def.h"
 
 /*
 const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { 
diff --git a/src/main/target/DOGE/target.c b/src/main/target/DOGE/target.c
index 243de4dc18..92957613d5 100644
--- a/src/main/target/DOGE/target.c
+++ b/src/main/target/DOGE/target.c
@@ -22,16 +22,17 @@
 
 #include "drivers/timer.h"
 #include "drivers/dma.h"
+#include "drivers/timer_def.h"
 
 const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
-    { TIM1,  IO_TAG(PA8),  TIM_Channel_1, TIM_USE_PPM,   0, GPIO_AF_6 , NULL, 0 }, // PWM1 - PA8
-    { TIM4,  IO_TAG(PB8),  TIM_Channel_3, TIM_USE_MOTOR, 1, GPIO_AF_2 , NULL, 0 }, // PWM2 - PB8
-    { TIM4,  IO_TAG(PB9),  TIM_Channel_4, TIM_USE_MOTOR, 1, GPIO_AF_2 , NULL, 0 }, // PWM3 - PB9
-    { TIM2,  IO_TAG(PA10), TIM_Channel_4, TIM_USE_MOTOR, 1, GPIO_AF_10, NULL, 0 }, // PMW4 - PA10
-    { TIM2,  IO_TAG(PA9),  TIM_Channel_3, TIM_USE_MOTOR, 1, GPIO_AF_10, NULL, 0 }, // PWM5 - PA9
-    { TIM2,  IO_TAG(PA0),  TIM_Channel_1, TIM_USE_MOTOR, 1, GPIO_AF_1 , NULL, 0 },  // PWM6 - PA0
-    { TIM2,  IO_TAG(PA1),  TIM_Channel_2, TIM_USE_MOTOR, 1, GPIO_AF_1 , NULL, 0 },  // PWM7 - PA1
-    { TIM3,  IO_TAG(PB0),  TIM_Channel_3, TIM_USE_MOTOR, 1, GPIO_AF_2 , NULL, 0 },  // PWM8 - PB1
-    { TIM3,  IO_TAG(PB1),  TIM_Channel_4, TIM_USE_MOTOR, 1, GPIO_AF_2 , NULL, 0 },  // PWM9 - PB0
-    { TIM16, IO_TAG(PA6),  TIM_Channel_1, TIM_USE_LED,   1, GPIO_AF_1, DMA1_Channel3, DMA1_CH3_HANDLER },  // PWM9 - PB0
+    DEF_TIM(TIM1,  CH1, PA8,  TIM_USE_PPM,   0), // PWM1 - PA8
+    DEF_TIM(TIM4,  CH3, PB8,  TIM_USE_MOTOR, 1), // PWM2 - PB8
+    DEF_TIM(TIM4,  CH4, PB9,  TIM_USE_MOTOR, 1), // PWM3 - PB9
+    DEF_TIM(TIM2,  CH4, PA10, TIM_USE_MOTOR, 1), // PMW4 - PA10
+    DEF_TIM(TIM2,  CH3, PA9,  TIM_USE_MOTOR, 1), // PWM5 - PA9
+    DEF_TIM(TIM2,  CH1, PA0,  TIM_USE_MOTOR, 1), // PWM6 - PA0
+    DEF_TIM(TIM2,  CH2, PA1,  TIM_USE_MOTOR, 1), // PWM7 - PA1
+    DEF_TIM(TIM3,  CH3, PB0,  TIM_USE_MOTOR, 1), // PWM8 - PB1
+    DEF_TIM(TIM3,  CH4, PB1,  TIM_USE_MOTOR, 1), // PWM9 - PB0
+    DEF_TIM(TIM16, CH1, PA6,  TIM_USE_LED,   1), // PWM9 - PB0
 };
diff --git a/src/main/target/DOGE/target.h b/src/main/target/DOGE/target.h
index ff03fbe1bd..ee10bfd70f 100644
--- a/src/main/target/DOGE/target.h
+++ b/src/main/target/DOGE/target.h
@@ -124,6 +124,7 @@
 #define ENSURE_MPU_DATA_READY_IS_LOW
 
 #define LED_STRIP
+#define USE_DSHOT
 
 #define DEFAULT_RX_FEATURE      FEATURE_RX_PPM