From 73722f699b1f8d5badccc9c5e5171bb633ad4fe4 Mon Sep 17 00:00:00 2001 From: zhyinch <zhyinch@gmail.com> Date: 星期四, 19 十二月 2019 13:53:00 +0800 Subject: [PATCH] 1 --- 源码/核心板/Src/application/dw_app.h | 2 +- 源码/核心板/Src/main.c | 2 +- 源码/核心板/Src/application/dw_app.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 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 93bc9a8..d88e469 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" @@ -298,7 +298,7 @@ } tyncpoll_time=(tagslotpos-1)*slottime; } - mainbase_id=minid; + mainbase_id=0;//minid; } u8 FindNearBasePos(u16 baseid) @@ -383,7 +383,7 @@ dwt_write32bitreg(SYS_STATUS_ID, SYS_STATUS_RXFCG | SYS_STATUS_TXFRS);//清楚寄存器标志位 frame_len = dwt_read32bitreg(RX_FINFO_ID) & RX_FINFO_RXFLEN_MASK; //获得接收到的数据长度 dwt_readrxdata(rx_buffer, frame_len, 0); //读取接收数据 - dwt_setrxtimeout(DELAY_BETWEEN_TWO_FRAME_UUS+120);//设定接收超时时间,0位没有超时时间 + //dwt_setrxtimeout(DELAY_BETWEEN_TWO_FRAME_UUS*(nearbase_num+1-recbase_num)+10);//设定接收超时时间,0位没有超时时间 dwt_rxenable(0);//打开接收 if (rx_buffer[MESSAGE_TYPE_IDX] == NEAR_RESPONSE&&!memcmp(&rx_buffer[TAG_ID_IDX],&dev_id,2)) //判断接收到的数据是否是response数据 { u16 rec_nearbaseid,rec_nearbasepos; @@ -412,7 +412,7 @@ //////////////////////////// mainbase_lost_count=0; memcpy(&mainbase_dist,&rx_buffer[DIST_IDX],4); - final_tx_time = (resp_rx_ts + ((RESP_RX_TO_FINAL_TX_DLY_UUS+DELAY_BETWEEN_TWO_FRAME_UUS*nearbase_num+130) * UUS_TO_DWT_TIME)) >> 8; + final_tx_time = (resp_rx_ts + ((RESP_RX_TO_FINAL_TX_DLY_UUS+DELAY_BETWEEN_TWO_FRAME_UUS*nearbase_num+1300) * UUS_TO_DWT_TIME)) >> 8; dwt_setdelayedtrxtime(final_tx_time);//设置final包发送时间T5 final_tx_ts = (((uint64_t)(final_tx_time & 0xFFFFFFFE)) << 8) + TX_ANT_DLY;//final包实际发送时间是计算时间加上发送天线delay final_msg_set_ts(&tx_near_msg[FINAL_MSG_POLL_TX_TS_IDX], poll_tx_ts);//将T1,T4,T5写入发送数据 @@ -619,7 +619,7 @@ tmp_time=TIM3->CNT; memcpy(&tx_near_msg[ANCTIMEMS],&sync_timer,2); memcpy(&tx_near_msg[ANCTIMEUS],&tmp_time,2); - memcpy(&tx_near_msg[TAGSLOTPOS],&taglist_pos,1); + memcpy(&tx_near_msg[TAGSLOTPOS],&taglist_pos,2); memcpy(&tx_near_msg[TAG_ID_IDX],&tag_id_recv,2); poll_rx_ts = get_rx_timestamp_u64();//获得Poll包接收时间T2 diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.h" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.h" index b7a69d9..2f460f2 100644 --- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.h" +++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.h" @@ -82,7 +82,7 @@ #define DIST_IDX 10 #define ANCTIMEMS 14 #define ANCTIMEUS 16 -#define TAGSLOTPOS 8 +#define TAGSLOTPOS 7 //Final #define FINAL_MSG_POLL_TX_TS_IDX 10 #define FINAL_MSG_RESP_RX_TS_IDX 14 diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/main.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/main.c" index 87ded51..3a40269 100644 --- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/main.c" +++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/main.c" @@ -11,7 +11,7 @@ #include "global_param.h" #include "ADC.h" -//#define DEBUG_MODE +#define DEBUG_MODE void Device_Init(void) { -- Gitblit v1.9.3