4.4.1: Latest changes from unified targets, and sdcard build fix. (#1…

…2415)

src/config/ALIENFLIGHTNGF7_ELRS/config.h

@@ -39,8 +39,17 @@
 #define USE_MAG_SPI_AK8963
 #define USE_MAX7456
 #define USE_SDCARD
+#define USE_RX_SPI
 #define USE_RX_EXPRESSLRS
 #define USE_RX_EXPRESSLRS_TELEMETRY
 #define USE_RX_SX1280
 #define RX_CHANNELS_AETR
+#define RX_SPI_DEFAULT_PROTOCOL         RX_SPI_EXPRESSLRS
+#define RX_EXPRESSLRS_TIMER_INSTANCE    TIM5
+#define RX_EXPRESSLRS_SPI_RESET_PIN     PB6
+#define RX_EXPRESSLRS_SPI_BUSY_PIN      PB7
+#define RX_SPI_CS                       PA15
+#define RX_SPI_EXTI                     PB15
+#define RX_SPI_BIND                     PB2
+#define RX_SPI_LED                      PB9
 

src/config/BETAFPVF4SX1280/config.h

@@ -36,8 +36,17 @@
 #define USE_GYRO_SPI_MPU6000
 #define USE_ACCGYRO_BMI270
 #define USE_MAX7456
+#define USE_RX_SPI
 #define USE_RX_EXPRESSLRS
 #define USE_RX_EXPRESSLRS_TELEMETRY
 #define USE_RX_SX1280
 #define RX_CHANNELS_AETR
+#define RX_SPI_DEFAULT_PROTOCOL         RX_SPI_EXPRESSLRS
+#define RX_EXPRESSLRS_TIMER_INSTANCE    TIM5
+#define RX_EXPRESSLRS_SPI_RESET_PIN     PB9
+#define RX_EXPRESSLRS_SPI_BUSY_PIN      PA13
+#define RX_SPI_CS                       PA15
+#define RX_SPI_EXTI                     PC13
+#define RX_SPI_BIND                     PB2
+#define RX_SPI_LED                      PC15
 

src/config/CRAZYBEEF4SX1280/config.h

@@ -37,11 +37,19 @@
 #define USE_ACCGYRO_BMI270
 #define USE_GYRO_SPI_ICM42688P
 #define USE_ACC_SPI_ICM42688P
+#define USE_FLASH_W25Q128FV
 #define USE_MAX7456
 #define USE_RX_SPI
 #define USE_RX_EXPRESSLRS
 #define USE_RX_EXPRESSLRS_TELEMETRY
 #define USE_RX_SX1280
 #define RX_CHANNELS_AETR
-#define USE_FLASH_W25Q128FV
+#define RX_SPI_DEFAULT_PROTOCOL         RX_SPI_EXPRESSLRS
+#define RX_EXPRESSLRS_TIMER_INSTANCE    TIM3
+#define RX_EXPRESSLRS_SPI_RESET_PIN     PA8
+#define RX_EXPRESSLRS_SPI_BUSY_PIN      PA13
+#define RX_SPI_CS                       PA15
+#define RX_SPI_EXTI                     PC14
+#define RX_SPI_BIND                     PB2
+#define RX_SPI_LED                      PB9
 

src/config/DARWINF4SX1280HD/config.h

@@ -42,9 +42,18 @@
 #define USE_GYRO_SPI_ICM42688P
 #define USE_ACC_SPI_ICM42605
 #define USE_ACC_SPI_ICM42688P
+#define USE_MAX7456
+#define USE_RX_SPI
 #define USE_RX_EXPRESSLRS
 #define USE_RX_EXPRESSLRS_TELEMETRY
 #define USE_RX_SX1280
 #define RX_CHANNELS_AETR
-#define USE_MAX7456
+#define RX_SPI_DEFAULT_PROTOCOL         RX_SPI_EXPRESSLRS
+#define RX_EXPRESSLRS_TIMER_INSTANCE    TIM5
+#define RX_EXPRESSLRS_SPI_RESET_PIN     PB9
+#define RX_EXPRESSLRS_SPI_BUSY_PIN      PA13
+#define RX_SPI_CS                       PA15
+#define RX_SPI_EXTI                     PC13
+#define RX_SPI_BIND                     PB2
+#define RX_SPI_LED                      PC15
 

src/config/EMAX_TINYHAWKF4SX1280/config.h

