From fc78430a35be252a1cd5a29b5b66290a68cd9ca3 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期二, 27 八月 2024 17:21:18 +0800
Subject: [PATCH] Merge branch '安邦测距手环' of http://47.108.70.204:60062/r/ChinaUWBProject into 安邦测距手环

---
 keil/include/drivers/global_param.h |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/keil/include/drivers/global_param.h b/keil/include/drivers/global_param.h
index b5e8f7f..592a309 100644
--- a/keil/include/drivers/global_param.h
+++ b/keil/include/drivers/global_param.h
@@ -19,14 +19,16 @@
 #define 	ANC_POLL							0x8		//基站主动测距
 
 #define 	ALARM_DEV						0x9		//是哪个设备报警
-#define		STATIONARY_TIME			0xA		//小于多少距离报警
+
+#define		ALARM_DISTANCE1			0xB		//小于多少距离报警
 #define		ALARM_DISTANCE2			0xB		//小于多少距离报警
 #define		ALARM_DISTANCE3			0xC		//小于多少距离报警
 #define		PAIR_ID							0xD		//小于多少距离报警
-#define   BIND_DEV_ID         0xD   //绑定的设备ID
+#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
@@ -56,7 +58,11 @@
 #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
 
 /*------------END Map Definition-------------------*/
 

--
Gitblit v1.9.3