From 3998be0800a2cc415c3b70217213e5c7cde4ea0a Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Sun, 26 Jan 2025 19:45:25 +0100 Subject: [PATCH 1/8] Add GYRO2 option to use BMI270 --- src/main/target/MICOAIR743AIO/CMakeLists.txt | 3 ++- src/main/target/MICOAIR743AIO/target.h | 7 +++++++ src/main/target/MICOAIR743V2/CMakeLists.txt | 4 +++- src/main/target/MICOAIR743V2/target.h | 10 +++++++++- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/main/target/MICOAIR743AIO/CMakeLists.txt b/src/main/target/MICOAIR743AIO/CMakeLists.txt index 43f14c7abd..1fe4b9d6fd 100755 --- a/src/main/target/MICOAIR743AIO/CMakeLists.txt +++ b/src/main/target/MICOAIR743AIO/CMakeLists.txt @@ -1 +1,2 @@ -target_stm32h743xi(MICOAIR743AIO) \ No newline at end of file +target_stm32h743xi(MICOAIR743AIO) +target_stm32h743xi(MICOAIR743AIO_GYRO2) \ No newline at end of file diff --git a/src/main/target/MICOAIR743AIO/target.h b/src/main/target/MICOAIR743AIO/target.h index 90ea60f0a0..2c064734b6 100755 --- a/src/main/target/MICOAIR743AIO/target.h +++ b/src/main/target/MICOAIR743AIO/target.h @@ -42,6 +42,7 @@ #define SPI2_MISO_PIN PC2 #define SPI2_MOSI_PIN PC3 +#ifndef MICOAIR743AIO_GYRO2 #define USE_IMU_BMI088 #define IMU_BMI088_ALIGN CW270_DEG #define BMI088_SPI_BUS BUS_SPI2 @@ -49,6 +50,12 @@ #define BMI088_GYRO_EXTI_PIN PD7 #define BMI088_ACC_CS_PIN PD4 #define BMI088_ACC_EXTI_PIN PB14 +#else +#define USE_IMU_BMI270 +#define IMU_BMI270 CW270_DEG +#define BMI270_SPI_BUS BUS_SPI2 +#define BMI270_CS_PIN PA15 +#endif // *************** UART ***************************** #define USE_VCP diff --git a/src/main/target/MICOAIR743V2/CMakeLists.txt b/src/main/target/MICOAIR743V2/CMakeLists.txt index a554c48c42..581ccbc324 100755 --- a/src/main/target/MICOAIR743V2/CMakeLists.txt +++ b/src/main/target/MICOAIR743V2/CMakeLists.txt @@ -1,2 +1,4 @@ target_stm32h743xi(MICOAIR743V2) -target_stm32h743xi(MICOAIR743V2_EXTMAG) \ No newline at end of file +target_stm32h743xi(MICOAIR743V2_EXTMAG) +target_stm32h743xi(MICOAIR743V2_GYRO2) +target_stm32h743xi(MICOAIR743V2_GYRO2_EXTMAG) \ No newline at end of file diff --git a/src/main/target/MICOAIR743V2/target.h b/src/main/target/MICOAIR743V2/target.h index 78de91df4a..b3dd9146a5 100755 --- a/src/main/target/MICOAIR743V2/target.h +++ b/src/main/target/MICOAIR743V2/target.h @@ -51,6 +51,13 @@ #define MAX7456_SPI_BUS BUS_SPI1 #define MAX7456_CS_PIN PB12 +#if defined(MICOAIR743V2_GYRO2) || defined(MICOAIR743V2_GYRO2_EXTMAG) +#define USE_IMU_BMI270 +#define IMU_BMI270_ALIGN CW270_DEG +#define BMI270_SPI_BUS BUS_SPI3 +#define BMI270_CS_PIN PA15 +#define BMI270_EXTI_PIN PB7 +#else #define USE_IMU_BMI088 #define IMU_BMI088_ALIGN CW270_DEG #define BMI088_SPI_BUS BUS_SPI2 @@ -58,6 +65,7 @@ #define BMI088_GYRO_EXTI_PIN PC15 #define BMI088_ACC_CS_PIN PD4 #define BMI088_ACC_EXTI_PIN PC14 +#endif // *************** UART ***************************** #define USE_VCP @@ -115,7 +123,7 @@ #define SPL06_I2C_ADDR 0x77 #define USE_MAG -#ifdef MICOAIR743V2_EXTMAG +#if defined(MICOAIR743V2_EXTMAG) || defined(MICOAIR743V2_GYRO2_EXTMAG) // External compass #define USE_MAG_ALL #define MAG_I2C_BUS BUS_I2C1 From 9a2e83ff780a8654a73236fc979a68786176a4ef Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Sun, 26 Jan 2025 19:49:32 +0100 Subject: [PATCH 2/8] Update target.h Add SPI3 definition --- src/main/target/MICOAIR743V2/target.h | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/target/MICOAIR743V2/target.h b/src/main/target/MICOAIR743V2/target.h index b3dd9146a5..9bf482dc64 100755 --- a/src/main/target/MICOAIR743V2/target.h +++ b/src/main/target/MICOAIR743V2/target.h @@ -39,11 +39,12 @@ #define USE_SPI_DEVICE_1 #define USE_SPI_DEVICE_2 -#define SPI1_SCK_PIN PA5 + +#define SPI1_SCK_PIN PA5 #define SPI1_MISO_PIN PA6 #define SPI1_MOSI_PIN PA7 -#define SPI2_SCK_PIN PD3 +#define SPI2_SCK_PIN PD3 #define SPI2_MISO_PIN PC2 #define SPI2_MOSI_PIN PC3 @@ -53,10 +54,14 @@ #if defined(MICOAIR743V2_GYRO2) || defined(MICOAIR743V2_GYRO2_EXTMAG) #define USE_IMU_BMI270 +#define USE_SPI_DEVICE_3 +#define SPI3_MISO_PIN PB4 +#define SPI3_MOSI_PIN PD6 + #define IMU_BMI270_ALIGN CW270_DEG #define BMI270_SPI_BUS BUS_SPI3 -#define BMI270_CS_PIN PA15 -#define BMI270_EXTI_PIN PB7 +#define BMI270_CS_PIN PA15 +#define BMI270_EXTI_PIN PB7 #else #define USE_IMU_BMI088 #define IMU_BMI088_ALIGN CW270_DEG From b88905f7e429346f52ea6f8a2e7ab774cb2a73eb Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Sun, 26 Jan 2025 20:02:52 +0100 Subject: [PATCH 3/8] Add missing SPI3 SCK pin --- src/main/target/MICOAIR743V2/target.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/target/MICOAIR743V2/target.h b/src/main/target/MICOAIR743V2/target.h index 9bf482dc64..9401c0e31a 100755 --- a/src/main/target/MICOAIR743V2/target.h +++ b/src/main/target/MICOAIR743V2/target.h @@ -40,11 +40,11 @@ #define USE_SPI_DEVICE_2 -#define SPI1_SCK_PIN PA5 +#define SPI1_SCK_PIN PA5 #define SPI1_MISO_PIN PA6 #define SPI1_MOSI_PIN PA7 -#define SPI2_SCK_PIN PD3 +#define SPI2_SCK_PIN PD3 #define SPI2_MISO_PIN PC2 #define SPI2_MOSI_PIN PC3 @@ -57,6 +57,7 @@ #define USE_SPI_DEVICE_3 #define SPI3_MISO_PIN PB4 #define SPI3_MOSI_PIN PD6 +#define SPI3_SCK_PIN PA7 #define IMU_BMI270_ALIGN CW270_DEG #define BMI270_SPI_BUS BUS_SPI3 From 1c3699b8394dd35df70732619cd2d4175f4bd4d1 Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Sun, 26 Jan 2025 16:37:37 -0500 Subject: [PATCH 4/8] Update target.h --- src/main/target/MICOAIR743AIO/target.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/target/MICOAIR743AIO/target.h b/src/main/target/MICOAIR743AIO/target.h index 2c064734b6..c95e9f1e82 100755 --- a/src/main/target/MICOAIR743AIO/target.h +++ b/src/main/target/MICOAIR743AIO/target.h @@ -52,7 +52,7 @@ #define BMI088_ACC_EXTI_PIN PB14 #else #define USE_IMU_BMI270 -#define IMU_BMI270 CW270_DEG +#define IMU_BMI270_ALIGN CW270_DEG #define BMI270_SPI_BUS BUS_SPI2 #define BMI270_CS_PIN PA15 #endif From 866451d6c0307c1f69a2972e78e76ec7e080f76c Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Mon, 27 Jan 2025 15:35:53 +0100 Subject: [PATCH 5/8] fix alignment. gyro not working. --- src/main/target/MICOAIR743AIO/target.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/target/MICOAIR743AIO/target.h b/src/main/target/MICOAIR743AIO/target.h index c95e9f1e82..dce97cefcf 100755 --- a/src/main/target/MICOAIR743AIO/target.h +++ b/src/main/target/MICOAIR743AIO/target.h @@ -52,7 +52,7 @@ #define BMI088_ACC_EXTI_PIN PB14 #else #define USE_IMU_BMI270 -#define IMU_BMI270_ALIGN CW270_DEG +#define IMU_BMI270_ALIGN CW0_DEG #define BMI270_SPI_BUS BUS_SPI2 #define BMI270_CS_PIN PA15 #endif From 16abd52eebf2c04c1ee4d5dd6171048d69c38705 Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Tue, 28 Jan 2025 10:25:52 +0100 Subject: [PATCH 6/8] Update target.h alignment --- src/main/target/MICOAIR743V2/target.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/target/MICOAIR743V2/target.h b/src/main/target/MICOAIR743V2/target.h index 9401c0e31a..fdda91f6e5 100755 --- a/src/main/target/MICOAIR743V2/target.h +++ b/src/main/target/MICOAIR743V2/target.h @@ -57,12 +57,12 @@ #define USE_SPI_DEVICE_3 #define SPI3_MISO_PIN PB4 #define SPI3_MOSI_PIN PD6 -#define SPI3_SCK_PIN PA7 +#define SPI3_SCK_PIN PA7 -#define IMU_BMI270_ALIGN CW270_DEG +#define IMU_BMI270_ALIGN CW0_DEG #define BMI270_SPI_BUS BUS_SPI3 #define BMI270_CS_PIN PA15 -#define BMI270_EXTI_PIN PB7 +//#define BMI270_EXTI_PIN PB7 #else #define USE_IMU_BMI088 #define IMU_BMI088_ALIGN CW270_DEG From 7f3c6b143dc906306370a1f7129cd6459cc7d91d Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Tue, 28 Jan 2025 10:27:40 +0100 Subject: [PATCH 7/8] Update target.h --- src/main/target/MICOAIR743V2/target.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/target/MICOAIR743V2/target.h b/src/main/target/MICOAIR743V2/target.h index fdda91f6e5..dbb55fdc1d 100755 --- a/src/main/target/MICOAIR743V2/target.h +++ b/src/main/target/MICOAIR743V2/target.h @@ -40,11 +40,11 @@ #define USE_SPI_DEVICE_2 -#define SPI1_SCK_PIN PA5 +#define SPI1_SCK_PIN PA5 #define SPI1_MISO_PIN PA6 #define SPI1_MOSI_PIN PA7 -#define SPI2_SCK_PIN PD3 +#define SPI2_SCK_PIN PD3 #define SPI2_MISO_PIN PC2 #define SPI2_MOSI_PIN PC3 @@ -55,9 +55,9 @@ #if defined(MICOAIR743V2_GYRO2) || defined(MICOAIR743V2_GYRO2_EXTMAG) #define USE_IMU_BMI270 #define USE_SPI_DEVICE_3 -#define SPI3_MISO_PIN PB4 -#define SPI3_MOSI_PIN PD6 -#define SPI3_SCK_PIN PA7 +#define SPI3_MISO_PIN PB4 +#define SPI3_MOSI_PIN PD6 +#define SPI3_SCK_PIN PA7 #define IMU_BMI270_ALIGN CW0_DEG #define BMI270_SPI_BUS BUS_SPI3 From c3be5b621a65e6ba64371a70d0d23a54265b5df9 Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Tue, 28 Jan 2025 10:28:26 +0100 Subject: [PATCH 8/8] Update target.h --- src/main/target/MICOAIR743V2/target.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/target/MICOAIR743V2/target.h b/src/main/target/MICOAIR743V2/target.h index dbb55fdc1d..9b514f8e54 100755 --- a/src/main/target/MICOAIR743V2/target.h +++ b/src/main/target/MICOAIR743V2/target.h @@ -41,12 +41,12 @@ #define SPI1_SCK_PIN PA5 -#define SPI1_MISO_PIN PA6 -#define SPI1_MOSI_PIN PA7 +#define SPI1_MISO_PIN PA6 +#define SPI1_MOSI_PIN PA7 #define SPI2_SCK_PIN PD3 -#define SPI2_MISO_PIN PC2 -#define SPI2_MOSI_PIN PC3 +#define SPI2_MISO_PIN PC2 +#define SPI2_MOSI_PIN PC3 #define USE_MAX7456 #define MAX7456_SPI_BUS BUS_SPI1