From 643829caa98867a769a95a25a7d6e93042f7b2bc Mon Sep 17 00:00:00 2001 From: zhyinch <zhyinch@gmail.com> Date: 星期三, 10 七月 2019 14:58:28 +0800 Subject: [PATCH] 去掉标签输出，标签探索6-4响应模式 --- 源码/核心板/Src/application/global_param.h | 20 ++++++++++++-------- 1 files changed, 12 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.h" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/global_param.h" index 977da01..2438903 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,22 +3,26 @@ #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 -#define DEV_ID 0x11 //设备的Id号 -#define COM_INTERVAL 0x12 //通讯间隔 -#define DEV_GROUP_ID 0x13 //通讯组ID +#define DEV_ID_L 0x11 //设备的Id号低8位 +#define DEV_ID_H 0x12 //设备的Id号高8位 +#define COM_INTERVAL 0x13 //通讯间隔 +#define DEV_GROUP_ID 0x14 //通讯组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