From f6dca40d6af17e0dddf923779b48924103cad1f4 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期四, 09 一月 2025 10:12:07 +0800
Subject: [PATCH] GPS定位手环V1.5,GGA10包上传数据逻辑修改,无限制条件10包上传,gga报文可能无效报文

---
 keil/include/drivers/serial_at_cmd_app.c |   24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/keil/include/drivers/serial_at_cmd_app.c b/keil/include/drivers/serial_at_cmd_app.c
index d48a5a2..aedfaa2 100644
--- a/keil/include/drivers/serial_at_cmd_app.c
+++ b/keil/include/drivers/serial_at_cmd_app.c
@@ -261,6 +261,17 @@
 										if(wd!=0)
 										blink_led(&gps_success_state);
                     pos_state=atoi(Posstate.m_pData);
+										if(gga_num<10&&!gps_open_flag)
+												{
+													gps_timeout_flag=0;
+												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超时无效数据
+												}
 								if(pos_state!=0)
 								{
 									
@@ -273,17 +284,8 @@
 								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超时无效数据
-												}
+//									}else{
+//												
 											}
 								pos_state=0;//防止多次进入
 								}

--
Gitblit v1.9.3