From 603876aab99a1fe5eb012e1ef13fa1fc02b0b717 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期三, 21 十二月 2022 09:40:18 +0800
Subject: [PATCH] V1.41 修改恢复出厂 升级 逻辑

---
 Src/application/global_param.c |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Src/application/global_param.c b/Src/application/global_param.c
index 68a299b..fc43ef6 100644
--- a/Src/application/global_param.c
+++ b/Src/application/global_param.c
@@ -47,14 +47,8 @@
 	__enable_irq();
 	return result;
 }
-
-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)
-	{
-		g_com_map[0] = 0x55AA;
+void ReturnFactory(void)
+{g_com_map[0] = 0x55AA;
 		g_com_map[DEV_ID] =0x04;//DEFAULT_DEV_ID;	//默认设备ID
 
 		g_com_map[COM_INTERVAL]=500;
@@ -85,7 +79,14 @@
 		g_com_map[CNT_REBOOT]=0;
 		g_com_map[CNT_UPDATE]=0;
 		g_com_map[MODBUS_MODE]=0;
-		save_com_map_to_flash();
+		save_com_map_to_flash();}
+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();
 	}	
 }
 

--
Gitblit v1.9.3