From e4d7c6073a5f3e99385abc7311480a4a845a1773 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期一, 28 十月 2024 18:13:10 +0800
Subject: [PATCH] 增加adc接地引脚逻辑修改adc采集电压bug，还有供电过低停止功能防止重启逻辑逻辑未加全
---
keil/include/src/TCPClient.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/keil/include/src/TCPClient.c b/keil/include/src/TCPClient.c
index 8171098..9c41851 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(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