From 5b6fe0edc2790d1948c09b191a2a565e8874f875 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期二, 24 五月 2022 09:57:23 +0800
Subject: [PATCH] V1.64 只和3个基站测距
---
源码/核心板/Src/application/global_param.c | 20 +++++++-------------
1 files changed, 7 insertions(+), 13 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 9d7dee0..3bf5b38 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,9 +17,14 @@
__enable_irq();
return result;
}
-void FactorySettings(void)
+
+void parameter_init(void)
{
- g_com_map[0] = 0x55AA;
+ 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]=100;
@@ -42,20 +47,9 @@
g_com_map[CNT_UPDATE]=0;
g_com_map[NEARBASE_NUM]=0;
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();
- delay_ms(100);
-}
-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