From 25c460c9da82215badc40a3ee917670263669f8e Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 25 三月 2021 17:48:40 +0800
Subject: [PATCH] V1.43 去掉滤波 单基站输出
---
源码/核心板/Src/main.c | 13 +++++++++++--
1 files changed, 11 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 9323423..770bdd5 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,13 +72,21 @@
{
g_com_map[COM_INTERVAL]=100;
}
- g_com_map[VERSION] = 0x011d;
+<<<<<<< HEAD
+ g_com_map[VERSION] = 0x012a;
+=======
+ g_com_map[VERSION] = 0x0127;
+>>>>>>> parent of 47d2701 (V1.41 璐熸暟涓嶈緭鍑� 淇敼鍥炲485鏃犳樉绀築UG)
+ 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;
@@ -172,7 +181,7 @@
tagpos_rec[i] = 0;
}
}
- if(target_time>1000)
+ if(target_time>=1000)
{target_time-=1000;}
#ifdef USART_INTEGRATE_OUTPUT
if(g_com_map[DEV_ROLE]==0&&usart_send_flag)
--
Gitblit v1.9.3