From 96d28a3f135e845a9f5465f58a33940760e90d43 Mon Sep 17 00:00:00 2001
From: mikeller <github@ike.ch>
Date: Wed, 16 Aug 2017 01:17:21 +1200
Subject: [PATCH] Renamed 'FRSKYD' to 'FRSKY_D' for consistency with other SPI
 RX providers.

---
 src/main/fc/settings.c             | 2 +-
 src/main/rx/frsky_d.c              | 2 +-
 src/main/rx/rx_spi.c               | 4 ++--
 src/main/rx/rx_spi.h               | 2 +-
 src/main/target/MIDELICF3/target.h | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/fc/settings.c b/src/main/fc/settings.c
index 209f2fa00a..55885e1415 100644
--- a/src/main/fc/settings.c
+++ b/src/main/fc/settings.c
@@ -739,7 +739,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) },
diff --git a/src/main/rx/frsky_d.c b/src/main/rx/frsky_d.c
index 0a38d93f24..3198ab1057 100644
--- a/src/main/rx/frsky_d.c
+++ b/src/main/rx/frsky_d.c
@@ -22,7 +22,7 @@
 
 #include "platform.h"
 
-#ifdef USE_RX_FRSKYD
+#ifdef USE_RX_FRSKY_D
 
 #include "build/build_config.h"
 
diff --git a/src/main/rx/rx_spi.c b/src/main/rx/rx_spi.c
index 089107fa63..77fed49b35 100644
--- a/src/main/rx/rx_spi.c
+++ b/src/main/rx/rx_spi.c
@@ -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;
diff --git a/src/main/rx/rx_spi.h b/src/main/rx/rx_spi.h
index 1946dea285..fd6438ef3a 100644
--- a/src/main/rx/rx_spi.h
+++ b/src/main/rx/rx_spi.h
@@ -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;
 
diff --git a/src/main/target/MIDELICF3/target.h b/src/main/target/MIDELICF3/target.h
index babe0726ba..d9ad203479 100644
--- a/src/main/target/MIDELICF3/target.h
+++ b/src/main/target/MIDELICF3/target.h
@@ -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