From 2466f43abdab22fd5cb03dad87acc2e47a47e08c Mon Sep 17 00:00:00 2001 From: Dominic Clifton Date: Tue, 21 May 2019 18:49:08 +0200 Subject: [PATCH] Remove USE_RTC6705_CLK_HACK. For hardware SPI the GPIO pin is in Alternate Function mode, so setting the bit in BSRR (via IOHi) won't have any affect on the IO level. --- src/main/drivers/vtx_rtc6705.c | 17 ----------------- src/main/target/SPRACINGF3NEO/target.h | 3 --- src/main/target/SPRACINGF4NEO/target.h | 3 --- 3 files changed, 23 deletions(-) diff --git a/src/main/drivers/vtx_rtc6705.c b/src/main/drivers/vtx_rtc6705.c index 4b16aff44c..f47919f5b2 100644 --- a/src/main/drivers/vtx_rtc6705.c +++ b/src/main/drivers/vtx_rtc6705.c @@ -55,14 +55,7 @@ static busDevice_t busInstance; static busDevice_t *busdev; #define DISABLE_RTC6705() IOHi(busdev->busdev_u.spi.csnPin) - -#ifdef USE_RTC6705_CLK_HACK -static IO_t vtxCLKPin = IO_NONE; -// HACK for missing pull up on CLK line - drive the CLK high *before* enabling the CS pin. -#define ENABLE_RTC6705() {IOHi(vtxCLKPin); delayMicroseconds(5); IOLo(busdev->busdev_u.spi.csnPin); } -#else #define ENABLE_RTC6705() IOLo(busdev->busdev_u.spi.csnPin) -#endif #define DP_5G_MASK 0x7000 // b111000000000000 #define PA5G_BS_MASK 0x0E00 // b000111000000000 @@ -113,16 +106,6 @@ bool rtc6705IOInit(const vtxIOConfig_t *vtxIOConfig) rtc6705HaveRequiredResources = rtc6705HaveRequiredResources && vtxPowerPin; #endif -#ifdef USE_RTC6705_CLK_HACK - SPIDevice device = SPI_CFG_TO_DEV(vtxIOConfig->spiDevice); - spiDevice_t *spi = &(spiDevice[device]); - - vtxCLKPin = IOGetByTag(spi->sck); - // we assume the CLK pin will have been initialised by the SPI code. - - rtc6705HaveRequiredResources = rtc6705HaveRequiredResources && vtxCLKPin; -#endif - if (!rtc6705HaveRequiredResources) { return false; } diff --git a/src/main/target/SPRACINGF3NEO/target.h b/src/main/target/SPRACINGF3NEO/target.h index 5cb34194ca..5dca18d4c4 100644 --- a/src/main/target/SPRACINGF3NEO/target.h +++ b/src/main/target/SPRACINGF3NEO/target.h @@ -101,9 +101,6 @@ #define RTC6705_SPI_INSTANCE SPI3 #define RTC6705_POWER_PIN PC3 -#define USE_RTC6705_CLK_HACK -#define RTC6705_CLK_PIN SPI3_SCK_PIN - #define USE_MAX7456 #define MAX7456_SPI_INSTANCE SPI3 #define MAX7456_SPI_CS_PIN PA15 diff --git a/src/main/target/SPRACINGF4NEO/target.h b/src/main/target/SPRACINGF4NEO/target.h index 8765fcd36a..3743b06884 100644 --- a/src/main/target/SPRACINGF4NEO/target.h +++ b/src/main/target/SPRACINGF4NEO/target.h @@ -147,9 +147,6 @@ #define RTC6705_SPI_INSTANCE SPI3 #define RTC6705_POWER_PIN PC3 -#define USE_RTC6705_CLK_HACK -#define RTC6705_CLK_PIN SPI3_SCK_PIN - // Bus Switched Device, Device A. #define USE_MAX7456 #define MAX7456_SPI_INSTANCE SPI3