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

Merge pull request #3856 from mikeller/renamed_frskyd_frsky_d

Browse source 
Renamed 'FRSKYD' to 'FRSKY_D' for consistency with other SPI RX providers.
This commit is contained in:
Martin Budden 2017-08-15 19:41:05 +01:00 • committed by GitHub
commit f3ab5a7877
5 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/fc/settings.c
View file

@ -743,7 +743,7 @@ const clivalue_t valueTable[] = {
{ "esc_sensor_halfduplex", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_ESC_SENSOR_CONFIG, offsetof(escSensorConfig_t, halfDuplex) },
#endif
#ifdef USE_RX_FRSKYD
#ifdef USE_RX_FRSKY_D
{ "frsky_d_autobind", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_FRSKY_D_CONFIG, offsetof(frSkyDConfig_t, autoBind) },
{ "frsky_d_tx_id", VAR_UINT8 | MASTER_VALUE | MODE_ARRAY, .config.array.length = 2, PG_FRSKY_D_CONFIG, offsetof(frSkyDConfig_t, bindTxId) },
{ "frsky_d_offset", VAR_INT8 | MASTER_VALUE, .config.minmax = { -127, 127 }, PG_FRSKY_D_CONFIG, offsetof(frSkyDConfig_t, bindOffset) },

2
src/main/rx/frsky_d.c
View file

@ -22,7 +22,7 @@
#include "platform.h"
#ifdef USE_RX_FRSKYD
#ifdef USE_RX_FRSKY_D
#include "build/build_config.h"

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

@ -109,8 +109,8 @@ STATIC_UNIT_TESTED bool rxSpiSetProtocol(rx_spi_protocol_e protocol)
protocolSetRcDataFromPayload = inavNrf24SetRcDataFromPayload;
break;
#endif
#ifdef USE_RX_FRSKYD
case RX_SPI_FRSKYD:
#ifdef USE_RX_FRSKY_D
case RX_SPI_FRSKY_D:
protocolInit = frskyD_Rx_Init;
protocolDataReceived = frskyD_Rx_DataReceived;
protocolSetRcDataFromPayload = frskyD_Rx_SetRCdata;

2
src/main/rx/rx_spi.h
View file

@ -29,7 +29,7 @@ typedef enum {
RX_SPI_NRF24_CX10A,
RX_SPI_NRF24_H8_3D,
RX_SPI_NRF24_INAV,
RX_SPI_FRSKYD,
RX_SPI_FRSKY_D,
RX_SPI_PROTOCOL_COUNT
} rx_spi_protocol_e;

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

@ -96,9 +96,9 @@
#define RX_SPI_INSTANCE SPI1
#define RX_NSS_GPIO_CLK_PERIPHERAL RCC_APB2Periph_GPIOA
#define USE_RX_FRSKYD
#define RX_SPI_DEFAULT_PROTOCOL RX_SPI_FRSKYD
#define USE_RX_FRSKY_D
#define DEFAULT_RX_FEATURE FEATURE_RX_SPI
#define RX_SPI_DEFAULT_PROTOCOL RX_SPI_FRSKY_D
#define FRSKY_BIND