diff --git a/src/main/target/AOCODARCH7DUAL/target.c b/src/main/target/AOCODARCH7DUAL/target.c
index c7cca05da7c..296f539030b 100644
--- a/src/main/target/AOCODARCH7DUAL/target.c
+++ b/src/main/target/AOCODARCH7DUAL/target.c
@@ -26,23 +26,22 @@
 #include "drivers/pinio.h"
 #include "drivers/sensor.h"
 
-BUSDEV_REGISTER_SPI_TAG(busdev_mpu6000,     DEVHW_MPU6000,      MPU6000_SPI_BUS,    MPU6000_CS_PIN,     NONE,  DEVFLAGS_NONE,  0,   IMU_MPU6000_ALIGN);
-BUSDEV_REGISTER_SPI_TAG(busdev_bmi270_1,      DEVHW_BMI270,       BMI270_SPI_BUS_1,     BMI270_CS_PIN_1,      NONE,  DEVFLAGS_NONE,  0,    IMU_BMI270_ALIGN_1);
-BUSDEV_REGISTER_SPI_TAG(busdev_bmi270_2,      DEVHW_BMI270,       BMI270_SPI_BUS_2,     BMI270_CS_PIN_2,      NONE,  DEVFLAGS_NONE,  1,    IMU_BMI270_ALIGN_2);
+BUSDEV_REGISTER_SPI_TAG(busdev_mpu6000,     DEVHW_MPU6000,      MPU6000_SPI_BUS,    MPU6000_CS_PIN,     MPU6000_EXTI_PIN,  DEVFLAGS_NONE,  0,   IMU_MPU6000_ALIGN);
+BUSDEV_REGISTER_SPI_TAG(busdev_bmi270_1,      DEVHW_BMI270,       BMI270_SPI_BUS_1,     BMI270_CS_PIN_1,      BMI270_EXTI_PIN_1,  DEVFLAGS_NONE,  0,    IMU_BMI270_ALIGN_1);
+BUSDEV_REGISTER_SPI_TAG(busdev_bmi270_2,      DEVHW_BMI270,       BMI270_SPI_BUS_2,     BMI270_CS_PIN_2,      BMI270_EXTI_PIN_2,  DEVFLAGS_NONE,  1,    IMU_BMI270_ALIGN_2);
 
 
 timerHardware_t timerHardware[] = {
     DEF_TIM(TIM3, CH3, PB0, TIM_USE_MC_MOTOR | TIM_USE_FW_MOTOR, 0, 0),   // S1
     DEF_TIM(TIM3, CH4, PB1, TIM_USE_MC_MOTOR | TIM_USE_FW_MOTOR, 0, 1),   // S2
 
-    DEF_TIM(TIM5, CH1, PA0, TIM_USE_MC_MOTOR | TIM_USE_FW_SERVO, 0, 2),   // S3
+    DEF_TIM(TIM5, CH1, PA0, TIM_USE_MC_MOTOR | TIM_USE_FW_SERVO, 0, 2),   // S3  
     DEF_TIM(TIM5, CH2, PA1, TIM_USE_MC_MOTOR | TIM_USE_FW_SERVO, 0, 3),   // S4
+    DEF_TIM(TIM5, CH3, PA2, TIM_USE_MC_MOTOR | TIM_USE_FW_SERVO, 0, 4),   // S5
+    DEF_TIM(TIM5, CH4, PA3, TIM_USE_MC_MOTOR | TIM_USE_FW_SERVO, 0, 5),   // S6
 
-    DEF_TIM(TIM4, CH2, PD13, TIM_USE_MC_MOTOR | TIM_USE_FW_SERVO, 0, 7),   // S5
-    DEF_TIM(TIM4, CH1, PD12, TIM_USE_MC_MOTOR | TIM_USE_FW_SERVO, 0, 6),   // S6
-    DEF_TIM(TIM5, CH4, PA3, TIM_USE_MC_MOTOR | TIM_USE_FW_SERVO, 0, 5),    // S7
-    DEF_TIM(TIM5, CH3, PA2, TIM_USE_MC_MOTOR | TIM_USE_FW_SERVO, 0, 4),    // S8
-
+    DEF_TIM(TIM4, CH1, PD12, TIM_USE_MC_MOTOR | TIM_USE_FW_SERVO, 0, 6),   // S7
+    DEF_TIM(TIM4, CH2, PD13, TIM_USE_MC_MOTOR | TIM_USE_FW_SERVO, 0, 7),   // S8
     DEF_TIM(TIM4, CH3, PD14, TIM_USE_MC_MOTOR | TIM_USE_FW_SERVO, 0, 0),   // S9
     DEF_TIM(TIM4, CH4, PD15, TIM_USE_MC_MOTOR | TIM_USE_FW_SERVO, 0, 0),   // S10 DMA_NONE