From 432238391c2dd093126aaad57d891896b66dc844 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期三, 26 二月 2025 10:57:26 +0800
Subject: [PATCH] 手环V1.9,增加4G重连不上30s，之后直接复位功能
---
keil/include/main/main.c | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 93dfebc..027c49d 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -254,6 +254,7 @@
{ gpio_pin_clr(ADC_GND_ENABLE);//拉低
adc_get(&sample[0], NUM_SAMPLES, adc_callback);//adc采样
}
+uint8_t link_error_time;
void SecondTask(void)
{static uint8_t second_count;
if(second_count++>60)
@@ -278,6 +279,7 @@
{
if(IfTCPConnected())
{
+ link_error_time=0;
TCP_reconnect_timer =0;
flag_TCP_reconnectting = 0;
} else {
@@ -285,7 +287,8 @@
{
flag_TCP_reconnectting = 1;
} else {
- flag_TCP_reconnectting = 0;
+ //flag_TCP_reconnectting = 0;
+ sys_reset(4);//重连不上就复位
}
if(TCP_reconnect_timer++>600)
{
@@ -386,7 +389,7 @@
ip2 = (g_com_map[TCP_IP_2]>>12&0xf)*1000+(g_com_map[TCP_IP_2]>>8&0xf)*100+(g_com_map[TCP_IP_2]>>4&0xf)*10+(g_com_map[TCP_IP_2]&0xf);
ip3 = (g_com_map[TCP_IP_3]>>12&0xf)*1000+(g_com_map[TCP_IP_3]>>8&0xf)*100+(g_com_map[TCP_IP_3]>>4&0xf)*10+(g_com_map[TCP_IP_3]&0xf);
port = g_com_map[TCP_PORT];
- g_com_map[VERSION] = (1<<8)|8;
+ g_com_map[VERSION] = (1<<8)|9;
LOG_INFO(TRACE_MODULE_APP,"设备ID: %x .\r\n",dev_id);
LOG_INFO(TRACE_MODULE_APP,"固件版本:4G-GPS定位手环 V%d.%d. \r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff);
LOG_INFO(TRACE_MODULE_APP,"服务器地址: %d.%d.%d.%d:%d.\r\n",ip0,ip1,ip2,ip3,port);
@@ -464,6 +467,7 @@
int test1,test3;
uint32_t test4;
uint32_t time_count;
+
static void app_wdt_callback(void *dev, uint32_t status)
{
ASSERT(status, "WDT TIMEOUT，程序复位");
@@ -558,6 +562,10 @@
{
if(flag_TCP_reconnectting||IfTCPConnected())
{
+// if(flag_TCP_reconnectting)
+// {
+// link_error_time++;
+// }//后加的
// LOG_INFO(TRACE_MODULE_APP, "处理4G任务\r\n");
// if(flag_4guart_needinit)
--
Gitblit v1.9.3