From df626657282ef703e9d59a1b2e00c06b9882ccbc Mon Sep 17 00:00:00 2001 From: Martin Budden Date: Tue, 27 Dec 2016 14:05:45 +0000 Subject: [PATCH] Tidied RX_SPI enums --- src/main/drivers/rx_nrf24l01.c | 4 ++-- src/main/rx/nrf24_cx10.c | 6 +++--- src/main/rx/nrf24_syma.c | 6 +++--- src/main/rx/nrf24_v202.c | 2 +- src/main/rx/rx_spi.c | 16 ++++++++-------- src/main/rx/rx_spi.h | 18 +++++++++--------- src/main/target/CJMCU/target.h | 12 ++++++------ 7 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/main/drivers/rx_nrf24l01.c b/src/main/drivers/rx_nrf24l01.c index a3689768fc..1f0d72b105 100644 --- a/src/main/drivers/rx_nrf24l01.c +++ b/src/main/drivers/rx_nrf24l01.c @@ -98,7 +98,7 @@ uint8_t NRF24L01_ReadPayload(uint8_t *data, uint8_t length) /* * Empty the transmit FIFO buffer. */ -void NRF24L01_FlushTx() +void NRF24L01_FlushTx(void) { rxSpiWriteByte(FLUSH_TX); } @@ -106,7 +106,7 @@ void NRF24L01_FlushTx() /* * Empty the receive FIFO buffer. */ -void NRF24L01_FlushRx() +void NRF24L01_FlushRx(void) { rxSpiWriteByte(FLUSH_RX); } diff --git a/src/main/rx/nrf24_cx10.c b/src/main/rx/nrf24_cx10.c index d7521e5687..ae5b3492f4 100644 --- a/src/main/rx/nrf24_cx10.c +++ b/src/main/rx/nrf24_cx10.c @@ -129,7 +129,7 @@ STATIC_UNIT_TESTED uint16_t cx10ConvertToPwmUnsigned(const uint8_t *pVal) void cx10Nrf24SetRcDataFromPayload(uint16_t *rcData, const uint8_t *payload) { - const uint8_t offset = (cx10Protocol == NRF24RX_CX10) ? 0 : 4; + const uint8_t offset = (cx10Protocol == RX_SPI_NRF24_CX10) ? 0 : 4; rcData[RC_SPI_ROLL] = (PWM_RANGE_MAX + PWM_RANGE_MIN) - cx10ConvertToPwmUnsigned(&payload[5 + offset]); // aileron rcData[RC_SPI_PITCH] = (PWM_RANGE_MAX + PWM_RANGE_MIN) - cx10ConvertToPwmUnsigned(&payload[7 + offset]); // elevator rcData[RC_SPI_THROTTLE] = cx10ConvertToPwmUnsigned(&payload[9 + offset]); // throttle @@ -274,8 +274,8 @@ static void cx10Nrf24Setup(rx_spi_protocol_e protocol) { cx10Protocol = protocol; protocolState = STATE_BIND; - payloadSize = (protocol == NRF24RX_CX10) ? CX10_PROTOCOL_PAYLOAD_SIZE : CX10A_PROTOCOL_PAYLOAD_SIZE; - hopTimeout = (protocol == NRF24RX_CX10) ? CX10_PROTOCOL_HOP_TIMEOUT : CX10A_PROTOCOL_HOP_TIMEOUT; + payloadSize = (protocol == RX_SPI_NRF24_CX10) ? CX10_PROTOCOL_PAYLOAD_SIZE : CX10A_PROTOCOL_PAYLOAD_SIZE; + hopTimeout = (protocol == RX_SPI_NRF24_CX10) ? CX10_PROTOCOL_HOP_TIMEOUT : CX10A_PROTOCOL_HOP_TIMEOUT; NRF24L01_Initialize(0); // sets PWR_UP, no CRC NRF24L01_SetupBasic(); diff --git a/src/main/rx/nrf24_syma.c b/src/main/rx/nrf24_syma.c index 61a51199b6..c3d3c4022b 100644 --- a/src/main/rx/nrf24_syma.c +++ b/src/main/rx/nrf24_syma.c @@ -124,7 +124,7 @@ static uint32_t hopTimeout = 10000; // 10ms STATIC_UNIT_TESTED bool symaCheckBindPacket(const uint8_t *packet) { bool bindPacket = false; - if (symaProtocol == NRF24RX_SYMA_X) { + if (symaProtocol == RX_SPI_NRF24_SYMA_X) { if ((packet[5] == 0xaa) && (packet[6] == 0xaa) && (packet[7] == 0xaa)) { bindPacket = true; rxTxAddr[4] = packet[0]; @@ -162,7 +162,7 @@ void symaNrf24SetRcDataFromPayload(uint16_t *rcData, const uint8_t *packet) { rcData[RC_SPI_THROTTLE] = symaConvertToPwmUnsigned(packet[0]); // throttle rcData[RC_SPI_ROLL] = symaConvertToPwmSigned(packet[3]); // aileron - if (symaProtocol == NRF24RX_SYMA_X) { + if (symaProtocol == RX_SPI_NRF24_SYMA_X) { rcData[RC_SPI_PITCH] = symaConvertToPwmSigned(packet[1]); // elevator rcData[RC_SPI_YAW] = symaConvertToPwmSigned(packet[2]); // rudder const uint8_t rate = (packet[5] & 0xc0) >> 6; @@ -271,7 +271,7 @@ static void symaNrf24Setup(rx_spi_protocol_e protocol) NRF24L01_Initialize(BV(NRF24L01_00_CONFIG_EN_CRC) | BV( NRF24L01_00_CONFIG_CRCO)); // sets PWR_UP, EN_CRC, CRCO - 2 byte CRC NRF24L01_SetupBasic(); - if (symaProtocol == NRF24RX_SYMA_X) { + if (symaProtocol == RX_SPI_NRF24_SYMA_X) { payloadSize = SYMA_X_PROTOCOL_PAYLOAD_SIZE; NRF24L01_WriteReg(NRF24L01_06_RF_SETUP, NRF24L01_06_RF_SETUP_RF_DR_250Kbps | NRF24L01_06_RF_SETUP_RF_PWR_n12dbm); protocolState = STATE_BIND; diff --git a/src/main/rx/nrf24_v202.c b/src/main/rx/nrf24_v202.c index fddc557249..8ddb1bb630 100644 --- a/src/main/rx/nrf24_v202.c +++ b/src/main/rx/nrf24_v202.c @@ -230,7 +230,7 @@ static void v202Nrf24Setup(rx_spi_protocol_e protocol) NRF24L01_WriteReg(NRF24L01_02_EN_RXADDR, BV(NRF24L01_02_EN_RXADDR_ERX_P0)); // Enable data pipe 0 NRF24L01_WriteReg(NRF24L01_03_SETUP_AW, NRF24L01_03_SETUP_AW_5BYTES); // 5-byte RX/TX address NRF24L01_WriteReg(NRF24L01_04_SETUP_RETR, 0xFF); // 4ms retransmit t/o, 15 tries - if (protocol == NRF24RX_V202_250K) { + if (protocol == RX_SPI_NRF24_V202_250K) { NRF24L01_WriteReg(NRF24L01_06_RF_SETUP, NRF24L01_06_RF_SETUP_RF_DR_250Kbps | NRF24L01_06_RF_SETUP_RF_PWR_n12dbm); } else { NRF24L01_WriteReg(NRF24L01_06_RF_SETUP, NRF24L01_06_RF_SETUP_RF_DR_1Mbps | NRF24L01_06_RF_SETUP_RF_PWR_n12dbm); diff --git a/src/main/rx/rx_spi.c b/src/main/rx/rx_spi.c index e4c5dbf80b..d1ead2ddd4 100644 --- a/src/main/rx/rx_spi.c +++ b/src/main/rx/rx_spi.c @@ -69,38 +69,38 @@ STATIC_UNIT_TESTED bool rxSpiSetProtocol(rx_spi_protocol_e protocol) switch (protocol) { default: #ifdef USE_RX_V202 - case NRF24RX_V202_250K: - case NRF24RX_V202_1M: + case RX_SPI_NRF24_V202_250K: + case RX_SPI_NRF24_V202_1M: protocolInit = v202Nrf24Init; protocolDataReceived = v202Nrf24DataReceived; protocolSetRcDataFromPayload = v202Nrf24SetRcDataFromPayload; break; #endif #ifdef USE_RX_SYMA - case NRF24RX_SYMA_X: - case NRF24RX_SYMA_X5C: + case RX_SPI_NRF24_SYMA_X: + case RX_SPI_NRF24_SYMA_X5C: protocolInit = symaNrf24Init; protocolDataReceived = symaNrf24DataReceived; protocolSetRcDataFromPayload = symaNrf24SetRcDataFromPayload; break; #endif #ifdef USE_RX_CX10 - case NRF24RX_CX10: - case NRF24RX_CX10A: + case RX_SPI_NRF24_CX10: + case RX_SPI_NRF24_CX10A: protocolInit = cx10Nrf24Init; protocolDataReceived = cx10Nrf24DataReceived; protocolSetRcDataFromPayload = cx10Nrf24SetRcDataFromPayload; break; #endif #ifdef USE_RX_H8_3D - case NRF24RX_H8_3D: + case RX_SPI_NRF24_H8_3D: protocolInit = h8_3dNrf24Init; protocolDataReceived = h8_3dNrf24DataReceived; protocolSetRcDataFromPayload = h8_3dNrf24SetRcDataFromPayload; break; #endif #ifdef USE_RX_INAV - case NRF24RX_INAV: + case RX_SPI_NRF24_INAV: protocolInit = inavNrf24Init; protocolDataReceived = inavNrf24DataReceived; protocolSetRcDataFromPayload = inavNrf24SetRcDataFromPayload; diff --git a/src/main/rx/rx_spi.h b/src/main/rx/rx_spi.h index 5b8b144f02..c858279564 100644 --- a/src/main/rx/rx_spi.h +++ b/src/main/rx/rx_spi.h @@ -21,15 +21,15 @@ #include typedef enum { - NRF24RX_V202_250K = 0, - NRF24RX_V202_1M, - NRF24RX_SYMA_X, - NRF24RX_SYMA_X5C, - NRF24RX_CX10, - NRF24RX_CX10A, - NRF24RX_H8_3D, - NRF24RX_INAV, - NRF24RX_PROTOCOL_COUNT + RX_SPI_NRF24_V202_250K = 0, + RX_SPI_NRF24_V202_1M, + RX_SPI_NRF24_SYMA_X, + RX_SPI_NRF24_SYMA_X5C, + RX_SPI_NRF24_CX10, + RX_SPI_NRF24_CX10A, + RX_SPI_NRF24_H8_3D, + RX_SPI_NRF24_INAV, + RX_SPI_PROTOCOL_COUNT } rx_spi_protocol_e; typedef enum { diff --git a/src/main/target/CJMCU/target.h b/src/main/target/CJMCU/target.h index 4f3d274b9e..f25346a2ae 100644 --- a/src/main/target/CJMCU/target.h +++ b/src/main/target/CJMCU/target.h @@ -81,12 +81,12 @@ #define USE_RX_INAV #define USE_RX_SYMA #define USE_RX_V202 -//#define RX_SPI_DEFAULT_PROTOCOL NRF24RX_SYMA_X5 -//#define RX_SPI_DEFAULT_PROTOCOL NRF24RX_SYMA_X5C -//#define RX_SPI_DEFAULT_PROTOCOL NRF24RX_INAV -#define RX_SPI_DEFAULT_PROTOCOL NRF24RX_H8_3D -//#define RX_SPI_DEFAULT_PROTOCOL NRF24RX_CX10A -//#define RX_SPI_DEFAULT_PROTOCOL NRF24RX_V202_1M +//#define RX_SPI_DEFAULT_PROTOCOL RX_SPI_NRF24_SYMA_X5 +//#define RX_SPI_DEFAULT_PROTOCOL RX_SPI_NRF24_SYMA_X5C +//#define RX_SPI_DEFAULT_PROTOCOL RX_SPI_NRF24_INAV +#define RX_SPI_DEFAULT_PROTOCOL RX_SPI_NRF24_H8_3D +//#define RX_SPI_DEFAULT_PROTOCOL RX_SPI_NRF24_CX10A +//#define RX_SPI_DEFAULT_PROTOCOL RX_SPI_NRF24_V202_1M #define DEFAULT_RX_FEATURE FEATURE_RX_SPI //#define TELEMETRY