From 0c4a7b78eee22326538b29c9a2ddf1c9e6ba0ae4 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期五, 20 九月 2024 11:17:44 +0800
Subject: [PATCH] 1小时上传，测试成功，GPS数据正常变化
---
keil/include/main/main.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index e033776..b75f289 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -422,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();
@@ -506,13 +507,13 @@
LOG_INFO(TRACE_MODULE_APP, "运行Socket_RecvAll\r\n");
Socket_RecvAll();
}
- // air780_led_on();
+ air780_led_on();
//LOG_INFO(TRACE_MODULE_APP, "处理4G\r\n");
Internet_Poll();
HIDO_ATLitePoll();
HIDO_TimerPoll();
TCPClient_Poll();
- // air780_led_off();
+ air780_led_off();
}
if(flag_secondtask)
{
@@ -526,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