From 109078c42e0bc06ad5797624204bdfb8fb8d0433 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 13 五月 2021 18:11:38 +0800
Subject: [PATCH] temp
---
源码/核心板/Src/application/dw_app.c | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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 aa1e615..1a5755c 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"
@@ -457,6 +457,7 @@
if(temp_dist!=0x1ffff)
{
g_Resttimer=0;
+ IWDG_Feed();
#ifdef USART_SINGLE_OUTPUT
usart_send[2] = 1;//正常模式
usart_send[3] = 17;//数据段长度
@@ -925,16 +926,18 @@
/*--------------------------以下为非测距逻辑------------------------*/
//dist_cm=33000;
getrange_success = 1;
- g_Resttimer=0;
+
LED0_BLINK; //每成功一次通讯则闪烁一次
dis_after_filter=dist_cm;
hex_dist = dist_cm+(int16_t)g_com_map[DIST_OFFSET]*10;
g_flag_Taggetdist[taglist_pos]=0;
- if(hex_dist>-10000&&hex_dist<2000000)
+ if(hex_dist>-1000&&hex_dist<2000000)
{
if(abs(hex_dist-his_dist[taglist_pos])<dist_threshold||misdist_num[taglist_pos]>3)
{
int32_t filter_dist;
+ g_Resttimer=0;
+ IWDG_Feed();
#ifdef TDFILTER
NewTrackingDiffUpdate(taglist_pos, (float)hex_dist);
filter_dist=pos_predict[taglist_pos]/10;
@@ -950,7 +953,9 @@
usart_send[3] = 17;//数据段长度
usart_send[4] = frame_seq_nb2;//数据段长度
memcpy(&usart_send[5],&tag_id_recv,2);
- memcpy(&usart_send[7],&dev_id,2);
+ memcpy(&usart_send[7],&dev_id,2);
+ if(tagdist_list[taglist_pos]<0)
+ tagdist_list[taglist_pos]=0;
memcpy(&usart_send[9],&tagdist_list[taglist_pos],4);
usart_send[13] = battary;
usart_send[14] = button;
--
Gitblit v1.9.3