From 012f7bf4e14a8e92f5bba7a2c80b78cbe42fb362 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期二, 23 三月 2021 12:17:37 +0800
Subject: [PATCH] V1.42 增加全基站数据模式，配合新华智云测试
---
源码/核心板/Src/main.c | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 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 014e391..003a31c 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"
@@ -44,6 +44,7 @@
checksum = Checksum_u16(&hbsend[2],12);
memcpy(&hbsend[14],&checksum,2);
}
+uint16_t vel_factor,pos_factor;
u16 tyncpoll_time;
u16 slottime,max_slotpos;
extern u8 module_power;
@@ -71,30 +72,34 @@
{
g_com_map[COM_INTERVAL]=100;
}
- g_com_map[VERSION] = 0x0121;
+ g_com_map[VERSION] = 0x012a;
+ g_com_map[SW_TYPE] = SW_FANGZHUANG;
dev_id = g_com_map[DEV_ID];
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];
total_slotnum = 1000/g_com_map[COM_INTERVAL];
+ vel_factor=g_com_map[FILTER_COEFFICIENT];
+ pos_factor=g_com_map[FILTER_COEFFICIENT];
+
if(module_power>67)
{
module_power=67;
}
- 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]);
- }
+// 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