From 81c6eacbe89801592f01f0e573b72d8547e3867b Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期二, 08 七月 2025 11:17:28 +0800
Subject: [PATCH] V3.3 增加10分钟超时保护，确认公网专网都能升级
---
keil/include/main/main.c | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 236cf1b..d49413f 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -280,12 +280,17 @@
extern uint8_t ceshidata[500];
extern uint8_t ceshichangdu;
uint8_t gps_ntripsend;
+uint16_t ota_failed_timer;
static void sleep_timer_callback(void *dev, uint32_t time)
{
if(secondtask_count++%2==0)
{
input5v_time=1;
flag_secondtask = 1;
+ if(ota_failed_timer++>600)
+ {
+ LOG_INFO(TRACE_MODULE_APP,"ota升级超时10分钟，重启\r\n");
+ OTA_Failed();}
if(!read_5v_input_pca())
{
if(bat_percent>15)
@@ -412,12 +417,13 @@
// gps_open_flag=1;
// }
g_com_map[MODBUS_MODE] = 0;
- log_4g_enable_flag=g_com_map[LOG_4G_ENABLE];
- g_com_map[VERSION] = (1<<8)|3;
+ log_4g_enable_flag = 1;
+ DBG_SetMode(DBG_MODE_SHELL);
+ g_com_map[VERSION] = (3<<8)|3;
// LOG_INFO(TRACE_MODULE_APP,"设备ID: %x .\r\n",dev_id);
- LOG_INFO(TRACE_MODULE_APP,"OTA版本V3.2\r\n");
+ LOG_INFO(TRACE_MODULE_APP,"OTA版本V3.3\r\n");
// LOG_INFO(TRACE_MODULE_APP,"服务器地址: %d.%d.%d.%d:%d.\r\n",g_com_map[IP_0],g_com_map[IP_1],g_com_map[IP_2],g_com_map[IP_3],g_com_map[PORT]);
delay_ms(500);
}
@@ -535,7 +541,7 @@
// PCA9555_Set_One_Value_Output(MCU_A,0);//输出低电平切换为GPS
// }
// }
-// UART_CheckReceive();
+ UART_CheckReceive();
// if(g_com_map[CNT_RESTART]==1)
// {
// g_com_map[CNT_RESTART]=0;
@@ -708,6 +714,6 @@
// PowerTask();
// IMUTask();
// UserKeyTask();
-// IdleTask();
+ IdleTask();
}
}
--
Gitblit v1.9.3