From 55c26cb52436d5c82f1602114bb38057832ef25b Mon Sep 17 00:00:00 2001 From: zhyinch <zhyinch@gmail.com> Date: 星期三, 09 二月 2022 21:30:38 +0800 Subject: [PATCH] V2.46 增加标签坐标下发,串口测试不丢包,待网线测试,波特率115200 --- 源码/核心板/Src/application/global_param.c | 43 ++++++++++++++++++++++++++++++++----------- 1 files changed, 32 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 30e9f55..7bf29c2 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,8 +2,8 @@ #include "Flash.h" #include "dw_app.h" #include <string.h> - -uint16_t g_com_map[COM_MAP_SIZE]; +char boardtype[4]="FZCJ"; +uint16_t g_com_map[COM_MAP_SIZE],g_com_map2[COM_MAP_SIZE]; uint32_t save_com_map_to_flash(void) @@ -25,15 +25,36 @@ 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.3); + g_com_map[DEV_ID] =0x9818;//DEFAULT_DEV_ID; //默认设备ID - + 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]=-40; +// #ifndef 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[NEARSWITCH_DISTANCE_INDEX] = 0; //默认报警距离50cm +// g_com_map[ALARM_DISTANCE2] = 0; //默认报警距离50cm + g_com_map[ALARM_DISTANCE3] = 0; //默认报警距离50cm + g_com_map[HEARTBEAT]=1; + g_com_map[CNT_RESTART]=0; + g_com_map[CNT_REBOOT]=0; + g_com_map[CNT_UPDATE]=0; + g_com_map[NEARBASE_NUM]=5; + g_com_map[POWER]=DEFAULT_RFPOWER; + g_com_map[SYNCBASEID] = 0; + g_com_map[BASESYNCSEQ] = 0; + g_com_map[HEIGHTOFFEST_INDEX] = 0; + g_com_map[MAXRANGDIST_INDEX] = 65535; + memcpy(&g_com_map[BOARD_TYPE],boardtype,4); + //save_com_map_to_flash(); + } + // g_com_map[BASESYNCSEQ] = 1; + //g_com_map[SYNCBASEID] = 0x9801; } -- Gitblit v1.9.3