From b4a3dfd45831f0db1e19f74beb685027e8dbc564 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期四, 29 八月 2024 12:04:09 +0800
Subject: [PATCH] 修改部分状态逻辑判断
---
keil/include/src/TCPClient.c | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/keil/include/src/TCPClient.c b/keil/include/src/TCPClient.c
index 4fcad11..571e7a4 100644
--- a/keil/include/src/TCPClient.c
+++ b/keil/include/src/TCPClient.c
@@ -102,10 +102,16 @@
save_com_map_to_flash();
// bind_resetbreak();
case OPEN_GNSS:
- GpsConrol(1,1); //4Gflag, on
+ gps_4g_flag = 1;
case CLOSE_VIBRATION:
- // vibration_close();
+ g_com_map[MOTOR_ENABLE]=0;
+ save_com_map_to_flash();
+
+ case OPEN_VIBRATION:
+ g_com_map[MOTOR_ENABLE]=1;
+ save_com_map_to_flash();
+
case QUARY_INFORMATION:
//??
case CHANGE_POLL_FREQUENCY:
@@ -186,11 +192,12 @@
extern uint8_t bat_percent,taglist_num;
uint8_t alarm_type,applyid,result;
extern double jd,wd;
-void TCPHeartBeatUpload(void)
+extern int32_t distance;
+void TCPHeartBeatUpload(void)
{
HIDO_CHAR acHeart[200];
- HIDO_UINT32 u32HeartLen = snprintf(acHeart, sizeof(acHeart), "$message,heart,%04x,%d,%04x,%d,%02u%%,%d,%d,%lf,%lf,%d,%d,%d,%d\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,1,taglist_num);
+ HIDO_UINT32 u32HeartLen = snprintf(acHeart, sizeof(acHeart), "$message,heart,%04x,%d,%04x,%d,%02u%%,%d,%d,%lf,%lf,%d,%d,%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,1,distance);
Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)acHeart, u32HeartLen);
}
uint8_t TCPfail_flag = 0,flag_first_TCPconnect=1;
@@ -228,14 +235,17 @@
else if (TCP_CLIENT_STATE_CONNECTED == l_eTCPClientState)
{
- 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(g_com_map[SEND_4G_SECOND])||flag_first_TCPconnect)
+ if ((u32CurTick - l_u32HeartBeatTick) >= HIDO_TIMER_TICK_S(15)||flag_first_TCPconnect)
{
flag_first_TCPconnect = 0;
l_u32HeartBeatTick = u32CurTick;
// 这里是自定义心跳
- 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]);
- Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)acHeart, u32HeartLen);
+ TCPHeartBeatUpload();
+// 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]);
+// Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)acHeart, u32HeartLen);
}
}
}
--
Gitblit v1.9.3