From 7001a22f0c7e737dc8193c1b50be7ef31b38108a Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期一, 28 四月 2025 18:28:55 +0800
Subject: [PATCH] 解决不测距，充电问题
---
keil/include/main/main.c | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 476ccbe..f837e83 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -161,7 +161,7 @@
{
bat_percent = 0;
}
- else if(fVoltage_mv > 4100)
+ else if(fVoltage_mv > 4200)
{
bat_percent = 100;
}
@@ -196,6 +196,7 @@
{
if(nomove_count>g_com_map[NOMOVESLEEP_TIME]&&g_com_map[IMU_ENABLE]==1)
{//power_wakeup_enable((enum POWER_WAKEUP_SOURCE_T)ACCLERATE_DETECT_Pin, POWER_WAKEUP_LEVEL_HIGH);
+ power_wakeup_enable((enum POWER_WAKEUP_SOURCE_T)PCA_INPUT_DETECT, POWER_WAKEUP_LEVEL_LOW);
mcu_deep_sleep();
}
}
@@ -365,6 +366,7 @@
send_struct.alarmDistence=prewarning_distance;//更新报警距离
memcpy(&send_struct.gunLableId,&g_com_map[BIND_DEV_ID],2);//更新绑定ID
send_struct.tagId=dev_id;//更新设备ID
+ tag_frequency = 1000/g_com_map[COM_INTERVAL];
// g_com_map[IP_0]=111;
// g_com_map[IP_1]=198;
@@ -414,7 +416,7 @@
}
g_com_map[MODBUS_MODE] = 0;
log_4g_enable_flag=g_com_map[LOG_4G_ENABLE];
- g_com_map[VERSION] = (1<<8)|7;
+ g_com_map[VERSION] = (1<<8)|8;
LOG_INFO(TRACE_MODULE_APP,"设备ID: %x .\r\n",dev_id);
@@ -467,7 +469,7 @@
{
nomove_count = 0;
// adctick = HIDO_TimerGetTick();
- if(HIDO_TimerGetTick()-adctick>60) //10分钟采样一次 电量
+ if(HIDO_TimerGetTick()-adctick>600) //10分钟采样一次 电量
{
chongman_time=chongman_time+60;
adctick = HIDO_TimerGetTick();
@@ -479,7 +481,7 @@
only_one_flag=1;
chongman_time=0;
}
- if(bat_percent>=99&&chongman_time>=600)
+ if(bat_percent>=99&&chongman_time>=180)
{
powerled = GREEN;
}else{
@@ -523,6 +525,7 @@
g_com_map[CNT_RESTART]=0;
save_com_map_to_flash();
NVIC_SystemReset();
+ LOG_INFO(TRACE_MODULE_APP,"1111");
}
}
else
@@ -538,6 +541,7 @@
}
}
NVIC_SystemReset();
+ LOG_INFO(TRACE_MODULE_APP,"2222");
input5vflag=1;
}
else
@@ -557,11 +561,12 @@
{
g_com_map[CNT_RESTART]=0;
NVIC_SystemReset();
-
+ LOG_INFO(TRACE_MODULE_APP,"3333");
}
if(g_com_map[MAP_SIGN_INDEX]!=0x55AA||g_com_map[COM_INTERVAL]==0)
{
NVIC_SystemReset();
+ LOG_INFO(TRACE_MODULE_APP,"4444");
}
HIDO_TimerPoll();
if(ledonflag==1)
--
Gitblit v1.9.3