From bbf47bcf1957faaca5803c6b1ec70d4554db23f8 Mon Sep 17 00:00:00 2001 From: Michael Jakob Date: Fri, 23 Dec 2016 09:22:21 +0100 Subject: [PATCH 1/2] Fix IO allocation for SPI CS pin on F7 targets --- src/main/drivers/bus_spi_hal.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/drivers/bus_spi_hal.c b/src/main/drivers/bus_spi_hal.c index f58c742431..7d86d279ae 100644 --- a/src/main/drivers/bus_spi_hal.c +++ b/src/main/drivers/bus_spi_hal.c @@ -155,6 +155,7 @@ void spiInitDevice(SPIDevice device) IOConfigGPIOAF(IOGetByTag(spi->mosi), SPI_IO_AF_CFG, spi->af); if (spi->nss) { + IOInit(IOGetByTag(spi->nss), OWNER_SPI_CS, RESOURCE_INDEX(device)); IOConfigGPIOAF(IOGetByTag(spi->nss), SPI_IO_CS_CFG, spi->af); } #endif @@ -164,6 +165,7 @@ void spiInitDevice(SPIDevice device) IOConfigGPIO(IOGetByTag(spi->mosi), SPI_IO_AF_MOSI_CFG); if (spi->nss) { + IOInit(IOGetByTag(spi->nss), OWNER_SPI_CS, RESOURCE_INDEX(device)); IOConfigGPIO(IOGetByTag(spi->nss), SPI_IO_CS_CFG); } #endif From 50ea7ba69ce98b63b74e5cebbfb058d8a36e165a Mon Sep 17 00:00:00 2001 From: Michael Jakob Date: Fri, 23 Dec 2016 09:25:51 +0100 Subject: [PATCH 2/2] AlienFlight F4 SDCard update --- src/main/target/ALIENFLIGHTF4/target.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/target/ALIENFLIGHTF4/target.h b/src/main/target/ALIENFLIGHTF4/target.h index 1744475fac..a2d1c74c40 100644 --- a/src/main/target/ALIENFLIGHTF4/target.h +++ b/src/main/target/ALIENFLIGHTF4/target.h @@ -69,14 +69,14 @@ //#define SDCARD_DETECT_INVERTED -#define SDCARD_DETECT_PIN PB10 +#define SDCARD_DETECT_PIN PB11 #define SDCARD_DETECT_EXTI_LINE EXTI_Line10 #define SDCARD_DETECT_EXTI_PIN_SOURCE EXTI_PinSource10 #define SDCARD_DETECT_EXTI_PORT_SOURCE EXTI_PortSourceGPIOB #define SDCARD_DETECT_EXTI_IRQn EXTI15_10_IRQn #define SDCARD_SPI_INSTANCE SPI2 -#define SDCARD_SPI_CS_PIN SPI2_NSS_PIN +#define SDCARD_SPI_CS_PIN PB10 // SPI2 is on the APB1 bus whose clock runs at 84MHz. Divide to under 400kHz for init: #define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 256 // 328kHz