From 608c1a243525fa97c5df29e758280916bf66cbc2 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期二, 08 二月 2022 16:12:26 +0800
Subject: [PATCH] V1.47 去掉持续滤波和继电器
---
源码/核心板/Src/application/global_param.c | 46 ++++++++++++++++++++++++++--------------------
1 files changed, 26 insertions(+), 20 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 99177bc..0e9d664 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,36 +17,42 @@
__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[VERSION] = 0x0100;
+ 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[MIN_REPORT_ANC_NUM]=2;
- g_com_map[DIST_OFFSET]=-26;
+ 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
- g_com_map[DEV_ROLE] =0x1;
+ g_com_map[DEV_ROLE] =0x1; //标签
#else
- g_com_map[DEV_ROLE] =0x0;
+ g_com_map[DEV_ROLE] =0x0; //基站
#endif
+ g_com_map[NEARBASE_NUM]=0;
g_com_map[ANC_POLL]=0;
- g_com_map[ALARM_DEV] = 1;
- g_com_map[ALARM_DISTANCE1] = 100; //默认报警距离50cm
- g_com_map[ALARM_DISTANCE2] = 600; //默认报警距离50cm
- g_com_map[ALARM_DISTANCE3] = 900; //默认报警距离50cm
+ g_com_map[ALARM_DEV] = 0;
+ g_com_map[ALARM_DISTANCE1] = 0; //默认报警距离50cm
+ g_com_map[ALARM_DISTANCE2] = 0; //默认报警距离50cm
+ g_com_map[ALARM_DISTANCE3] = 0; //默认报警距离50cm
g_com_map[HEARTBEAT]=0;
g_com_map[CNT_RESTART]=0;
g_com_map[CNT_REBOOT]=0;
g_com_map[CNT_UPDATE]=0;
- save_com_map_to_flash();
- }
+ g_com_map[MODBUS_MODE]=0;
+ 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)
+// {
+// returnfactory_parameter();
+// }
}
--
Gitblit v1.9.3