Jelajahi Sumber

除八方协议外的其余协议支持同时解析接收

Ye Jin 5 bulan lalu
induk
melakukan
70fdea6522

+ 2 - 7
3.BasicFunction/Source/usart.c

@@ -121,19 +121,14 @@ void UsartRx_Process(USART_Buf_TypeDef *USARTx_RxBuf_Struct, USART_Buf_TypeDef *
         /*解析1*/
         KM5S_USART_RxData_Process(USARTx_TxBuf_Struct, data, datacount);
         /*解析2*/
-#if (UART_ID == 1)
         Lidian2_USART_RxData_Process(USARTx_TxBuf_Struct, data, datacount);
-#elif (UART_ID == 2)
         GNZH_USART_RxData_Process(USARTx_TxBuf_Struct, data, datacount);
-#elif (UART_ID == 3)
+#if (UART_ID == 3)
         Bafang_USART_RxData_Process(USARTx_TxBuf_Struct, data, datacount);
-#elif (UART_ID == 4)
+#endif
         Lanfeng_USART_RxData_Process(USARTx_TxBuf_Struct, data, datacount);
-#elif (UART_ID == 5)
         J_USART_RxData_Process(USARTx_TxBuf_Struct, data, datacount);
-#elif (UART_ID == 6)
         Lanfeng9_USART_RxData_Process(USARTx_TxBuf_Struct, data, datacount);
-#endif
         TORG4BB_USART_RxData_Process(USARTx_TxBuf_Struct, data, datacount);
         /*clear*/
         USART_RxFrameBuf_Struct->uwDataCount[USART_RxFrameBuf_Struct->ucBufRdIndex] = 0;

+ 1 - 0
4.BasicHardwSoftwLayer/2.BasicSoftwLayer/Include/syspar.h

@@ -68,6 +68,7 @@ Update Time
 /*======================================================================*
    //仪表协议选择
 // //0-5s,1-锂电2号,2-概念智慧, 3-八方,4-澜风2.6,无适配仪表,暂未使用, 5-J协议,6-澜风9.0
+ //只区分ID==3,需要更新波特率,八方,其余协议可以直接解析
 *=======================================================================*/
 #define  UART_ID           0