From 4b6129ba871a8cd5b827cd219ef184376b190450 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期四, 06 三月 2025 11:32:33 +0800
Subject: [PATCH] 修改无法彻底关机的bug
---
keil/include/drivers/serial_at_cmd_app.c | 91 ++++++++++++++++++++-------------------------
1 files changed, 40 insertions(+), 51 deletions(-)
diff --git a/keil/include/drivers/serial_at_cmd_app.c b/keil/include/drivers/serial_at_cmd_app.c
index 31d7f51..7419cc3 100644
--- a/keil/include/drivers/serial_at_cmd_app.c
+++ b/keil/include/drivers/serial_at_cmd_app.c
@@ -231,60 +231,49 @@
}
} else if(gps_prase_flag)
{
- static uint8_t index = 0;
+// static uint8_t index = 0;
//GPS解析数据
// static ST_BLERecv BLE_recvive;
- GGA_DataStruct jdrecv,wdrecv,Posstate;
-
- //接收数据开始分析
- mUsart2ReceivePack[index] = data; //char数组传进来参数data
- mUsart2ReceivePack_before = mUsart2ReceivePack_now;
- mUsart2ReceivePack_now=data;
- index++;
- if( mUsart2ReceivePack_before == 0x0D && mUsart2ReceivePack_now==0x0A )//接收数据到“0x0D 0x0A”结束
- {
- //解析该条GPS报文
-
- analysis_num=sscanf((char*)mUsart2ReceivePack,"$%[^,],%*[^,],%[^,],%*[^,],%[^,],%*[^,],%[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*s",gps_header,wdrecv.m_pData,jdrecv.m_pData,Posstate.m_pData);
- if(!memcmp(gps_header,"GNGGA",5))
- {
- 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(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();
- }
- pos_state=0;//防止多次进入
- }
-
- }
-// if(!memcmp(gps_header,"GBGSV",5))
-// {memcpy(GPS_GSVmessage,mUsart2ReceivePack,strlen(mUsart2ReceivePack)-2);
-// GPS_ParseGSV(GPS_GSVmessage,strlen(GPS_GSVmessage));
+// GGA_DataStruct jdrecv,wdrecv,Posstate;
+ GPS_RecvFsm(data);
+// //接收数据开始分析
+// mUsart2ReceivePack[index] = data; //char数组传进来参数data
+// mUsart2ReceivePack_before = mUsart2ReceivePack_now;
+// mUsart2ReceivePack_now=data;
+// index++;
+// if( mUsart2ReceivePack_before == 0x0D && mUsart2ReceivePack_now==0x0A )//接收数据到“0x0D 0x0A”结束
+// {
+// //解析该条GPS报文
+//
+// analysis_num=sscanf((char*)mUsart2ReceivePack,"$%[^,],%*[^,],%[^,],%*[^,],%[^,],%*[^,],%[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*s",gps_header,wdrecv.m_pData,jdrecv.m_pData,Posstate.m_pData);
+// if(!memcmp(gps_header,"GNGGA",5))
+// {
+// 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;//防止多次进入
+// }
//
-// }
-
- memset(mUsart2ReceivePack,0,sizeof(mUsart2ReceivePack));
- memset(wdrecv.m_pData,0,sizeof(wdrecv.m_pData));
- memset(jdrecv.m_pData,0,sizeof(jdrecv.m_pData));
- memset(Posstate.m_pData,0,sizeof(Posstate.m_pData));
- index=0;
- mUsart2ReceivePack_before=0;
- mUsart2ReceivePack_now=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));
+// memset(Posstate.m_pData,0,sizeof(Posstate.m_pData));
+// index=0;
+// mUsart2ReceivePack_before=0;
+// mUsart2ReceivePack_now=0;
+// }
}
}
--
Gitblit v1.9.3