From 82250eaf568648839e4c8fe3f91445347f19c56d Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期一, 23 九月 2024 17:53:46 +0800
Subject: [PATCH] 1H上传测试成功,平均功耗0.7ma,GPS工作时,不能进休眠

---
 keil/include/main/main.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 1534149..b75f289 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -294,7 +294,8 @@
     if(delaysleep_count>0)
         delaysleep_count--;
     //GPS工作逻辑
-
+		
+update_led_power_state();//更新灯状态测试
 }
 static void voltage_input_handler(enum IO_PIN_T pin)
 {
@@ -421,6 +422,7 @@
 	 uart_close(UART_ID0);//解绑原来串口0
 }
 uint8_t flag_4guart_needinit=0,tt2;
+extern uint8_t gps_need_data_flag;
 int main(void)
 {
     board_clock_run();
@@ -525,7 +527,7 @@
        // if(!gpio_pin_get_val(INPUT_5V_Pin))//AIR780E_IsIPIdle() Socket_IsSendQueueEmpty(0)
       //  if(flag_4G_recdata!=2)
         //if(((IfTCPConnected()&&AIR780E_IsIPIdle()&&Socket_IsSendQueueEmpty(0))||((!flag_TCP_reconnectting)&&!IfTCPConnected()))) //进入休眠条件(与关系,全满足才进):1.没有5V输入 2 TCP已连接时发送队列为空||TCP无连接时不在重连状态。
-        if(delaysleep_count==0)
+        if(delaysleep_count==0&&!gps_need_data_flag) //GPS工作状态不休眠,4G接收中断唤醒后,延迟2秒再休眠
         if(((IfTCPConnected()&&AIR780E_IsIPIdle()&&Socket_IsSendQueueEmpty(0))||((!flag_TCP_reconnectting)&&!IfTCPConnected()))) //进入休眠条件(与关系,全满足才进):1.没有5V输入 2 TCP已连接时发送队列为空||TCP无连接时不在重连状态。
         {
             uint32_t lock;

--
Gitblit v1.9.3