From dbe67cd6a483817bfc234718c301ff419de6b4e7 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期日, 21 六月 2020 23:38:53 +0800
Subject: [PATCH] 测试完成，重改定时机制
---
源码/核心板/Src/application/global_param.c | 36 ++++++++++++++++++++++++------------
1 files changed, 24 insertions(+), 12 deletions(-)
diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/global_param.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/global_param.c"
index 5f745a2..1899e93 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/global_param.c"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/global_param.c"
@@ -25,18 +25,30 @@
if(g_com_map[0] != 0x55AA)
{
g_com_map[0] = 0x55AA;
- g_com_map[ALARM_DISTANCE1] = 500; //默认报警距离50cm
- g_com_map[ALARM_DISTANCE2] = 1000; //默认报警距离50cm
- g_com_map[ALARM_DISTANCE3] = 1500; //默认报警距离50cm
- g_com_map[ALARM_DEV] = 1;
- g_com_map[DEV_ID] = 1;//DEFAULT_DEV_ID; //默认设备ID
- g_com_map[COM_INTERVAL]=500;
- save_com_map_to_flash();
- }
-
- dis_after_filter = 1000; //默认距离
- p_Dis_Filter = New_LP_Frac(0.3);
+ g_com_map[DEV_ID] =0x04;//DEFAULT_DEV_ID; //默认设备ID
-
+ g_com_map[COM_INTERVAL]=100;
+ g_com_map[MAX_REPORT_ANC_NUM]=2;
+ g_com_map[MIN_REPORT_ANC_NUM]=2;
+ g_com_map[DIST_OFFSET]=-13;
+ #ifdef WORK_MODE_TAG
+ g_com_map[DEV_ROLE] =0x1; //标签
+ #else
+ g_com_map[DEV_ROLE] =0x0; //基站
+ #endif
+ g_com_map[ANC_POLL]=0;
+ g_com_map[ALARM_DEV] = 0;
+ g_com_map[ALARM_DISTANCE1] = 0; //默认报警距离50cm
+ g_com_map[ALARM_DISTANCE2] = 0; //默认报警距离50cm
+ g_com_map[ALARM_DISTANCE3] = 0; //默认报警距离50cm
+ g_com_map[HEARTBEAT]=0;
+ g_com_map[CNT_RESTART]=0;
+ g_com_map[CNT_REBOOT]=0;
+ g_com_map[CNT_UPDATE]=0;
+ g_com_map[NEARBASE_NUM]=0;
+ g_com_map[POWER]=67;
+
+ save_com_map_to_flash();
+ }
}
--
Gitblit v1.9.3