From ab16ddec95bf2abfed4a7b19ef59444b1a75f126 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期三, 04 一月 2023 11:26:46 +0800
Subject: [PATCH] 1.自动时间片标签，修改升级触发逻辑，修改参数增加校验
---
Src/application/global_param.c | 51 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 42 insertions(+), 9 deletions(-)
diff --git a/Src/application/global_param.c b/Src/application/global_param.c
index 8f7f047..4802e98 100644
--- a/Src/application/global_param.c
+++ b/Src/application/global_param.c
@@ -5,11 +5,41 @@
uint16_t g_com_map[COM_MAP_SIZE];
-
+u8 parameter_check(void)
+{
+ if(g_com_map[0] != 0x55AA)
+ {
+ return 1;
+ }
+ if(g_com_map[COM_INTERVAL]<50||COM_INTERVAL>1000)
+ {
+ return 1;
+ }
+ if(g_com_map[POWER]>67)
+ {
+ return 1;
+ }
+ if(g_com_map[MOTOR_ENABLE]>1)
+ {
+ return 1;
+ }
+ if(g_com_map[IMU_ENABLE]>1)
+ {
+ return 1;
+ }
+ if(g_com_map[ACTIVE_INDEX]>1)
+ {
+ return 1;
+ }
+ return 0;
+}
uint32_t save_com_map_to_flash(void)
{
uint32_t result = 0;
-
+ if(parameter_check()) //参数错误，不保存
+ {
+ return 1;
+ }
__disable_irq();
result = FLASH_Prepare(FLASH_IAP_CTRL_MAP, (COM_MAP_SIZE<<1));
if(result)
@@ -17,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
@@ -51,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));
+
+ if(g_com_map[0] != 0x55AA)
+ {
+ ReturnFactorySettings();
}
}
--
Gitblit v1.9.3