From e9a98e11c46b163fee6e3cab1ef7da02739813ba Mon Sep 17 00:00:00 2001 From: LinJieqiang <517503838@qq.com> Date: Wed, 6 Jan 2021 14:53:00 +0800 Subject: [PATCH] Add more feature for iFlight_H743_AIO support. --- src/main/target/IFLIGHT_H743_AIO/target.c | 5 +++++ src/main/target/IFLIGHT_H743_AIO/target.h | 26 +++++++++++++++++++--- src/main/target/IFLIGHT_H743_AIO/target.mk | 14 ++++++++++-- 3 files changed, 40 insertions(+), 5 deletions(-) diff --git a/src/main/target/IFLIGHT_H743_AIO/target.c b/src/main/target/IFLIGHT_H743_AIO/target.c index 4c5d49de23..9dabe37761 100644 --- a/src/main/target/IFLIGHT_H743_AIO/target.c +++ b/src/main/target/IFLIGHT_H743_AIO/target.c @@ -38,4 +38,9 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { DEF_TIM( TIM3, CH4, PB1, TIM_USE_MOTOR, 0, 1, 0 ), // M2 DEF_TIM( TIM1, CH1, PE9, TIM_USE_MOTOR, 0, 2, 0 ), // M3 DEF_TIM( TIM1, CH2, PE11, TIM_USE_MOTOR, 0, 3, 0 ), // M4 + + DEF_TIM( TIM3, CH1, PB4, TIM_USE_MOTOR, 0, 4, 0 ), // M5 + DEF_TIM( TIM3, CH2, PB5, TIM_USE_MOTOR, 0, 5, 0 ), // M6 + DEF_TIM( TIM1, CH3, PE13, TIM_USE_MOTOR, 0, 6, 0 ), // M7 + DEF_TIM( TIM1, CH4, PE14, TIM_USE_MOTOR, 0, 7, 0 ), // M8 }; diff --git a/src/main/target/IFLIGHT_H743_AIO/target.h b/src/main/target/IFLIGHT_H743_AIO/target.h index 2613ce1164..5525f088a1 100644 --- a/src/main/target/IFLIGHT_H743_AIO/target.h +++ b/src/main/target/IFLIGHT_H743_AIO/target.h @@ -91,14 +91,26 @@ #define USE_I2C #define USE_I2C_DEVICE_1 +#define I2C_DEVICE_1 (I2CDEV_1) #define I2C1_SCL PB8 #define I2C1_SDA PB9 -#define I2C_DEVICE (I2CDEV_1) +#define USE_I2C_DEVICE_2 +#define I2C_DEVICE_2 (I2CDEV_2) +#define I2C2_SCL PB10 +#define I2C2_SDA PB11 + +#define MAG_I2C_INSTANCE (I2CDEV_1) #define USE_MAG #define USE_MAG_HMC5883 +#define USE_MAG_QMC5883 +#define USE_MAG_LIS3MDL +#define BARO_I2C_INSTANCE (I2CDEV_1) #define USE_BARO +#define DEFAULT_BARO_DPS310 +#define USE_BARO_MS5611 +#define USE_BARO_BMP280 #define USE_BARO_DPS310 #define USE_GYRO @@ -106,18 +118,25 @@ #define USE_GYRO_SPI_MPU6000 #define USE_ACC_SPI_MPU6000 #define USE_ACCGYRO_BMI270 +#define USE_ACCGYRO_LSM6DSO #define USE_EXTI #define USE_GYRO_EXTI #define GYRO_1_EXTI_PIN PD0 +#define GYRO_2_EXTI_PIN PD8 #define USE_MPU_DATA_READY_SIGNAL #define ENSURE_MPU_DATA_READY_IS_LOW #define GYRO_1_CS_PIN SPI1_NSS_PIN #define GYRO_1_SPI_INSTANCE SPI1 - #define GYRO_1_ALIGN CW0_DEG +#define GYRO_2_CS_PIN SPI2_NSS_PIN +#define GYRO_2_SPI_INSTANCE SPI2 +#define GYRO_2_ALIGN CW0_DEG + +#define GYRO_CONFIG_USE_GYRO_DEFAULT GYRO_CONFIG_USE_GYRO_BOTH + #define USE_FLASHFS #define USE_FLASH_TOOLS #define USE_FLASH_M25P16 @@ -159,6 +178,7 @@ #define RSSI_ADC_PIN PC5 #define VBAT_ADC_PIN PC3 #define CURRENT_METER_ADC_PIN PC2 +#define EXTERNAL1_ADC_PIN PC1 #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC @@ -176,6 +196,6 @@ #define TARGET_IO_PORTF 0xffff #define TARGET_IO_PORTG 0xffff -#define USABLE_TIMER_CHANNEL_COUNT 7 +#define USABLE_TIMER_CHANNEL_COUNT 11 #define USED_TIMERS ( TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(4) | TIM_N(8) ) diff --git a/src/main/target/IFLIGHT_H743_AIO/target.mk b/src/main/target/IFLIGHT_H743_AIO/target.mk index 93047291cd..3aa2860784 100644 --- a/src/main/target/IFLIGHT_H743_AIO/target.mk +++ b/src/main/target/IFLIGHT_H743_AIO/target.mk @@ -5,10 +5,20 @@ HSE_VALUE = 8000000 FEATURES += VCP ONBOARDFLASH TARGET_SRC += \ - drivers/max7456.c \ drivers/accgyro/accgyro_mpu.c \ + drivers/accgyro/accgyro_spi_mpu6500.c \ + drivers/accgyro/accgyro_mpu6500.c \ drivers/accgyro/accgyro_spi_mpu6000.c \ + drivers/accgyro/accgyro_spi_lsm6dso_init.c \ + drivers/accgyro/accgyro_spi_lsm6dso.c \ $(ROOT)/lib/main/BoschSensortec/BMI270-Sensor-API/bmi270.c \ drivers/accgyro/accgyro_spi_bmi270.c \ - drivers/compass/compass_hmc5883l.c \ drivers/barometer/barometer_dps310.c \ + drivers/barometer/barometer_bmp280.c \ + drivers/barometer/barometer_ms5611.c \ + drivers/compass/compass_hmc5883l.c \ + drivers/compass/compass_qmc5883l.c \ + drivers/compass/compass_lis3mdl.c \ + drivers/light_ws2811strip.c \ + drivers/light_ws2811strip_hal.c \ + drivers/max7456.c \ No newline at end of file