From 2f058ec421172a7950d24b5b2d9dd7d88c94e619 Mon Sep 17 00:00:00 2001 From: zhyinch <zhyinch@gmail.com> Date: 星期六, 07 十一月 2020 17:39:36 +0800 Subject: [PATCH] Revert "V1.34 增加滤波 防撞1对10发货" --- 源码/核心板/Src/application/global_param.c | 35 +++++++++++++++++++++++++---------- 1 files changed, 25 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 fbd5c01..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" @@ -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]; @@ -25,15 +25,30 @@ if(g_com_map[0] != 0x55AA) { g_com_map[0] = 0x55AA; - g_com_map[ALARM_DISTANCE1] = 300; //默认报警距离50cm - g_com_map[ALARM_DISTANCE2] = 600; //默认报警距离50cm - g_com_map[ALARM_DISTANCE3] = 900; //默认报警距离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(); - } + 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