From f6dca40d6af17e0dddf923779b48924103cad1f4 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期四, 09 一月 2025 10:12:07 +0800
Subject: [PATCH] GPS定位手环V1.5，GGA10包上传数据逻辑修改，无限制条件10包上传，gga报文可能无效报文
---
keil/include/src/TCPClient.c | 52 ++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 40 insertions(+), 12 deletions(-)
diff --git a/keil/include/src/TCPClient.c b/keil/include/src/TCPClient.c
index 6b46dfb..912d1b0 100644
--- a/keil/include/src/TCPClient.c
+++ b/keil/include/src/TCPClient.c
@@ -74,23 +74,31 @@
uint16_t receive_id;
uint16_t g_com_position;
uint16_t g_com_num;
+
+HIDO_UINT8 *_u8Data_temp1=NULL;
+HIDO_UINT32 _u32Len_temp;
+extern int32_t distance;
+extern uint8_t GPS_GGAmessage[150],userkey_state,gps_timeout_flag;
+extern uint16_t g_spsum,g_snum,ave_sp;
+extern uint32_t u32GGaLenth;
+extern char GGA_Final_message[1024];
+extern uint32_t gga_num;
static HIDO_INT32 TCPClient_DataProc(HIDO_UINT8 *_u8Data, HIDO_UINT32 _u32Len)
{
HIDO_CHAR *apcSplitStr[12];
HIDO_UINT32 u32SplitCnt = 0;
HIDO_CHAR acResponse[200];
HIDO_CHAR temp_acResponse[200];
+ _u8Data_temp1=_u8Data;
+ _u32Len_temp=_u32Len;
HIDO_CHAR acReadponse[200];
HIDO_UINT32 datalenth;
HIDO_UINT32 u32ResponseLen;
HIDO_UINT32 u32ReadResponseLen;
LOG_INFO(TRACE_MODULE_APP, "收到数据\r\n");
-
-
-
if(STRCMP(_u8Data, "$setpara,") == 0)
{
- u32ResponseLen = snprintf(acResponse, sizeof(acResponse), "$setparaok,%s\r\n", \
+ u32ResponseLen = snprintf(acResponse, 12+_u32Len, "$setparaok,%s\r\n", \
_u8Data);
memcpy(temp_acResponse,acResponse,sizeof(acResponse));
@@ -111,6 +119,9 @@
gps_wait_count=0;
gps_wait_count2=0;
gps_need_data_flag=1;//切换状态
+ memset(GGA_Final_message, 0, sizeof(GGA_Final_message));//清空接收到的用完的数组
+ u32GGaLenth=0;
+ gga_num=0;//清0有效次数
}else{
gps_open_flag=1;
gps_wait_count=0;
@@ -238,10 +249,12 @@
HIDO_UINT32 u32RecvLen = 0;
i32Ret = Socket_Recv(l_i32TCPClientID, l_au8CmdBuff, sizeof(l_au8CmdBuff) - 1, &u32RecvLen);
+
if(HIDO_OK == i32Ret)
{
TCPClient_DataProc(l_au8CmdBuff, u32RecvLen);
}
+ memset(l_au8CmdBuff,0,sizeof(l_au8CmdBuff));
break;
}
default:
@@ -266,11 +279,10 @@
extern uint8_t bat_percent,taglist_num;
uint8_t alarm_type;
extern double jd,wd;
-extern int32_t distance;
-extern uint8_t GPS_GGAmessage[150],userkey_state,gps_timeout_flag;
-extern uint16_t g_spsum,g_snum,ave_sp;
+
void UDPClient_UploadGPS(void)
-{ air780_led_on();
+{ if(gps_open_flag||userkey_state)
+ air780_led_on();
HIDO_CHAR acHeart[200];
HIDO_UINT32 u32HeartLen;
ave_sp = g_spsum/g_snum;
@@ -285,13 +297,29 @@
// 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", \
+ u32HeartLen = snprintf(acHeart, sizeof(acHeart), "%s,%04x,%02u%%,%d,%d,0,0\r\n", \
GPS_GGAmessage,g_com_map[DEV_ID],bat_percent,userkey_state,gps_timeout_flag);
- userkey_state = 0;
- Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)acHeart, u32HeartLen);
+
+
+ if(gps_open_flag||userkey_state){
+ Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)acHeart, u32HeartLen);
+ }else{
+// Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)GGA_Final_message, u32GGaLenth);
+// memset(GGA_Final_message, 0, sizeof(GGA_Final_message));//清空接收到的用完的数组
+// u32GGaLenth=0;
+// gga_num=0;//清0有效次数
+ }
+ userkey_state = 0;
air780_led_off();
}
-
+void UDPClient_UploadGPS_10pack(void)//10包发送功能
+{ air780_led_on();
+ Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)GGA_Final_message, u32GGaLenth);
+ memset(GGA_Final_message, 0, sizeof(GGA_Final_message));//清空接收到的用完的数组
+ u32GGaLenth=0;
+ gga_num=0;//清0有效次数
+ air780_led_off();
+}
void TCPHeartBeatUpload(void)
{
HIDO_CHAR acHeart[200];
--
Gitblit v1.9.3