From f61f19e571c8effbdb509e3550e5ed65deeaffb7 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期二, 20 二月 2024 15:36:25 +0800
Subject: [PATCH] 版本V2.5，修复恢复出厂设置bug，并把GPS启动间隔放到临近基站2的位置，并且临近基站初始化默认10
---
APL/global_param.c | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/APL/global_param.c b/APL/global_param.c
index e8674a4..a00f5f2 100644
--- a/APL/global_param.c
+++ b/APL/global_param.c
@@ -50,6 +50,7 @@
void parameter_init(void)
{
+ memset((uint8_t*)&g_com_map,0,(COM_MAP_SIZE<<1));
FLASH_Read(FLASH_IAP_CTRL_MAP, (uint8_t*)&g_com_map, (COM_MAP_SIZE<<1));
if(g_com_map[0] != 0x55AA)
@@ -57,10 +58,10 @@
g_com_map[0] = 0x55AA;
g_com_map[DEV_ID] =0x1234;//DEFAULT_DEV_ID; //默认设备ID
- g_com_map[COM_INTERVAL]=500; //频率2HZ
+ g_com_map[COM_INTERVAL]=10000; //频率2HZ
g_com_map[MAX_REPORT_ANC_NUM]=10;
g_com_map[GROUP_ID]=0;
- g_com_map[DIST_OFFSET]=-31;
+ g_com_map[DIST_OFFSET]=0;
g_com_map[DEV_ROLE] =0x1; //标签
@@ -69,7 +70,7 @@
g_com_map[POWER]=67; //发射功率
g_com_map[IMU_THRES]=2;
- g_com_map[NOMOVESLEEP_TIME]=3600; //静止休眠2分钟
+ g_com_map[NOMOVESLEEP_TIME]=3900; //静止休眠2分钟
g_com_map[MOTOR_ENABLE]=1; //震动电机使能
g_com_map[IMU_ENABLE]=1; //静止休眠使能
@@ -81,7 +82,38 @@
g_com_map[STATIONARY_TIME]=20; //静止判定时间20秒
g_com_map[HEIGHTOFFEST_INDEX]=0;
g_com_map[GPS_ONTIME]=3600;
+ g_com_map[NEARBASE_NUM]=10;
save_com_map_to_flash();
}
}
+void Reboot_init(void)
+{
+ g_com_map[0] = 0x55AA;
+ g_com_map[DEV_ID] =0x1234;//DEFAULT_DEV_ID; //默认设备ID
+ g_com_map[COM_INTERVAL]=10000; //频率2HZ
+ g_com_map[MAX_REPORT_ANC_NUM]=10;
+ g_com_map[GROUP_ID]=0;
+ g_com_map[DIST_OFFSET]=0;
+
+ g_com_map[DEV_ROLE] =0x1; //标签
+
+
+ g_com_map[HEARTBEAT]=0;
+
+ g_com_map[POWER]=67; //发射功率
+ g_com_map[IMU_THRES]=2;
+ g_com_map[NOMOVESLEEP_TIME]=3900; //静止休眠2分钟
+ g_com_map[MOTOR_ENABLE]=1; //震动电机使能
+ g_com_map[IMU_ENABLE]=1; //静止休眠使能
+
+ g_com_map[CNT_RESTART]=0;
+ g_com_map[CNT_REBOOT]=0;
+ g_com_map[CNT_UPDATE]=0;
+ g_com_map[MODBUS_MODE]=0;
+ g_com_map[ACTIVE_INDEX]=0;
+ g_com_map[STATIONARY_TIME]=20; //静止判定时间20秒
+ g_com_map[HEIGHTOFFEST_INDEX]=0;
+ g_com_map[GPS_ONTIME]=3600;
+ g_com_map[NEARBASE_NUM]=10;
+}
\ No newline at end of file
--
Gitblit v1.9.3