From 643809f2cd7143577987aed55ff1e4102e83cda8 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期三, 16 九月 2020 08:23:37 +0800
Subject: [PATCH] GETNEARMSG 模式有BUG，去掉这个模式
---
源码/核心板/Src/application/global_param.c | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 insertions(+), 6 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..fd6d5fa 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,7 +1,8 @@
#include "global_param.h"
#include "Flash.h"
#include "dw_app.h"
-
+#include <string.h>
+char boardtype[4]="FZCJ";
uint16_t g_com_map[COM_MAP_SIZE];
@@ -21,11 +22,33 @@
{
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;
- dis_after_filter = 1000; //默认距离
- p_Dis_Filter = New_LP_Frac(0.7);
+ 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;
+ g_com_map[MAX_REPORT_ANC_NUM]=2;
+ g_com_map[MIN_REPORT_ANC_NUM]=2;
+ g_com_map[DIST_OFFSET]=-13;
+ #ifdef WORK_MODE_TAG
+ g_com_map[DEV_ROLE] =0x1; //标签
+ #else
+ g_com_map[DEV_ROLE] =0x0; //基站
+ #endif
+ g_com_map[ANC_POLL]=0;
+ 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;
+ g_com_map[NEARBASE_NUM]=0;
+ g_com_map[POWER]=67;
+ memcpy(&g_com_map[BOARD_TYPE],boardtype,4);
+ save_com_map_to_flash();
+ }
}
--
Gitblit v1.9.3