Merge branch 'master' into 20231108_BETAFPVF411RX_BMI270

emuflight · Nov 8, 2023 · 66778f0 · 66778f0
2 parents 8ea64fd + 3fd716c
commit 66778f0
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/src/main/target/GEPRCF411_AIO/target.h b/src/main/target/GEPRCF411_AIO/target.h
@@ -60,6 +60,20 @@
 #define USE_ACC_SPI_MPU6500
 #define ACC_MPU6500_ALIGN       CW180_DEG
 
+#define USE_ACC_SPI_ICM42688P
+#define USE_GYRO_SPI_ICM42688P
+#define ACC_ICM42688P_ALIGN      CW180_DEG
+#define GYRO_ICM42688P_ALIGN     CW180_DEG
+#define ICM42688P_CS_PIN         PA4
+#define ICM42688P_SPI_INSTANCE   SPI1
+
+#define USE_SPI_GYRO
+#define USE_ACCGYRO_BMI270
+#define ACC_BMI270_ALIGN         CW180_DEG
+#define GYRO_BMI270_ALIGN        CW180_DEG
+#define BMI270_CS_PIN            PA4
+#define BMI270_SPI_INSTANCE      SPI1
+
 // *************** Baro **************************
 #define USE_I2C
 
@@ -131,7 +145,7 @@
 #define USE_ESCSERIAL
 #define USE_SERIAL_4WAY_BLHELI_INTERFACE
 
-#define DEFAULT_FEATURES                (FEATURE_OSD | FEATURE_TELEMETRY | FEATURE_SOFTSERIAL)
+#define DEFAULT_FEATURES                (FEATURE_OSD | FEATURE_TELEMETRY | FEATURE_AIRMODE | FEATURE_SOFTSERIAL)
 #define DEFAULT_VOLTAGE_METER_SOURCE    VOLTAGE_METER_ADC
 #define DEFAULT_CURRENT_METER_SOURCE    CURRENT_METER_ADC
 #define CURRENT_METER_SCALE_DEFAULT         100

diff --git a/src/main/target/GEPRCF411_AIO/target.mk b/src/main/target/GEPRCF411_AIO/target.mk
@@ -2,14 +2,16 @@ F411_TARGETS    += $(TARGET)
 FEATURES        += VCP ONBOARDFLASH
 
 TARGET_SRC = \
-						drivers/accgyro/accgyro_mpu.c \
-						drivers/accgyro/accgyro_spi_mpu6500.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_icm426xx.c \
+			drivers/accgyro/accgyro_spi_bmi270.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/light_ws2811strip.c\
+			drivers/compass/compass_hmc5883l.c \
+			drivers/compass/compass_qmc5883l.c\
+			drivers/light_ws2811strip.c\
             drivers/max7456.c