1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-25 17:25:20 +03:00

Adding a few more gates in common post to assist in build errors. (#13250)

This commit is contained in:
J Blackman 2024-01-01 14:33:47 +11:00 committed by GitHub
parent 507fc67274
commit 1e09315965
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -281,8 +281,10 @@
#endif #endif
#if defined(USE_SERIALRX_SBUS) || defined(USE_SERIALRX_FPORT) #if defined(USE_SERIALRX_SBUS) || defined(USE_SERIALRX_FPORT)
#if !defined(USE_SBUS_CHANNELS)
#define USE_SBUS_CHANNELS #define USE_SBUS_CHANNELS
#endif #endif
#endif
#if !defined(USE_TELEMETRY_SMARTPORT) && !defined(USE_TELEMETRY_CRSF) && !defined(USE_TELEMETRY_GHST) #if !defined(USE_TELEMETRY_SMARTPORT) && !defined(USE_TELEMETRY_CRSF) && !defined(USE_TELEMETRY_GHST)
#undef USE_MSP_OVER_TELEMETRY #undef USE_MSP_OVER_TELEMETRY
@ -312,37 +314,55 @@
#endif #endif
#ifdef USE_FLASH #ifdef USE_FLASH
#if !defined(USE_FLASH_TOOLS)
#define USE_FLASH_TOOLS #define USE_FLASH_TOOLS
#endif
#if !defined(USE_FLASHFS)
#define USE_FLASHFS #define USE_FLASHFS
#endif #endif
#endif
#if (defined(USE_FLASH_W25M512) || defined(USE_FLASH_W25Q128FV)) && !defined(USE_FLASH_M25P16) #if (defined(USE_FLASH_W25M512) || defined(USE_FLASH_W25Q128FV)) && !defined(USE_FLASH_M25P16)
#if !defined(USE_FLASH_M25P16)
#define USE_FLASH_M25P16 #define USE_FLASH_M25P16
#endif #endif
#endif
#if defined(USE_FLASH_W25M02G) && !defined(USE_FLASH_W25N01G) #if defined(USE_FLASH_W25M02G) && !defined(USE_FLASH_W25N01G)
#if !defined(USE_FLASH_W25N01G)
#define USE_FLASH_W25N01G #define USE_FLASH_W25N01G
#endif #endif
#endif
#if (defined(USE_FLASH_M25P16) || defined(USE_FLASH_W25N01G)) && !defined(USE_FLASH_W25M) #if (defined(USE_FLASH_M25P16) || defined(USE_FLASH_W25N01G)) && !defined(USE_FLASH_W25M)
#if !defined(USE_FLASH_W25M)
#define USE_FLASH_W25M #define USE_FLASH_W25M
#endif #endif
#endif
#if defined(USE_FLASH_M25P16) || defined(USE_FLASH_W25M) || defined(USE_FLASH_W25N01G) || defined(USE_FLASH_W25Q128FV) #if defined(USE_FLASH_M25P16) || defined(USE_FLASH_W25M) || defined(USE_FLASH_W25N01G) || defined(USE_FLASH_W25Q128FV)
#if !defined(USE_FLASH_CHIP)
#define USE_FLASH_CHIP #define USE_FLASH_CHIP
#endif #endif
#endif
#if defined(USE_SPI) && (defined(USE_FLASH_M25P16) || defined(USE_FLASH_W25M512) || defined(USE_FLASH_W25N01G) || defined(USE_FLASH_W25M02G)) #if defined(USE_SPI) && (defined(USE_FLASH_M25P16) || defined(USE_FLASH_W25M512) || defined(USE_FLASH_W25N01G) || defined(USE_FLASH_W25M02G))
#if !defined(USE_FLASH_SPI)
#define USE_FLASH_SPI #define USE_FLASH_SPI
#endif #endif
#endif
#if defined(USE_QUADSPI) && (defined(USE_FLASH_W25Q128FV) || defined(USE_FLASH_W25N01G)) #if defined(USE_QUADSPI) && (defined(USE_FLASH_W25Q128FV) || defined(USE_FLASH_W25N01G))
#if !defined(USE_FLASH_QUADSPI)
#define USE_FLASH_QUADSPI #define USE_FLASH_QUADSPI
#endif #endif
#endif
#if defined(USE_OCTOSPI) && (defined(USE_FLASH_W25Q128FV)) #if defined(USE_OCTOSPI) && defined(USE_FLASH_W25Q128FV)
#if !defined(USE_FLASH_OCTOSPI)
#define USE_FLASH_OCTOSPI #define USE_FLASH_OCTOSPI
#endif #endif
#endif
#ifndef USE_FLASH_CHIP #ifndef USE_FLASH_CHIP
#undef USE_FLASH_TOOLS #undef USE_FLASH_TOOLS