From b20cee9a3445b3ea3c4f0a1aafec0ba202dc77b5 Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期四, 12 六月 2025 14:00:43 +0800
Subject: [PATCH] 修改合并错误
---
keil/include/src/TCPClient.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/keil/include/src/TCPClient.c b/keil/include/src/TCPClient.c
index e5762d7..51a2dd2 100644
--- a/keil/include/src/TCPClient.c
+++ b/keil/include/src/TCPClient.c
@@ -515,9 +515,10 @@
extern uint8_t GPS_ParseGGA_data[256];
extern uint8_t GPS_ParseGGA_changdu;
uint8_t uwbsendnum,gpssendnum;
+
extern uint8_t exercise_state;
extern uint32_t step_count;
-void UDPClient_UploadGPS(HIDO_CHAR *_pcGGA)
+extern uint16_t gaodu;void UDPClient_UploadGPS(HIDO_CHAR *_pcGGA)
{
if(TCP_CLIENT_STATE_CONNECTED == l_eTCPClientState)
{
@@ -525,10 +526,12 @@
#ifdef JIBU_XIUMIAN
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,step_count,exercise_state);
+// _pcGGA, g_com_map[DEV_ID], bat_percent,ave_sp,0,0,0);
+ _pcGGA, g_com_map[DEV_ID], bat_percent,ave_sp,gaodu,(uint8_t)(step_count),exercise_state);
#else
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,gaodu,0,0);
+
#endif
// if((l_u32UploadBuffLen + u32Len) < sizeof(l_acUploadBuff))
--
Gitblit v1.9.3