From 2ad2b82d448645cc81409aa4765288da95931cb8 Mon Sep 17 00:00:00 2001
From: guanjiao <sqrgj@163.com>
Date: 星期六, 15 九月 2018 17:20:16 +0800
Subject: [PATCH] 1. 增加了“收不到信息1s后，停止报警”的功能 2. 将判断喇叭是否响的功能，在systick中断中实现
---
源码/核心板/Src/application/dw_app.c | 55 +++++++++++++++----------------------------------------
1 files changed, 15 insertions(+), 40 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 db01397..64a0756 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"
@@ -26,6 +26,10 @@
#include "dw_driver.h"
#include "Spi.h"
#include "led.h"
+#include "serial_at_cmd_app.h"
+#include "Usart.h"
+#include "global_param.h"
+#include "filters.h"
/*------------------------------------ Marcos ------------------------------------------*/
@@ -127,6 +131,10 @@
uint8_t random_delay_tim = 0;
double distance, dist_no_bias, dist_cm;
+
+uint32_t g_UWB_com_interval = 0;
+float dis_after_filter; //当前距离值
+LPFilter_Frac* p_Dis_Filter; //测距用的低通滤波器
/*------------------------------------ Functions ------------------------------------------*/
@@ -292,26 +300,6 @@
dwt_writetxdata(sizeof(tx_final_msg), tx_final_msg, 0);//将发送数据写入DW1000
dwt_writetxfctrl(sizeof(tx_final_msg), 0);//设定发送数据长度
dwt_starttx(DWT_START_TX_DELAYED);//设定为延迟发送
-
- //这里为串口输出
-// if (GPIO_ReadInputDataBit(GPIOA, SW2) != RESET) //通过拨码开关判断数据输出格式
-// {
-// dID = TAG_ID;
-// printf("TAG_ID: %2.0f ", dID);
-// dID = ANCHOR_ID;
-// printf("ANCHOR_ID: %2.0f ", dID);
-// printf("Distance: %5.0f cm\n", (double)dist[TAG_ID]);
-// }
-// else
-// {
-// send[2] = ANCHOR_ID;
-// send[3] = TAG_ID;
-
-// memcpy(&send[4], &dist[TAG_ID], 2);
-// check = Checksum_u16(&send[2], 6);
-// memcpy(&send[8], &check, 2);
-// USART_puts(send, 10);
-// }
/* Poll DW1000 until TX frame sent event set. See NOTE 8 below. */
while (!(dwt_read32bitreg(SYS_STATUS_ID) & SYS_STATUS_TXFRS))//不断查询芯片状态直到发送完成
@@ -353,7 +341,10 @@
/* Poll for reception of a frame or error/timeout. See NOTE 7 below. */
while (!((status_reg = dwt_read32bitreg(SYS_STATUS_ID)) & (SYS_STATUS_RXFCG | SYS_STATUS_ALL_RX_ERR)))//不断查询芯片状态直到接收成功或者出现错误
- { };
+ {
+ UART_CheckReceive();
+ UART_CheckSend();
+ };
if (status_reg & SYS_STATUS_RXFCG)//成功接收
{
@@ -450,26 +441,10 @@
dist_cm = dist_no_bias * 100; //dis 为单位为cm的距离
// dist[TAG_ID] = LP(dis, TAG_ID); //LP 为低通滤波器，让数据更稳定
+ /*--------------------------以下为非测距逻辑------------------------*/
LED0_BLINK; //每成功一次通讯则闪烁一次
- //这里供串口输出
-// if (GPIO_ReadInputDataBit(GPIOA, SW2) != RESET) //通过拨码开关判断数据输出格式
-// {
-// dID = TAG_ID;
-// printf("TAG_ID: %2.0f ", dID);
-// dID = ANCHOR_ID;
-// printf("ANCHOR_ID: %2.0f ", dID);
-// printf("Distance: %5.0f cm\n", (double)dist[TAG_ID]);
-// }
-// else
-// {
-// send[2] = ANCHOR_ID;
-// send[3] = TAG_ID;
-
-// memcpy(&send[4], &dist[TAG_ID], 2);
-// check = Checksum_u16(&send[2], 6);
-// memcpy(&send[8], &check, 2);
-// USART_puts(send, 10);
-// }
+ g_UWB_com_interval = 0;
+ dis_after_filter = LP_Frac_Update(p_Dis_Filter, dist_cm);
}
}
--
Gitblit v1.9.3