From de3d43245fd148de72fa7a70d2f7b95d02590a7e Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期三, 26 七月 2023 18:01:39 +0800
Subject: [PATCH] V2.15 回复出厂逻辑，解决恢复出厂就死机的BUG
---
Src/application/global_param.c | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/Src/application/global_param.c b/Src/application/global_param.c
index 68a299b..685d22d 100644
--- a/Src/application/global_param.c
+++ b/Src/application/global_param.c
@@ -47,14 +47,9 @@
__enable_irq();
return result;
}
-
-void parameter_init(void)
+void ReturnFactory(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]=500;
@@ -86,6 +81,14 @@
g_com_map[CNT_UPDATE]=0;
g_com_map[MODBUS_MODE]=0;
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