From 4a9f1384be153a34ff058c62983193b2eaec4487 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期三, 23 十月 2024 10:28:19 +0800
Subject: [PATCH] V1.11增加充电灯逻辑和修改range接收逻辑，4g灯会有常亮bug和充电灯不间断闪烁
---
keil/include/src/TCPClient.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/keil/include/src/TCPClient.c b/keil/include/src/TCPClient.c
index 8171098..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);
@@ -302,8 +302,9 @@
- // 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