From f018800c5cddf3a3fc70a8b319c4e5dd94a3190f Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期日, 24 十一月 2019 16:43:47 +0800
Subject: [PATCH] 修改跳数40米bug
---
源码/核心板/Src/application/dw_app.c | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 6ac274f..453bc30 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"
@@ -313,7 +313,7 @@
uint16_t g_Resttimer;
uint8_t result;
u8 tag_succ_times=0;
-int32_t hex_dist;
+int32_t hex_dist,hex_dist2;
u16 checksum;
int8_t tag_delaytime;
extern uint16_t sync_timer;
@@ -395,7 +395,7 @@
}
TIM3->CNT=tmp_time;
}
- memcpy(&anchor_dist_last_frm[0], &rx_buffer[DIST_IDX], 4);
+ memcpy(&hex_dist2, &rx_buffer[DIST_IDX], 4);
memcpy(&tx_final_msg[ANCHOR_ID_IDX], &rx_buffer[ANCHOR_ID_IDX], 4);
/* Compute final message transmission time. See NOTE 9 below. */
final_tx_time = (resp_rx_ts + (RESP_RX_TO_FINAL_TX_DLY_UUS * UUS_TO_DWT_TIME)) >> 8;//计算final包发送时间，T5=T4+Treply2
@@ -418,7 +418,7 @@
tag_succ_times++;
LED0_BLINK;
- hex_dist = anchor_dist_last_frm[0];
+
memcpy(&anc_id_recv,&rx_buffer[ANCHOR_ID_IDX],2);
// g_Tagdist[anc_id_recv]= hex_dist;
// g_flag_Taggetdist[anc_id_recv]=0;
@@ -430,7 +430,7 @@
memcpy(&usart_send[5],&dev_id,2);
memcpy(&usart_send[7],&rx_buffer[ANCHOR_ID_IDX],2);
- memcpy(&usart_send[9],&hex_dist,4);
+ memcpy(&usart_send[9],&hex_dist2,4);
usart_send[13] = battary;
usart_send[14] = button;
checksum = Checksum_u16(&usart_send[2],17);
@@ -643,7 +643,9 @@
Modbus_HoldReg[tag_id_recv*2+1]=anchor_dist_last_frm[tag_id_recv-TAG_ID_START];
//dis_after_filter = LP_Frac_Update(p_Dis_Filter, dist_cm);
}
- }
+ }else{
+ LED0_BLINK;
+ }
}
}else{
/* Clear RX error events in the DW1000 status register. */
--
Gitblit v1.9.3