From b32e18a80201f1f285f172f07dda6b48beb6bab6 Mon Sep 17 00:00:00 2001 From: zhyinch <zhyinch@gmail.com> Date: 星期六, 23 四月 2022 20:38:12 +0800 Subject: [PATCH] V2.49 --- 源码/核心板/Src/application/global_param.c | 17 +++++++++++------ 1 files changed, 11 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 e659858..929bb81 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" @@ -3,7 +3,7 @@ #include "dw_app.h" #include <string.h> char boardtype[4]="FZCJ"; -uint16_t g_com_map[COM_MAP_SIZE]; +uint16_t g_com_map[COM_MAP_SIZE],g_com_map2[COM_MAP_SIZE]; uint32_t save_com_map_to_flash(void) @@ -25,7 +25,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[DEV_ID] =0x9818;//DEFAULT_DEV_ID; //默认设备ID g_com_map[COM_INTERVAL]=100; g_com_map[MAX_REPORT_ANC_NUM]=10; @@ -39,18 +39,23 @@ 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_DISTANCE2] = 0; //默认报警距离50cm g_com_map[ALARM_DISTANCE3] = 0; //默认报警距离50cm - g_com_map[HEARTBEAT]=0; + 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]=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[OUTPUTALLNEARPOLLMSG] = 1; + g_com_map[MAXRANGDIST_INDEX] = 65535; memcpy(&g_com_map[BOARD_TYPE],boardtype,4); - save_com_map_to_flash(); + //save_com_map_to_flash(); } + // g_com_map[BASESYNCSEQ] = 1; + //g_com_map[SYNCBASEID] = 0x9801; } -- Gitblit v1.9.3