@@ -37,8 +37,18 @@
 #define USE_ACC_SPI_ICM20689
 #define USE_ACC_SPI_ICM42688P
 #define USE_GYRO_SPI_ICM42688P
+#define USE_MAX7456
+#define USE_RX_SPI
 #define USE_RX_EXPRESSLRS
 #define USE_RX_EXPRESSLRS_TELEMETRY
 #define USE_RX_SX1280
-#define USE_MAX7456
+#define RX_CHANNELS_AETR
+#define RX_SPI_DEFAULT_PROTOCOL         RX_SPI_EXPRESSLRS
+#define RX_EXPRESSLRS_TIMER_INSTANCE    TIM5
+#define RX_EXPRESSLRS_SPI_RESET_PIN     PA8
+#define RX_EXPRESSLRS_SPI_BUSY_PIN      PA13
+#define RX_SPI_CS                       PA15
+#define RX_SPI_EXTI                     PC14
+#define RX_SPI_BIND                     PB2
+#define RX_SPI_LED                      PB9
 

src/config/FF_RACEPIT/config.h

@@ -32,5 +32,6 @@
 
 #define USE_ACC_SPI_MPU6000
 #define USE_GYRO_SPI_MPU6000
+#define USE_FLASH_M25P16
 #define USE_MAX7456
 

src/config/FLYWOOF405NANO/config.h

@@ -32,9 +32,10 @@
 
 #define USE_GYRO_SPI_MPU6000
 #define USE_ACC_SPI_MPU6000
+#define USE_ACCGYRO_BMI270
 #define USE_GYRO_SPI_ICM42688P
 #define USE_ACC_SPI_ICM42688P
+#define USE_BARO_BMP280
 #define USE_FLASH_W25Q128FV
 #define USE_MAX7456
-#define USE_BARO_BMP280
 

src/config/FLYWOOF405PRO/config.h

@@ -32,6 +32,9 @@
 
 #define USE_GYRO_SPI_ICM20689
 #define USE_ACC_SPI_ICM20689
+#define USE_GYRO_SPI_ICM42688P
+#define USE_ACC_SPI_ICM42688P
+#define USE_BARO_DPS310
 #define USE_FLASH_W25Q128FV
 #define USE_MAX7456
 

src/config/FLYWOOF411/config.h

@@ -34,5 +34,6 @@
 #define USE_ACC_SPI_MPU6000
 #define USE_GYRO_SPI_ICM20689
 #define USE_GYRO_SPI_MPU6000
+#define USE_FLASH_W25Q128FV
 #define USE_MAX7456
 

src/config/GEPRCF411SX1280/config.h

@@ -42,8 +42,17 @@
 #define USE_GYRO_SPI_ICM42688P
 #define USE_ACC_SPI_ICM42605
 #define USE_ACC_SPI_ICM42688P
+#define USE_RX_SPI
 #define USE_RX_EXPRESSLRS
 #define USE_RX_EXPRESSLRS_TELEMETRY
 #define USE_RX_SX1280
 #define RX_CHANNELS_AETR
+#define RX_SPI_DEFAULT_PROTOCOL         RX_SPI_EXPRESSLRS
+#define RX_EXPRESSLRS_TIMER_INSTANCE    TIM5
+#define RX_EXPRESSLRS_SPI_RESET_PIN     PB9
+#define RX_EXPRESSLRS_SPI_BUSY_PIN      PA13
+#define RX_SPI_CS                       PA15
+#define RX_SPI_EXTI                     PC13
+#define RX_SPI_BIND                     PB2
+#define RX_SPI_LED                      PC15
 

src/config/GEPRCF722_BT_HD/config.h

@@ -35,6 +35,6 @@
 #define USE_ACCGYRO_BMI270
 #define USE_ACC_SPI_ICM42688P
 #define USE_GYRO_SPI_ICM42688P
-#define USE_FLASH_W25Q128FV
+#define USE_SDCARD
 #define USE_MAX7456
 

src/config/HAKRCF411D/config.h

@@ -30,8 +30,11 @@
 #define BOARD_NAME        HAKRCF411D
 #define MANUFACTURER_ID   HARC
 
+#define USE_ACC_SPI_MPU6000
+#define USE_GYRO_SPI_MPU6000
 #define USE_GYRO_SPI_ICM42688P
 #define USE_ACC_SPI_ICM42688P
+#define USE_BARO_BMP280
 #define USE_BARO_DPS310
 #define USE_FLASH_W25Q128FV
 #define USE_MAX7456

