From b0e6260abb7b73fbc178af119c24b0a73ab2ffc5 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 09 一月 2020 08:56:02 +0800
Subject: [PATCH] 华星第一版测试完成，修复标签timeout bug
---
源码/核心板/Src/main.c | 15 +++++----------
1 files changed, 5 insertions(+), 10 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 19620cc..80f4abc 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"
@@ -56,26 +56,21 @@
HeartBeatInit();
#ifdef DEBUG_MODE
g_com_map[DEV_ROLE]=1;
- g_com_map[DEV_ID]=4;
+ g_com_map[DEV_ID]=1;
g_com_map[COM_INTERVAL]=100;
g_com_map[MAX_REPORT_ANC_NUM]=3;
+ g_com_map[NEARBASE_NUM]=1;
+ g_com_map[NEARBASE_ID1]=2;
#endif
OUT485_ENABLE;
- g_com_map[VERSION] = 0x0106;
+ g_com_map[VERSION] = 0x0108;
dev_id = g_com_map[DEV_ID];
- temp=(float)g_com_map[MAX_REPORT_ANC_NUM]*4/3;
- temp2=g_com_map[MAX_REPORT_ANC_NUM]*4/3;
- if(temp2<temp)
- {
- temp2++;
- }
- slottime=temp2;
+ slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]*4/3);
max_slotpos=g_com_map[COM_INTERVAL]/slottime;
tyncpoll_time=(g_com_map[DEV_ID]%max_slotpos)*slottime;
if(g_com_map[DEV_ROLE])
{
- tyncpoll_time=g_com_map[DEV_ID]*g_com_map[MAX_REPORT_ANC_NUM]*4/3;
printf("标签ID: %d .\r\n",dev_id);
printf("通讯间隔: %d ms.\r\n",g_com_map[COM_INTERVAL]);
printf("单次通讯基站数量: %d个.\r\n",g_com_map[MAX_REPORT_ANC_NUM]);
--
Gitblit v1.9.3