From bddf0b37dfea62d0d3f7f5f8c180c24727665b68 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期一, 26 五月 2025 09:59:25 +0800
Subject: [PATCH] Merge branch 'MK大工卡-低精度GPS-1/5HZ' of http://47.108.70.204:60062/r/ChinaUWBProject into MK大工卡-低精度GPS-1/5HZ
---
keil/include/src/TCPClient.c | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/keil/include/src/TCPClient.c b/keil/include/src/TCPClient.c
index 984795f..c002be9 100644
--- a/keil/include/src/TCPClient.c
+++ b/keil/include/src/TCPClient.c
@@ -515,15 +515,24 @@
extern uint8_t GPS_ParseGGA_data[256];
extern uint8_t GPS_ParseGGA_changdu;
uint8_t uwbsendnum,gpssendnum;
-extern uint16_t gaodu;
-void UDPClient_UploadGPS(HIDO_CHAR *_pcGGA)
+
+extern uint8_t exercise_state;
+extern uint32_t step_count;
+extern uint16_t gaodu;void UDPClient_UploadGPS(HIDO_CHAR *_pcGGA)
{
if(TCP_CLIENT_STATE_CONNECTED == l_eTCPClientState)
{
+
+#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,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,gaodu,0,0);
+#endif
// if((l_u32UploadBuffLen + u32Len) < sizeof(l_acUploadBuff))
// {
--
Gitblit v1.9.3