From 84a6bd36d897097c1f10857bd7c7f552d9d08b0d Mon Sep 17 00:00:00 2001
From: mikeller <github@ike.ch>
Date: Mon, 17 Jun 2019 23:18:53 +1200
Subject: [PATCH] Fixed runtime configuration for CC2500 SPI RX.

---
 src/main/pg/rx_spi_cc2500.c | 8 +++++++-
 src/main/rx/cc2500_common.c | 4 ----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/pg/rx_spi_cc2500.c b/src/main/pg/rx_spi_cc2500.c
index 885046c867..07a945e670 100644
--- a/src/main/pg/rx_spi_cc2500.c
+++ b/src/main/pg/rx_spi_cc2500.c
@@ -31,6 +31,12 @@
 
 PG_REGISTER_WITH_RESET_TEMPLATE(rxCc2500SpiConfig_t, rxCc2500SpiConfig, PG_RX_CC2500_SPI_CONFIG, 1);
 
+#if defined(RX_CC2500_SPI_DISABLE_CHIP_DETECTION)
+#define CC2500_SPI_CHIP_DETECTION false
+#else
+#define CC2500_SPI_CHIP_DETECTION true
+#endif
+
 PG_RESET_TEMPLATE(rxCc2500SpiConfig_t, rxCc2500SpiConfig,
     .autoBind = false,
     .bindTxId = {0, 0},
@@ -41,7 +47,7 @@ PG_RESET_TEMPLATE(rxCc2500SpiConfig_t, rxCc2500SpiConfig,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
     .rxNum = 0,
     .a1Source = FRSKY_SPI_A1_SOURCE_VBAT,
-    .chipDetectEnabled = true,
+    .chipDetectEnabled = CC2500_SPI_CHIP_DETECTION,
     .txEnIoTag = IO_TAG(RX_CC2500_SPI_TX_EN_PIN),
     .lnaEnIoTag = IO_TAG(RX_CC2500_SPI_LNA_EN_PIN),
     .antSelIoTag = IO_TAG(RX_CC2500_SPI_ANT_SEL_PIN),
diff --git a/src/main/rx/cc2500_common.c b/src/main/rx/cc2500_common.c
index e9594672cf..4e7ca47d22 100755
--- a/src/main/rx/cc2500_common.c
+++ b/src/main/rx/cc2500_common.c
@@ -118,13 +118,9 @@ static bool cc2500SpiDetect(void)
 
 bool cc2500SpiInit(void)
 {
-#if !defined(RX_CC2500_SPI_DISABLE_CHIP_DETECTION)
     if (rxCc2500SpiConfig()->chipDetectEnabled && !cc2500SpiDetect()) {
         return false;
     }
-#else
-    UNUSED(cc2500SpiDetect);
-#endif
 
     // gpio init here
     gdoPin = IOGetByTag(rxSpiConfig()->extiIoTag);