From f3a6daa409dfb287e517cf792a425435038e44df Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期二, 18 五月 2021 16:26:09 +0800
Subject: [PATCH] 修改基站类型未附值BUG
---
源码/核心板/Src/application/global_param.c | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/global_param.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/global_param.c"
index 59f3b70..8937d2c 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/global_param.c"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/global_param.c"
@@ -17,18 +17,13 @@
__enable_irq();
return result;
}
-
-void parameter_init(void)
+void returnfactory_parameter(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]=50;
- g_com_map[MAX_REPORT_ANC_NUM]=2;
+ g_com_map[COM_INTERVAL]=200;
+ g_com_map[MAX_REPORT_ANC_NUM]=10;
g_com_map[GROUP_ID]=0;
g_com_map[DIST_OFFSET]=-31;
#ifdef WORK_MODE_TAG
@@ -47,7 +42,17 @@
g_com_map[CNT_REBOOT]=0;
g_com_map[CNT_UPDATE]=0;
g_com_map[MODBUS_MODE]=0;
- save_com_map_to_flash();
- }
+ g_com_map[POWER]=67;
+ g_com_map[FILTER_COEFFICIENT]=40;
+ g_com_map[SPEEDFILTER_THRES]=10000;
+}
+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)
+// {
+
+// }
}
--
Gitblit v1.9.3