From 9ff35110c0d55f0c5f3dbb3453301283a1e8de42 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期一, 04 十一月 2024 09:51:40 +0800
Subject: [PATCH] 增加串口打印LOG提示电量,并修复亏电情况下不进入低功耗问题

---
 keil/include/drivers/serial_at_cmd_app.c |   24 +++++++++++-------------
 1 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/keil/include/drivers/serial_at_cmd_app.c b/keil/include/drivers/serial_at_cmd_app.c
index ff17484..4e9f542 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
@@ -246,9 +246,7 @@
             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);
+               d_value = strtod(wdrecv.m_pData,NULL);
                 if(d_value>1)
                 {
                      blink_led(&gps_success_state);
@@ -256,17 +254,17 @@
                     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
-            }
+								gps_power_state=0;//立即关闭gps避免紧接着进入搜索导致未及时关闭
+								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));

--
Gitblit v1.9.3