From 0e4f298824b83e1a1e81ec8ced2e6c007a1c8961 Mon Sep 17 00:00:00 2001 From: guanjiao <sqrgj@163.com> Date: 星期三, 29 八月 2018 21:10:40 +0800 Subject: [PATCH] 1. 修改为外部晶振 2. 修改led与蜂鸣器pin角 --- 源码/核心板/Src/application/dw_app.c | 39 --------------------------------------- 1 files changed, 0 insertions(+), 39 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 db01397..822a810 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" @@ -292,26 +292,6 @@ dwt_writetxdata(sizeof(tx_final_msg), tx_final_msg, 0);//将发送数据写入DW1000 dwt_writetxfctrl(sizeof(tx_final_msg), 0);//设定发送数据长度 dwt_starttx(DWT_START_TX_DELAYED);//设定为延迟发送 - - //这里为串口输出 -// if (GPIO_ReadInputDataBit(GPIOA, SW2) != RESET) //通过拨码开关判断数据输出格式 -// { -// dID = TAG_ID; -// printf("TAG_ID: %2.0f ", dID); -// dID = ANCHOR_ID; -// printf("ANCHOR_ID: %2.0f ", dID); -// printf("Distance: %5.0f cm\n", (double)dist[TAG_ID]); -// } -// else -// { -// send[2] = ANCHOR_ID; -// send[3] = TAG_ID; - -// memcpy(&send[4], &dist[TAG_ID], 2); -// check = Checksum_u16(&send[2], 6); -// memcpy(&send[8], &check, 2); -// USART_puts(send, 10); -// } /* Poll DW1000 until TX frame sent event set. See NOTE 8 below. */ while (!(dwt_read32bitreg(SYS_STATUS_ID) & SYS_STATUS_TXFRS))//不断查询芯片状态直到发送完成 @@ -451,25 +431,6 @@ // dist[TAG_ID] = LP(dis, TAG_ID); //LP 为低通滤波器,让数据更稳定 LED0_BLINK; //每成功一次通讯则闪烁一次 - //这里供串口输出 -// if (GPIO_ReadInputDataBit(GPIOA, SW2) != RESET) //通过拨码开关判断数据输出格式 -// { -// dID = TAG_ID; -// printf("TAG_ID: %2.0f ", dID); -// dID = ANCHOR_ID; -// printf("ANCHOR_ID: %2.0f ", dID); -// printf("Distance: %5.0f cm\n", (double)dist[TAG_ID]); -// } -// else -// { -// send[2] = ANCHOR_ID; -// send[3] = TAG_ID; - -// memcpy(&send[4], &dist[TAG_ID], 2); -// check = Checksum_u16(&send[2], 6); -// memcpy(&send[8], &check, 2); -// USART_puts(send, 10); -// } } } -- Gitblit v1.9.3