From 90c12f7313b10ea074c198c3b43b62ffb6e877c9 Mon Sep 17 00:00:00 2001 From: Peter van der Perk Date: Mon, 23 Dec 2024 13:41:22 +0100 Subject: [PATCH] mr-tropic fix and test uart's --- boards/nxp/mr-tropic/nuttx-config/include/board.h | 15 ++++++--------- boards/nxp/mr-tropic/nuttx-config/nsh/defconfig | 1 - boards/nxp/mr-tropic/src/board_config.h | 4 ++-- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/boards/nxp/mr-tropic/nuttx-config/include/board.h b/boards/nxp/mr-tropic/nuttx-config/include/board.h index 0dda059ef0..0f379dc008 100644 --- a/boards/nxp/mr-tropic/nuttx-config/include/board.h +++ b/boards/nxp/mr-tropic/nuttx-config/include/board.h @@ -291,15 +291,15 @@ #define GPIO_LPUART5_RX (GPIO_LPUART5_RX_1 | LPUART_IOMUX) /* GPIO_B1_13 */ #define GPIO_LPUART5_TX (GPIO_LPUART5_TX_1 | LPUART_IOMUX) /* GPIO_B1_12 */ -#define GPIO_LPUART5_CTS (GPIO_LPUART5_CTS_1 | IOMUX_UART_CTS_DEFAULT | PADMUX_SION) /* GPIO_EMC_27 GPIO4_IO27 (GPIO only, no HW Flow control) */ -#define GPIO_LPUART5_RTS (GPIO_PORT4 | GPIO_PIN28 | GPIO_OUTPUT | GPIO_OUTPUT_ZERO | HS_OUTPUT_IOMUX) /* GPIO_EMC_28 GPIO4_IO28 (GPIO only, no HW Flow control) */ +#define GPIO_LPUART5_CTS (GPIO_LPUART5_CTS_1 | IOMUX_UART_CTS_DEFAULT | PADMUX_SION) /* GPIO_EMC_28 GPIO4_IO27 */ +#define GPIO_LPUART5_RTS (GPIO_PORT4 | GPIO_PIN27 | GPIO_OUTPUT | GPIO_OUTPUT_ZERO | IOMUX_UART_DEFAULT) /* GPIO_EMC_27 GPIO4_IO27 (GPIO only, no HW Flow control) */ /* AUX */ #define GPIO_LPUART4_RX (GPIO_LPUART4_RX_1 | LPUART_IOMUX) /* GPIO_B1_01 */ #define GPIO_LPUART4_TX (GPIO_LPUART4_TX_1 | LPUART_IOMUX) /* GPIO_B1_00 */ -#define GPIO_LPUART4_CTS (GPIO_PORT1 | GPIO_PIN14 | GPIO_INPUT | IOMUX_UART_CTS_DEFAULT) /* GPIO_AD_B0_14 GPIO4_IO27 (GPIO only, no HW Flow control) */ -#define GPIO_LPUART4_RTS (GPIO_PORT1 | GPIO_PIN15 | GPIO_OUTPUT | GPIO_OUTPUT_ZERO | HS_OUTPUT_IOMUX) /* GPIO_AD_B0_15 GPIO4_IO28 (GPIO only, no HW Flow control) */ +#define GPIO_LPUART4_CTS (GPIO_PORT1 | GPIO_PIN15 | GPIO_INPUT | PADMUX_SION | IOMUX_UART_CTS_DEFAULT) /* GPIO_AD_B0_15 GPIO1_IO14 (Fixme Add GPIO Flow support in LPUART) */ +#define GPIO_LPUART4_RTS (GPIO_PORT1 | GPIO_PIN14 | GPIO_OUTPUT | GPIO_OUTPUT_ZERO | IOMUX_UART_DEFAULT) /* GPIO_AD_B0_14 GPIO1_IO14 (GPIO only, no HW Flow control) */ /* GPS 1 */ @@ -308,13 +308,10 @@ /* Telem 1 */ -#define HS_INPUT_IOMUX (IOMUX_CMOS_INPUT | IOMUX_SLEW_SLOW | IOMUX_DRIVE_HIZ | IOMUX_SPEED_MEDIUM | IOMUX_PULL_UP_47K) -#define HS_OUTPUT_IOMUX (IOMUX_CMOS_OUTPUT | IOMUX_SLEW_FAST | IOMUX_DRIVE_33OHM | IOMUX_SPEED_MEDIUM | IOMUX_PULL_KEEP) - #define GPIO_LPUART3_RX (GPIO_LPUART3_RX_1 | LPUART_IOMUX) /* GPIO_AD_B1_07 */ #define GPIO_LPUART3_TX (GPIO_LPUART3_TX_1 | LPUART_IOMUX) /* GPIO_AD_B1_06 */ -#define GPIO_LPUART3_CTS (GPIO_LPUART3_CTS_1 | IOMUX_UART_CTS_DEFAULT | PADMUX_SION) /* GPIO_AD_B1_04 GPIO1_IO20 (GPIO only, no HW Flow control) */ -#define GPIO_LPUART3_RTS (GPIO_PORT1 | GPIO_PIN21 | GPIO_OUTPUT | GPIO_OUTPUT_ZERO | HS_OUTPUT_IOMUX) /* GPIO_AD_B1_05 GPIO1_IO21 (GPIO only, no HW Flow control) */ +#define GPIO_LPUART3_CTS (GPIO_LPUART3_CTS_1 | IOMUX_UART_CTS_DEFAULT | PADMUX_SION) /* GPIO_AD_B1_04 GPIO1_IO20 */ +#define GPIO_LPUART3_RTS (GPIO_PORT1 | GPIO_PIN21 | GPIO_OUTPUT | GPIO_OUTPUT_ZERO | IOMUX_UART_DEFAULT) /* GPIO_AD_B1_05 GPIO1_IO21 (GPIO only, no HW Flow control) */ //TODO check RT7 partial HW handshake /* RC INPUT single wire mode on TX, RX is not used */ diff --git a/boards/nxp/mr-tropic/nuttx-config/nsh/defconfig b/boards/nxp/mr-tropic/nuttx-config/nsh/defconfig index 8330942d09..58d50b967c 100644 --- a/boards/nxp/mr-tropic/nuttx-config/nsh/defconfig +++ b/boards/nxp/mr-tropic/nuttx-config/nsh/defconfig @@ -133,7 +133,6 @@ CONFIG_LPUART3_TXBUFSIZE=3000 CONFIG_LPUART3_TXDMA=y CONFIG_LPUART4_BAUD=57600 CONFIG_LPUART4_IFLOWCONTROL=y -CONFIG_LPUART4_OFLOWCONTROL=y CONFIG_LPUART4_RXBUFSIZE=600 CONFIG_LPUART4_RXDMA=y CONFIG_LPUART4_TXBUFSIZE=3000 diff --git a/boards/nxp/mr-tropic/src/board_config.h b/boards/nxp/mr-tropic/src/board_config.h index f31920ab56..7c0265aa4c 100644 --- a/boards/nxp/mr-tropic/src/board_config.h +++ b/boards/nxp/mr-tropic/src/board_config.h @@ -168,7 +168,7 @@ #define TONE_ALARM_TIMER 3 /* FlexPWM 3 */ #define TONE_ALARM_CHANNEL 1 /* GPIO_EMC_31 PWM3_PWMA01 */ -#define GPIO_BUZZER_1 /* GPIO_EMC_31 GPIO4_IO31 */ (GPIO_PORT1 | GPIO_PIN23 | GPIO_OUTPUT | GPIO_OUTPUT_ZERO | GENERAL_OUTPUT_IOMUX) +#define GPIO_BUZZER_1 /* GPIO_EMC_31 GPIO4_IO31 */ (GPIO_PORT4 | GPIO_PIN31 | GPIO_OUTPUT | GPIO_OUTPUT_ZERO | GENERAL_OUTPUT_IOMUX) #define GPIO_TONE_ALARM_IDLE GPIO_BUZZER_1 #define GPIO_TONE_ALARM (GPIO_FLEXPWM3_PWMA01_1 | GENERAL_OUTPUT_IOMUX) @@ -182,7 +182,7 @@ #define HRT_TIMER 1 /* use GPT1 for the HRT */ #define HRT_TIMER_CHANNEL 1 /* use capture/compare channel 1 */ -#define RC_SERIAL_PORT "/dev/ttyS4" +#define RC_SERIAL_PORT "/dev/ttyS5" #define RC_SERIAL_SINGLEWIRE 1 // Suport Single wire wiring #define RC_SERIAL_SWAP_RXTX 1 // Set Swap (but not supported in HW) to use Single wire #define RC_SERIAL_SWAP_USING_SINGLEWIRE 1 // Set to use Single wire swap as HW does not support swap