From 39b7c15f7068585bef663d739a5fc63eb1859997 Mon Sep 17 00:00:00 2001 From: LinJieqiang <517503838@qq.com> Date: Wed, 18 Mar 2020 15:50:51 +0800 Subject: [PATCH] [IF_H7_TWING] Fix timer assignment error, adjust sensor orientation. --- src/main/target/IFLIGHT_H7_TWING/target.c | 14 +++++++------- src/main/target/IFLIGHT_H7_TWING/target.h | 5 ++--- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/main/target/IFLIGHT_H7_TWING/target.c b/src/main/target/IFLIGHT_H7_TWING/target.c index 6051063192..11e56e167b 100644 --- a/src/main/target/IFLIGHT_H7_TWING/target.c +++ b/src/main/target/IFLIGHT_H7_TWING/target.c @@ -36,12 +36,12 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { DEF_TIM( TIM5, CH1, PA0, TIM_USE_MOTOR, 0, 0, 0 ), // M1 DEF_TIM( TIM5, CH2, PA1, TIM_USE_MOTOR, 0, 1, 0 ), // M2 - DEF_TIM( TIM3, CH3, PB0, TIM_USE_MOTOR, 0, 0, 0 ), // M3 - DEF_TIM( TIM3, CH4, PB1, TIM_USE_MOTOR, 0, 0, 0 ), // M4 + DEF_TIM( TIM3, CH3, PB0, TIM_USE_MOTOR, 0, 2, 0 ), // M3 + DEF_TIM( TIM3, CH4, PB1, TIM_USE_MOTOR, 0, 3, 0 ), // M4 - DEF_TIM( TIM4, CH3, PD14, TIM_USE_MOTOR, 0, 12, 0 ), // M5 - DEF_TIM( TIM4, CH4, PD15, TIM_USE_MOTOR, 0, 0, 0 ), // M6 - DEF_TIM( TIM8, CH3, PC8, TIM_USE_MOTOR, 0, 0, 0 ), // M7 - DEF_TIM( TIM8, CH4, PC9, TIM_USE_MOTOR, 0, 0, 0 ), // M8 + DEF_TIM( TIM4, CH1, PB6, TIM_USE_MOTOR, 0, 4, 1 ), // M5 + DEF_TIM( TIM4, CH2, PB7, TIM_USE_MOTOR, 0, 5, 1 ), // M6 + + DEF_TIM( TIM8, CH3, PC8, TIM_USE_MOTOR, 0, 6, 4 ), // M7 + DEF_TIM( TIM8, CH4, PC9, TIM_USE_MOTOR, 0, 7, 4 ), // M8 }; - diff --git a/src/main/target/IFLIGHT_H7_TWING/target.h b/src/main/target/IFLIGHT_H7_TWING/target.h index 4fec5b57fe..06c03d55ec 100644 --- a/src/main/target/IFLIGHT_H7_TWING/target.h +++ b/src/main/target/IFLIGHT_H7_TWING/target.h @@ -145,9 +145,8 @@ #define USE_ACC #define USE_ACC_SPI_MPU6500 -#define GYRO_1_ALIGN CW180_DEG -#define GYRO_2_ALIGN ALIGN_CUSTOM -#define GYRO_2_CUSTOM_ALIGN SENSOR_ALIGNMENT(0, 0, 225) +#define GYRO_1_ALIGN CW0_DEG +#define GYRO_2_ALIGN CW90_DEG #define GYRO_CONFIG_USE_GYRO_DEFAULT GYRO_CONFIG_USE_GYRO_BOTH