diff --git a/src/main/drivers/resource.c b/src/main/drivers/resource.c index 336dc0219d..cc11efad76 100644 --- a/src/main/drivers/resource.c +++ b/src/main/drivers/resource.c @@ -69,4 +69,5 @@ const char * const ownerNames[OWNER_TOTAL_COUNT] = { "CAMERA_CONTROL", "TIMUP", "RANGEFINDER", + "RX_SPI" }; diff --git a/src/main/drivers/resource.h b/src/main/drivers/resource.h index 17e5956db7..30daf039eb 100644 --- a/src/main/drivers/resource.h +++ b/src/main/drivers/resource.h @@ -69,6 +69,7 @@ typedef enum { OWNER_CAMERA_CONTROL, OWNER_TIMUP, OWNER_RANGEFINDER, + OWNER_RX_SPI, OWNER_TOTAL_COUNT } resourceOwner_e; diff --git a/src/main/drivers/rx/rx_spi.c b/src/main/drivers/rx/rx_spi.c index 754e9bb18e..1e475036af 100644 --- a/src/main/drivers/rx/rx_spi.c +++ b/src/main/drivers/rx/rx_spi.c @@ -69,7 +69,7 @@ void rxSpiDeviceInit(rx_spi_type_e spiType) UNUSED(spiType); const SPIDevice rxSPIDevice = spiDeviceByInstance(RX_SPI_INSTANCE); 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); #endif // USE_RX_SOFTSPI diff --git a/src/main/rx/cc2500_frsky_shared.c b/src/main/rx/cc2500_frsky_shared.c index 532a00a7e3..e162560791 100644 --- a/src/main/rx/cc2500_frsky_shared.c +++ b/src/main/rx/cc2500_frsky_shared.c @@ -530,22 +530,22 @@ void frSkySpiInit(const rxConfig_t *rxConfig, rxRuntimeConfig_t *rxRuntimeConfig // gpio init here 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); frSkyLedPin = IOGetByTag(IO_TAG(RX_FRSKY_SPI_LED_PIN)); IOInit(frSkyLedPin, OWNER_LED, 0); IOConfigGPIO(frSkyLedPin, IOCFG_OUT_PP); #if defined(USE_RX_FRSKY_SPI_PA_LNA) 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); IOHi(rxLnaEnPin); // always on at the moment 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); #if defined(USE_RX_FRSKY_SPI_DIVERSITY) 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); #endif #endif // USE_RX_FRSKY_SPI_PA_LNA diff --git a/src/main/rx/flysky.c b/src/main/rx/flysky.c index 7814506e66..579154fd75 100644 --- a/src/main/rx/flysky.c +++ b/src/main/rx/flysky.c @@ -358,7 +358,7 @@ void flySkyInit (const struct rxConfig_s *rxConfig, struct rxRuntimeConfig_s *rx } 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); uint8_t startRxChannel;