From 5f2e20f7984c0f09a9c2721b63381a1a17536ed1 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期四, 09 一月 2025 17:55:19 +0800
Subject: [PATCH] 手环V1.6，增加心跳包功能逻辑，增加第一次30sgps开启逻辑
---
keil/include/src/TCPClient.c | 58 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 43 insertions(+), 15 deletions(-)
diff --git a/keil/include/src/TCPClient.c b/keil/include/src/TCPClient.c
index 9b2ce20..f6ebb7b 100644
--- a/keil/include/src/TCPClient.c
+++ b/keil/include/src/TCPClient.c
@@ -77,6 +77,12 @@
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];
@@ -113,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;
@@ -270,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;
@@ -289,16 +297,32 @@
// 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];
+ HIDO_CHAR acHeart1[200];
HIDO_UINT32 u32HeartLen;
ave_sp = g_spsum/g_snum;
g_spsum = 0;
@@ -311,9 +335,12 @@
// 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%%\r\n", \
- GPS_GGAmessage,g_com_map[DEV_ID],bat_percent);
- Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)acHeart, u32HeartLen);
+ // u32Len = HIDO_UtilSnprintf((HIDO_CHAR *)l_au8CmdBuff, sizeof(l_au8CmdBuff), "$XTB,%X,%02u%%,%d.%d,%s,%d,1.",
+// g_com_map[DEV_ID], bat_percent2, g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff, Module_GetCCID(),userkey_state4g,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]);
+
+ u32HeartLen = snprintf(acHeart1, sizeof(acHeart1), "$XTB,%04x,%02u%%,%d.%d,%s,%d,0\r\n", \
+ g_com_map[DEV_ID],bat_percent,g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff,Module_GetCCID(),userkey_state);
+ Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)acHeart1, u32HeartLen);
}
void TCPReceiveMessageReply(void)
{
@@ -367,13 +394,14 @@
- //if ((u32CurTick - l_u32HeartBeatTick) >= HIDO_TIMER_TICK_S(15)||flag_first_TCPconnect)
- if ((u32CurTick - l_u32HeartBeatTick) >= HIDO_TIMER_TICK_S(g_com_map[SEND_4G_SECOND])||flag_first_TCPconnect)
+ if ((u32CurTick - l_u32HeartBeatTick) >= HIDO_TIMER_TICK_S(60)||flag_first_TCPconnect)
+ //if ((u32CurTick - l_u32HeartBeatTick) >= HIDO_TIMER_TICK_S(g_com_map[SEND_4G_SECOND])||flag_first_TCPconnect)
{
flag_first_TCPconnect = 0;
l_u32HeartBeatTick = u32CurTick;
// 这里是自定义心跳
- //TCPHeartBeatUpload();
+ if(g_com_map[HEARTBEAT])
+ TCPHeartBeatUpload();
//UDPClient_UploadGPS();//先不弄心跳
// HIDO_CHAR acHeart[128];
// HIDO_UINT32 u32HeartLen = snprintf(acHeart, sizeof(acHeart), "$message heart,%04x,00001,1,50,50,50,,,,\r\n", g_com_map[DEV_ID]);
--
Gitblit v1.9.3