From 1964c9f6c990dde20db364b687275d8d50416ff4 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期二, 14 四月 2020 23:15:25 +0800
Subject: [PATCH] V1.9 修改成串口距离信息整合输出

---
 源码/核心板/Src/application/global_param.c |   28 +++++++++++++++++++++-------
 1 files changed, 21 insertions(+), 7 deletions(-)

diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/global_param.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/global_param.c"
index d656f6c..13b2883 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/global_param.c"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/global_param.c"
@@ -25,13 +25,27 @@
 	if(g_com_map[0] != 0x55AA)
 	{
 		g_com_map[0] = 0x55AA;
-//		g_com_map[ALARM_DISTANCE1] = 100;	//默认报警距离50cm
-//		g_com_map[ALARM_DISTANCE2] = 600;	//默认报警距离50cm
-//		g_com_map[ALARM_DISTANCE3] = 900;	//默认报警距离50cm
-//		g_com_map[ALARM_DEV] = 1;
-		g_com_map[DEV_ID_L] =0xdb;//DEFAULT_DEV_ID;	//默认设备ID
-		g_com_map[DEV_ID_H] =0x00;//DEFAULT_DEV_ID;	//默认设备ID
-		g_com_map[COM_INTERVAL]=1000;
+		g_com_map[DEV_ID] =0x04;//DEFAULT_DEV_ID;	//默认设备ID
+
+		g_com_map[COM_INTERVAL]=100;
+		g_com_map[MAX_REPORT_ANC_NUM]=2;
+		g_com_map[MIN_REPORT_ANC_NUM]=2;
+		g_com_map[DIST_OFFSET]=-13;
+		#ifdef WORK_MODE_TAG
+			g_com_map[DEV_ROLE] =0x1;  //标签
+		#else
+			g_com_map[DEV_ROLE] =0x0;  //基站
+		#endif
+		g_com_map[ANC_POLL]=0;
+		g_com_map[ALARM_DEV] = 0;
+		g_com_map[ALARM_DISTANCE1] = 0;	//默认报警距离50cm
+		g_com_map[ALARM_DISTANCE2] = 0;	//默认报警距离50cm
+		g_com_map[ALARM_DISTANCE3] = 0;	//默认报警距离50cm
+		g_com_map[HEARTBEAT]=0;
+		g_com_map[CNT_RESTART]=0;
+		g_com_map[CNT_REBOOT]=0;
+		g_com_map[CNT_UPDATE]=0;
+		g_com_map[NEARBASE_NUM]=0;
 		save_com_map_to_flash();
 	}	
 }

--
Gitblit v1.9.3