Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-17 05:15:25 +03:00
Code Issues Wiki Activity

Add SPI RX to STM32F7xx unified targets

Browse source 
Avoid crash if CC2500 is not present on unified targets
This commit is contained in:
MJ666 2019-04-14 17:31:36 +02:00
parent cb935ff55c
commit 0c80b1a92a
4 changed files with 25 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/rx/cc2500_frsky_shared.c
View file

@ -407,7 +407,9 @@ void nextChannel(uint8_t skip)
bool frSkySpiInit(const rxSpiConfig_t *rxSpiConfig, rxRuntimeConfig_t *rxRuntimeConfig) bool frSkySpiInit(const rxSpiConfig_t *rxSpiConfig, rxRuntimeConfig_t *rxRuntimeConfig)
{ {
rxSpiCommonIOInit(rxSpiConfig); rxSpiCommonIOInit(rxSpiConfig);
cc2500SpiInit(); if (!cc2500SpiInit()) {
return false;
}
spiProtocol = rxSpiConfig->rx_spi_protocol; spiProtocol = rxSpiConfig->rx_spi_protocol;

12
src/main/target/STM32F745/target.mk
View file

@ -5,4 +5,14 @@ TARGET_SRC = \
$(addprefix drivers/accgyro/,$(notdir $(wildcard $(SRC_DIR)/drivers/accgyro/*.c))) \ $(addprefix drivers/accgyro/,$(notdir $(wildcard $(SRC_DIR)/drivers/accgyro/*.c))) \
$(addprefix drivers/barometer/,$(notdir $(wildcard $(SRC_DIR)/drivers/barometer/*.c))) \ $(addprefix drivers/barometer/,$(notdir $(wildcard $(SRC_DIR)/drivers/barometer/*.c))) \
$(addprefix drivers/compass/,$(notdir $(wildcard $(SRC_DIR)/drivers/compass/*.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

12
src/main/target/STM32F7X2/target.mk
View file

@ -5,4 +5,14 @@ TARGET_SRC = \
$(addprefix drivers/accgyro/,$(notdir $(wildcard $(SRC_DIR)/drivers/accgyro/*.c))) \ $(addprefix drivers/accgyro/,$(notdir $(wildcard $(SRC_DIR)/drivers/accgyro/*.c))) \
$(addprefix drivers/barometer/,$(notdir $(wildcard $(SRC_DIR)/drivers/barometer/*.c))) \ $(addprefix drivers/barometer/,$(notdir $(wildcard $(SRC_DIR)/drivers/barometer/*.c))) \
$(addprefix drivers/compass/,$(notdir $(wildcard $(SRC_DIR)/drivers/compass/*.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

4
src/main/target/common_unified.h
View file

@ -99,9 +99,6 @@
#define USE_ADC #define USE_ADC
#if defined(STM32F4)
//We currently only have stdperiph drivers for this
#define USE_RX_SPI #define USE_RX_SPI
#define USE_RX_FRSKY_SPI_D #define USE_RX_FRSKY_SPI_D
@ -113,4 +110,3 @@
#define USE_RX_FLYSKY #define USE_RX_FLYSKY
#define USE_RX_FLYSKY_SPI_LED #define USE_RX_FLYSKY_SPI_LED
#endif