From 003aff1766ffd3ccfe9df6096ef137340ebfeabf Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期五, 18 十二月 2020 16:57:26 +0800
Subject: [PATCH] Merge branch '调试' into 定位-临近

---
 Src/application/global_param.h |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/Src/application/global_param.h b/Src/application/global_param.h
index f9bd33d..991567b 100644
--- a/Src/application/global_param.h
+++ b/Src/application/global_param.h
@@ -3,16 +3,17 @@
 
 #include "main.h"
 
-#define COM_MAP_SIZE		1024		//MAP表的最大空间
+#define COM_MAP_SIZE		512		//MAP表的最大空间
 #define	DEFAULT_DISTANCE	1000		//初始测距距离为10米
 #define DEFAULT_DEV_ID		5555		//默认设备ID是5555
 
 /*---------------Map Definition-------------------*/
+#define   MAP_SIGN_INDEX      	0x0
 #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 	GROUP_ID		0x5		//单次通讯基站下限
 #define 	DIST_OFFSET						0x6	
 #define 	DEV_ROLE							0x7		//该设备是anchor还是tag	
 #define 	ANC_POLL							0x8		//基站主动测距
@@ -37,6 +38,15 @@
 #define      NEARBASE_ID9                    0x19
 #define      NEARBASE_ID10                   0x1a
 
+#define 	POWER           		0x1B
+#define		IMU_THRES				   	0x1C
+#define   NOMOVESLEEP_TIME    0x1D
+#define   MOTOR_ENABLE        0x1E
+#define   IMU_ENABLE          0x1F
+#define 	REMOTEPARA_STATE  	0x20
+#define 	MOTOR_ONTIME 				0x21
+#define 	ACTIVE_INDEX 				0x22
+
 #define 	CNT_RESTART						0x30
 #define 	CNT_REBOOT						0x31
 #define 	CNT_UPDATE						0x32
@@ -46,6 +56,7 @@
 
 
 extern uint16_t g_com_map[COM_MAP_SIZE];
+extern uint16_t rtag_com_map[30];
 
 extern uint32_t save_com_map_to_flash(void);
 extern void parameter_init(void);

--
Gitblit v1.9.3