From 5bdc868b2ef673bbce5e0abbc2a7bf8f7f8fa55e Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期二, 27 四月 2021 11:59:30 +0800
Subject: [PATCH] V2.17 增加基站汇总模式,青岛待测试

---
 源码/核心板/Src/application/global_param.c |   29 +++++++++++++++++------------
 1 files changed, 17 insertions(+), 12 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 3a68e3e..fcace1f 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,24 +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]=-40;
-		#ifdef WORK_MODE_TAG
-			g_com_map[DEV_ROLE] =0x1;  //标签
-		#else
+//		#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] = 1;
-		g_com_map[ALARM_DISTANCE1] = 100;	//默认报警距离50cm
-		g_com_map[ALARM_DISTANCE2] = 600;	//默认报警距离50cm
-		g_com_map[ALARM_DISTANCE3] = 900;	//默认报警距离50cm
-		g_com_map[HEARTBEAT]=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]=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