From eebb4812ddd3b0f7cb385329c821f7317bfb8a32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=95=E5=85=A8=E8=BE=89?= Date: Wed, 7 Oct 2020 08:55:36 +0800 Subject: [PATCH] change uart in/out port --- EF3Lite/hal_uart_in_wrapper.c | 4 ++-- EF3Lite/hal_uart_out_wrapper.c | 15 +++++++++++---- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/EF3Lite/hal_uart_in_wrapper.c b/EF3Lite/hal_uart_in_wrapper.c index 813bc96..1b0f3ce 100644 --- a/EF3Lite/hal_uart_in_wrapper.c +++ b/EF3Lite/hal_uart_in_wrapper.c @@ -71,13 +71,13 @@ ErrorCode[0] = -1; { case 0: // TODO read all data from fifo - Data_len[0] = UART_RX_FIFO_read(&rs232_rx1, Data, y_width); + Data_len[0] = UART_RX_FIFO_read(&uart6_RS232_GCS_rx, Data, y_width); ErrorCode[0] = 0; break; case 1: // TODO read all data from fifo - Data_len[0] = UART_RX_FIFO_read(&rs422_rx2, Data, y_width); + Data_len[0] = UART_RX_FIFO_read(&uart5_RS232_HIL_rx, Data, y_width); ErrorCode[0] = 0; break; diff --git a/EF3Lite/hal_uart_out_wrapper.c b/EF3Lite/hal_uart_out_wrapper.c index d12a371..8806ef7 100644 --- a/EF3Lite/hal_uart_out_wrapper.c +++ b/EF3Lite/hal_uart_out_wrapper.c @@ -69,17 +69,24 @@ void hal_uart_out_Outputs_wrapper(uint8_T *buff, * u_width - the maximum size of buff, do not read buff out of range. *************************************************/ ErrorCode[0] = -1; +static uint8_T seq_last[16]; switch (uart_id[0]) { case 0: // TODO write all data to fifo - UART_TX_FIFO_write(&rs232_tx1, buff, len[0]); - ErrorCode[0] = 0; + if (sep[0] != seq_last[uart_id[0]] && UART_TX_FIFO_write(&uart6_RS232_GCS_tx, (uint8_t *)buff, len[0])) + { + seq_last[uart_id[0]] = sep[0]; + ErrorCode[0] = 0; + } break; case 1: // TODO write all data to fifo - UART_TX_FIFO_write(&rs422_tx2, buff, len[0]); - ErrorCode[0] = 0; + if (sep[0] != seq_last[uart_id[0]] && UART_TX_FIFO_write(&uart5_RS232_HIL_tx, (uint8_t *)buff, len[0])) + { + seq_last[uart_id[0]] = sep[0]; + ErrorCode[0] = 0; + } break; } #else