From 0f740df1a59278f05b8fb28e92be5075dbc8aa86 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期一, 16 八月 2021 16:52:27 +0800
Subject: [PATCH] 去掉继电器，修改标签输出和其他基站测距信息，以及MODBUS

---
 源码/核心板/Src/application/global_param.h |   10 +++++++---
 1 files changed, 7 insertions(+), 3 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 8bec85b..395615b 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,6 +7,10 @@
 #define	DEFAULT_DISTANCE	1000		//初始测距距离为10米
 #define DEFAULT_DEV_ID		5555		//默认设备ID是5555
 
+#define SW_MODBUS     		 	1
+#define SW_FANGZHUANG           2
+#define SW_DINGWEI              3
+
 /*---------------Map Definition-------------------*/
 #define   MAP_SIGN_INDEX      0x0		//MAP表初始化标志位
 #define 	VERSION        			0x1		//版本号
@@ -44,17 +48,17 @@
 #define   MOTOR_ENABLE        0x1E	//震动使能
 #define   IMU_ENABLE          0x1F	//加速计使能
 #define 	FILTER_COEFFICIENT  0x20	//滤波参数
-
+#define 	SPEEDFILTER_THRES   0x24	//滤波参数
 #define 	CNT_RESTART					0x30	//重启
 #define 	CNT_REBOOT					0x31	//恢复出厂设置
 #define 	CNT_UPDATE					0x32	//升级
-
+#define 	SW_TYPE  						0x27
 
 /*------------END Map Definition-------------------*/
 
 
 extern uint16_t g_com_map[COM_MAP_SIZE];
-
+extern void returnfactory_parameter(void);
 extern uint32_t save_com_map_to_flash(void);
 extern void parameter_init(void);
 extern u8 group_id,sync_mainbase,synclost_timer;

--
Gitblit v1.9.3