From 16ccf41b599457daa3e870be7875d23cda6183f2 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期三, 02 四月 2025 15:14:35 +0800
Subject: [PATCH] 1.7 改变gps上传解析逻辑，按键跟关机改为中断触发
---
keil/include/src/TCPClient.c | 91 +++++++++++++++++++++++++++------------------
1 files changed, 54 insertions(+), 37 deletions(-)
diff --git a/keil/include/src/TCPClient.c b/keil/include/src/TCPClient.c
index 1beed56..e0c1dd6 100644
--- a/keil/include/src/TCPClient.c
+++ b/keil/include/src/TCPClient.c
@@ -25,6 +25,7 @@
#include "PCA9555.h"
#include "mk_flash.h"
#include <serial_at_cmd_app.h>
+#include "DBG.h"
/*******************************************************************************
* Macro *
*******************************************************************************/
@@ -48,7 +49,7 @@
static HIDO_UINT32 l_u32HeartBeatTick = 0;
static HIDO_UINT8 l_au8CmdBuff[1024];
-static uint8_t TCPfail_flag = 0,flag_first_TCPconnect=1;
+uint8_t TCPfail_flag = 0,flag_first_TCPconnect=0;
static uint32_t TCPfailetimer;
uint16_t ip0,ip1,ip2,ip3,port;
@@ -57,7 +58,7 @@
*******************************************************************************/
static HIDO_INT32 TCPClient_Heartbeat(HIDO_VOID);
void TCPHeartBeatUpload(void);
-void UDPClient_UploadGPS(void);
+void UDPClient_UploadGPS(HIDO_CHAR *_pcGGA);
void TCPReceiveMessageReply(void);
/*******************************************************************************
* Local Function *
@@ -393,26 +394,34 @@
uint16_t g_spsum,g_snum,ave_sp;
extern uint8_t GPS_ParseGGA_data[256];
extern uint8_t GPS_ParseGGA_changdu;
-void UDPClient_UploadGPS(void)
+uint8_t uwbsendnum,gpssendnum;
+void UDPClient_UploadGPS(HIDO_CHAR *_pcGGA)
{
- HIDO_CHAR acHeart[200];
- HIDO_UINT32 u32HeartLen;
- ave_sp = g_spsum/g_snum;
- g_spsum = 0;
- g_snum = 0;
-// if(alarm_type==1)
-// {
-// u32HeartLen = snprintf(acHeart, sizeof(acHeart), "$message,alarm,%04x,%d,%04x,%d,%02u%%,%d,%d,%lf,%lf,%s,%d,%d,0\r\n", \
-// g_com_map[DEV_ID],GetUWBBindState(),g_com_map[BIND_DEV_ID],alarm_type,bat_percent,g_com_map[ALARM_DISTANCE1],g_com_map[ALARM_DISTANCE2],jd,wd,applyid,result,distance);
-// } else {
-// u32HeartLen = snprintf(acHeart, sizeof(acHeart), "$message,heart,%04x,%d,%04x,%d,%02u%%,%d,%d,%lf,%lf,%s,%d,%d,0\r\n", \
-// g_com_map[DEV_ID],GetUWBBindState(),g_com_map[BIND_DEV_ID],alarm_type,bat_percent,g_com_map[ALARM_DISTANCE1],g_com_map[ALARM_DISTANCE2],jd,wd,applyid,result,distance);
-// }
-
-// u32HeartLen = snprintf(acHeart, sizeof(acHeart), "%s,%04x,%02u%%,%d,%d\r\n",
-// GPS_ParseGGA_data,g_com_map[DEV_ID],bat_percent,userkey_state,gps_timeout_flag);
-// userkey_state = 0;
- Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)GPS_ParseGGA_data, GPS_ParseGGA_changdu);
+ if(TCP_CLIENT_STATE_CONNECTED == l_eTCPClientState)
+ {
+
+ HIDO_UINT32 u32Len = HIDO_UtilSnprintf((HIDO_CHAR *)l_au8CmdBuff, sizeof(l_au8CmdBuff), "%s,%X,%02x,%x,%d,%d,%d%\r\n",
+ _pcGGA, g_com_map[DEV_ID], bat_percent,ave_sp,0,0,0);
+
+
+// if((l_u32UploadBuffLen + u32Len) < sizeof(l_acUploadBuff))
+// {
+// memcpy(l_acUploadBuff + l_u32UploadBuffLen, l_au8CmdBuff, u32Len);
+// l_u32UploadBuffLen += u32Len;
+// }
+ //memcpy(l_acUploadBuff + l_u32UploadBuffLen, l_au8CmdBuff, u32Len);
+ //l_u32UploadBuffLen += u32Len;
+ // if((l_u32UploadBuffLen + u32Len )> sizeof(l_acUploadBuff))
+// if((HIDO_TimerGetTick() - l_u32UdpsendTick) >= 200)
+ {
+// l_u32UdpsendTick = HIDO_TimerGetTick();
+ Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)l_au8CmdBuff, u32Len);
+ gpssendnum++;
+// l_u32UploadBuffLen = 0;
+ }
+
+
+ }
}
char senddata[2048];
void HexToAsciiSendUDP(uint8_t* data,uint8_t len)
@@ -442,6 +451,7 @@
// {
// l_u32UdpsendTick = HIDO_TimerGetTick();
Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)l_acUploadBuff, l_u32UploadBuffLen);
+ uwbsendnum++;
l_u32UploadBuffLen = 0;
// }
@@ -450,22 +460,29 @@
}
void TCPHeartBeatUpload(void)
{
- HIDO_CHAR acHeart[200];
- HIDO_UINT32 u32HeartLen;
- ave_sp = g_spsum/g_snum;
- g_spsum = 0;
- g_snum = 0;
-// if(alarm_type==1)
-// {
-// u32HeartLen = snprintf(acHeart, sizeof(acHeart), "$message,alarm,%04x,%d,%04x,%d,%02u%%,%d,%d,%lf,%lf,%s,%d,%d,0\r\n", \
-// g_com_map[DEV_ID],GetUWBBindState(),g_com_map[BIND_DEV_ID],alarm_type,bat_percent,g_com_map[ALARM_DISTANCE1],g_com_map[ALARM_DISTANCE2],jd,wd,applyid,result,distance);
-// } else {
-// u32HeartLen = snprintf(acHeart, sizeof(acHeart), "$message,heart,%04x,%d,%04x,%d,%02u%%,%d,%d,%lf,%lf,%s,%d,%d,0\r\n", \
-// g_com_map[DEV_ID],GetUWBBindState(),g_com_map[BIND_DEV_ID],alarm_type,bat_percent,g_com_map[ALARM_DISTANCE1],g_com_map[ALARM_DISTANCE2],jd,wd,applyid,result,distance);
-// }
- u32HeartLen = HIDO_UtilSnprintf((HIDO_CHAR *)acHeart, sizeof(acHeart), "$XTB,%X,%02u%%,%d.%d,%s",
- g_com_map[DEV_ID], bat_percent, g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff, Module_GetCCID());
- Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)acHeart, u32HeartLen);
+ HIDO_UINT32 u32Len = 0;
+ if(TCP_CLIENT_STATE_CONNECTED == l_eTCPClientState)
+ {
+ 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",
+ 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",
+ g_com_map[DEV_ID], bat_percent, g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff, \
+ Module_GetCCID(),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]);
+ }
+ Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)l_au8CmdBuff, u32Len);
+ }
+// u32HeartLen = HIDO_UtilSnprintf((HIDO_CHAR *)acHeart, sizeof(acHeart), "$XTB,%X,%02u%%,%d.%d,%s",
+// g_com_map[DEV_ID], bat_percent, g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff, Module_GetCCID());
+// Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)acHeart, u32HeartLen);
}
--
Gitblit v1.9.3