From f3a6daa409dfb287e517cf792a425435038e44df Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期二, 18 五月 2021 16:26:09 +0800
Subject: [PATCH] 修改基站类型未附值BUG
---
源码/核心板/Src/main.c | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 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 509aec6..8cb3622 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"
@@ -80,9 +80,9 @@
group_id=g_com_map[GROUP_ID];
vel_factor=g_com_map[FILTER_COEFFICIENT];
pos_factor=g_com_map[FILTER_COEFFICIENT];
- dist_threshold = g_com_map[SPEEDFILTER_THRES]/(1000/g_com_map[COM_INTERVAL]);
- if(dist_threshold<30)
- {dist_threshold = 30;}
+ dist_threshold = (g_com_map[SPEEDFILTER_THRES]*10)/(1000/g_com_map[COM_INTERVAL]);
+ if(dist_threshold<300)
+ {dist_threshold = 300;}
if(dist_threshold>15000)
{dist_threshold = 15000;}
if(dev_id==0)
@@ -92,7 +92,7 @@
{
module_power=67;
}
- g_com_map[VERSION] = 0x0123;
+ g_com_map[VERSION] = 0x0129;
temp=(float)g_com_map[MAX_REPORT_ANC_NUM]*4/3;
temp2=g_com_map[MAX_REPORT_ANC_NUM]*4/3;
if(temp2<temp)
@@ -103,17 +103,18 @@
max_slotnum=g_com_map[COM_INTERVAL]/temp2;
current_slotpos=g_com_map[DEV_ID];
tyncpoll_time=(current_slotpos%max_slotnum)*slottime;
- if(g_com_map[DEV_ROLE])
- {
- 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]);
- }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]);
- }
+ anchor_type = dev_id%g_com_map[MAX_REPORT_ANC_NUM];
+// if(g_com_map[DEV_ROLE])
+// {
+// 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]);
+// }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]);
+// }
OUT485_DISABLE;
// printf("DEVICE PAIRID: %d .\r\n",g_com_map[PAIR_ID]);
// printf("DEVICE ALARM DISTANCE: 1.%d 2.%d 3.%d .\r\n",g_com_map[ALARM_DISTANCE1],g_com_map[ALARM_DISTANCE2],g_com_map[ALARM_DISTANCE3]);
--
Gitblit v1.9.3