diff --git a/src/main/target/FLYWOOF405/target.c b/src/main/target/FLYWOOF405/target.c index 02679460b..4c17ec309 100755 --- a/src/main/target/FLYWOOF405/target.c +++ b/src/main/target/FLYWOOF405/target.c @@ -32,8 +32,8 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { DEF_TIM(TIM3, CH4, PB1, TIM_USE_MOTOR, 0, 0), // S2_OUT - DMA1_ST2 DEF_TIM(TIM2, CH4, PA3, TIM_USE_MOTOR, 0, 1), // S3_OUT - DMA1_ST6 DEF_TIM(TIM2, CH3, PA2, TIM_USE_MOTOR, 0, 0), // S4_OUT - DMA1_ST1 - DEF_TIM(TIM3, CH2, PB5, TIM_USE_MOTOR, 0, 0), // S5_OUT - DMA1_ST5 - DEF_TIM(TIM4, CH2, PB7, TIM_USE_MOTOR, 0, 0), // S6_OUT - DMA1_ST3 + DEF_TIM(TIM3, CH2, PB5, TIM_USE_MOTOR, 0, 0), // S5_OUT - DMA1_ST0 + DEF_TIM(TIM4, CH2, PB7, TIM_USE_MOTOR, 0, 0), // S6_OUT - DMA1_ST3 DEF_TIM(TIM8, CH4, PC9, TIM_USE_MOTOR, 0, 0), // S7_OUT - DMA2_ST7 DEF_TIM(TIM3, CH1, PB4, TIM_USE_MOTOR, 0, 0), // S8_OUT - DMA1_ST4 diff --git a/src/main/target/FLYWOOF405/target.h b/src/main/target/FLYWOOF405/target.h index e5e6a35de..995376c38 100755 --- a/src/main/target/FLYWOOF405/target.h +++ b/src/main/target/FLYWOOF405/target.h @@ -36,13 +36,19 @@ #define CAMERA_CONTROL_PIN PA9//////////// -// ICM20689 interrupt -#define USE_EXTI -#define MPU_INT_EXTI PC5 + //#define DEBUG_MPU_DATA_READY_INTERRUPT #define USE_MPU_DATA_READY_SIGNAL #define ENSURE_MPU_DATA_READY_IS_LOW +#define USE_SPI + +#define USE_SPI_DEVICE_1 //ICM20689-MPU6000 +#define SPI1_NSS_PIN PC4 +#define SPI1_SCK_PIN PA5 +#define SPI1_MISO_PIN PA6 +#define SPI1_MOSI_PIN PA7 + #define USE_GYRO @@ -127,13 +133,7 @@ #define USE_ESCSERIAL #define ESCSERIAL_TIMER_TX_PIN PB8 // (HARDARE=0,PPM) -#define USE_SPI -#define USE_SPI_DEVICE_1 //ICM20689-MPU6000 -#define SPI1_NSS_PIN PC4 -#define SPI1_SCK_PIN PA5 -#define SPI1_MISO_PIN PA6 -#define SPI1_MOSI_PIN PA7 #define USE_SPI_DEVICE_3 //dataflash #define SPI3_NSS_PIN PB3 diff --git a/src/main/target/FLYWOOF405/target.mk b/src/main/target/FLYWOOF405/target.mk index 8f2f2e734..f29ea9ab2 100755 --- a/src/main/target/FLYWOOF405/target.mk +++ b/src/main/target/FLYWOOF405/target.mk @@ -3,6 +3,7 @@ FEATURES += VCP ONBOARDFLASH TARGET_SRC = \ drivers/accgyro/accgyro_spi_icm20689.c \ + drivers/accgyro/accgyro_spi_mpu6000.c \ drivers/barometer/barometer_bmp280.c \ drivers/barometer/barometer_ms5611.c \ drivers/compass/compass_ak8963.c \