diff --git a/src/main/target/AIR32/target.c b/src/main/target/AIR32/target.c
index a6b455f81..d39e00200 100644
--- a/src/main/target/AIR32/target.c
+++ b/src/main/target/AIR32/target.c
@@ -21,17 +21,18 @@
 #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] = {
-    { TIM3,  IO_TAG(PA4),  TIM_Channel_2, TIM_USE_MOTOR, 1, GPIO_AF_2, NULL, 0 }, // PWM1  - PA4  - *TIM3_CH2
-    { TIM3,  IO_TAG(PA6),  TIM_Channel_1, TIM_USE_MOTOR, 1, GPIO_AF_2, NULL, 0 }, // PWM2  - PA6  - *TIM3_CH1, TIM8_BKIN, TIM1_BKIN, TIM16_CH1
-    { TIM3,  IO_TAG(PB0),  TIM_Channel_3, TIM_USE_MOTOR, 1, GPIO_AF_2, NULL, 0 }, // PWM3  - PB0  - *TIM3_CH3, TIM1_CH2N, TIM8_CH2N
-    { TIM3,  IO_TAG(PB1),  TIM_Channel_4, TIM_USE_MOTOR, 1, GPIO_AF_2, NULL, 0 }, // PWM4  - PB1  - *TIM3_CH4, TIM1_CH3N, TIM8_CH3N
-    { TIM2,  IO_TAG(PA1),  TIM_Channel_2, TIM_USE_MOTOR, 1, GPIO_AF_1, NULL, 0 }, // PWM5  - PA1  - *TIM2_CH2, TIM15_CH1N
-    { TIM2,  IO_TAG(PA2),  TIM_Channel_3, TIM_USE_MOTOR, 1, GPIO_AF_1, NULL, 0 }, // PWM6  - PA2  - *TIM2_CH3, !TIM15_CH1
-    { TIM15, IO_TAG(PA3),  TIM_Channel_2, TIM_USE_MOTOR, 1, GPIO_AF_9, NULL, 0 }, // PWM7  - PA3  - *TIM15_CH2, TIM2_CH4
-    { TIM1,  IO_TAG(PA8),  TIM_Channel_1, TIM_USE_MOTOR, 1, GPIO_AF_6, NULL, 0 }, // PWM8  - PA8  - *TIM1_CH1, TIM4_ETR
-    { TIM17, IO_TAG(PA7),  TIM_Channel_1, TIM_USE_PPM,   0, GPIO_AF_1, NULL, 0 }, // PPM   - PA7  - *TIM17_CH1, TIM1_CH1N, TIM8_CH1
-    { TIM16, IO_TAG(PB8),  TIM_Channel_1, TIM_USE_LED,   0, GPIO_AF_1, DMA1_Channel3, DMA1_CH3_HANDLER }, // PPM   - PA7  - *TIM17_CH1, TIM1_CH1N, TIM8_CH1
+    DEF_TIM(TIM3,  CH2, PA4, TIM_USE_MOTOR, 1), // PWM1  - PA4  - *TIM3_CH2
+    DEF_TIM(TIM3,  CH1, PA6, TIM_USE_MOTOR, 1), // PWM2  - PA6  - *TIM3_CH1, TIM8_BKIN, TIM1_BKIN, TIM16_CH1
+    DEF_TIM(TIM3,  CH3, PB0, TIM_USE_MOTOR, 1), // PWM3  - PB0  - *TIM3_CH3, TIM1_CH2N, TIM8_CH2N
+    DEF_TIM(TIM3,  CH4, PB1, TIM_USE_MOTOR, 1), // PWM4  - PB1  - *TIM3_CH4, TIM1_CH3N, TIM8_CH3N
+    DEF_TIM(TIM2,  CH2, PA1, TIM_USE_MOTOR, 1), // PWM5  - PA1  - *TIM2_CH2, TIM15_CH1N
+    DEF_TIM(TIM2,  CH3, PA2, TIM_USE_MOTOR, 1), // PWM6  - PA2  - *TIM2_CH3, !TIM15_CH1
+    DEF_TIM(TIM15, CH2, PA3, TIM_USE_MOTOR, 1), // PWM7  - PA3  - *TIM15_CH2, TIM2_CH4
+    DEF_TIM(TIM1,  CH1, PA8, TIM_USE_MOTOR, 1), // PWM8  - PA8  - *TIM1_CH1, TIM4_ETR
+    DEF_TIM(TIM17, CH1, PA7, TIM_USE_PPM, 0), // PPM   - PA7  - *TIM17_CH1, TIM1_CH1N, TIM8_CH1
+    DEF_TIM(TIM16, CH1, PB8, TIM_USE_LED, 0), // PPM   - PA7  - *TIM17_CH1, TIM1_CH1N, TIM8_CH1
 };