From 681567d6d1bd2894eccde5b22a948eac7d3a22a5 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期五, 20 九月 2024 18:38:25 +0800
Subject: [PATCH] 对应发货标签V1.6，更改版本号为V1.1，与一期标签分开，更改了tag的uwb测距配置与DW1000通讯,并将测距接包逻辑单次接包改为打开循环接收
---
keil/dw_app.h | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/keil/dw_app_anchor.h b/keil/dw_app.h
similarity index 79%
rename from keil/dw_app_anchor.h
rename to keil/dw_app.h
index 9b55b15..6f6f019 100644
--- a/keil/dw_app_anchor.h
+++ b/keil/dw_app.h
@@ -1,38 +1,37 @@
#ifndef __DW_APP_H__
#define __DW_APP_H__
#include "stdint.h"
-void SetANCTimestap(uint8_t i,uint8_t* pollrx,uint8_t* resptx,uint32_t resprx,uint8_t* distoffset,int32_t anc_clockoffset);
+void SetANCTimestap(uint8_t i,uint8_t* pollrx,uint8_t* resptx,uint32_t resprx,uint8_t* distoffset,int32_t anc_clockoffset_from_MK,uint32_t polltx);
+void CalculateDists1(int64_t poll_tx_ts);
void CalculateDists(int64_t poll_tx_ts);
-typedef enum
-{ UN_BIND=0,
- LINK_SUCCESS,
- SEARCH_DEV,
-} Operation_step;
+int64_t ranging_timestamp_diff(int64_t ts_a, int64_t ts_b);
#define MBX_RESPONSE 0x21
#define MBX_POLL 0x20
#define MBX_RESPONSE 0x21
#define MBX_FINAL 0x22
#define MBX_PRAAREPLY 0x23
#define MBX_REG 0x24
+
#define MESSAGE_TYPE_IDX 9
#define TAG_ID_IDX 5
#define GROUP_ID_IDX 0
#define ANCHOR_ID_IDX 1
#define MAX_NEARBASE_NUM 25
#define TAG_KEEPTIMES 30 //标签存活时间
-#define KEEP_TIMES 5
+#define KEEP_TIMES 100
#define TAG_NUM_IN_SYS 25
-#define FZ_NEARBASENUM_INDEX 10
-#define FZ_NEARBASEID_INDEX 11
-#define DIST_IDX 10
#define SEQUENCE_IDX 3
-#define BATTARY_IDX 4
+#define BATTARY_IDX 4
//NEAR POLL
#define RESP_MSG_POLL_RX_TS_IDX 26
#define RESP_MSG_RESP_TX_TS_IDX 30
#define RESP_MSG_ANC_DISTOFFSET 34
+//NEAR MSG
+#define NEARBASENUM_INDEX 10
+#define NEARBASEID_INDEX 11
+
#define TAG_KEEPTIMES 30 //标签存活时间
#define MAX_TAG_LIST_NUM 200 //同时通讯标签最大数量
--
Gitblit v1.9.3