From 4a64e6c81db587706d9c92a9badf321d31264254 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 06 六月 2019 16:34:59 +0800
Subject: [PATCH] 用户测试1
---
源码/核心板/Src/application/dw_app.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 b28421b..1fa5677 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"
@@ -31,7 +31,7 @@
#include "global_param.h"
#include "filters.h"
#include <stdio.h>
-
+#include "beep.h"
/*------------------------------------ Marcos ------------------------------------------*/
@@ -83,7 +83,7 @@
/*------------------------------------ Variables ------------------------------------------*/
/* Default communication configuration. We use here EVK1000's default mode (mode 3). */
static dwt_config_t config = {
- 5, /* Channel number. */
+ 2, /* Channel number. */
DWT_PRF_64M, /* Pulse repetition frequency. */
DWT_PLEN_128, /* Preamble length. */
DWT_PAC8, /* Preamble acquisition chunk size. Used in RX only. */
@@ -264,7 +264,7 @@
}
void Dw1000_App_Init(void)
{
-// g_com_map[DEV_ID] = 0x02;
+//g_com_map[DEV_ID] = 0x0b;
tx_poll_msg[MESSAGE_TYPE_IDX]=POLL;
tx_resp_msg[MESSAGE_TYPE_IDX]=RESPONSE;
tx_final_msg[MESSAGE_TYPE_IDX]=FINAL;
@@ -493,7 +493,7 @@
// dist[TAG_ID] = LP(dis, TAG_ID); //LP 为低通滤波器，让数据更稳定
/*--------------------------以下为非测距逻辑------------------------*/
- LED0_BLINK; //每成功一次通讯则闪烁一次
+ // LED0_BLINK; //每成功一次通讯则闪烁一次
g_UWB_com_interval = 0;
dis_after_filter=dist_cm;
g_Tagdist[tag_id_recv]=dist_cm;
@@ -502,6 +502,8 @@
g_pairstart=0;
g_com_map[PAIR_ID]=tag_id_recv;
save_com_map_to_flash();
+ BEEP2_ON;
+ delay_ms(1000);
printf("Pair Finish PairID: %d. \r\n",g_com_map[PAIR_ID]);
}
g_flag_Taggetdist[tag_id_recv]=0;
--
Gitblit v1.9.3