From 4a99709fbaf35e70ab7102c902e2c4caab74b96c Mon Sep 17 00:00:00 2001 From: zhyinch <zhyinch@gmail.com> Date: 星期四, 18 十月 2018 16:27:33 +0800 Subject: [PATCH] Revert "Revert "配对完成，有bug"" --- 源码/核心板/Src/application/global_param.h | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/global_param.h" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/global_param.h" index 977da01..d04d1ab 100644 --- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/global_param.h" +++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/global_param.h" @@ -3,8 +3,9 @@ #include "stm32f10x.h" -#define COM_MAP_SIZE 1024 - +#define COM_MAP_SIZE 1024 //MAP表的最大空间 +#define DEFAULT_DISTANCE 1000 //初始测距距离为10米 +#define DEFAULT_DEV_ID 5555 //默认设备ID是5555 /*---------------Map Definition-------------------*/ #define DEV_ROLE 0x10 //该设备是anchor还是tag @@ -13,12 +14,14 @@ #define DEV_GROUP_ID 0x13 //通讯组ID #define ALARM_DEV 0x20 //是哪个设备报警 -#define ALARM_DISTANCE 0x21 //小于多少距离报警 - +#define ALARM_DISTANCE1 0x21 //小于多少距离报警 +#define ALARM_DISTANCE2 0x22 //小于多少距离报警 +#define ALARM_DISTANCE3 0x23 //小于多少距离报警 +#define PAIR_ID 0x24 //小于多少距离报警 /*------------END Map Definition-------------------*/ -extern uint16_t g_com_map[COM_MAP_SIZE]; +extern uint16_t g_com_map[COM_MAP_SIZE]; extern uint32_t save_com_map_to_flash(void); extern void parameter_init(void); -- Gitblit v1.9.3