From e80c06f1244bf23bfb1b46e093cdb1edb6bb0f20 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期一, 23 八月 2021 10:25:43 +0800
Subject: [PATCH] V2.23上海动车测试完成
---
源码/核心板/Src/application/global_param.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 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..95261ea 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;
@@ -41,7 +41,7 @@
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[HEARTBEAT]=1;
g_com_map[CNT_RESTART]=0;
g_com_map[CNT_REBOOT]=0;
g_com_map[CNT_UPDATE]=0;
@@ -49,8 +49,10 @@
g_com_map[POWER]=DEFAULT_RFPOWER;
g_com_map[SYNCBASEID] = 0;
g_com_map[BASESYNCSEQ] = 0;
+ g_com_map[HEIGHTOFFEST_INDEX] = 0;
memcpy(&g_com_map[BOARD_TYPE],boardtype,4);
- save_com_map_to_flash();
+ //save_com_map_to_flash();
}
+
}
--
Gitblit v1.9.3