From 84ba94f2667ee69bca2fa0bee1b1fe2c45be69c5 Mon Sep 17 00:00:00 2001 From: jflyper Date: Mon, 26 Jun 2017 11:35:17 +0900 Subject: [PATCH] Remove NSS related defs and ammend cli.c --- src/main/drivers/bus_spi_pinconfig.c | 15 +-------------- src/main/fc/cli.c | 4 ++++ 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/src/main/drivers/bus_spi_pinconfig.c b/src/main/drivers/bus_spi_pinconfig.c index f93b576b1..469f5dc39 100644 --- a/src/main/drivers/bus_spi_pinconfig.c +++ b/src/main/drivers/bus_spi_pinconfig.c @@ -35,38 +35,25 @@ #include "config/parameter_group.h" #include "config/parameter_group_ids.h" -// Pin defaults +// Pin defaults for backward compatibility #ifndef SPI1_SCK_PIN -#define SPI1_NSS_PIN PA4 #define SPI1_SCK_PIN PA5 #define SPI1_MISO_PIN PA6 #define SPI1_MOSI_PIN PA7 #endif #ifndef SPI2_SCK_PIN -#define SPI2_NSS_PIN PB12 #define SPI2_SCK_PIN PB13 #define SPI2_MISO_PIN PB14 #define SPI2_MOSI_PIN PB15 #endif #ifndef SPI3_SCK_PIN -#define SPI3_NSS_PIN PA15 #define SPI3_SCK_PIN PB3 #define SPI3_MISO_PIN PB4 #define SPI3_MOSI_PIN PB5 #endif -#ifndef SPI1_NSS_PIN -#define SPI1_NSS_PIN NONE -#endif -#ifndef SPI2_NSS_PIN -#define SPI2_NSS_PIN NONE -#endif -#ifndef SPI3_NSS_PIN -#define SPI3_NSS_PIN NONE -#endif - PG_DECLARE(spiPinConfig_t, spiPinConfig); PG_REGISTER_WITH_RESET_FN(spiPinConfig_t, spiPinConfig, PG_SPI_PIN_CONFIG, 0); diff --git a/src/main/fc/cli.c b/src/main/fc/cli.c index 3336b2afa..919396970 100755 --- a/src/main/fc/cli.c +++ b/src/main/fc/cli.c @@ -2829,6 +2829,10 @@ const cliResourceValue_t resourceTable[] = { { OWNER_I2C_SDA, PG_I2C_CONFIG, offsetof(i2cConfig_t, ioTagSda[0]), I2CDEV_COUNT }, #endif { OWNER_LED, PG_STATUS_LED_CONFIG, offsetof(statusLedConfig_t, ioTags[0]), STATUS_LED_NUMBER }, +#ifdef USE_SPEKTRUM_BIND + { OWNER_RX_BIND, PG_RX_CONFIG, offsetof(rxConfig_t, spektrum_bind_pin_override_ioTag), 0 }, + { OWNER_RX_BIND_PLUG, PG_RX_CONFIG, offsetof(rxConfig_t, spektrum_bind_plug_ioTag), 0 }, +#endif #ifdef USE_SPI { OWNER_SPI_SCK, PG_SPI_PIN_CONFIG, offsetof(spiPinConfig_t, ioTagSck[0]), SPIDEV_COUNT }, { OWNER_SPI_MISO, PG_SPI_PIN_CONFIG, offsetof(spiPinConfig_t, ioTagMiso[0]), SPIDEV_COUNT },