From fd0ea29fc6682beb7ed2a48d508811459aefd3c5 Mon Sep 17 00:00:00 2001 From: Hyon Lim Date: Thu, 26 Mar 2020 02:27:14 +0900 Subject: [PATCH] Board support: UVify Core. As Core is not using SPI4 as external, SPI4 external interface related code removed. Also, PMW3901 flow sensor is added on SPI2 bus. --- boards/uvify/core/nuttx-config/nsh/defconfig | 2 +- boards/uvify/core/src/spi.cpp | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/boards/uvify/core/nuttx-config/nsh/defconfig b/boards/uvify/core/nuttx-config/nsh/defconfig index 3a26b1f5d9..895d59de1c 100644 --- a/boards/uvify/core/nuttx-config/nsh/defconfig +++ b/boards/uvify/core/nuttx-config/nsh/defconfig @@ -189,7 +189,7 @@ CONFIG_STM32_SPI1=y CONFIG_STM32_SPI1_DMA=y CONFIG_STM32_SPI1_DMA_BUFFER=1024 CONFIG_STM32_SPI2=y -CONFIG_STM32_SPI4=y +CONFIG_STM32_SPI4=n CONFIG_STM32_SPI_DMA=y CONFIG_STM32_SPI_DMATHRESHOLD=8 CONFIG_STM32_TIM10=y diff --git a/boards/uvify/core/src/spi.cpp b/boards/uvify/core/src/spi.cpp index 47048ed43a..5b867f4b2d 100644 --- a/boards/uvify/core/src/spi.cpp +++ b/boards/uvify/core/src/spi.cpp @@ -46,14 +46,13 @@ constexpr px4_spi_bus_t px4_spi_buses[SPI_BUS_MAX_BUS_ITEMS] = { initSPIDevice(SPIDEV_FLASH(0), SPI::CS{GPIO::PortD, GPIO::Pin10}), initSPIDevice(DRV_BARO_DEVTYPE_MS5611, SPI::CS{GPIO::PortD, GPIO::Pin7}), initSPIDevice(DRV_BARO_DEVTYPE_MS5607, SPI::CS{GPIO::PortD, GPIO::Pin7}), - }), - initSPIBusExternal(SPI::Bus::SPI4, { - SPI::CS{GPIO::PortA, GPIO::Pin8}, - }), + initSPIDevice(DRV_FLOW_DEVTYPE_PMW3901, SPI::CS{GPIO::PortB, GPIO::Pin12}) + }) }; static constexpr bool unused = validateSPIConfig(px4_spi_buses); +#if defined(BOARD_HAS_BUS_MANIFEST) __EXPORT bool board_has_bus(enum board_bus_types type, uint32_t bus) { bool rv = true; @@ -73,4 +72,4 @@ __EXPORT bool board_has_bus(enum board_bus_types type, uint32_t bus) return rv; } - +#endif