From 1a59f50100f4e91e9cf66ae28ab58aa556094fbc Mon Sep 17 00:00:00 2001 From: Martin Budden Date: Sun, 21 Jan 2018 11:58:22 +0000 Subject: [PATCH] Added NRF24 RX to CJMCU and NUCLEOF4 builds --- src/main/target/CJMCU/target.mk | 6 ++++++ src/main/target/NUCLEOF446RE/target.h | 22 ++++++++++++++++++++++ src/main/target/NUCLEOF446RE/target.mk | 8 +++++++- 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/src/main/target/CJMCU/target.mk b/src/main/target/CJMCU/target.mk index 072f7f22e0..61db0f8ea8 100644 --- a/src/main/target/CJMCU/target.mk +++ b/src/main/target/CJMCU/target.mk @@ -5,7 +5,13 @@ TARGET_SRC = \ drivers/accgyro/accgyro_mpu.c \ drivers/accgyro/accgyro_mpu6050.c \ drivers/compass/compass_hmc5883l.c \ + drivers/rx/rx_nrf24l01.c \ blackbox/blackbox.c \ blackbox/blackbox_io.c \ + rx/nrf24_cx10.c \ + rx/nrf24_inav.c \ + rx/nrf24_h8_3d.c \ + rx/nrf24_syma.c \ + rx/nrf24_v202.c \ telemetry/telemetry.c \ telemetry/ltm.c diff --git a/src/main/target/NUCLEOF446RE/target.h b/src/main/target/NUCLEOF446RE/target.h index 65114418f8..474730f87f 100644 --- a/src/main/target/NUCLEOF446RE/target.h +++ b/src/main/target/NUCLEOF446RE/target.h @@ -92,6 +92,28 @@ //#define USE_MAG_AK8975 //#define USE_MAG_HMC5883 +#define USE_RX_SPI +#define RX_SPI_INSTANCE SPI1 +// Nordic Semiconductor uses 'CSN', STM uses 'NSS' +#define RX_CE_PIN PC7 // D9 +#define RX_NSS_PIN PB6 // D10 +#define RX_SCK_PIN PA5 // D13 +#define RX_MISO_PIN PA6 // D12 +#define RX_MOSI_PIN PA7 // D11 +// NUCLEO has NSS on PB6, rather than the standard PA4 +#define SPI1_NSS_PIN RX_NSS_PIN +#define SPI1_SCK_PIN RX_SCK_PIN +#define SPI1_MISO_PIN RX_MISO_PIN +#define SPI1_MOSI_PIN RX_MOSI_PIN + +#define USE_RX_NRF24 +#define USE_RX_CX10 +#define USE_RX_H8_3D +#define USE_RX_INAV +#define USE_RX_SYMA +#define USE_RX_V202 +#define RX_SPI_DEFAULT_PROTOCOL RX_SPI_NRF24_H8_3D + #define USE_VCP #define USE_UART1 diff --git a/src/main/target/NUCLEOF446RE/target.mk b/src/main/target/NUCLEOF446RE/target.mk index eb6cbd4b51..a3a3181d86 100644 --- a/src/main/target/NUCLEOF446RE/target.mk +++ b/src/main/target/NUCLEOF446RE/target.mk @@ -7,4 +7,10 @@ TARGET_SRC = \ drivers/accgyro/accgyro_spi_mpu9250.c \ drivers/accgyro/accgyro_fake.c \ drivers/barometer/barometer_fake.c \ - drivers/compass/compass_fake.c + drivers/compass/compass_fake.c \ + drivers/rx/rx_nrf24l01.c \ + rx/nrf24_cx10.c \ + rx/nrf24_inav.c \ + rx/nrf24_h8_3d.c \ + rx/nrf24_syma.c \ + rx/nrf24_v202.c