From c23f343e74095a5a90bfa3fd262c201063c90096 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期六, 23 十一月 2019 14:10:03 +0800
Subject: [PATCH] 1
---
源码/核心板/Src/main.c | 13 +++----------
1 files changed, 3 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 f775c2a..7b982e9 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"
@@ -55,27 +55,20 @@
//deca_sleep(1000);
HeartBeatInit();
#ifdef DEBUG_MODE
- g_com_map[DEV_ROLE]=1;
+ g_com_map[DEV_ROLE]=0;
g_com_map[DEV_ID]=4;
g_com_map[COM_INTERVAL]=100;
g_com_map[MAX_REPORT_ANC_NUM]=3;
#endif
OUT485_ENABLE;
- g_com_map[VERSION] = 0x0106;
+ g_com_map[VERSION] = 0x0107;
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