From fa86ebd985aaf06c2257a41f04e131a74a3c79bc Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期五, 10 一月 2025 16:57:07 +0800
Subject: [PATCH] 稳定7个标签上线不掉线版本

---
 keil/include/drivers/serial_at_cmd_app.c |   50 +++++++++++++++++++-------------------------------
 1 files changed, 19 insertions(+), 31 deletions(-)

diff --git a/keil/include/drivers/serial_at_cmd_app.c b/keil/include/drivers/serial_at_cmd_app.c
index 51d0a94..f6b8654 100644
--- a/keil/include/drivers/serial_at_cmd_app.c
+++ b/keil/include/drivers/serial_at_cmd_app.c
@@ -20,6 +20,8 @@
 
 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 +29,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,
@@ -247,37 +248,24 @@
             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;//不超时接收状态
-                
-                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
-            
+							memcpy(GPS_GGAmessage,mUsart2ReceivePack,strlen(mUsart2ReceivePack)-2);
+                   
+                    wd=strtod(wdrecv.m_pData,NULL);
+                    jd=strtod(jdrecv.m_pData,NULL);
+										if(wd!=0)
+                    pos_state=atoi(Posstate.m_pData);
+								if(pos_state!=0)
+								{
+								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