From 9e89f6865618d0b48b4676baad4ef693f69129d1 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期四, 09 一月 2025 14:19:35 +0800
Subject: [PATCH] GPS成功热启动,1-3s接受到有效数据,jlink问题

---
 keil/include/drivers/serial_at_cmd_app.c |   81 ++++++++++++++++++++++++++--------------
 1 files changed, 52 insertions(+), 29 deletions(-)

diff --git a/keil/include/drivers/serial_at_cmd_app.c b/keil/include/drivers/serial_at_cmd_app.c
index 51d0a94..0223e9b 100644
--- a/keil/include/drivers/serial_at_cmd_app.c
+++ b/keil/include/drivers/serial_at_cmd_app.c
@@ -17,9 +17,12 @@
 #define Label_id_local    1     //标签id
 #define data_buff_MAX     50    //基站数量
 #define Lora_TXD_bff_MAX  220   //发送缓存区大小  >4+8+4*基站数量+2=14+4*基站数量
+#define FIRST_MIN_OPEN_TIME 30
 
 uint8_t mUsartReceivePack[100] = {0};
 uint8_t mUsart2ReceivePack[150] = {0};
+uint8_t GPS_GGAmessage[150]={0};
+uint8_t GPS_GSVmessage[150]={0};
 double jd,wd;
 int analysis_num,pos_state;
 uint8_t state5V_prase_flag=1,gps_prase_flag=1;
@@ -27,10 +30,9 @@
 extern void IO_control_init(void);
 extern void blink_led(uint8_t*state);
 extern void updata_led_power_state(void);
-extern uint8_t gps_success_state;
+extern uint8_t gps_success_state,gps_open_flag;
 extern uint8_t gps_success_state,gps_enable_flag,gps_need_data_flag,gps_timeout_flag,gps_power_state;
 extern uint16_t gps_wait_count;
-uint8_t gps_send_count=3;
 typedef enum
 {
     BLE_RECV_STATE_IDLE = 0,
@@ -137,6 +139,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,gps_first_flag;
 void UsartParseDataHandler(uint8_t data)
 {
     if(state5V_prase_flag&&!g_com_map[MODBUS_MODE])
@@ -247,37 +255,52 @@
             analysis_num=sscanf((char*)mUsart2ReceivePack,"$%[^,],%*[^,],%[^,],%*[^,],%[^,],%*[^,],%[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*s",gps_header,wdrecv.m_pData,jdrecv.m_pData,Posstate.m_pData);
             if(!memcmp(gps_header,"GNGGA",5))
             { 
-//                if(g_com_map[MODBUS_MODE])
-//                    LOG_INFO(TRACE_MODULE_APP,"%s", mUsart2ReceivePack);
-             pos_state=atoi(Posstate.m_pData);   
-					if(pos_state!=0)
-            {
-							
-                //4g.jd=jd;
-                //4g.wd=wd;
-							  blink_led(&gps_success_state);
-                wd=strtod(wdrecv.m_pData,NULL);
-                jd=strtod(jdrecv.m_pData,NULL);
-                gps_send_count--;
-                gps_timeout_flag=0;//不超时接收状态
+							memcpy(GPS_GGAmessage,mUsart2ReceivePack,strlen(mUsart2ReceivePack)-2);
+                   
+                    wd=strtod(wdrecv.m_pData,NULL);
+                    jd=strtod(jdrecv.m_pData,NULL);
+										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)
+								{
+									
                 
+								//gps_power_state=0;//关闭gps
+								if(gps_open_flag){
+								//if(gps_open_flag&&!gps_first_flag){
+									
+//								delay_ms(1000);
+								gps_timeout_flag=0;//不超时接收状态
+                gps_need_data_flag=0;//接收数据完成
                 gps_wait_count=0;//清0接收状态
-							if(gps_send_count==0){
-								gps_need_data_flag=0;//接收数据完成
-								TCPHeartBeatUpload();//上传GPS数据
-							gps_power_state=0;
-							update_led_power_state();
-								gps_send_count=3;
-							}
-							pos_state=0;//以防多次发生
-								
-								
-//		gps_enable_flag=0;//收到有效数据关闭GPS
-            
+								UDPClient_UploadGPS();//上传GPS超时无效数据
+								gps_power_state=0;//立即关掉gps,防止串口数据过多导致无法切换休眠
+								update_led_power_state();
+//									}else{
+//												
+											}
+								pos_state=0;//防止多次进入
+								}
+						
             }
-					}						
+						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));
             memset(jdrecv.m_pData,0,sizeof(jdrecv.m_pData));

--
Gitblit v1.9.3