From f6ffc594b577e197c37b95d10b6c21743ed37654 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期二, 10 九月 2024 14:59:54 +0800
Subject: [PATCH] 测距break位置改变加入波形调试和uwb配置宏定义选择，与修改后不休眠手环1.11适配
---
keil/dw_app.c | 54 +++++++++++++++++++++++++++---------------------------
1 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/keil/dw_app.c b/keil/dw_app.c
index 0f00856..2a33e58 100644
--- a/keil/dw_app.c
+++ b/keil/dw_app.c
@@ -37,34 +37,34 @@
memcpy(&tag_polltx[i],&polltx,4);
//anc_clockoffset[i] = anc_clockoffset_from_MK;//MK8000修改
}
-void CalculateDists1(int64_t poll_tx_ts)
-{
-for(int i=0;i<MAX_NEARBASE_NUM;i++)
- {
- //rec_anc_signalpower[i] = exsistbase_list[i];
- 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) ;//MK8000修改
-#endif
- rtd_init = tag_resprx[i] - (uint32_t)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/100;
- if(distance>-10&&distance<1000)
- {
- nearbase_distlist[i] = distance+anc_distoffset[i];
- }
- }else{
- nearbase_distlist[i] = 0x1ffff;
- }
-
- }
+//void CalculateDists1(int64_t poll_tx_ts)
+//{
+//for(int i=0;i<MAX_NEARBASE_NUM;i++)
+// {
+// //rec_anc_signalpower[i] = exsistbase_list[i];
+// 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) ;//MK8000修改
+//#endif
+// rtd_init = tag_resprx[i] - (uint32_t)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/100;
+// if(distance>-10&&distance<1000)
+// {
+// nearbase_distlist[i] = distance+anc_distoffset[i];
+// }
+// }else{
+// nearbase_distlist[i] = 0x1ffff;
+// }
+//
+// }
-}
+//}
// ts_a - ts_b
int64_t ranging_timestamp_diff(int64_t ts_a, int64_t ts_b)
{
--
Gitblit v1.9.3