From fadf2a684268a36b7d3069f0e4e932147416c481 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期一, 21 四月 2025 18:23:57 +0800
Subject: [PATCH] 手环V1.16版本，修改gps闪灯状态e后为1时不用状态机控制，修改5s后关闭4g和gps逻辑，初步测试成功，但OTA中途会重连导致升级不了
---
keil/include/main/main.c | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 72d51b7..23aab6e 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -165,6 +165,7 @@
}
uint8_t control_close_flag;
int16_t control_close_count;
+uint8_t close_state_flag;
static void adc_callback(void *data, uint32_t number)
{
uint32_t *result = (uint32_t *)data;
@@ -195,6 +196,7 @@
userkey_state=2;
TCPHeartBeatUpload();//低电量休眠
control_close_flag=1;
+ close_state_flag=2;
// delay_ms(1000);//等待发送完成
}
power_low_flag=1;
@@ -258,6 +260,7 @@
TCPHeartBeatUpload();//静止休眠
// delay_ms(1000);
control_close_flag=1;
+ close_state_flag=3;
}
}
@@ -292,14 +295,18 @@
{
gps_air780_power_change(0,0);//gps,4G关闭
- control_close_flag=0;
- control_close_count=0;
- if(userkey_state==4)
- active_flag=0;
- else if(userkey_state==3)
+
+ if(close_state_flag==4)
+ {active_flag=0;
+ TCP_reconnect_timer=0;//重置4G重连条件
+ flag_TCP_reconnectting = 1;
+ }else if(close_state_flag==3)
{
mcu_deep_sleep();
}
+ close_state_flag=0;
+ control_close_flag=0;
+ control_close_count=0;
}
}else{
control_close_count=0;
@@ -378,6 +385,7 @@
{ userkey_state=4;
TCPHeartBeatUpload();//立即上传心跳包
control_close_flag=1;
+ close_state_flag=4;
//air_send_Task();
// gps_air780_power_change(0,0);//gps,4G关闭
// active_flag=0;
@@ -571,7 +579,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)|15;
+ g_com_map[VERSION] = (1<<8)|16;
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);
--
Gitblit v1.9.3