From 9b5beb905d2c3846b912adcce8051ce4ea3377de Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期一, 13 一月 2020 22:09:52 +0800
Subject: [PATCH] v1.18 标签可调距离补偿 第一个测距信息bug
---
源码/核心板/Src/application/global_param.c | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 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 99177bc..3c30898 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,27 +25,28 @@
if(g_com_map[0] != 0x55AA)
{
g_com_map[0] = 0x55AA;
- g_com_map[VERSION] = 0x0100;
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]=-26;
+ g_com_map[DIST_OFFSET]=-31;
#ifdef WORK_MODE_TAG
- g_com_map[DEV_ROLE] =0x1;
+ g_com_map[DEV_ROLE] =0x1; //标签
#else
- g_com_map[DEV_ROLE] =0x0;
+ g_com_map[DEV_ROLE] =0x0; //基站
#endif
+ g_com_map[NEARBASE_NUM]=0;
g_com_map[ANC_POLL]=0;
- g_com_map[ALARM_DEV] = 1;
- 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] = 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[MODBUS_MODE]=0;
save_com_map_to_flash();
}
}
--
Gitblit v1.9.3