From cb9f8345145f29d7d2437953b5647955c4530080 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期四, 13 三月 2025 09:12:02 +0800
Subject: [PATCH] 增加打印串口逻辑方便app端调试
---
keil/include/src/TCPClient.c | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/keil/include/src/TCPClient.c b/keil/include/src/TCPClient.c
index edf055b..5201ec2 100644
--- a/keil/include/src/TCPClient.c
+++ b/keil/include/src/TCPClient.c
@@ -126,7 +126,7 @@
// bind_resetbreak();
case OPEN_GNSS:
gps_4g_flag = 1;
-
+ g_com_map[GPS_REFRESH_WAIT_COUNT]=TCP_command.frequency;
break;
case CLOSE_VIBRATION:
@@ -147,8 +147,12 @@
case CHANGE_POLL_FREQUENCY:
g_com_map[SEND_4G_MINUTE]=TCP_command.frequency;
- air780e_send_second=g_com_map[SEND_4G_MINUTE]*60;
+ //air780e_send_second=g_com_map[SEND_4G_MINUTE]*60;
+ air780e_send_second=TCP_command.frequency;
break;
+ case CLOSE_GNSS:
+ gps_4g_flag = 0;
+ break;
}
result = 1;
TCPHeartBeatUpload();
@@ -215,6 +219,7 @@
{
TCPClient_DataProc(l_au8CmdBuff, u32RecvLen);
}
+ memset(l_au8CmdBuff,0,sizeof(l_au8CmdBuff));
break;
}
default:
@@ -236,7 +241,7 @@
* Author : www.hido-studio.com
* Modified Date: : 2021?1?9?
*******************************************************************************/
-extern uint8_t bat_percent,taglist_num,userkey_state;
+extern uint8_t bat_percent,taglist_num,userkey_state,gps_timeout_flag;
uint8_t alarm_type;
extern double jd,wd;
@@ -255,8 +260,8 @@
}
if(query_open_flag)
{
- u32HeartLen = snprintf(acHeart, sizeof(acHeart), "$message,query,%04x,%d,%04x,%d,%02u%%,%d,%d,%lf,%lf,%s,%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,distance,userkey_state);
+ u32HeartLen = snprintf(acHeart, sizeof(acHeart), "$message,query,%04x,%d,%04x,%d,%d,%02u%%,%d,%d,%lf,%lf,%s,%d,%d,%d,%d,V%d.%d.,0\r\n", \
+ g_com_map[DEV_ID],GetUWBBindState(),g_com_map[BIND_DEV_ID],g_com_map[GPS_REFRESH_WAIT_COUNT],gps_timeout_flag,bat_percent,g_com_map[ALARM_DISTANCE1],g_com_map[ALARM_DISTANCE2],jd,wd,applyid,result,distance,g_com_map[SEND_4G_MINUTE],gps_4g_flag,g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff);
}
userkey_state=0;
query_open_flag=0;//关闭查询模式
@@ -316,7 +321,7 @@
- //if ((u32CurTick - l_u32HeartBeatTick) >= HIDO_TIMER_TICK_S(15)||flag_first_TCPconnect)
+ //if ((u32CurTick - l_u32HeartBeatTick) >= HIDO_TIMER_TICK_S(5)||flag_first_TCPconnect)
if ((u32CurTick - l_u32HeartBeatTick) >= HIDO_TIMER_TICK_S(air780e_send_second)||flag_first_TCPconnect)
{
flag_first_TCPconnect = 0;
--
Gitblit v1.9.3