From 8beb43dada6de301b1000b8af935652d2b3413bd Mon Sep 17 00:00:00 2001
From: guanjiao <sqrgj@163.com>
Date: 星期日, 02 九月 2018 17:08:01 +0800
Subject: [PATCH] 1. 修改Led的pin脚 2. 修改蜂鸣器与两个外设输出的pin 3. 修改dw1000的外部pin
---
源码/核心板/Src/main.c | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 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 21cdfa8..49dd841 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 @@
//#define WORK_MODE_TAG
#define WORK_MODE_ANCHOR
-#define START_ALARM_DIST_CM 500
+#define START_ALARM_DIST_CM 200
#define BEEM_ON_TIME_MS 200
float dis_after_filter = 0;
@@ -30,7 +30,8 @@
GPIO_PinRemapConfig(GPIO_Remap_SWJ_JTAGDisable, ENABLE);
}
-
+
+ uint8_t aa;
/*! ------------------------------------------------------------------------------------------------------------------
* @fn main()
*
@@ -55,21 +56,35 @@
Tag_App();
#else
Anchor_App();
+
#endif
+ if(USART_GetFlagStatus(EXT_USART, USART_FLAG_RXNE) != RESET)
+ {
+ aa = USART_ReceiveData(EXT_USART);
+ USART_SendData(EXT_USART, 0x66);//向串口1发送数据
+
+ while(USART_GetFlagStatus(EXT_USART, USART_FLAG_TC)!=SET);//等待发送结束
+
+ aa = 0;
+ }
+
//除UWB之外的其他代码...
dis_after_filter = LP_Frac_Update(p_Dis_Filter, dist_cm);
if(dis_after_filter <= START_ALARM_DIST_CM)
{
- g_beep_off_time = (uint32_t)dis_after_filter * 10;
- if(g_beep_off_time <= 0)
- g_beep_off_time = 0;
- g_beep_on_time = BEEM_ON_TIME_MS;
+// g_beep_off_time = (uint32_t)dis_after_filter * 10;
+// if(g_beep_off_time <= 0)
+// g_beep_off_time = 0;
+// g_beep_on_time = BEEM_ON_TIME_MS;
+ OUT2_ON;
+
}
else
{
- g_beep_on_time = 0;
- g_beep_off_time = 0;
+// g_beep_on_time = 0;
+// g_beep_off_time = 0;
+ OUT2_OFF;
}
}
--
Gitblit v1.9.3