From 5ff0b0f86d3f81e2d8aebd5ac5b55eb0d3d09961 Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期一, 28 七月 2025 14:05:58 +0800
Subject: [PATCH] 修改心跳包会上传工卡信标的升级固件名
---
keil/include/src/TCPClient.c | 51 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 35 insertions(+), 16 deletions(-)
diff --git a/keil/include/src/TCPClient.c b/keil/include/src/TCPClient.c
index ac6b27c..6ef1d1b 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;
// }
@@ -735,6 +737,7 @@
}
}
+extern char file_name[25];
void TCPHeartBeatUpload(void)
{
HIDO_UINT32 u32Len = 0;
@@ -742,9 +745,11 @@
{
if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_TCP)
- { u32Len = HIDO_UtilSnprintf((HIDO_CHAR *)l_au8CmdBuff, sizeof(l_au8CmdBuff), "$XTB,%X,%02u%%,%d.%d,%s,%d,3:%d.%d.%d.%d:%d.,1",
+ {
+ u32Len = HIDO_UtilSnprintf((HIDO_CHAR *)l_au8CmdBuff, sizeof(l_au8CmdBuff), "$XTB,%X,%02u%%,%d.%d,%s,%d,3:%d.%d.%d.%d:%d.,1",
g_com_map[DEV_ID], bat_percent, g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff, Module_GetCCID(),\
userkey_state,g_com_map[TCP_IP_0],g_com_map[TCP_IP_1],g_com_map[TCP_IP_2],g_com_map[TCP_IP_3],g_com_map[TCP_PORT]);
+
} else if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_NTRIP)
{
u32Len = HIDO_UtilSnprintf((HIDO_CHAR *)l_au8CmdBuff, sizeof(l_au8CmdBuff), "$XTB,%X,%02u%%,%d.%d,%s,%d,2%s %s,1",
@@ -752,9 +757,12 @@
userkey_state,(char *)&g_com_map[NTRIP_HOST_INDEX],(char *)&g_com_map[NTRIP_USERNANME_INDEX]);
} else if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_NONE)
{
- u32Len = HIDO_UtilSnprintf((HIDO_CHAR *)l_au8CmdBuff, sizeof(l_au8CmdBuff), "$XTB,%X,%02u%%,%d.%d,%s,%d,1.,1",
- g_com_map[DEV_ID], bat_percent, g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff, Module_GetCCID(),\
- userkey_state,g_com_map[TCP_IP_0],g_com_map[TCP_IP_1],g_com_map[TCP_IP_2],g_com_map[TCP_IP_3],g_com_map[TCP_PORT]);
+// u32Len = HIDO_UtilSnprintf((HIDO_CHAR *)l_au8CmdBuff, sizeof(l_au8CmdBuff), "$XTB,%X,%02u%%,%d.%d,%s,%d,1.,1",
+// g_com_map[DEV_ID], bat_percent, g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff, Module_GetCCID(),\
+// userkey_state,g_com_map[TCP_IP_0],g_com_map[TCP_IP_1],g_com_map[TCP_IP_2],g_com_map[TCP_IP_3],g_com_map[TCP_PORT]);
+ u32Len = HIDO_UtilSnprintf((HIDO_CHAR *)l_au8CmdBuff, sizeof(l_au8CmdBuff), "$XTB,%X,%02u%%,%d.%d,%s,%d,3:%d.%d.%d.%d:%d.,1",
+ g_com_map[DEV_ID], bat_percent, g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff,file_name,\
+ userkey_state,g_com_map[TCP_IP_0],g_com_map[TCP_IP_1],g_com_map[TCP_IP_2],g_com_map[TCP_IP_3],g_com_map[TCP_PORT]);
}
userkey_state=0;
Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)l_au8CmdBuff, u32Len);
@@ -833,7 +841,7 @@
}
else
{
- led4g=RED;
+ led4g = RED;
l_eTCPClientState = TCP_CLIENT_STATE_IDLE;
}
@@ -878,6 +886,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