From 0224d3d45a970bba6d2310f8a401df8bbae55d26 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期二, 15 十二月 2020 10:41:28 +0800
Subject: [PATCH] V1.40 增加1fff重置时间，开机就变成0x1ffff
---
源码/核心板/Src/application/dw_app.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.c"
index 52f2990..daa6f7b 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.c"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.c"
@@ -240,7 +240,7 @@
for(i=0;i<100;i++)
{
g_flag_Taggetdist[i]++;
- if(g_flag_Taggetdist[i]>=2)
+ if(g_flag_Taggetdist[i]>=5)
{
g_Tagdist[i]=0xffff;
Modbus_HoldReg[i*2]=1;
@@ -442,13 +442,13 @@
tag_succ_times++;
LED0_BLINK;
-
+ g_Resttimer=0;
memcpy(&anc_id_recv,&rx_buffer[ANCHOR_ID_IDX],2);
if(hex_dist2!=0xffff)
{
g_Tagdist[anc_id_recv]= hex_dist2;
g_flag_Taggetdist[anc_id_recv]=0;
-// g_Resttimer=0;
+
if(!g_com_map[MODBUS_MODE])
{
hex_dist2 = hex_dist2;
@@ -508,6 +508,7 @@
#define TDFILTER
//#define CHECK_UID
extern uint8_t UID_ERROR;
+extern u16 dist_threshold;
u8 misdist_num[TAG_NUM_IN_SYS];
void Anchor_App(void)
{
@@ -645,11 +646,11 @@
/*--------------------------以下为非测距逻辑------------------------*/
LED0_BLINK; //每成功一次通讯则闪烁一次
g_UWB_com_interval = 0;
-// g_Resttimer=0;
+ g_Resttimer=0;
hex_dist = dist_cm+(int16_t)g_com_map[DIST_OFFSET]*10;
if(tag_id_recv-TAG_ID_START<=TAG_NUM_IN_SYS)
{
- if(abs(hex_dist-his_dist[tag_id_recv-TAG_ID_START])<15000||misdist_num[tag_id_recv-TAG_ID_START]>4)
+ if(abs(hex_dist-his_dist[tag_id_recv-TAG_ID_START])<dist_threshold||misdist_num[tag_id_recv-TAG_ID_START]>4)
{
int32_t filter_dist;
misdist_num[tag_id_recv-TAG_ID_START]=0;
--
Gitblit v1.9.3