From 4a13529748c983ff0d5627a28365ad7737141016 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期五, 18 二月 2022 09:31:49 +0800
Subject: [PATCH] V1.62

---
 源码/核心板/Src/application/global_param.h |   35 +++++++++++++++++++++--------------
 1 files changed, 21 insertions(+), 14 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 9cd6e20..96b3349 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"
@@ -16,7 +16,7 @@
 #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		//该设备是anchor还是tag	
@@ -27,18 +27,19 @@
 #define		ALARM_DISTANCE3			0xC		//小于多少距离报警
 #define		PAIR_ID							0xD		//小于多少距离报警
 #define		HEARTBEAT       		0xE
+#define		MODBUS_MODE		   		0xF		//MOBUS模式
 
-#define      NEARBASE_NUM                    0x10
-#define      NEARBASE_ID1                    0x11
-#define      NEARBASE_ID2                    0x12
-#define      NEARBASE_ID3                    0x13
-#define      NEARBASE_ID4                    0x14
-#define      NEARBASE_ID5                    0x15
-#define      NEARBASE_ID6                    0x16
-#define      NEARBASE_ID7                    0x17
-#define      NEARBASE_ID8                    0x18
-#define      NEARBASE_ID9                    0x19
-#define      NEARBASE_ID10                   0x1a
+#define      MODBUS_ADDRESS                    0x10
+#define      MODBUS_ID1                    0x11
+#define      MODBUS_ID2                    0x12
+#define      MODBUS_ID3                    0x13
+#define      MODBUS_ID4                    0x14
+#define      MODBUS_ID5                    0x15
+#define      MODBUS_ID6                    0x16
+#define      MODBUS_ID7                    0x17
+#define      MODBUS_ID8                    0x18
+#define      MODBUS_ID9                    0x19
+#define      MODBUS_ID10                   0x1a
 
 #define 	POWER           		0x1B
 #define		IMU_THRES				   	0x1C
@@ -50,16 +51,22 @@
 #define 	WHITELIST1_START  	0x25
 #define 	WHITELIST1_END  		0x26
 #define 	SW_TYPE  						0x27
+#define     WAR_JDQ_TIME                   0x28      
+#define     ANT_LENGTH                   0x2A  
 
 #define 	CNT_RESTART						0x30
 #define 	CNT_REBOOT						0x31
 #define 	CNT_UPDATE						0x32
-
-#define 	BOARD_TYPE         0x40   //板子类型
+#define 	CNT_UPDATE						0x32
+#define     HARDWAREFLAG_INDEX              0x33
+#define 	BOARD_TYPE                      0x40   //板子类型
 
 #define 	ANC_FLAG							0x100
 #define 	RELAY1ON_INDEX							0x78
 #define 	RELAY2ON_INDEX							0x79
+#define 	RELAY2_DISTANCE1					    0x7A
+#define 	RELAY2_DISTANCE2					    0x7B
+#define 	RELAY2_DISTANCE3					    0x7C
 /*------------END Map Definition-------------------*/
 
 

--
Gitblit v1.9.3