diff --git a/src/main/rx/cc2500_frsky_shared.c b/src/main/rx/cc2500_frsky_shared.c index f24b39b03d..f1de441680 100644 --- a/src/main/rx/cc2500_frsky_shared.c +++ b/src/main/rx/cc2500_frsky_shared.c @@ -407,7 +407,9 @@ void nextChannel(uint8_t skip) bool frSkySpiInit(const rxSpiConfig_t *rxSpiConfig, rxRuntimeConfig_t *rxRuntimeConfig) { rxSpiCommonIOInit(rxSpiConfig); - cc2500SpiInit(); + if (!cc2500SpiInit()) { + return false; + } spiProtocol = rxSpiConfig->rx_spi_protocol; diff --git a/src/main/target/STM32F745/target.mk b/src/main/target/STM32F745/target.mk index 8455db6492..c79f3d97bb 100644 --- a/src/main/target/STM32F745/target.mk +++ b/src/main/target/STM32F745/target.mk @@ -5,4 +5,14 @@ TARGET_SRC = \ $(addprefix drivers/accgyro/,$(notdir $(wildcard $(SRC_DIR)/drivers/accgyro/*.c))) \ $(addprefix drivers/barometer/,$(notdir $(wildcard $(SRC_DIR)/drivers/barometer/*.c))) \ $(addprefix drivers/compass/,$(notdir $(wildcard $(SRC_DIR)/drivers/compass/*.c))) \ - drivers/max7456.c + drivers/max7456.c \ + rx/cc2500_common.c \ + rx/cc2500_frsky_shared.c \ + rx/cc2500_frsky_d.c \ + rx/cc2500_frsky_x.c \ + rx/cc2500_sfhss.c \ + rx/a7105_flysky.c \ + rx/cyrf6936_spektrum.c \ + drivers/rx/rx_cc2500.c \ + drivers/rx/rx_a7105.c \ + drivers/rx/rx_cyrf6936.c diff --git a/src/main/target/STM32F7X2/target.mk b/src/main/target/STM32F7X2/target.mk index 16e071a610..5e1d962e79 100644 --- a/src/main/target/STM32F7X2/target.mk +++ b/src/main/target/STM32F7X2/target.mk @@ -5,4 +5,14 @@ TARGET_SRC = \ $(addprefix drivers/accgyro/,$(notdir $(wildcard $(SRC_DIR)/drivers/accgyro/*.c))) \ $(addprefix drivers/barometer/,$(notdir $(wildcard $(SRC_DIR)/drivers/barometer/*.c))) \ $(addprefix drivers/compass/,$(notdir $(wildcard $(SRC_DIR)/drivers/compass/*.c))) \ - drivers/max7456.c + drivers/max7456.c \ + rx/cc2500_common.c \ + rx/cc2500_frsky_shared.c \ + rx/cc2500_frsky_d.c \ + rx/cc2500_frsky_x.c \ + rx/cc2500_sfhss.c \ + rx/a7105_flysky.c \ + rx/cyrf6936_spektrum.c \ + drivers/rx/rx_cc2500.c \ + drivers/rx/rx_a7105.c \ + drivers/rx/rx_cyrf6936.c diff --git a/src/main/target/common_unified.h b/src/main/target/common_unified.h index b0e8886c53..6570cd2f33 100644 --- a/src/main/target/common_unified.h +++ b/src/main/target/common_unified.h @@ -99,9 +99,6 @@ #define USE_ADC -#if defined(STM32F4) -//We currently only have stdperiph drivers for this - #define USE_RX_SPI #define USE_RX_FRSKY_SPI_D @@ -113,4 +110,3 @@ #define USE_RX_FLYSKY #define USE_RX_FLYSKY_SPI_LED -#endif