From adec93c184bbeb692dcd3e74c1e379a9aa5d9eb9 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期三, 09 八月 2023 10:37:52 +0800
Subject: [PATCH] 修改气压驱动，过采样频率，输出更稳定
---
Src/application/dw_app.c | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/Src/application/dw_app.c b/Src/application/dw_app.c
index 5c0f4c3..a5ac547 100644
--- a/Src/application/dw_app.c
+++ b/Src/application/dw_app.c
@@ -80,8 +80,13 @@
NEARPOLL,
SINGLEPOLL,
}tag_state=STARTPOLL;
+//#define _UWB_4G
static dwt_config_t config = {
+#ifdef _UWB_4G
2, /* Channel number. */
+#else
+ 5,
+#endif
DWT_PRF_64M, /* Pulse repetition frequency. */
DWT_PLEN_128, /* Preamble length. */
DWT_PAC8, /* Preamble acquisition chunk size. Used in RX only. */
@@ -829,19 +834,23 @@
for(int i=0;i<11;i++)
{
rec_anc_signalpower[i] = exsistbase_list[i];
- if(exsistbase_list[i]>0)
+ if(exsistbase_list[i]==KEEP_TIMES)
{
exsistbase_list[i]--;
+#ifdef _UWB_4G
clockOffsetRatio = anc_clockoffset[i] * (FREQ_OFFSET_MULTIPLIER * HERTZ_TO_PPM_MULTIPLIER_CHAN_2 / 1.0e6) ;
+#else
+ clockOffsetRatio = anc_clockoffset[i] * (FREQ_OFFSET_MULTIPLIER * HERTZ_TO_PPM_MULTIPLIER_CHAN_5 / 1.0e6) ;
+#endif
rtd_init = tag_resprx[i] - poll_tx_ts;
rtd_resp = anc_resptx[i] - anc_pollrx[i];
tof = ((rtd_init - rtd_resp * (1 - clockOffsetRatio)) / 2.0) * DWT_TIME_UNITS;
distance = tof * SPEED_OF_LIGHT;
- if(distance>-1000&&distance<100000)
+ if(distance>-10&&distance<1000)
nearbase_distlist[i] = distance*100+anc_distoffset[i];
}else{
- nearbase_distlist[i] = 0x1ffff;
+ nearbase_distlist[i] = 0x1ffff;
}
}
@@ -1258,7 +1267,7 @@
memcpy(nearbaseid_list,&rx_buffer[NEARBASEID_INDEX],nearbase_num*2);
memcpy(nearbaseid_list2,&rx_buffer[NEARBASEID_INDEX],nearbase_num*2);
if(tagslotpos!=255)
- tag_state = DISCPOLL;
+ tag_state = DISCPOLL;
}
}
}
--
Gitblit v1.9.3