From 01dc43a68c51e22f383081b4f8756f661e2692fd Mon Sep 17 00:00:00 2001
From: Lizongdi <1210855344@qq.com>
Date: Wed, 22 Jul 2026 15:16:07 +0800
Subject: [PATCH] =?UTF-8?q?repl=E6=94=B9=E4=B8=BA=E7=9B=B4=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=EF=BC=8C=E5=88=A0=E9=99=A4send=E7=BA=BF?=
 =?UTF-8?q?=E7=A8=8B=EF=BC=8C=E5=90=8E=E7=BB=AD=E9=9C=80=E8=A6=81=E7=9A=84?=
 =?UTF-8?q?=E8=AF=9D=E5=86=8D=E5=8A=A0=E5=9B=9E=E6=9D=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 RBcore/drv_interface.c | 33 +--------------------------------
 bspMCU/My_print.c      | 10 +++++-----
 2 files changed, 6 insertions(+), 37 deletions(-)

diff --git a/RBcore/drv_interface.c b/RBcore/drv_interface.c
index ed11d8e..02ba487 100644
--- a/RBcore/drv_interface.c
+++ b/RBcore/drv_interface.c
@@ -29,7 +29,7 @@
 /*----------------------------------------------*
  * 外部函数原型说明                             *
  *----------------------------------------------*/
-
+extern TComCtrl *g_ptUartCtrl;
 /*----------------------------------------------*
  * 内部函数原型说明                             *
  *----------------------------------------------*/
@@ -127,7 +127,6 @@ int FDCAN2_Send(char *_pBuffer, uint32_t _iSize)
 }
 
 #ifndef CONFIG_UART_IT_IDLEDMA
-extern TComCtrl *g_ptUartCtrl;
 void HAL_UART_RxCpltCallback(UART_HandleTypeDef *huart)
 {
     if (huart->Instance == USART1)
@@ -226,36 +225,6 @@ void Read_RS485_1(void *argument)
     }
 }
 
-void SendAll_Task(void *argument)
-{
-    while(1)
-    {
-        rd_ComSendProc(g_ptRS485_1);
-        Rd_Delay(1);
-#ifdef USE_PRINT
-        rd_ComSendProc(g_ptUartCtrl);
-#else
-        rd_ComSendProc(g_ptRS485_2);
-#endif
-        Rd_Delay(1);
-        rd_ComSendProc(g_ptRS485_3);
-        Rd_Delay(1);
-        rd_ComSendProc(g_ptRS485_4);
-        Rd_Delay(1);
-        rd_ComSendProc(g_ptLTE_7S0);
-        Rd_Delay(1);
-        rd_ComSendProc(g_ptE28_SBUS);
-        Rd_Delay(1);
-        rd_ComSendProc(g_ptInterCall);
-        Rd_Delay(1);
-        rd_ComSendProc(g_ptFDCAN1);
-        Rd_Delay(1);
-        rd_ComSendProc(g_ptFDCAN2);
-        Rd_Delay(1);
-    }
-}
-
-extern void RBcore_Init(void);
 extern void MotorInit(void);
 extern void MotorMgr_ParseResponse(uint8_t ucMotorID, const uint8_t *pucData, uint32_t uiLen);
 
diff --git a/bspMCU/My_print.c b/bspMCU/My_print.c
index 40692cd..c89941f 100644
--- a/bspMCU/My_print.c
+++ b/bspMCU/My_print.c
@@ -34,9 +34,9 @@ int USART_Send(char *_pBuffer, uint32_t _iSize)
 {
 	HAL_GPIO_WritePin(RS485_2_DIR_GPIO_Port, RS485_2_DIR_Pin,GPIO_PIN_SET);
     TUartUserData *ptUartUserData = (TUartUserData *)g_ptUartCtrl->m_pUserData;
-//    int iRet = HAL_UART_Transmit(ptUartUserData->m_uart, (uint8_t *)_pBuffer, _iSize, 100);
-//    HAL_GPIO_WritePin(RS485_2_DIR_GPIO_Port, RS485_2_DIR_Pin,GPIO_PIN_RESET);
-    int iRet = HAL_UART_Transmit_DMA(ptUartUserData->m_uart, (uint8_t *)_pBuffer, _iSize);
+    int iRet = HAL_UART_Transmit(ptUartUserData->m_uart, (uint8_t *)_pBuffer, _iSize, 100);
+    HAL_GPIO_WritePin(RS485_2_DIR_GPIO_Port, RS485_2_DIR_Pin,GPIO_PIN_RESET);
+//    int iRet = HAL_UART_Transmit_DMA(ptUartUserData->m_uart, (uint8_t *)_pBuffer, _iSize);
 
     return iRet;
 }
@@ -189,14 +189,14 @@ WEAK int Myprint_putchar(uint8_t ch)
         // 遇到换行，发送 \r\n
         tx_buf[0] = '\r';
         tx_buf[1] = '\n';
-        if (rd_ComWrite(g_ptUartCtrl, tx_buf, 2) < 0) return EOF;
+        if (rd_ComSend(g_ptUartCtrl, tx_buf, 2) < 0) return EOF;
         return 2;
     } 
     else 
     {
         // 普通字符
         tx_buf[0] = ch;
-        if (rd_ComWrite(g_ptUartCtrl, tx_buf, 1) < 0) return EOF;
+        if (rd_ComSend(g_ptUartCtrl, tx_buf, 1) < 0) return EOF;
         return 1;
     }
 }