From 743f4f1291c555b1facc0c34bcbb3cea3cfd41c4 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期一, 29 七月 2019 16:54:22 +0800
Subject: [PATCH] 标签输出

---
 源码/核心板/Src/application/global_param.c |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 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 870ee88..59524bd 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,15 +25,14 @@
 	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] =10;//DEFAULT_DEV_ID;	//默认设备ID
-		g_com_map[COM_INTERVAL]=500;
+//		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] =0x04;//DEFAULT_DEV_ID;	//默认设备ID
+		g_com_map[DEV_ID_H] =0x00;//DEFAULT_DEV_ID;	//默认设备ID
+		g_com_map[COM_INTERVAL]=1000;
 		save_com_map_to_flash();
-	}
-
-	
+	}	
 }
 

--
Gitblit v1.9.3