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

Fixed ownership labels for pins of SPI receivers.

Browse source
This commit is contained in:
mikeller 2017-12-29 00:51:48 +13:00
parent 7b8634e1c9
commit 2a837890b7
5 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/main/drivers/resource.c
View file

@ -69,4 +69,5 @@ const char * const ownerNames[OWNER_TOTAL_COUNT] = {
"CAMERA_CONTROL", "CAMERA_CONTROL",
"TIMUP", "TIMUP",
"RANGEFINDER", "RANGEFINDER",
"RX_SPI"
}; };

1
src/main/drivers/resource.h
View file

@ -69,6 +69,7 @@ typedef enum {
OWNER_CAMERA_CONTROL, OWNER_CAMERA_CONTROL,
OWNER_TIMUP, OWNER_TIMUP,
OWNER_RANGEFINDER, OWNER_RANGEFINDER,
OWNER_RX_SPI,
OWNER_TOTAL_COUNT OWNER_TOTAL_COUNT
} resourceOwner_e; } resourceOwner_e;

2
src/main/drivers/rx/rx_spi.c
View file

@ -69,7 +69,7 @@ void rxSpiDeviceInit(rx_spi_type_e spiType)
UNUSED(spiType); UNUSED(spiType);
const SPIDevice rxSPIDevice = spiDeviceByInstance(RX_SPI_INSTANCE); const SPIDevice rxSPIDevice = spiDeviceByInstance(RX_SPI_INSTANCE);
const IO_t rxCsPin = DEFIO_IO(RX_NSS_PIN); const IO_t rxCsPin = DEFIO_IO(RX_NSS_PIN);
IOInit(rxCsPin, OWNER_SPI_CS, rxSPIDevice + 1); IOInit(rxCsPin, OWNER_RX_SPI_CS, rxSPIDevice + 1);
IOConfigGPIO(rxCsPin, SPI_IO_CS_CFG); IOConfigGPIO(rxCsPin, SPI_IO_CS_CFG);
#endif // USE_RX_SOFTSPI #endif // USE_RX_SOFTSPI

8
src/main/rx/cc2500_frsky_shared.c
View file

@ -530,22 +530,22 @@ void frSkySpiInit(const rxConfig_t *rxConfig, rxRuntimeConfig_t *rxRuntimeConfig
// gpio init here // gpio init here
gdoPin = IOGetByTag(IO_TAG(RX_FRSKY_SPI_GDO_0_PIN)); gdoPin = IOGetByTag(IO_TAG(RX_FRSKY_SPI_GDO_0_PIN));
IOInit(gdoPin, OWNER_RX_BIND, 0); IOInit(gdoPin, OWNER_RX_SPI, 0);
IOConfigGPIO(gdoPin, IOCFG_IN_FLOATING); IOConfigGPIO(gdoPin, IOCFG_IN_FLOATING);
frSkyLedPin = IOGetByTag(IO_TAG(RX_FRSKY_SPI_LED_PIN)); frSkyLedPin = IOGetByTag(IO_TAG(RX_FRSKY_SPI_LED_PIN));
IOInit(frSkyLedPin, OWNER_LED, 0); IOInit(frSkyLedPin, OWNER_LED, 0);
IOConfigGPIO(frSkyLedPin, IOCFG_OUT_PP); IOConfigGPIO(frSkyLedPin, IOCFG_OUT_PP);
#if defined(USE_RX_FRSKY_SPI_PA_LNA) #if defined(USE_RX_FRSKY_SPI_PA_LNA)
rxLnaEnPin = IOGetByTag(IO_TAG(RX_FRSKY_SPI_LNA_EN_PIN)); rxLnaEnPin = IOGetByTag(IO_TAG(RX_FRSKY_SPI_LNA_EN_PIN));
IOInit(rxLnaEnPin, OWNER_RX_BIND, 0); IOInit(rxLnaEnPin, OWNER_RX_SPI, 0);
IOConfigGPIO(rxLnaEnPin, IOCFG_OUT_PP); IOConfigGPIO(rxLnaEnPin, IOCFG_OUT_PP);
IOHi(rxLnaEnPin); // always on at the moment IOHi(rxLnaEnPin); // always on at the moment
txEnPin = IOGetByTag(IO_TAG(RX_FRSKY_SPI_TX_EN_PIN)); txEnPin = IOGetByTag(IO_TAG(RX_FRSKY_SPI_TX_EN_PIN));
IOInit(txEnPin, OWNER_RX_BIND, 0); IOInit(txEnPin, OWNER_RX_SPI, 0);
IOConfigGPIO(txEnPin, IOCFG_OUT_PP); IOConfigGPIO(txEnPin, IOCFG_OUT_PP);
#if defined(USE_RX_FRSKY_SPI_DIVERSITY) #if defined(USE_RX_FRSKY_SPI_DIVERSITY)
antSelPin = IOGetByTag(IO_TAG(RX_FRSKY_SPI_ANT_SEL_PIN)); antSelPin = IOGetByTag(IO_TAG(RX_FRSKY_SPI_ANT_SEL_PIN));
IOInit(antSelPin, OWNER_RX_BIND, 0); IOInit(antSelPin, OWNER_RX_SPI, 0);
IOConfigGPIO(antSelPin, IOCFG_OUT_PP); IOConfigGPIO(antSelPin, IOCFG_OUT_PP);
#endif #endif
#endif // USE_RX_FRSKY_SPI_PA_LNA #endif // USE_RX_FRSKY_SPI_PA_LNA

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

@ -358,7 +358,7 @@ void flySkyInit (const struct rxConfig_s *rxConfig, struct rxRuntimeConfig_s *rx
} }
IO_t bindPin = IOGetByTag(IO_TAG(BINDPLUG_PIN)); IO_t bindPin = IOGetByTag(IO_TAG(BINDPLUG_PIN));
IOInit(bindPin, OWNER_RX_SPI_CS, 0); IOInit(bindPin, OWNER_RX_BIND, 0);
IOConfigGPIO(bindPin, IOCFG_IPU); IOConfigGPIO(bindPin, IOCFG_IPU);
uint8_t startRxChannel; uint8_t startRxChannel;