From f8dda0f9757bab836487931d88935e0d6a334e58 Mon Sep 17 00:00:00 2001 From: chen <15335560115@163.com> Date: 星期三, 13 十一月 2024 09:16:17 +0800 Subject: [PATCH] 手环V1.12版本,修复GPS太快获得数据导致DMA缓存重复出现有效经纬度仅有一个报文保持不变的问题,修改从供电保护到正常后部分4G重连逻辑,增加查询功能,测距稳定版本 --- 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 edf055b..959fb53 100644 --- a/keil/include/src/TCPClient.c +++ b/keil/include/src/TCPClient.c @@ -236,7 +236,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 +255,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,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],g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff); } userkey_state=0; query_open_flag=0;//关闭查询模式 -- Gitblit v1.9.3