Merge pull request #5352 from betaflight/fix-spi-init-on-spracingf3osd

CF/BF - Fix SPI init on SPRacingF3OSD.
This commit is contained in:
jflyper 2018-03-03 18:08:28 +09:00 committed by GitHub
commit f645b6bbf5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 0 deletions

View File

@ -77,6 +77,7 @@
#include "pg/adc.h"
#include "pg/bus_i2c.h"
#include "pg/bus_spi.h"
#include "pg/pg.h"
#include "pg/pg_ids.h"
#include "pg/vcd.h"
@ -119,6 +120,20 @@ static IO_t busSwitchResetPin = IO_NONE;
}
#endif
#ifdef USE_SPI
// Pre-initialize all CS pins to input with pull-up.
// It's sad that we can't do this with an initialized array,
// since we will be taking care of configurable CS pins shortly.
void spiPreInit(void)
{
#ifdef USE_MAX7456
spiPreInitCs(IO_TAG(MAX7456_SPI_CS_PIN));
#endif
}
#endif
void init(void)
{
#ifdef USE_HAL_DRIVER
@ -186,6 +201,11 @@ void init(void)
#else
#ifdef USE_SPI
spiPinConfigure(spiPinConfig());
// Initialize CS lines and keep them high
spiPreInit();
#ifdef USE_SPI_DEVICE_1
spiInit(SPIDEV_1);
#endif