From b86f294182dea4af94f83a745c3fdbb18d7fa40b Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期二, 29 四月 2025 18:06:27 +0800
Subject: [PATCH] V1.20版本，修改未激活模式下，静止休眠功能关闭，防止复位激活，切换激活和非激活状态时重新加速度计计数
---
keil/include/main/main.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 6b17a2d..afa9faf 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -253,7 +253,7 @@
void IMUTask(void)
{
- if(nomove_count>g_com_map[NOMOVESLEEP_TIME]&&g_com_map[IMU_ENABLE]==1)
+ if(nomove_count>g_com_map[NOMOVESLEEP_TIME]&&g_com_map[IMU_ENABLE]==1&&active_flag)
{power_wakeup_enable((enum POWER_WAKEUP_SOURCE_T)ACCLERATE_DETECT_Pin, POWER_WAKEUP_LEVEL_HIGH);
userkey_state=3;
if(control_close_flag==0)
@@ -389,6 +389,7 @@
TCPHeartBeatUpload();//立即上传心跳包
control_close_flag=1;
close_state_flag=4;
+
//air_send_Task();
// gps_air780_power_change(0,0);//gps,4G关闭
// active_flag=0;
@@ -396,6 +397,7 @@
gps_air780_power_change(1,1);//gps,4G关闭
active_flag=1;
}
+ nomove_count=0;
}
void handle_single_click(void)
{
@@ -425,6 +427,7 @@
{
sos_state=WAIT_NEXT_RISING;
falling_time=HIDO_TimerGetTick();
+if(!power_low_flag&&active_flag)
motor_on();
}
void click_Task(void)
@@ -589,7 +592,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)|18;
+ g_com_map[VERSION] = (1<<8)|20;
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