From 79d5d6bcc3bc634ea2f977c0ecb1f1356554d4b0 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 07 十一月 2019 15:33:21 +0800
Subject: [PATCH] 修改串口数组个数bug，增加报警距离功能
---
源码/核心板/Src/application/global_param.c | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 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 fbd5c01..d8930cf 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,15 +25,27 @@
if(g_com_map[0] != 0x55AA)
{
g_com_map[0] = 0x55AA;
- g_com_map[ALARM_DISTANCE1] = 300; //默认报警距离50cm
+ g_com_map[DEV_ID] =0x04;//DEFAULT_DEV_ID; //默认设备ID
+
+ g_com_map[COM_INTERVAL]=50;
+ 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] = 100; //默认报警距离50cm
g_com_map[ALARM_DISTANCE2] = 600; //默认报警距离50cm
g_com_map[ALARM_DISTANCE3] = 900; //默认报警距离50cm
- g_com_map[ALARM_DEV] = 1;
- g_com_map[DEV_ID] = 1;//DEFAULT_DEV_ID; //默认设备ID
- g_com_map[COM_INTERVAL]=500;
+ g_com_map[HEARTBEAT]=0;
+ g_com_map[CNT_RESTART]=0;
+ g_com_map[CNT_REBOOT]=0;
+ g_com_map[CNT_UPDATE]=0;
save_com_map_to_flash();
- }
-
-
+ }
}
--
Gitblit v1.9.3