From 4bdcef16fd860b674793c435288ed3afb50ddabe Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期六, 03 六月 2023 11:38:07 +0800
Subject: [PATCH] V2.17 Z增加参数保护，有bug
---
Src/application/global_param.c | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/Src/application/global_param.c b/Src/application/global_param.c
index 53784be..ea10492 100644
--- a/Src/application/global_param.c
+++ b/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];
u8 parameter_check(void)
{
@@ -47,14 +47,9 @@
__enable_irq();
return result;
}
-
-void parameter_init(void)
+void ReturnFactorySettings(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] =4;//DEFAULT_DEV_ID; //默认设备ID
g_com_map[COM_INTERVAL]=500; //频率2HZ
@@ -81,6 +76,14 @@
g_com_map[STATIONARY_TIME]=20; //静止判定时间20秒
g_com_map[HEIGHTOFFEST_INDEX]=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));
+ FLASH_Read(FLASH_IAP_CTRL_MAP, (uint8_t*)&g_com_map2, (COM_MAP_SIZE<<1));
+ if(g_com_map[0] != 0x55AA)
+ {
+ ReturnFactorySettings();
}
}
--
Gitblit v1.9.3