Merge pull request #4918 from mikeller/improve_rtc6705_spi_preinit
Improved RTC6705 preinit conditional.
This commit is contained in:
commit
732ca6ae63
|
@ -61,9 +61,9 @@ static IO_t rtc6705ClkPin = IO_NONE;
|
|||
|
||||
void rtc6705IOInit(void)
|
||||
{
|
||||
rtc6705DataPin = IOGetByTag(IO_TAG(RTC6705_SPIDATA_PIN));
|
||||
rtc6705CsnPin = IOGetByTag(IO_TAG(RTC6705_SPILE_PIN));
|
||||
rtc6705DataPin = IOGetByTag(IO_TAG(RTC6705_SPI_MOSI_PIN));
|
||||
rtc6705ClkPin = IOGetByTag(IO_TAG(RTC6705_SPICLK_PIN));
|
||||
rtc6705CsnPin = IOGetByTag(IO_TAG(RTC6705_CS_PIN));
|
||||
|
||||
IOInit(rtc6705CsnPin, OWNER_SPI_CS, RESOURCE_SOFT_OFFSET);
|
||||
IOConfigGPIO(rtc6705CsnPin, IOCFG_OUT_PP);
|
||||
|
|
|
@ -235,7 +235,7 @@ void spiPreInit(void)
|
|||
#ifdef USE_MAG_SPI_AK8963
|
||||
spiPreInitCs(IO_TAG(AK8963_CS_PIN));
|
||||
#endif
|
||||
#ifdef RTC6705_CS_PIN // XXX VTX_RTC6705? Should use USE_ format.
|
||||
#if defined(USE_VTX_RTC6705)
|
||||
spiPreInitCs(IO_TAG(RTC6705_CS_PIN));
|
||||
#endif
|
||||
#ifdef USE_FLASH_M25P16
|
||||
|
|
|
@ -84,9 +84,9 @@
|
|||
#define USE_VTX_RTC6705
|
||||
#define USE_VTX_RTC6705_SOFTSPI
|
||||
#define USE_VTX_CONTROL
|
||||
#define RTC6705_SPIDATA_PIN PC15
|
||||
#define RTC6705_SPILE_PIN PB12
|
||||
#define RTC6705_SPI_MOSI_PIN PC15
|
||||
#define RTC6705_SPICLK_PIN PC13
|
||||
#define RTC6705_CS_PIN PB12
|
||||
|
||||
#define USE_ADC
|
||||
#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
|
||||
|
|
|
@ -118,9 +118,9 @@
|
|||
// *************** RTC6705 *************************
|
||||
#define USE_VTX_RTC6705
|
||||
#define USE_VTX_RTC6705_SOFTSPI
|
||||
#define RTC6705_SPILE_PIN PB3
|
||||
#define RTC6705_SPICLK_PIN PB4
|
||||
#define RTC6705_SPIDATA_PIN PB5
|
||||
#define RTC6705_SPI_MOSI_PIN PB5
|
||||
#define RTC6705_CS_PIN PB3
|
||||
|
||||
// *************** ADC *****************************
|
||||
#define USE_ADC
|
||||
|
|
|
@ -99,9 +99,9 @@
|
|||
#define SERIAL_PORT_COUNT 5 //VCP, USART1, USART2, UART4, UART5
|
||||
#define USE_VTX_RTC6705
|
||||
#define USE_VTX_RTC6705_SOFTSPI
|
||||
#define RTC6705_SPIDATA_PIN PC6
|
||||
#define RTC6705_SPILE_PIN PC7
|
||||
#define RTC6705_SPI_MOSI_PIN PC6
|
||||
#define RTC6705_SPICLK_PIN PC2
|
||||
#define RTC6705_CS_PIN PC7
|
||||
#endif
|
||||
|
||||
#define USE_SPI
|
||||
|
|
|
@ -111,9 +111,9 @@
|
|||
#define USE_VTX_RTC6705
|
||||
#define USE_VTX_RTC6705_SOFTSPI
|
||||
|
||||
#define RTC6705_SPIDATA_PIN PC15
|
||||
#define RTC6705_SPILE_PIN PC14
|
||||
#define RTC6705_SPI_MOSI_PIN PC15
|
||||
#define RTC6705_SPICLK_PIN PC13
|
||||
#define RTC6705_CS_PIN PC14
|
||||
|
||||
#define USE_SDCARD
|
||||
|
||||
|
|
Loading…
Reference in New Issue