From e946ba5602833311031b32d6fc1cd5cf655f6e90 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期五, 07 一月 2022 17:13:39 +0800
Subject: [PATCH] 修改设备ID

---
 源码/核心板/Src/application/global_param.c |   28 +++++++++++++++-------------
 1 files changed, 15 insertions(+), 13 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 f395025..aaebaa2 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"
@@ -17,18 +17,13 @@
 	__enable_irq();
 	return result;
 }
-
-void parameter_init(void)
+void returnfactory_parameter(void)
 {
-	FLASH_Read(FLASH_IAP_CTRL_MAP, (uint8_t*)&g_com_map, (COM_MAP_SIZE<<1));
-	
-	if(g_com_map[0] != 0x55AA)
-	{
-		g_com_map[0] = 0x55AA;
+  	g_com_map[0] = 0x55AA;
 		g_com_map[DEV_ID] =0x04;//DEFAULT_DEV_ID;	//默认设备ID
 
-		g_com_map[COM_INTERVAL]=1000;
-		g_com_map[MAX_REPORT_ANC_NUM]=2;
+		g_com_map[COM_INTERVAL]=200;
+		g_com_map[MAX_REPORT_ANC_NUM]=10;
 		g_com_map[GROUP_ID]=0;
 		g_com_map[DIST_OFFSET]=-31;
 		#ifdef WORK_MODE_TAG
@@ -47,10 +42,17 @@
 		g_com_map[CNT_REBOOT]=0;
 		g_com_map[CNT_UPDATE]=0;
 		g_com_map[MODBUS_MODE]=0;
-		g_com_map[POWER]=67;
-		g_com_map[FILTER_COEFFICIENT]=10;
-		
-		save_com_map_to_flash();
+		g_com_map[POWER]=67; 
+		g_com_map[FILTER_COEFFICIENT]=40;
+		g_com_map[SPEEDFILTER_THRES]=10000;
+}
+void parameter_init(void)
+{
+	FLASH_Read(FLASH_IAP_CTRL_MAP, (uint8_t*)&g_com_map, (COM_MAP_SIZE<<1));
+	if(g_com_map[0] != 0x55AA)
+	{
+        returnfactory_parameter();
 	}	
+//	g_com_map[DEV_ROLE] =0x1;
 }
 

--
Gitblit v1.9.3