瀏覽代碼

测试暂存

LAPTOP-KB7QFH2U\ChenJie-PC 2 年之前
父節點
當前提交
29fd626788
共有 2 個文件被更改,包括 20 次插入3 次删除
  1. 2 1
      src/AppTaskUart1.c
  2. 18 2
      src/hal_adapter.c

+ 2 - 1
src/AppTaskUart1.c

@@ -246,7 +246,8 @@ sint8 tcpipConnectionSend(uint8 TcpConnectId, uint8 *SendDataPtr, uint16 SendDat
 			else
 			{
 #if SEGGER_PRINTF==1
-			SEGGER_RTT_printf("[%d]sendFault!!!\r\n",__LINE__);
+			SEGGER_RTT_printf("\r\n[%d]sendFault!!!\r\n",__LINE__);
+			SEGGER_RTT_printf("[%d]SendDataLen=%d,len=%d\r\n",__LINE__,SendDataLen,sizeof(StorageInfo));
 #endif
 				outValue = -2;
 				sendErrConuter++;

+ 18 - 2
src/hal_adapter.c

@@ -206,6 +206,17 @@ Std_ReturnType UART_Receive_Data(uint8 recvChannel, uint8 *rxBuffer, uint8 *rxle
 		*rxlen = UartRecvMsg.DataLen;
 //		read_ringBuffer(rxBuffer, queueRecvSize, &uartRingBuffer[recvChannel]);
 		memcpy(rxBuffer,(uint8 *)UartRecvMsg.dataAddr,UartRecvMsg.DataLen);
+#if SEGGER_PRINTF==1
+    if(recvChannel==1)
+    {
+    	SEGGER_RTT_printf("[%d]Addr=%X,Len=%d,recv=\r\n",__LINE__,UartRecvMsg.dataAddr,UartRecvMsg.DataLen);
+    	for(uint16 i=0;i<UartRecvMsg.DataLen;i++)
+    	{
+    		SEGGER_RTT_printf("%c",*((uint8 *)UartRecvMsg.dataAddr+i));
+    	}
+    	SEGGER_RTT_printf("[%d]\r\n\r\n",__LINE__);
+    }
+#endif
 		retVal = E_OK;
 	}
 	return retVal;
@@ -352,10 +363,15 @@ Std_ReturnType UART_Send_Data(uint8 transChannel, const uint8 *txBuffer, uint32
 			 {
 				 Dio_WriteChannel(DioConf_DioChannel_PTB4_GPIO_OUT_MCU_RS485_EN, STD_ON);
 			 }
-#if SEGGER_PRINTF==2
+#if SEGGER_PRINTF==1
 					if(UartIdx==1)
 					{
-						SEGGER_RTT_printf("[%d]uart1_s=%s\r\n",__LINE__,UartSendMsg.dataPtr);
+						SEGGER_RTT_printf("[%d]uart1_s=%X,len = %d\r\n",__LINE__,UartSendMsg.dataPtr,UartSendMsg.DataLen);
+						for(uint16 i=0;i<UartSendMsg.DataLen;i++)
+						{
+							SEGGER_RTT_printf("%02X ",*(UartSendMsg.dataPtr+i));
+						}
+						SEGGER_RTT_printf("\r\n");
 					}
 #endif
 			 T_Uart_Status[UartIdx] = Uart_AsyncSend(UartIdx, UartSendMsg.dataPtr, UartSendMsg.DataLen);