From 6e7d484264afa951a0491cb4a868580a2f0b647b Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期三, 25 八月 2021 15:05:24 +0800
Subject: [PATCH] map表检查

---
 源码/核心板/Src/application/global_param.c |   24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 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 6bb73ae..96cf68f 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"
@@ -3,7 +3,7 @@
 #include "dw_app.h"
 #include <string.h>
 
-uint16_t g_com_map[COM_MAP_SIZE];
+uint16_t g_com_map[COM_MAP_SIZE],g_com_map2[COM_MAP_SIZE];
 
 
 uint32_t save_com_map_to_flash(void)
@@ -17,14 +17,9 @@
 	__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]=200;
@@ -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[POWER]=67; 
 		g_com_map[FILTER_COEFFICIENT]=40;
-		
-		save_com_map_to_flash();
+		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();
 	}	
 }
 

--
Gitblit v1.9.3