fix compiler warnings - KAKUTEF7*; add icm20689

emuflight · Mar 1, 2024 · 3ee64f5 · 3ee64f5
1 parent f5c35c6
commit 3ee64f5
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 10 deletions.
diff --git a/src/main/target/KAKUTEF7HDV/KAKUTEF7V2.mk b/src/main/target/KAKUTEF7HDV/KAKUTEF7V2.mk
@@ -0,0 +1 @@
+#KAKUTEF7V15.mk file
diff --git a/src/main/target/KAKUTEF7HDV/target.h b/src/main/target/KAKUTEF7HDV/target.h
@@ -20,21 +20,21 @@
 
 #pragma once
 
+#define FC_TARGET_MCU                   STM32F745  // not used in EmuF
+#define TARGET_BOARD_IDENTIFIER        "S745"      // generic ID
+#define TARGET_MANUFACTURER_IDENTIFIER "HBRO"
+
 //#define USE_TARGET_CONFIG
 #if defined(KAKUTEF7MINIV2)
-#define TARGET_BOARD_IDENTIFIER "KF7M"
-#define USBD_PRODUCT_STRING "KakuteF7 Mini V2"
+#define USBD_PRODUCT_STRING "KAKUTEF7MINIV2"
+#elif defined(KAKUTEF7V2)
+#define USBD_PRODUCT_STRING "KAKUTEF7V2"
 #elif defined(KAKUTEF7V15)
-#define TARGET_BOARD_IDENTIFIER "KTF7"
-#define USBD_PRODUCT_STRING "Kakutef7 v15"
+#define USBD_PRODUCT_STRING "KAKUTEF7V15"
 #else
-#define TARGET_BOARD_IDENTIFIER "KTF7"
-#define USBD_PRODUCT_STRING "KakuteF7 HD"
+#define USBD_PRODUCT_STRING "KAKUTEF7HDV"
 #endif
 
-#define TARGET_BOARD_IDENTIFIER "KTF7"
-#define USBD_PRODUCT_STRING "KakuteF7"
-
 #define LED0_PIN                PA2
 
 #define USE_BEEPER
@@ -44,6 +44,14 @@
 #define USE_ACC
 #define USE_GYRO
 
+//ICM20689
+#define USE_ACC_SPI_ICM20689
+#define USE_GYRO_SPI_ICM20689
+#define ACC_ICM20689_ALIGN         CW270_DEG
+#define GYRO_ICM20689_ALIGN        CW270_DEG
+#define ICM20689_CS_PIN            PE4
+#define ICM20689_SPI_INSTANCE      SPI4
+
 // MPU6000
 #define USE_ACC_SPI_MPU6000
 #define USE_GYRO_SPI_MPU6000
@@ -119,7 +127,7 @@
 #define SPI4_MISO_PIN           PE5
 #define SPI4_MOSI_PIN           PE6
 
-#if defined(KAKUTEF7V15) || defined(KAKUTEF7MINIV2)
+#if defined(KAKUTEF7V15) || defined(KAKUTEF7V2) ||defined(KAKUTEF7MINIV2)
 #define CAMERA_CONTROL_PIN      PB3
 
 #define USE_MAX7456

diff --git a/src/main/target/KAKUTEF7HDV/target.mk b/src/main/target/KAKUTEF7HDV/target.mk
@@ -7,6 +7,7 @@ endif
 TARGET_SRC = \
             drivers/accgyro/accgyro_mpu.c \
             drivers/accgyro/accgyro_spi_mpu6000.c \
+            drivers/accgyro/accgyro_spi_icm20689.c \
             drivers/barometer/barometer_bmp280.c \
             drivers/compass/compass_hmc5883l.c \
             drivers/compass/compass_qmc5883l.c \