From f018800c5cddf3a3fc70a8b319c4e5dd94a3190f Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期日, 24 十一月 2019 16:43:47 +0800
Subject: [PATCH] 修改跳数40米bug

---
 源码/核心板/Src/application/global_param.h |   32 ++++++++++++++++++++++----------
 1 files changed, 22 insertions(+), 10 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 2438903..dfca262 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"
@@ -8,17 +8,29 @@
 #define DEFAULT_DEV_ID		5555		//默认设备ID是5555
 
 /*---------------Map Definition-------------------*/
-#define 	DEV_ROLE				0x10		//该设备是anchor还是tag	
-#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 	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		//基站主动测距
 
-#define 	ALARM_DEV				0x20		//是哪个设备报警
-#define		ALARM_DISTANCE1			0x21		//小于多少距离报警
-#define		ALARM_DISTANCE2			0x22		//小于多少距离报警
-#define		ALARM_DISTANCE3			0x23		//小于多少距离报警
-#define		PAIR_ID							0x24		//小于多少距离报警
+#define 	ALARM_DEV						0x9		//是哪个设备报警
+#define		ALARM_DISTANCE1			0xA		//小于多少距离报警
+#define		ALARM_DISTANCE2			0xB		//小于多少距离报警
+#define		ALARM_DISTANCE3			0xC		//小于多少距离报警
+#define		PAIR_ID							0xD		//小于多少距离报警
+#define		HEARTBEAT       		0xE
+#define		MODBUS_MODE		   		0xF
+
+
+#define 	CNT_RESTART						0x30
+#define 	CNT_REBOOT						0x31
+#define 	CNT_UPDATE						0x32
+
+
 /*------------END Map Definition-------------------*/
 
 

--
Gitblit v1.9.3