From e328ebef585cea2351b37117b2d5ac4978ecd3c0 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期二, 11 二月 2025 14:57:23 +0800
Subject: [PATCH] 1111111
---
keil/include/drivers/serial_at_cmd_app.c | 44 +++++++++++++++++---------------------------
1 files changed, 17 insertions(+), 27 deletions(-)
diff --git a/keil/include/drivers/serial_at_cmd_app.c b/keil/include/drivers/serial_at_cmd_app.c
index 31d7f51..ff17484 100644
--- a/keil/include/drivers/serial_at_cmd_app.c
+++ b/keil/include/drivers/serial_at_cmd_app.c
@@ -20,8 +20,6 @@
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;
@@ -29,8 +27,8 @@
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,gps_open_flag;
-extern uint8_t gps_success_state,gps_enable_flag,gps_need_data_flag,gps_timeout_flag,gps_power_state;
+extern uint8_t gps_success_state;
+extern uint8_t gps_success_state,gps_enable_flag,gps_need_data_flag,gps_timeout_flag;
extern uint16_t gps_wait_count;
typedef enum
{
@@ -248,35 +246,27 @@
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);
-
+ if(g_com_map[MODBUS_MODE])
+ LOG_INFO(TRACE_MODULE_APP,"%s", mUsart2ReceivePack);
+ d_value = strtod(wdrecv.m_pData,NULL);
+ if(d_value>1)
+ {
+ blink_led(&gps_success_state);
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;//不超时接收状态
-
+ }
+ }
+ index = 0;
+ if(pos_state!=0)
+ {
+ //4g.jd=jd;
+ //4g.wd=wd;
+ gps_timeout_flag=1;//不超时接收状态
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;//防止多次进入
- }
-
+// gps_enable_flag=0;//收到有效数据关闭GPS
}
-// 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