From 1b783d20cd9c53fada9c7855ed2b903399285de7 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期四, 21 三月 2024 14:52:30 +0800
Subject: [PATCH] V1.11尝试解决标签回复出厂设置BUG 1.去掉开机判断55AA标志位 2.map表2校验，不对就重启
---
Src/application/global_param.c | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/Src/application/global_param.c b/Src/application/global_param.c
index 7d84e39..8b3c0c3 100644
--- a/Src/application/global_param.c
+++ b/Src/application/global_param.c
@@ -34,16 +34,12 @@
memcpy(g_com_map2,g_com_map,COM_MAP_SIZE);
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[DEV_ID] =0x04;//DEFAULT_DEV_ID; //默认设备ID
-
- g_com_map[COM_INTERVAL]=500;
+ g_com_map[COM_INTERVAL]=1000;
g_com_map[MAX_REPORT_ANC_NUM]=10;
g_com_map[GROUP_ID]=0;
g_com_map[DIST_OFFSET]=-31;
@@ -74,6 +70,9 @@
g_com_map[NEARBASE_ID1]=0x470;
g_com_map[LORA_POWER]=22;
save_com_map_to_flash();
- }
+}
+void parameter_init(void)
+{
+ FLASH_Read(FLASH_IAP_CTRL_MAP, (uint8_t*)&g_com_map, (COM_MAP_SIZE<<1));
}
--
Gitblit v1.9.3