src/config/HGLRCF411SX1280/config.h

@@ -33,10 +33,19 @@
 #define USE_ACC_SPI_ICM42688P
 #define USE_GYRO_SPI_ICM42688P
 #define USE_ACCGYRO_BMI270
+#define USE_FLASH_W25Q128FV
 #define USE_MAX7456
+#define USE_RX_SPI
 #define USE_RX_EXPRESSLRS
 #define USE_RX_EXPRESSLRS_TELEMETRY
 #define USE_RX_SX1280
 #define RX_CHANNELS_AETR
-#define USE_FLASH_W25Q128FV
+#define RX_SPI_DEFAULT_PROTOCOL         RX_SPI_EXPRESSLRS
+#define RX_EXPRESSLRS_TIMER_INSTANCE    TIM5
+#define RX_EXPRESSLRS_SPI_RESET_PIN     PB9
+#define RX_EXPRESSLRS_SPI_BUSY_PIN      PA13
+#define RX_SPI_CS                       PA15
+#define RX_SPI_EXTI                     PC13
+#define RX_SPI_BIND                     PB2
+#define RX_SPI_LED                      PC15
 

src/config/IFLIGHT_F4SX1280/config.h

@@ -32,9 +32,17 @@
 
 #define USE_ACCGYRO_BMI270
 #define USE_MAX7456
+#define USE_RX_SPI
 #define USE_RX_EXPRESSLRS
 #define USE_RX_EXPRESSLRS_TELEMETRY
 #define USE_RX_SX1280
 #define RX_CHANNELS_AETR
-#define USE_RX_SPI
+#define RX_SPI_DEFAULT_PROTOCOL         RX_SPI_EXPRESSLRS
+#define RX_EXPRESSLRS_TIMER_INSTANCE    TIM5
+#define RX_EXPRESSLRS_SPI_RESET_PIN     PA8
+#define RX_EXPRESSLRS_SPI_BUSY_PIN      PA13
+#define RX_SPI_CS                       PA15
+#define RX_SPI_EXTI                     PC14
+#define RX_SPI_BIND                     PB2
+#define RX_SPI_LED                      PC15
 

src/config/MAMBAG4/config.h

@@ -0,0 +1,38 @@
+/*
+ * This file is part of Betaflight.
+ *
+ * Betaflight is free software. You can redistribute this software
+ * and/or modify this software under the terms of the GNU General
+ * Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * Betaflight is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this software.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+   This file has been auto generated from unified-targets repo.
+
+   The auto generation is transitional only, please ensure you update unified targets and not this file until the transition has complete.
+*/
+
+#define FC_TARGET_MCU     STM32G47X
+
+#define BOARD_NAME        MAMBAG4
+#define MANUFACTURER_ID   DIAT
+
+#define USE_ACC_SPI_MPU6000
+#define USE_BARO_DPS310
+#define USE_GYRO_SPI_MPU6000
+#define USE_FLASH_W25Q128FV
+#define USE_MAX7456
+

src/config/MATEKF405STD_CLONE/config.h

@@ -32,6 +32,8 @@
 
 #define USE_ACC_SPI_MPU6000
 #define USE_GYRO_SPI_MPU6000
+#define USE_ACC_SPI_MPU6500
+#define USE_GYRO_SPI_MPU6500
 #define USE_ACC_SPI_ICM20689
 #define USE_GYRO_SPI_ICM20689
 #define USE_ACCGYRO_BMI270

src/config/NEUTRONRCF411SX1280/config.h

@@ -39,9 +39,17 @@
 #define USE_ACC_SPI_MPU6000
 #define USE_GYRO_SPI_MPU6000
 #define USE_MAX7456
+#define USE_RX_SPI
 #define USE_RX_EXPRESSLRS
 #define USE_RX_EXPRESSLRS_TELEMETRY
 #define USE_RX_SX1280
 #define RX_CHANNELS_AETR
-#define USE_RX_SPI
+#define RX_SPI_DEFAULT_PROTOCOL         RX_SPI_EXPRESSLRS
+#define RX_EXPRESSLRS_TIMER_INSTANCE    TIM5
+#define RX_EXPRESSLRS_SPI_RESET_PIN     PB9
+#define RX_EXPRESSLRS_SPI_BUSY_PIN      PA13
+#define RX_SPI_CS                       PA15
+#define RX_SPI_EXTI                     PC13
+#define RX_SPI_BIND                     PB2
+#define RX_SPI_LED                      PC15
 

