From 8770b97111b845632246b08696f4362f6e88a5ee Mon Sep 17 00:00:00 2001
From: guanjiao <sqrgj@163.com>
Date: 星期六, 15 九月 2018 20:31:25 +0800
Subject: [PATCH] Merge branch 'dev_zyc' into Merge_anchor_and_tag
---
源码/核心板/Src/application/global_param.c | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 609adcd..6c64f8f 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"
@@ -1,6 +1,7 @@
#include "global_param.h"
#include "Flash.h"
#include "dw_app.h"
+#include <string.h>
uint16_t g_com_map[COM_MAP_SIZE];
@@ -21,8 +22,15 @@
{
FLASH_Read(FLASH_IAP_CTRL_MAP, (uint8_t*)&g_com_map, (COM_MAP_SIZE<<1));
- g_com_map[ALARM_DISTANCE] = 200; //默认报警距离200cm
- g_com_map[ALARM_DEV] = 0;
+ if(g_com_map[0] != 0x55AA)
+ {
+ g_com_map[0] = 0x55AA;
+ g_com_map[ALARM_DISTANCE] = 200; //默认报警距离200cm
+ g_com_map[ALARM_DEV] = 0;
+ g_com_map[DEV_ID] = DEFAULT_DEV_ID; //默认设备ID
+ save_com_map_to_flash();
+ }
+
dis_after_filter = 1000; //默认距离
p_Dis_Filter = New_LP_Frac(0.7);
--
Gitblit v1.9.3