From dcac514bc4be1c6acfd7cf92ce609d282ba55f1c Mon Sep 17 00:00:00 2001 From: zhyinch <zhyinch@gmail.com> Date: 星期二, 10 十一月 2020 20:48:07 +0800 Subject: [PATCH] V2.13 1增加临近距离判断 2增加注册包超时清空机制 --- 源码/核心板/Src/application/global_param.c | 26 +++++++++++++++----------- 1 files changed, 15 insertions(+), 11 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 3887e17..e659858 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]; @@ -27,25 +27,29 @@ g_com_map[0] = 0x55AA; g_com_map[DEV_ID] =0x04;//DEFAULT_DEV_ID; //默认设备ID - g_com_map[COM_INTERVAL]=50; - g_com_map[MAX_REPORT_ANC_NUM]=2; + g_com_map[COM_INTERVAL]=100; + g_com_map[MAX_REPORT_ANC_NUM]=10; 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[DIST_OFFSET]=-40; +// #ifndef WORK_MODE_TAG +// g_com_map[DEV_ROLE] =0x1; //标签 +// #else g_com_map[DEV_ROLE] =0x0; //基站 - #endif +// #endif g_com_map[ANC_POLL]=0; g_com_map[ALARM_DEV] = 0; - g_com_map[ALARM_DISTANCE1] = 100; //默认报警距离50cm - g_com_map[ALARM_DISTANCE2] = 600; //默认报警距离50cm - g_com_map[ALARM_DISTANCE3] = 900; //默认报警距离50cm + g_com_map[NEARSWITCH_DISTANCE_INDEX] = 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]=DEFAULT_RFPOWER; + g_com_map[SYNCBASEID] = 0; + g_com_map[BASESYNCSEQ] = 0; + memcpy(&g_com_map[BOARD_TYPE],boardtype,4); save_com_map_to_flash(); } } -- Gitblit v1.9.3