Merge branch 'master' into 20231101_IFLIGHT_F745_AIO_V2_BMI270

emuflight · Nov 2, 2023 · b684f62 · b684f62
2 parents 127f1e2 + 0d1a56a
commit b684f62
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 15 deletions.
diff --git a/src/main/target/FLYWOOF411_5IN1_AIO/target.h b/src/main/target/FLYWOOF411_5IN1_AIO/target.h
@@ -65,10 +65,16 @@
 #define USE_ACC_SPI_ICM42688P
 
 #define ICM42688P_SPI_INSTANCE    SPI1
-#define ICM42688P_CS_PIN          PB2
+#define ICM42688P_CS_PIN          PA4
 #define ACC_ICM42688P_ALIGN       CW0_DEG_FLIP
 #define GYRO_ICM42688P_ALIGN      CW0_DEG_FLIP
 
+#define USE_SPI_GYRO
+#define BMI270_SPI_INSTANCE       SPI1
+#define BMI270_CS_PIN             PA4
+#define ACC_BMI270_ALIGN          CW0_DEG_FLIP
+#define GYRO_BMI270_ALIGN         CW0_DEG_FLIP
+
 // *************** Baro **************************
 #define USE_I2C
 

diff --git a/src/main/target/FLYWOOF411_5IN1_AIO/target.mk b/src/main/target/FLYWOOF411_5IN1_AIO/target.mk
@@ -3,22 +3,23 @@ F411_TARGETS    += $(TARGET)
 FEATURES        += VCP
 
 TARGET_SRC = \
-						drivers/accgyro/accgyro_mpu.c \
-						drivers/accgyro/accgyro_spi_mpu6000.c \
-						drivers/accgyro/accgyro_spi_icm20689.c \
-						drivers/accgyro/accgyro_spi_icm426xx.c \
-						drivers/barometer/barometer_bmp085.c \
-						drivers/barometer/barometer_bmp280.c \
-						drivers/barometer/barometer_ms5611.c \
-						drivers/compass/compass_hmc5883l.c \
+            drivers/accgyro/accgyro_mpu.c \
+            drivers/accgyro/accgyro_spi_bmi270.c \
+            drivers/accgyro/accgyro_spi_icm20689.c \
+            drivers/accgyro/accgyro_spi_icm426xx.c \
+            drivers/accgyro/accgyro_spi_mpu6000.c \
+            drivers/barometer/barometer_bmp085.c \
+            drivers/barometer/barometer_bmp280.c \
+            drivers/barometer/barometer_ms5611.c \
+            drivers/compass/compass_hmc5883l.c \
             drivers/compass/compass_qmc5883l.c \
             drivers/max7456.c \
             drivers/rx/rx_cc2500.c \
-						rx/cc2500_common.c \
+            rx/cc2500_common.c \
             rx/cc2500_frsky_shared.c \
             rx/cc2500_frsky_d.c \
-						rx/cc2500_frsky_x.c \
-						rx/cc2500_redpine.c \
+            rx/cc2500_frsky_x.c \
+            rx/cc2500_redpine.c \
             rx/cc2500_sfhss.c\
             drivers/rx/rx_a7105.c \
-						drivers/light_ws2811strip.c
+            drivers/light_ws2811strip.c
diff --git a/src/main/target/FOXEERF745_AIO/FOXEERF745_AIO_V2.mk b/src/main/target/FOXEERF745_AIO/FOXEERF745_AIO_V2.mk
diff --git a/src/main/target/FOXEERF745_AIO/target.h b/src/main/target/FOXEERF745_AIO/target.h
@@ -21,7 +21,13 @@
  #pragma once
 
  #define TARGET_BOARD_IDENTIFIER "FOXE"
+ #define TARGET_MANUFACTURER_IDENTIFIER "FOXE"
+
+ #if defined(FOXEERF745_AIO_V2)
+ #define USBD_PRODUCT_STRING "FOXEERF745_AIO_V2"
+ #else
  #define USBD_PRODUCT_STRING "FOXEERF745_AIO"
+ #endif
 
  #define LED0_PIN   PC13
 
@@ -55,6 +61,16 @@
  //#define MAG_HMC5883_ALIGN CW270_DEG_FLIP
  //#define MAG_ALIGN CW180_DEG  //not sure if this command will work or if should be more specific to mag
 
+ #if defined(FOXEERF745_AIO_V2)
+ //BMI270
+ #define USE_SPI_GYRO
+ #define USE_ACCGYRO_BMI270
+ #define BMI270_CS_PIN           PA15
+ #define BMI270_SPI_INSTANCE     SPI3
+ #define ACC_BMI270_ALIGN        CW180_DEG
+ #define GYRO_BMI270_ALIGN       CW180_DEG
+ #endif
+
  #define USE_BARO
  #define USE_BARO_BMP280
  #define BARO_I2C_INSTANCE           (I2CDEV_1)

diff --git a/src/main/target/FOXEERF745_AIO/target.mk b/src/main/target/FOXEERF745_AIO/target.mk
@@ -2,11 +2,12 @@ F7X5XG_TARGETS += $(TARGET)
 FEATURES       += VCP ONBOARDFLASH
 
 TARGET_SRC = \
+            drivers/accgyro/accgyro_spi_bmi270.c \
             drivers/accgyro/accgyro_spi_mpu6000.c \
-						drivers/accgyro/accgyro_mpu.c \
+            drivers/accgyro/accgyro_mpu.c \
             drivers/barometer/barometer_bmp280.c \
             drivers/compass/compass_hmc5883l.c \
             drivers/compass/compass_qmc5883l.c \
-					  drivers/compass/compass_lis3mdl.c \
+            drivers/compass/compass_lis3mdl.c \
             drivers/light_ws2811strip.c \
             drivers/max7456.c