From 2d82c2dfc1a64b05cf92a1bf1bd6fc840cb84e79 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 18 十月 2018 16:24:29 +0800
Subject: [PATCH] Revert "配对完成，有bug"
---
源码/核心板/Src/application/global_param.c | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 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..5f745a2 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,10 +22,20 @@
{
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_DISTANCE1] = 500; //默认报警距离50cm
+ g_com_map[ALARM_DISTANCE2] = 1000; //默认报警距离50cm
+ g_com_map[ALARM_DISTANCE3] = 1500; //默认报警距离50cm
+ g_com_map[ALARM_DEV] = 1;
+ g_com_map[DEV_ID] = 1;//DEFAULT_DEV_ID; //默认设备ID
+ g_com_map[COM_INTERVAL]=500;
+ save_com_map_to_flash();
+ }
+
dis_after_filter = 1000; //默认距离
- p_Dis_Filter = New_LP_Frac(0.7);
+ p_Dis_Filter = New_LP_Frac(0.3);
}
--
Gitblit v1.9.3