From 681567d6d1bd2894eccde5b22a948eac7d3a22a5 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期五, 20 九月 2024 18:38:25 +0800
Subject: [PATCH] 对应发货标签V1.6,更改版本号为V1.1,与一期标签分开,更改了tag的uwb测距配置与DW1000通讯,并将测距接包逻辑单次接包改为打开循环接收

---
 keil/include/drivers/global_param.h |   19 +++++--------------
 1 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/keil/include/drivers/global_param.h b/keil/include/drivers/global_param.h
index 592a309..29b4a02 100644
--- a/keil/include/drivers/global_param.h
+++ b/keil/include/drivers/global_param.h
@@ -13,25 +13,21 @@
 #define 	DEV_ID								0x2		//设备的Id
 #define 	COM_INTERVAL					0x3		//通讯间隔
 #define 	MAX_REPORT_ANC_NUM		0x4		//单次通讯基站上限
-#define 	GROUP_ID							0x5		//单次通讯基站下限
+#define 	GROUP_ID		0x5		//单次通讯基站下限
 #define 	DIST_OFFSET						0x6	
 #define 	DEV_ROLE							0x7		//该设备是anchor还是tag	
 #define 	ANC_POLL							0x8		//基站主动测距
 
 #define 	ALARM_DEV						0x9		//是哪个设备报警
-
-#define		ALARM_DISTANCE1			0xB		//小于多少距离报警
+#define		STATIONARY_TIME		0xA		//小于多少距离报警
 #define		ALARM_DISTANCE2			0xB		//小于多少距离报警
 #define		ALARM_DISTANCE3			0xC		//小于多少距离报警
 #define		PAIR_ID							0xD		//小于多少距离报警
-#define     BIND_DEV_ID         0xD   //绑定的设备ID
 #define		HEARTBEAT       		0xE
-#define   SEND_4G_FREQUENCY   0xE		//4G上报频率
 #define		MODBUS_MODE		   		0xF
-#define 	QUIT_SLOT_TIME 5
 
-#define    MOTOR_ONTIME_INDEX                0x10
-#define 	 MOTORBEEPER_INDEX 				    		 0x11
+#define      MOTOR_ONTIME_INDEX                    0x10
+#define 	 MOTORBEEPER_INDEX 				    0x11
 #define      NEARBASE_ID1                    0x11
 #define      NEARBASE_ID2                    0x12
 #define      NEARBASE_ID3                    0x13
@@ -57,12 +53,7 @@
 #define 	CNT_RESTART						0x30
 #define 	CNT_REBOOT						0x31
 #define 	CNT_UPDATE						0x32
-
-#define     TCP_IP_0                        0x39
-#define     TCP_IP_1                        0x3a
-#define     TCP_IP_2                        0x3b
-#define     TCP_IP_3                        0x3c
-#define     TCP_PORT                        0x3d
+#define   BIND_DEV_ID           0x40
 
 /*------------END Map Definition-------------------*/
 

--
Gitblit v1.9.3