From e4d167a7d5e73b58a7d4adbc8b91499dc1e2d4c4 Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期二, 01 四月 2025 11:08:41 +0800
Subject: [PATCH] 低功耗，逻辑正确，现在室外40ma，室内20ma电流
---
keil/include/main/main.c | 47 +++++++++++++++++++++++++++++------------------
1 files changed, 29 insertions(+), 18 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 44eaa7d..ed2dccf 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -176,7 +176,7 @@
uint32_t ledontime;
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]==2)
{//power_wakeup_enable((enum POWER_WAKEUP_SOURCE_T)ACCLERATE_DETECT_Pin, POWER_WAKEUP_LEVEL_HIGH);
mcu_deep_sleep();
}
@@ -285,6 +285,7 @@
extern uint16_t g_spsum_GSV,g_snum_GSV;
extern uint16_t g_spsum_GSV_sum;
extern uint16_t g_snum_GSV_sum;
+extern uint8_t ceju_leave_flag;
static void sleep_timer_callback(void *dev, uint32_t time)
{
if(secondtask_count++%2==0)
@@ -311,28 +312,38 @@
Uwb_init();
// OpenUWB();
}
-// in_the_room_flag=1;
- if(in_the_room_flag==1)
- {
+// in_the_room_flag=1;
Receive_g_spsum_Data(g_spsum_GSV);
Receive_g_snum_Data(g_snum_GSV);
- if(g_spsum_GSV_sum<200&&g_snum_GSV_sum<9)
+
+ if((g_spsum_GSV_sum<200&&g_snum_GSV_sum<3)&&(ceju_leave_flag==1))
+// if((g_spsum_GSV_sum<200&&g_snum_GSV_sum<3)&&(ceju_leave_flag==1))
{
- lounei_flag=1;
+ lounei_flag=1;
+ Switch_low_power_mode(lounei_flag);
}
- if(50<g_spsum_GSV_sum&&2<g_snum_GSV_sum)
+ if((100<g_spsum_GSV_sum&&2<g_snum_GSV_sum))
+// if((200<g_spsum_GSV_sum&&3<g_snum_GSV_sum)&&(ceju_leave_flag==1))
{
lounei_flag=0;
- }
Switch_low_power_mode(lounei_flag);
-
- if(heart_upload_time==0||heart_upload_time==60)
- {
- TCPHeartBeatUpload();
- heart_upload_time=0;
- }
+ }
+ if(heart_upload_time==0||heart_upload_time==60)
+ {
+ TCPHeartBeatUpload();
+ heart_upload_time=0;
+ if(lounei_flag==1)
+ {
+ // PCA9555_Set_One_Value_Output(LED_POWER,0);
+ PCA9555_Set_One_Value_Output(GPS_POWER,0);
+ // PCA9555_Set_One_Value_Output(AIR780E_ENBALE,0);
+ }
+ }
heart_upload_time++;
- }
+
+
+
+
@@ -385,7 +396,7 @@
Usart1ParseDataCallback = UsartParseDataHandler;//需改为默认为gps处理，UsartParseDataHandler为升级处理当调试时候改为
parameter_init_anchor();//g_com_map表初始化角色默认为基站
dev_id=g_com_map[DEV_ID];//这里不太对
-// g_com_map[GROUP_ID]=9;
+ g_com_map[GROUP_ID]=9;
group_id=g_com_map[GROUP_ID];//组ID
memcpy(&disoffset,&g_com_map[DIST_OFFSET],2);
warning_distance=g_com_map[ALARM_DISTANCE1];
@@ -447,7 +458,7 @@
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,"固件版本:MK-大工卡 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",g_com_map[IP_0],g_com_map[IP_1],g_com_map[IP_2],g_com_map[IP_3],g_com_map[PORT]);
if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_TCP)
{
@@ -615,7 +626,7 @@
board_clock_run();
boot_deinit();
board_pins_config();
- board_debug_console_open_baud(TRACE_PORT_UART1,BAUD_115200);
+ board_debug_console_open_baud(TRACE_PORT_UART1,BAUD_115200);
// Reset reason
reset_cause_get();
reset_cause_clear();
--
Gitblit v1.9.3