From 5f9ce742caf296fe786af133507ed94c2fb83ba5 Mon Sep 17 00:00:00 2001 From: chen <15335560115@163.com> Date: 星期六, 28 九月 2024 17:26:51 +0800 Subject: [PATCH] 修改4G上传15s对应V1.8 --- keil/include/src/TCPClient.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/keil/include/src/TCPClient.c b/keil/include/src/TCPClient.c index 08979ca..ea4c6dc 100644 --- a/keil/include/src/TCPClient.c +++ b/keil/include/src/TCPClient.c @@ -240,7 +240,7 @@ { HIDO_CHAR acHeart[200]; HIDO_UINT32 u32HeartLen; - if(alarm_type) + if(alarm_type==1) { u32HeartLen = snprintf(acHeart, sizeof(acHeart), "$message,alarm,%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); @@ -303,8 +303,8 @@ - //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(15)||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; -- Gitblit v1.9.3