From 0fab14bd3b70cdb16f134eaeeaac7d0947f2078f Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期三, 25 十一月 2020 19:36:16 +0800
Subject: [PATCH] 增加速度滤波阈值

---
 源码/核心板/Src/application/global_param.h |   62 ++++++++++++++++--------------
 1 files changed, 33 insertions(+), 29 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 0acd157..7ce793d 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"
@@ -8,49 +8,53 @@
 #define DEFAULT_DEV_ID		5555		//默认设备ID是5555
 
 /*---------------Map Definition-------------------*/
-#define   MAP_SIGN_INDEX      0x0
-#define 	VERSION        			0x1		
+#define   MAP_SIGN_INDEX      0x0		//MAP表初始化标志位
+#define 	VERSION        			0x1		//版本号
 #define 	DEV_ID						  0x2		//设备的Id
 #define 	COM_INTERVAL				0x3		//通讯间隔
 #define 	MAX_REPORT_ANC_NUM  0x4		//单次通讯基站上限
-#define 	GROUP_ID					  0x5		//单次通讯基站下限
-#define 	DIST_OFFSET					0x6	
+#define 	GROUP_ID					  0x5		//组ID
+#define 	DIST_OFFSET					0x6		//校准距离
 #define 	DEV_ROLE						0x7		//该设备是anchor还是tag	
 #define 	ANC_POLL						0x8		//基站主动测距
 
-#define 	ALARM_DEV						0x9		//是哪个设备报警
-#define		ALARM_DISTANCE1			0xA		//小于多少距离报警
-#define		ALARM_DISTANCE2			0xB		//小于多少距离报警
-#define		ALARM_DISTANCE3			0xC		//小于多少距离报警
-#define		PAIR_ID							0xD		//小于多少距离报警
-#define		HEARTBEAT       		0xE
-#define		MODBUS_MODE		   		0xF
+#define 	ALARM_DEV						0x9		//报警接口
+#define		ALARM_DISTANCE1			0xA		//无报警距离
+#define		ALARM_DISTANCE2			0xB		//报警距离
+#define		ALARM_DISTANCE3			0xC		//预警距离
+#define		PAIR_ID							0xD		//配对ID(无作用)
+#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      NEARBASE_NUM     0x10	//临近基站数量
+#define      NEARBASE_ID1     0x11	//临近基站1 ID
+#define      NEARBASE_ID2     0x12	//临近基站2 ID
+#define      NEARBASE_ID3     0x13	//临近基站3 ID
+#define      NEARBASE_ID4     0x14	//临近基站4 ID
+#define      NEARBASE_ID5     0x15	//临近基站5 ID
+#define      NEARBASE_ID6     0x16	//临近基站6 ID
+#define      NEARBASE_ID7     0x17	//临近基站7 ID
+#define      NEARBASE_ID8     0x18	//临近基站8 ID
+#define      NEARBASE_ID9     0x19	//临近基站9 ID
+#define      NEARBASE_ID10    0x1a	//临近基站10 ID
 
-#define 	POWER          			0x25
-#define 	FILTER_COEFFICIENT  0x26
-
-#define 	CNT_RESTART					0x30
-#define 	CNT_REBOOT					0x31
-#define 	CNT_UPDATE					0x32
+#define 	POWER           		0x1B	//发射功率
+#define		IMU_THRES				   	0x1C	//加速计灵敏度
+#define   NOMOVESLEEP_TIME    0x1D	//无运动休眠时间
+#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	//升级
 
 
 /*------------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