From e71ce2771abe8afff42768a0ad74784da44c708e Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期五, 13 九月 2024 09:37:56 +0800
Subject: [PATCH] 更新一些DMAGPS数据判断逻辑
---
keil/include/drivers/serial_at_cmd_app.c | 45 ++++++++++++++++++++++++++++-----------------
1 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/keil/include/drivers/serial_at_cmd_app.c b/keil/include/drivers/serial_at_cmd_app.c
index f0ced09..51d0a94 100644
--- a/keil/include/drivers/serial_at_cmd_app.c
+++ b/keil/include/drivers/serial_at_cmd_app.c
@@ -28,8 +28,9 @@
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_enable_flag,gps_need_data_flag,gps_timeout_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,
@@ -246,28 +247,38 @@
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);
- 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);
- pos_state=atoi(Posstate.m_pData);
- }
- }
- index = 0;
- if(pos_state!=0)
+// 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;
- gps_timeout_flag=1;//不超时接收状态
- gps_need_data_flag=0;//接收数据完成
+ 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
+
}
- //memset(mUsart2ReceivePack,0,sizeof(mUsart2ReceivePack));
+ }
+
+
+ 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));
--
Gitblit v1.9.3