From 1fdf2ece0b00b8ec9c6e4459e3f7fb1ab4117788 Mon Sep 17 00:00:00 2001 From: J Blackman Date: Mon, 2 Jan 2023 07:14:26 +1100 Subject: [PATCH] FIX: CC2500 not building due to undefined pins. (#12125) See: https://build.betaflight.com/api/builds/4.4.0-RC3/CRAZYBEEF4FR/d84f1a9ce8df5c1907aa7b545100a96a/log --- src/main/pg/rx_spi_cc2500.c | 12 ++++++++++++ src/main/target/common_defaults_post.h | 14 -------------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/main/pg/rx_spi_cc2500.c b/src/main/pg/rx_spi_cc2500.c index f575fe4728..6723a5f134 100644 --- a/src/main/pg/rx_spi_cc2500.c +++ b/src/main/pg/rx_spi_cc2500.c @@ -22,6 +22,18 @@ #if defined(USE_RX_CC2500) +#if !defined(RX_CC2500_SPI_TX_EN_PIN) +#define RX_CC2500_SPI_TX_EN_PIN NONE +#endif + +#if !defined(RX_CC2500_SPI_LNA_EN_PIN) +#define RX_CC2500_SPI_LNA_EN_PIN NONE +#endif + +#if !defined(RX_CC2500_SPI_ANT_SEL_PIN) +#define RX_CC2500_SPI_ANT_SEL_PIN NONE +#endif + #include "drivers/io.h" #include "pg/pg.h" diff --git a/src/main/target/common_defaults_post.h b/src/main/target/common_defaults_post.h index 97ae4604e8..862c52fb61 100644 --- a/src/main/target/common_defaults_post.h +++ b/src/main/target/common_defaults_post.h @@ -291,20 +291,6 @@ #define RX_SPI_BIND_PIN NONE #endif -#if defined(USE_RX_CC2500) -#if !defined(RX_CC2500_SPI_TX_EN_PIN) -#define RX_CC2500_SPI_TX_EN_PIN NONE -#endif - -#if !defined(RX_CC2500_SPI_LNA_EN_PIN) -#define RX_CC2500_SPI_LNA_EN_PIN NONE -#endif - -#if !defined(RX_CC2500_SPI_ANT_SEL_PIN) -#define RX_CC2500_SPI_ANT_SEL_PIN NONE -#endif -#endif - #if defined(USE_RX_EXPRESSLRS) #if !defined(RX_EXPRESSLRS_SPI_RESET_PIN) #define RX_EXPRESSLRS_SPI_RESET_PIN NONE