From 20ef2d42f15f2763a5079929fc7c375e9c94b697 Mon Sep 17 00:00:00 2001 From: zhyinch <zhyinch@gmail.com> Date: 星期六, 09 十一月 2019 14:16:39 +0800 Subject: [PATCH] V1.5 修改数据溢出bug --- 源码/核心板/Src/application/global_param.h | 26 ++++++++++++++++++++------ 1 files changed, 20 insertions(+), 6 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 ca85222..317c3fe 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" @@ -5,15 +5,29 @@ #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 VERSION 0x1 +#define DEV_ID 0x2 //设备的Id +#define COM_INTERVAL 0x3 //通讯间隔 +#define MAX_REPORT_ANC_NUM 0x4 //单次通讯基站上限 +#define MIN_REPORT_ANC_NUM 0x5 //单次通讯基站下限 +#define DIST_OFFSET 0x6 +#define DEV_ROLE 0x7 //该设备是anchor还是tag +#define ANC_POLL 0x8 //该设备是anchor还是tag -#define ALARM_DEV 0x20 //是哪个设备报警 -#define ALARM_DISTANCE 0x21 //小于多少距离报警 +#define ALARM_DEV 0x9 //是哪个设备报警 +#define ALARM_DISTANCE1 0xA //小于多少距离报警 +#define ALARM_DISTANCE2 0xB //小于多少距离报警 +#define ALARM_DISTANCE3 0xC //小于多少距离报警 +#define PAIR_ID 0xD //小于多少距离报警 +#define HEARTBEAT 0xE + +#define CNT_RESTART 0x30 +#define CNT_REBOOT 0x31 +#define CNT_UPDATE 0x32 + /*------------END Map Definition-------------------*/ -- Gitblit v1.9.3