From a33e16c68f4bd99fe74e5ae47aa5fdcb762071c2 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期二, 06 四月 2021 12:12:38 +0800
Subject: [PATCH] 增加独立看门狗，修改恢复出厂设置方式
---
源码/核心板/Src/application/global_param.c | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 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 1899e93..f23690b 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"
@@ -2,7 +2,7 @@
#include "Flash.h"
#include "dw_app.h"
#include <string.h>
-
+char boardtype[4]="FZCJ";
uint16_t g_com_map[COM_MAP_SIZE];
@@ -17,14 +17,9 @@
__enable_irq();
return result;
}
-
-void parameter_init(void)
+void FactorySettings(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]=100;
@@ -46,9 +41,20 @@
g_com_map[CNT_REBOOT]=0;
g_com_map[CNT_UPDATE]=0;
g_com_map[NEARBASE_NUM]=0;
- g_com_map[POWER]=67;
-
+ g_com_map[POWER]=30;
+ g_com_map[SPEEDFILTER_THRES]=10000;
+ g_com_map[FILTER_COEFFICIENT]=40;
+ //memcpy(&g_com_map[BOARD_TYPE],boardtype,4);
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&&g_com_map[CNT_REBOOT]!=0)
+ {
+ FactorySettings();
+ NVIC_SystemReset();
}
}
--
Gitblit v1.9.3