From 0e91bca2aaebc14a6ea8ef97433d4a7953876ffa Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期三, 29 三月 2023 15:08:23 +0800
Subject: [PATCH] Merge branch '防撞' of http://47.108.70.204:60062/r/XRange_Tag into 防撞

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

diff --git a/Src/application/global_param.h b/Src/application/global_param.h
index ba486d7..3720698 100644
--- a/Src/application/global_param.h
+++ b/Src/application/global_param.h
@@ -3,7 +3,7 @@
 
 #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
 
@@ -43,8 +43,12 @@
 #define   NOMOVESLEEP_TIME    0x1D
 #define   MOTOR_ENABLE        0x1E
 #define   IMU_ENABLE          0x1F
-#define 	FILTER_COEFFICIENT  0x20
+#define 	REMOTEPARA_STATE  	0x20
+#define 	ACTIVE_INDEX 				    0x22
+#define     ANT_LENGTH                   0x2A  
 
+#define MOTOR_ONTIME 500
+#define MOTOR_OFFTIME 500
 
 #define 	CNT_RESTART						0x30
 #define 	CNT_REBOOT						0x31
@@ -55,6 +59,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