From 70c51212fc82fa8026d1295697be5f150aed7dce Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期三, 08 一月 2025 17:58:48 +0800
Subject: [PATCH] 手环V1.4，增加10包逻辑，修改灯按钮按下常亮问题，修改上传包格式适配轨迹定位，未修改全部无无效数据时无上报逻辑
---
keil/include/drivers/serial_at_cmd_app.c | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/keil/include/drivers/serial_at_cmd_app.c b/keil/include/drivers/serial_at_cmd_app.c
index 31d7f51..d48a5a2 100644
--- a/keil/include/drivers/serial_at_cmd_app.c
+++ b/keil/include/drivers/serial_at_cmd_app.c
@@ -138,6 +138,12 @@
}
double d_value;
+uint8_t first_gps_open_flag;
+ char GGA_Final_message[1024];
+ uint32_t datalenth_gga,gga_num;
+ uint32_t u32GGaLenth;
+ char GGA_Format_message[200];
+extern uint8_t bat_percent,userkey_state;
void UsartParseDataHandler(uint8_t data)
{
if(state5V_prase_flag&&!g_com_map[MODBUS_MODE])
@@ -257,25 +263,37 @@
pos_state=atoi(Posstate.m_pData);
if(pos_state!=0)
{
+
gps_timeout_flag=0;//不超时接收状态
-
gps_need_data_flag=0;//接收数据完成
gps_wait_count=0;//清0接收状态
//gps_power_state=0;//关闭gps
if(gps_open_flag){
+
UDPClient_UploadGPS();//上传GPS超时无效数据
gps_power_state=0;//立即关掉gps，防止串口数据过多导致无法切换休眠
update_led_power_state();
- }
+ }else{
+ if(gga_num<10)
+ {
+ snprintf(GGA_Format_message, sizeof(GGA_Format_message), "%s,%04x,%02u%%,%d,%d,0,0\r\n", \
+ GPS_GGAmessage,g_com_map[DEV_ID],bat_percent,userkey_state,gps_timeout_flag);
+ datalenth_gga = sprintf((char*)&GGA_Final_message[u32GGaLenth],"%s",GGA_Format_message);
+ u32GGaLenth += datalenth_gga;
+ gga_num++;//有效数据计数
+ }else{
+ UDPClient_UploadGPS_10pack();//上传GPS超时无效数据
+ }
+ }
pos_state=0;//防止多次进入
}
}
-// if(!memcmp(gps_header,"GBGSV",5))
-// {memcpy(GPS_GSVmessage,mUsart2ReceivePack,strlen(mUsart2ReceivePack)-2);
-// GPS_ParseGSV(GPS_GSVmessage,strlen(GPS_GSVmessage));
-//
-// }
+ if(!memcmp(gps_header,"GBGSV",5))
+ {memcpy(GPS_GSVmessage,mUsart2ReceivePack,strlen(mUsart2ReceivePack)-2);
+ GPS_ParseGSV(GPS_GSVmessage,strlen(GPS_GSVmessage));
+
+ }
memset(mUsart2ReceivePack,0,sizeof(mUsart2ReceivePack));
memset(wdrecv.m_pData,0,sizeof(wdrecv.m_pData));
--
Gitblit v1.9.3