fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-23 17:23:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

S32K3 Correct pinirq pinset for external interrupt

Browse Source
This commit is contained in:
Peter van der Perk
2022-12-16 12:02:44 -05:00
committed by David Sidrane
parent ffdf186598
commit 05dd43a8de
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boards/nxp/mr-canhubk3/nuttx-config/nsh/defconfig
+2
View File
@@ -210,6 +210,7 @@ CONFIG_S32K3XX_LPSPI2_PINCFG=3
CONFIG_S32K3XX_LPSPI3=y CONFIG_S32K3XX_LPSPI3=y
CONFIG_S32K3XX_LPSPI3_PINCFG=3 CONFIG_S32K3XX_LPSPI3_PINCFG=3
CONFIG_S32K3XX_LPSPI4=y CONFIG_S32K3XX_LPSPI4=y
CONFIG_S32K3XX_LPSPI4_DMA=y
CONFIG_S32K3XX_LPSPI4_PINCFG=3 CONFIG_S32K3XX_LPSPI4_PINCFG=3
CONFIG_S32K3XX_LPSPI5=y CONFIG_S32K3XX_LPSPI5=y
CONFIG_S32K3XX_LPSPI5_DMA=y CONFIG_S32K3XX_LPSPI5_DMA=y
@@ -225,6 +226,7 @@ CONFIG_S32K3XX_LPUART9=y
CONFIG_S32K3XX_LPUART_INVERT=y CONFIG_S32K3XX_LPUART_INVERT=y
CONFIG_S32K3XX_LPUART_SINGLEWIRE=y CONFIG_S32K3XX_LPUART_SINGLEWIRE=y
CONFIG_S32K3XX_QSPI=y CONFIG_S32K3XX_QSPI=y
CONFIG_S32K3XX_WKPUINTS=y
CONFIG_SCHED_HPWORK=y CONFIG_SCHED_HPWORK=y
CONFIG_SCHED_HPWORKPRIORITY=249 CONFIG_SCHED_HPWORKPRIORITY=249
CONFIG_SCHED_HPWORKSTACKSIZE=1280 CONFIG_SCHED_HPWORKSTACKSIZE=1280
boards/nxp/mr-canhubk3/src/spi.cpp
+2 -2
View File
@@ -71,10 +71,10 @@ constexpr px4_spi_bus_t px4_spi_buses[SPI_BUS_MAX_BUS_ITEMS] = {
initSPIDevice(SPIDEV_FLASH(0), SPI::CS{GPIO::PortD, GPIO::Pin17}) initSPIDevice(SPIDEV_FLASH(0), SPI::CS{GPIO::PortD, GPIO::Pin17})
}), }),
initSPIBus(SPI::Bus::SPI4, { initSPIBus(SPI::Bus::SPI4, {
initSPIDevice(DRV_IMU_DEVTYPE_ICM42688P, SPI::CS{GPIO::PortA, GPIO::Pin16}, SPI::DRDY{GPIO::PortA, GPIO::Pin15, 551}) initSPIDevice(DRV_IMU_DEVTYPE_ICM42688P, SPI::CS{GPIO::PortA, GPIO::Pin16}, SPI::DRDY{PIN_WKPU20})
}), }),
initSPIBus(SPI::Bus::SPI5, { initSPIBus(SPI::Bus::SPI5, {
initSPIDevice(DRV_IMU_DEVTYPE_ICM20649, SPI::CS{GPIO::PortA, GPIO::Pin14}, SPI::DRDY{GPIO::PortA, GPIO::Pin13, 549}) initSPIDevice(DRV_IMU_DEVTYPE_ICM20649, SPI::CS{GPIO::PortA, GPIO::Pin14}, SPI::DRDY{PIN_WKPU4})
}), }),
}; };
platforms/nuttx/src/px4/nxp/s32k3xx/include/px4_arch/hw_description.h
+1 -2
View File
@@ -131,7 +131,6 @@ enum Pin {
struct GPIOPin { struct GPIOPin {
Port port; Port port;
Pin pin; Pin pin;
uint16_t imcr;
}; };
} }
@@ -244,7 +243,7 @@ enum class Bus {
}; };
using CS = GPIO::GPIOPin; using CS = GPIO::GPIOPin;
using DRDY = GPIO::GPIOPin; using DRDY = uint32_t;
struct bus_device_external_cfg_t { struct bus_device_external_cfg_t {
CS cs_gpio; CS cs_gpio;
platforms/nuttx/src/px4/nxp/s32k3xx/include/px4_arch/spi_hw_description.h
+2 -3
View File
@@ -45,9 +45,8 @@ static inline constexpr px4_spi_bus_device_t initSPIDevice(uint32_t devid, SPI::
px4_spi_bus_device_t ret{}; px4_spi_bus_device_t ret{};
ret.cs_gpio = getGPIOPort(cs_gpio.port) | getGPIOPin(cs_gpio.pin) | (GPIO_LOWDRIVE | GPIO_OUTPUT_ONE); ret.cs_gpio = getGPIOPort(cs_gpio.port) | getGPIOPin(cs_gpio.pin) | (GPIO_LOWDRIVE | GPIO_OUTPUT_ONE);
if (drdy_gpio.port != GPIO::PortInvalid) { if (drdy_gpio != 0) {
ret.drdy_gpio = getGPIOPort(drdy_gpio.port) | getGPIOPin(drdy_gpio.pin) | getIMCR(drdy_gpio.imcr) | ret.drdy_gpio = drdy_gpio;
(GPIO_PULLUP | PIN_INT_BOTH);
} }
if (PX4_SPIDEVID_TYPE(devid) == 0) { // it's a PX4 device (internal or external) if (PX4_SPIDEVID_TYPE(devid) == 0) { // it's a PX4 device (internal or external)