src/config/OMNINXT7/config.h

@@ -30,10 +30,11 @@
 #define BOARD_NAME        OMNINXT7
 #define MANUFACTURER_ID   AIRB
 
-#define USE_GYRO_SPI_MPU6500
-#define USE_ACC_SPI_MPU6500
-#define USE_GYRO_SPI_MPU6000
 #define USE_ACC_SPI_MPU6000
+#define USE_GYRO_SPI_MPU6000
+#define USE_ACC_SPI_MPU6500
+#define USE_GYRO_SPI_MPU6500
 #define USE_BARO_SPI_LPS
+#define USE_FLASH_W25Q128FV
 #define USE_MAX7456
 

src/config/SPRACINGH7EXTREME/config.h

@@ -22,7 +22,7 @@
 /*
    This file has been auto generated from unified-targets repo.
 
-   The auto generation is transitional only.
+   The auto generation is transitional only, please ensure you update unified targets and not this file until the transition has complete.
 */
 
 #define FC_TARGET_MCU     STM32H750
@@ -32,13 +32,19 @@
 
 #define TARGET_BOARD_IDENTIFIER "SP7E"
 #define USBD_PRODUCT_STRING "SPRacingH7EXTREME"
+
+#define FC_VMA_ADDRESS    0x97CE0000
+
 #define EEPROM_SIZE 8192
+
 #define USE_SPRACING_PERSISTENT_RTC_WORKAROUND
+
 #define USE_BUTTONS
 #define BUTTON_A_PIN            PE4
 #define BUTTON_A_PIN_INVERTED
 #define BUTTON_B_PIN            PE4
 #define BUTTON_B_PIN_INVERTED
+
 #define USE_QUADSPI
 #define USE_QUADSPI_DEVICE_1
 #define QUADSPI1_SCK_PIN PB2
@@ -54,9 +60,13 @@
 #define QUADSPI1_BK2_CS_PIN NONE
 #define QUADSPI1_MODE QUADSPI_MODE_BK1_ONLY
 #define QUADSPI1_CS_FLAGS (QUADSPI_BK1_CS_HARDWARE | QUADSPI_BK2_CS_NONE | QUADSPI_CS_MODE_LINKED)
+
 #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT
+
 #define FLASH_QUADSPI_INSTANCE    QUADSPI
+
 #define CONFIG_IN_EXTERNAL_FLASH
+
 #define SDCARD_DETECT_PIN PD10
 #define SDCARD_DETECT_INVERTED
 #define SDIO_DEVICE             SDIODEV_1
@@ -67,33 +77,44 @@
 #define SDIO_D1_PIN             PC9
 #define SDIO_D2_PIN             PC10
 #define SDIO_D3_PIN             PC11
+
 #define USE_SPI
+
 #define USE_SPI_DEVICE_2
 #define SPI2_SCK_PIN            PD3
 #define SPI2_MISO_PIN           PC2
 #define SPI2_MOSI_PIN           PC3
 #define SPI2_NSS_PIN            PB12
+
 #define USE_SPI_DEVICE_3
 #define SPI3_SCK_PIN            PB3
 #define SPI3_MISO_PIN           PB4
 #define SPI3_MOSI_PIN           PD6
 #define SPI3_NSS_PIN            PA15
+
 #define USE_SPI_DEVICE_4
 #define SPI4_SCK_PIN            PE12
 #define SPI4_MISO_PIN           PE13
 #define SPI4_MOSI_PIN           PE14
 #define SPI4_NSS_PIN            PE11
+
 #define USE_USB_ID
+
 #define USE_I2C
 #define USE_I2C_DEVICE_1
-#define I2C1_SCL PB8
-#define I2C1_SDA PB9
+#define I2C1_SCL_PIN PB8
+#define I2C1_SDA_PIN PB9
 #define I2C_DEVICE (I2CDEV_1)
+
 #define ENSURE_MPU_DATA_READY_IS_LOW
+
 #define USE_PID_AUDIO
+
 #define VTX_RTC6705_OPTIONAL
+
 #define ADC1_DMA_OPT 8
 #define ADC3_DMA_OPT 9
+
 #define USE_ACC_SPI_MPU6500
 #define USE_GYRO_SPI_MPU6500
 #define USE_BARO_BMP388
@@ -103,3 +124,4 @@
 #define USE_SDCARD
 #define USE_CAMERA_CONTROL
 #define USE_MAX7456
+