From 0817c03a55b444ff4958723476f807486439e107 Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期四, 24 七月 2025 17:43:29 +0800
Subject: [PATCH] 4G升级待详细测试，基本功能开发完成
---
keil/include/src/TCPClient.c | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/keil/include/src/TCPClient.c b/keil/include/src/TCPClient.c
index ac6b27c..becdb0e 100644
--- a/keil/include/src/TCPClient.c
+++ b/keil/include/src/TCPClient.c
@@ -26,6 +26,7 @@
#include "mk_flash.h"
#include <serial_at_cmd_app.h>
#include "DBG.h"
+#include "Usart.h"
/*******************************************************************************
* Macro *
*******************************************************************************/
@@ -622,12 +623,19 @@
{
HIDO_INT32 i32Ret = 0;
HIDO_UINT32 u32RecvLen = 0;
-
+
+ HIDO_UINT32 u32Index = 0; // 新增索引变量
i32Ret = Socket_Recv(l_i32TCPClientID, l_au8CmdBuff, sizeof(l_au8CmdBuff) - 1, &u32RecvLen);
if(HIDO_OK == i32Ret)
{
l_au8CmdBuff[u32RecvLen]=0;
- TCPClient_DataProc(l_au8CmdBuff, u32RecvLen);
+
+// Usart1ParseDataCallback(l_au8CmdBuff[u32RecvLen]);
+ for(int t=0;t< u32RecvLen;t++)
+ {
+ Usart1ParseDataCallback(l_au8CmdBuff[t]);
+ }
+// TCPClient_DataProc(l_au8CmdBuff, u32RecvLen);
}
break;
}
@@ -700,10 +708,9 @@
}
}
-char senddata[2048];
+char senddata[500];
void HexToAsciiSendUDP(uint8_t* data,uint8_t len)
-{
- static HIDO_CHAR l_acUploadBuff[2048];
+{
static HIDO_UINT32 l_u32UploadBuffLen = 0;
static HIDO_UINT32 l_u32UdpsendTick = 0;
uint8_t i,temp;
@@ -721,13 +728,8 @@
// UDPClient_Uploadhex(senddata,2*len+2);
if(TCP_CLIENT_STATE_CONNECTED == l_eTCPClientState)
{
- memcpy(l_acUploadBuff + l_u32UploadBuffLen, senddata, 2*len+2);
l_u32UploadBuffLen += 2*len+2;
- // if((l_u32UploadBuffLen + u32Len )> sizeof(l_acUploadBuff))
-// if((HIDO_TimerGetTick() - l_u32UdpsendTick) >= 200)
-// {
-// l_u32UdpsendTick = HIDO_TimerGetTick();
- Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)l_acUploadBuff, l_u32UploadBuffLen);
+ Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)senddata, l_u32UploadBuffLen);
uwbsendnum++;
l_u32UploadBuffLen = 0;
// }
@@ -833,7 +835,7 @@
}
else
{
- led4g=RED;
+ led4g = RED;
l_eTCPClientState = TCP_CLIENT_STATE_IDLE;
}
@@ -878,6 +880,17 @@
return HIDO_OK;
}
+
+HIDO_INT32 TCPClient_Upload_hex(uint8_t *_pcGGA, uint16_t u32Len)
+{
+ if(TCP_CLIENT_STATE_CONNECTED == l_eTCPClientState)
+ {
+
+ Socket_Send(l_i32TCPClientID, _pcGGA, u32Len);
+ }
+
+ return HIDO_OK;
+}
HIDO_BOOL TCPClient_IsSendOver(HIDO_VOID)
{
return Socket_IsSendQueueEmpty(l_i32TCPClientID);
--
Gitblit v1.9.3