From 239d693f7b7b567f0ee171afa0f3b8324a390403 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期六, 25 七月 2020 12:53:09 +0800
Subject: [PATCH] V1.24基站数量时间参数改到0.7，标签输出数据。6基站互测可以到40HZ--50ms

---
 源码/核心板/Src/main.c |    4 ++--
 1 files changed, 2 insertions(+), 2 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 224ab19..e0382dd 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] = 0x0115;	
+	g_com_map[VERSION] = 0x0118;	
 	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];

--
Gitblit v1.9.3