From e0a196fc7dcb47d200ab81a933dde2b18d169ed5 Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期二, 13 五月 2025 16:23:21 +0800
Subject: [PATCH] 移植开关GPS代码
---
keil/include/src/TCPClient.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/keil/include/src/TCPClient.c b/keil/include/src/TCPClient.c
index 4f647a0..e2e237e 100644
--- a/keil/include/src/TCPClient.c
+++ b/keil/include/src/TCPClient.c
@@ -443,13 +443,16 @@
extern uint8_t GPS_ParseGGA_data[256];
extern uint8_t GPS_ParseGGA_changdu;
uint8_t uwbsendnum,gpssendnum;
+
+extern uint16_t g_spsum_GSV_sum,g_snum_GSV_sum;
+extern uint8_t lounei_flag;
void UDPClient_UploadGPS(HIDO_CHAR *_pcGGA)
{
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);
+ _pcGGA, g_com_map[DEV_ID], bat_percent,ave_sp,g_spsum_GSV_sum,g_snum_GSV_sum,lounei_flag);
// if((l_u32UploadBuffLen + u32Len) < sizeof(l_acUploadBuff))
@@ -511,6 +514,7 @@
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(),\
@@ -526,6 +530,7 @@
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]);
}
+ userkey_state=0;
Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)l_au8CmdBuff, u32Len);
}
// u32HeartLen = HIDO_UtilSnprintf((HIDO_CHAR *)acHeart, sizeof(acHeart), "$XTB,%X,%02u%%,%d.%d,%s",
--
Gitblit v1.9.3