From 95e97a5cd0aa1bfd7c87e2bd66a9afbdd086e34e Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期六, 12 九月 2020 15:01:58 +0800
Subject: [PATCH] 增加基站远程修改标签配置功能,未充分测试

---
 源码/核心板/Src/main.c |    6 +++---
 1 files changed, 3 insertions(+), 3 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 f443402..33cffde 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"
@@ -67,9 +67,9 @@
 		save_com_map_to_flash();
 #endif
 	OUT485_ENABLE;
-	g_com_map[VERSION] = 0x0114;	
+	g_com_map[VERSION] = 0x011b;	
 	dev_id = g_com_map[DEV_ID];
-	slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]*0.4)+3;
+	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];
@@ -152,7 +152,7 @@
 	if(g_com_map[DEV_ROLE]==0&&usart_send_flag)
 	{u16 checksum;
 				usart_send_flag=0;
-				usart_send_anc[2] = 4;//正常模式
+				usart_send_anc[2] = 5;//正常模式
 				usart_send_anc[3] = anc_report_num*6+2;//正常模式
 				checksum = Checksum_u16(&usart_send_anc[2],anc_report_num*6+2);
 				memcpy(&usart_send_anc[4+anc_report_num*6],&checksum,2);

--
Gitblit v1.9.3