From 9feab27e4f72c2bfdb169d8127ece2552e0c6269 Mon Sep 17 00:00:00 2001
From: Jonathan Hudson <jh+github@daria.co.uk>
Date: Fri, 7 Mar 2025 14:19:56 +0000
Subject: [PATCH 1/2] fix MATEKF405 variants BBL logging

---
 src/main/target/MATEKF405/CMakeLists.txt |  1 +
 src/main/target/MATEKF405/target.h       | 33 ++++++++++--------------
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/src/main/target/MATEKF405/CMakeLists.txt b/src/main/target/MATEKF405/CMakeLists.txt
index ebf457cda2..7bd41c4111 100644
--- a/src/main/target/MATEKF405/CMakeLists.txt
+++ b/src/main/target/MATEKF405/CMakeLists.txt
@@ -1,2 +1,3 @@
 target_stm32f405xg(MATEKF405)
 target_stm32f405xg(MATEKF405OSD)
+target_stm32f405xg(MATEKF405SPI)
diff --git a/src/main/target/MATEKF405/target.h b/src/main/target/MATEKF405/target.h
index 50786e8efc..9d4906ece9 100644
--- a/src/main/target/MATEKF405/target.h
+++ b/src/main/target/MATEKF405/target.h
@@ -47,21 +47,7 @@
 #define USE_IMU_MPU6000
 #define IMU_MPU6000_ALIGN       CW270_DEG
 
-// *************** SPI3 ********************
-#define USE_SPI_DEVICE_3
-#define SPI3_SCK_PIN            PB3
-#define SPI3_MISO_PIN   	    PB4
-#define SPI3_MOSI_PIN   	    PB5
-
-#ifdef MATEKF405OSD
-// *************** SD Card **************************
-#define USE_SDCARD
-#define USE_SDCARD_SPI
-#define SDCARD_SPI_BUS          BUS_SPI3
-#define SDCARD_CS_PIN           PC1
-
-#define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT
-#else
+#ifdef MATEKF405SPI
 // *************** M25P256 flash ********************
 #define USE_FLASHFS
 #define USE_FLASH_M25P16
@@ -69,6 +55,19 @@
 #define M25P16_CS_PIN           PC0
 
 #define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT
+#else
+// *************** SD Card **************************
+#define USE_SDCARD
+#define USE_SDCARD_SPI
+#define SDCARD_SPI_BUS          BUS_SPI3
+#define SDCARD_CS_PIN           PC1
+
+#define USE_SPI_DEVICE_3
+#define SPI3_SCK_PIN            PB3
+#define SPI3_MISO_PIN   	    PB4
+#define SPI3_MOSI_PIN   	    PB5
+
+#define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT
 #endif
 
 // *************** OSD *****************************
@@ -173,11 +172,7 @@
 #define CURRENT_METER_ADC_CHANNEL   ADC_CHN_2
 #define RSSI_ADC_CHANNEL            ADC_CHN_3
 
-#ifdef MATEKF405
-#define DEFAULT_FEATURES        (FEATURE_OSD | FEATURE_CURRENT_METER | FEATURE_VBAT | FEATURE_TELEMETRY | FEATURE_BLACKBOX )
-#else
 #define DEFAULT_FEATURES        (FEATURE_OSD | FEATURE_CURRENT_METER | FEATURE_VBAT | FEATURE_TELEMETRY )
-#endif
 #define CURRENT_METER_SCALE   179
 
 #define USE_LED_STRIP

From 87f768ec55c9be0b8d47e9bfc4cb05d29d5ceb20 Mon Sep 17 00:00:00 2001
From: Jonathan Hudson <jh+github@daria.co.uk>
Date: Thu, 20 Mar 2025 16:22:53 +0000
Subject: [PATCH 2/2] [matekf405mini] sp3 across all variants

---
 src/main/target/MATEKF405/CMakeLists.txt |  2 +-
 src/main/target/MATEKF405/target.h       | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/main/target/MATEKF405/CMakeLists.txt b/src/main/target/MATEKF405/CMakeLists.txt
index 7bd41c4111..d5c4656763 100644
--- a/src/main/target/MATEKF405/CMakeLists.txt
+++ b/src/main/target/MATEKF405/CMakeLists.txt
@@ -1,3 +1,3 @@
 target_stm32f405xg(MATEKF405)
 target_stm32f405xg(MATEKF405OSD)
-target_stm32f405xg(MATEKF405SPI)
+target_stm32f405xg(MATEKF405MINI)
diff --git a/src/main/target/MATEKF405/target.h b/src/main/target/MATEKF405/target.h
index 9d4906ece9..a33807c06a 100644
--- a/src/main/target/MATEKF405/target.h
+++ b/src/main/target/MATEKF405/target.h
@@ -47,7 +47,13 @@
 #define USE_IMU_MPU6000
 #define IMU_MPU6000_ALIGN       CW270_DEG
 
-#ifdef MATEKF405SPI
+// *************** SPI3 ********************
+#define USE_SPI_DEVICE_3
+#define SPI3_SCK_PIN            PB3
+#define SPI3_MISO_PIN   	    PB4
+#define SPI3_MOSI_PIN   	    PB5
+
+#ifdef MATEKF405MINI
 // *************** M25P256 flash ********************
 #define USE_FLASHFS
 #define USE_FLASH_M25P16
@@ -62,11 +68,6 @@
 #define SDCARD_SPI_BUS          BUS_SPI3
 #define SDCARD_CS_PIN           PC1
 
-#define USE_SPI_DEVICE_3
-#define SPI3_SCK_PIN            PB3
-#define SPI3_MISO_PIN   	    PB4
-#define SPI3_MOSI_PIN   	    PB5
-
 #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT
 #endif
 
@@ -172,7 +173,7 @@
 #define CURRENT_METER_ADC_CHANNEL   ADC_CHN_2
 #define RSSI_ADC_CHANNEL            ADC_CHN_3
 
-#define DEFAULT_FEATURES        (FEATURE_OSD | FEATURE_CURRENT_METER | FEATURE_VBAT | FEATURE_TELEMETRY )
+#define DEFAULT_FEATURES        (FEATURE_OSD | FEATURE_CURRENT_METER | FEATURE_VBAT | FEATURE_TELEMETRY | FEATURE_BLACKBOX )
 #define CURRENT_METER_SCALE   179
 
 #define USE_LED_STRIP