From 40149ecabcf33238c6e51708d00412fbd186b03c Mon Sep 17 00:00:00 2001 From: modaltb <50114502+modaltb@users.noreply.github.com> Date: Mon, 22 Aug 2022 17:58:44 -0700 Subject: [PATCH] boards: modalai_fc-v2 configure SPI6, disable unused SPI3/4 (#20093) --- boards/modalai/fc-v2/nuttx-config/nsh/defconfig | 7 +++++-- boards/modalai/fc-v2/src/spi.cpp | 3 --- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/boards/modalai/fc-v2/nuttx-config/nsh/defconfig b/boards/modalai/fc-v2/nuttx-config/nsh/defconfig index 1e46ecd996..134ec7e122 100644 --- a/boards/modalai/fc-v2/nuttx-config/nsh/defconfig +++ b/boards/modalai/fc-v2/nuttx-config/nsh/defconfig @@ -183,10 +183,13 @@ CONFIG_STM32H7_SPI1_DMA=y CONFIG_STM32H7_SPI1_DMA_BUFFER=1024 CONFIG_STM32H7_SPI2=y CONFIG_STM32H7_SPI2_DMA=y -CONFIG_STM32H7_SPI2_DMA_BUFFER=4096 -CONFIG_STM32H7_SPI4=y +CONFIG_STM32H7_SPI2_DMA_BUFFER=1024 +CONFIG_STM32H7_SPI3=n +CONFIG_STM32H7_SPI4=n CONFIG_STM32H7_SPI5=y CONFIG_STM32H7_SPI6=y +CONFIG_STM32H7_SPI6_DMA=y +CONFIG_STM32H7_SPI6_DMA_BUFFER=1024 CONFIG_STM32H7_SPI_DMA=y CONFIG_STM32H7_TIM12=y CONFIG_STM32H7_TIM1=y diff --git a/boards/modalai/fc-v2/src/spi.cpp b/boards/modalai/fc-v2/src/spi.cpp index 69555c8526..8a9541f4fe 100644 --- a/boards/modalai/fc-v2/src/spi.cpp +++ b/boards/modalai/fc-v2/src/spi.cpp @@ -42,9 +42,6 @@ constexpr px4_spi_bus_t px4_spi_buses[SPI_BUS_MAX_BUS_ITEMS] = { initSPIBus(SPI::Bus::SPI2, { initSPIDevice(DRV_IMU_DEVTYPE_ICM42688P, SPI::CS{GPIO::PortH, GPIO::Pin5}, SPI::DRDY{GPIO::PortA, GPIO::Pin10}), }), - initSPIBus(SPI::Bus::SPI4, { - initSPIDevice(DRV_MAG_DEVTYPE_BMM150, SPI::CS{GPIO::PortH, GPIO::Pin15}, SPI::DRDY{GPIO::PortD, GPIO::Pin12}), - }), initSPIBus(SPI::Bus::SPI5, { initSPIDevice(SPIDEV_FLASH(0), SPI::CS{GPIO::PortG, GPIO::Pin7}) }),