From 612814daf9bb44c4104ab3708d8a5fcba6f2a6d5 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期五, 23 七月 2021 14:25:42 +0800
Subject: [PATCH] 增加继电器控制时间,还有速度显示

---
 源码/核心板/Src/application/global_param.h |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 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 ad7dcc5..72d68c6 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"
@@ -7,13 +7,16 @@
 #define	DEFAULT_DISTANCE	1000		//初始测距距离为10米
 #define DEFAULT_DEV_ID		5555		//默认设备ID是5555
 #define SYNCLOST_TIME     10000  //多久收不到信号变成同步基站
+#define SW_MODBUS     		 	1
+#define SW_FANGZHUANG       2
+#define SW_DINGWEI      		3
 /*---------------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		//该设备是anchor还是tag	
@@ -43,15 +46,21 @@
 #define   MOTOR_ENABLE        0x1E
 #define   IMU_ENABLE          0x1F
 #define 	FILTER_COEFFICIENT  0x20
+#define 	SPEEDFILTER_THRES   0x24	//滤波参数
+#define 	WHITELIST1_START  	0x25
+#define 	WHITELIST1_END  		0x26
+#define 	SW_TYPE  						0x27
+#define     WAR_JDQ_TIME                   0x28     
 
 #define 	CNT_RESTART						0x30
 #define 	CNT_REBOOT						0x31
 #define 	CNT_UPDATE						0x32
 
-#define 	BOARD_TYPE         0x40   //板子类型
+#define 	BOARD_TYPE                      0x40   //板子类型
 
 #define 	ANC_FLAG							0x100
-
+#define 	RELAY1ON_INDEX							0x78
+#define 	RELAY2ON_INDEX							0x79
 /*------------END Map Definition-------------------*/
 
 
@@ -59,6 +68,6 @@
 
 extern uint32_t save_com_map_to_flash(void);
 extern void parameter_init(void);
-
+void FactorySettings(void);
 #endif
 

--
Gitblit v1.9.3