From bee59c23f38f1aeddf78cef7f70ce5f07ae5269f Mon Sep 17 00:00:00 2001 From: J Blackman Date: Thu, 3 Nov 2022 15:52:00 +1100 Subject: [PATCH] Adding SDCARD as a cloud build option (#11947) --- src/main/target/STM32F405/target.h | 7 +++++-- src/main/target/STM32F411/target.h | 7 +++++-- src/main/target/STM32F411SX1280/target.h | 7 +++++-- src/main/target/STM32F745/target.h | 13 ++++++++----- src/main/target/STM32F7X2/target.h | 7 +++++-- src/main/target/STM32G47X/target.h | 8 ++++++-- src/main/target/STM32H743/target.h | 7 +++++-- 7 files changed, 39 insertions(+), 17 deletions(-) diff --git a/src/main/target/STM32F405/target.h b/src/main/target/STM32F405/target.h index fcebbb7e5c..12aa9f0b1c 100644 --- a/src/main/target/STM32F405/target.h +++ b/src/main/target/STM32F405/target.h @@ -154,11 +154,14 @@ #define USE_FLASH_W25M02G // 2Gb (1Gb x 2 stacked) NAND flash support #define USE_FLASH_W25Q128FV // 16MB Winbond 25Q128 -#endif // cloud_build - #define USE_SDCARD + +#endif // CLOUD_BUILD + +#ifdef USE_SDCARD #define USE_SDCARD_SPI #define USE_SDCARD_SDIO +#endif #define USE_FLASHFS #define USE_FLASH_TOOLS diff --git a/src/main/target/STM32F411/target.h b/src/main/target/STM32F411/target.h index 3c3369bb95..7068ecac87 100644 --- a/src/main/target/STM32F411/target.h +++ b/src/main/target/STM32F411/target.h @@ -132,11 +132,14 @@ #define USE_RX_SPI -#endif // cloud_build - #define USE_SDCARD + +#endif // CLOUD_BUILD + +#ifdef USE_SDCARD #define USE_SDCARD_SPI #define USE_SDCARD_SDIO +#endif #define USE_SPI #define SPI_FULL_RECONFIGURABILITY diff --git a/src/main/target/STM32F411SX1280/target.h b/src/main/target/STM32F411SX1280/target.h index d72e76bc0f..9437289379 100644 --- a/src/main/target/STM32F411SX1280/target.h +++ b/src/main/target/STM32F411SX1280/target.h @@ -114,11 +114,14 @@ #define USE_RX_SPI -#endif // cloud_build - #define USE_SDCARD + +#endif // CLOUD_BUILD + +#ifdef USE_SDCARD #define USE_SDCARD_SPI #define USE_SDCARD_SDIO +#endif #define USE_SPI #define SPI_FULL_RECONFIGURABILITY diff --git a/src/main/target/STM32F745/target.h b/src/main/target/STM32F745/target.h index fdc871eec3..8a6d047cbe 100644 --- a/src/main/target/STM32F745/target.h +++ b/src/main/target/STM32F745/target.h @@ -125,10 +125,6 @@ #define USE_BARO_SPI_DPS310 #endif -#define USE_SDCARD -#define USE_SDCARD_SPI -#define USE_SDCARD_SDIO - #define USE_FLASHFS #define USE_FLASH_TOOLS #define USE_FLASH_M25P16 @@ -162,7 +158,14 @@ #define USE_RX_SPI -#endif // cloud_build +#define USE_SDCARD + +#endif // CLOUD_BUILD + +#ifdef USE_SDCARD +#define USE_SDCARD_SPI +#define USE_SDCARD_SDIO +#endif #define USE_SPI #define SPI_FULL_RECONFIGURABILITY diff --git a/src/main/target/STM32F7X2/target.h b/src/main/target/STM32F7X2/target.h index 970a1e65be..94594aa2a8 100644 --- a/src/main/target/STM32F7X2/target.h +++ b/src/main/target/STM32F7X2/target.h @@ -134,11 +134,14 @@ #define USE_MAX7456 -#endif - #define USE_SDCARD + +#endif // CLOUD_BUILD + +#ifdef USE_SDCARD #define USE_SDCARD_SPI #define USE_SDCARD_SDIO +#endif #define USE_SPI #define SPI_FULL_RECONFIGURABILITY diff --git a/src/main/target/STM32G47X/target.h b/src/main/target/STM32G47X/target.h index 2d82c6ec30..91c086805e 100644 --- a/src/main/target/STM32G47X/target.h +++ b/src/main/target/STM32G47X/target.h @@ -142,10 +142,14 @@ #define USE_RANGEFINDER_HCSR04 #define USE_RANGEFINDER_TF -#endif // cloud_build - #define USE_SDCARD + +#endif // CLOUD_BUILD + +#ifdef USE_SDCARD #define USE_SDCARD_SPI +#endif + #define USE_SPI #define SPI_FULL_RECONFIGURABILITY diff --git a/src/main/target/STM32H743/target.h b/src/main/target/STM32H743/target.h index 8c7254be38..f3e5198848 100644 --- a/src/main/target/STM32H743/target.h +++ b/src/main/target/STM32H743/target.h @@ -159,11 +159,14 @@ #define USE_RX_SX1280 #define USE_RX_SX127X -#endif //cloud_build - #define USE_SDCARD + +#endif // CLOUD_BUILD + +#ifdef USE_SDCARD #define USE_SDCARD_SPI #define USE_SDCARD_SDIO +#endif #define USE_SPI #define SPI_FULL_RECONFIGURABILITY