From 7440843d3a1e108fdf78b8cfff073aa60a2a41f7 Mon Sep 17 00:00:00 2001
From: guanjiao ren <guanjiao.ren@ninebot.com>
Date: 星期五, 18 五月 2018 15:22:35 +0800
Subject: [PATCH] spi与dw_driver重写
---
源码/核心板/Src/main.c | 63 ++++++++++++++++---------------
1 files changed, 32 insertions(+), 31 deletions(-)
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 af5d8de..0100b5a 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"
@@ -190,17 +190,17 @@
sum = ~sum;
return sum;
}
-void LED_blink(void)
-{
- uint8_t ii;
- for (ii = 0; ii < 10; ii++)
- {
- GPIO_Toggle(GPIOA, LED_PIN);
- deca_sleep(100);
- }
-}
+//void LED_blink(void)
+//{
+// uint8_t ii;
+// for (ii = 0; ii < 10; ii++)
+// {
+// GPIO_Toggle(GPIOA, LED_PIN);
+// deca_sleep(100);
+// }
+//}
//extern volatile unsigned long time32_reset;
-extern uint8_t Work_Mode;
+uint8_t Work_Mode = 1;
uint32 frame_len;
uint8_t send[9];
char dist_str[16] = {0};
@@ -270,7 +270,7 @@
rx_resp_msg[5] = TAG_ID;//UWB RESPONSE 包数据
tx_final_msg[5] = TAG_ID;//UWB Fianl 包数据
/* Loop forever initiating ranging exchanges. */
- LED_blink();
+//LED_blink();
if(!Work_Mode) //选择发送模式（TAG标签）还是接收模式(ANCHOR基站)
{
while (1) //发送模式(TAG标签)
@@ -336,15 +336,15 @@
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
+// 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;
@@ -364,7 +364,8 @@
/* Increment frame sequence number after transmission of the final message (modulo 256). */
frame_seq_nb++;
// time32_reset = 0;
- GPIO_Toggle(GPIOA, LED_PIN); //LED闪烁
+// GPIO_Toggle(GPIOA, LED_PIN); //LED闪烁
+ LED0_BLINK;
jumptime = 0;
}
else
@@ -494,16 +495,16 @@
dis = dist2 * 100; //dis 为单位为cm的距离
dist[TAG_ID] = LP(dis, TAG_ID); //LP 为低通滤波器，让数据更稳定
// time32_reset = 0;
- GPIO_Toggle(GPIOA, LED_PIN);
- 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
+ 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;
--
Gitblit v1.9.3