From 382decb66116a76f5c7bff9e1a9c4e728b9444a6 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 29 十月 2020 14:28:37 +0800
Subject: [PATCH] 增加信号强度功能

---
 源码/核心板/Src/main.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/main.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/main.c"
index 1e0b193..f0d5def 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/main.c"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/main.c"
@@ -91,14 +91,15 @@
 #endif
 	OUT485_ENABLE;
 	ComMapCheck();
-	g_com_map[VERSION] = 0x0200;	
+	g_com_map[VERSION] = 0x0204;	
 	dev_id = g_com_map[DEV_ID];
 	slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]*SLOT_SCALE)+3;
 	max_slotpos=g_com_map[COM_INTERVAL]/slottime;
 	tyncpoll_time=(g_com_map[DEV_ID]%max_slotpos)*slottime;	
 	module_power = g_com_map[POWER];
 	total_slotnum = 1000/g_com_map[COM_INTERVAL];
-
+	anchor_type = dev_id%3;
+ 
 	if(g_com_map[DEV_ROLE])
 	{
 	printf("标签ID: %d .\r\n",dev_id);
@@ -106,7 +107,6 @@
 	printf("单次通讯基站数量: %d个.\r\n",g_com_map[MAX_REPORT_ANC_NUM]);
 	}else{
 	
-	anchor_type = dev_id%g_com_map[MAX_REPORT_ANC_NUM];
 	printf("基站ID: %x .\r\n",dev_id);
 	printf("基站类型: %c .\r\n",anchor_type+0x41);
 	printf("单次通讯基站数量: %d个.\r\n",g_com_map[MAX_REPORT_ANC_NUM]);
@@ -232,7 +232,7 @@
 	usart_send[1]=0xAA;
 	usart_send_anc[0]=0x55;
 	usart_send_anc[1]=0xAA;
-
+  //SendComMap(50, 0);
 	while(1)
 	{
 	g_start_sync_flag=0;

--
Gitblit v1.9.3