From f8dda0f9757bab836487931d88935e0d6a334e58 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期三, 13 十一月 2024 09:16:17 +0800
Subject: [PATCH] 手环V1.12版本，修复GPS太快获得数据导致DMA缓存重复出现有效经纬度仅有一个报文保持不变的问题，修改从供电保护到正常后部分4G重连逻辑，增加查询功能，测距稳定版本
---
keil/include/drivers/serial_at_cmd_app.c | 38 ++++++++++++++++++--------------------
1 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/keil/include/drivers/serial_at_cmd_app.c b/keil/include/drivers/serial_at_cmd_app.c
index f0ced09..6230465 100644
--- a/keil/include/drivers/serial_at_cmd_app.c
+++ b/keil/include/drivers/serial_at_cmd_app.c
@@ -27,7 +27,7 @@
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_power_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
@@ -135,7 +135,7 @@
}
}
-double d_value;
+double d_value,d_value1;
void UsartParseDataHandler(uint8_t data)
{
if(state5V_prase_flag&&!g_com_map[MODBUS_MODE])
@@ -245,29 +245,27 @@
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);
+ { d_value=strtod(wdrecv.m_pData,NULL);
+ d_value1=strtod(jdrecv.m_pData,NULL);
+ if(d_value>0&&d_value1>0)
+ {
+ 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)
- {
- //4g.jd=jd;
- //4g.wd=wd;
- gps_timeout_flag=1;//不超时接收状态
+ }
+ if(pos_state!=0)
+ {
+ gps_timeout_flag=0;//不超时接收状态
gps_need_data_flag=0;//接收数据完成
gps_wait_count=0;//清0接收状态
-// gps_enable_flag=0;//收到有效数据关闭GPS
- }
- //memset(mUsart2ReceivePack,0,sizeof(mUsart2ReceivePack));
+ gps_power_state=0;//立即关闭gps避免紧接着进入搜索导致未及时关闭//注释为了防止GPS获得数据过快导致DMA缓存区数据重新涌入
+ update_led_power_state();
+ 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));
--
Gitblit v1.9.3