From e5f73b1e954eb54e0af326b3a5aee5fab719f0ce Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期六, 08 六月 2019 10:06:45 +0800
Subject: [PATCH] 6月7号

---
 源码/核心板/Src/application/global_param.c |   16 ++++++++++++----
 1 files changed, 12 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.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/global_param.c"
index 609adcd..1d194b0 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"
@@ -1,6 +1,7 @@
 #include "global_param.h"
 #include "Flash.h"
 #include "dw_app.h"
+#include <string.h>
 
 uint16_t g_com_map[COM_MAP_SIZE];
 
@@ -21,10 +22,17 @@
 {
 	FLASH_Read(FLASH_IAP_CTRL_MAP, (uint8_t*)&g_com_map, (COM_MAP_SIZE<<1));
 	
-	g_com_map[ALARM_DISTANCE] = 200;	//默认报警距离200cm
-	g_com_map[ALARM_DEV] = 0;
-	dis_after_filter = 1000;			//默认距离
-	p_Dis_Filter = New_LP_Frac(0.7);
+	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] =4;//DEFAULT_DEV_ID;	//默认设备ID
+		g_com_map[COM_INTERVAL]=1000;
+		save_com_map_to_flash();
+	}
 
 	
 }

--
Gitblit v1.9.3