From 8bb8fdc8ea89e54ee0cfea17377b33d61d5940fa Mon Sep 17 00:00:00 2001
From: guanjiao ren <guanjiao.ren@ninebot.com>
Date: 星期日, 27 五月 2018 13:34:18 +0800
Subject: [PATCH] 增加了测距防碰的程序
---
源码/核心板/Src/application/dw_app.h | 1 +
源码/核心板/Src/main.c | 8 ++++++++
源码/核心板/Src/ExternalDevices/beep.h | 3 +++
源码/核心板/MDK-ARM/Project.uvoptx | 2 +-
源码/核心板/Src/ExternalDevices/beep.c | 2 +-
5 files changed, 14 insertions(+), 2 deletions(-)
diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvoptx" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvoptx"
index ef378e0..326a025 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvoptx"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvoptx"
@@ -229,7 +229,7 @@
<Group>
<GroupName>App</GroupName>
- <tvExp>0</tvExp>
+ <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/ExternalDevices/beep.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/ExternalDevices/beep.c"
index 9630966..dfe1346 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/ExternalDevices/beep.c"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/ExternalDevices/beep.c"
@@ -8,7 +8,7 @@
RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOA, ENABLE);
// Enable GPIO used for beep
- GPIO_InitStructure.GPIO_Pin = BEEP_PIN;
+ GPIO_InitStructure.GPIO_Pin = BEEP_PIN | BEEP2_PIN;
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_Out_PP;
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
GPIO_Init(BEEP_GPIO, &GPIO_InitStructure);
diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/ExternalDevices/beep.h" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/ExternalDevices/beep.h"
index c9b6945..29c2d60 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/ExternalDevices/beep.h"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/ExternalDevices/beep.h"
@@ -5,9 +5,12 @@
#include "stm32f10x.h"
#define BEEP_PIN GPIO_Pin_0
+#define BEEP2_PIN GPIO_Pin_11
#define BEEP_GPIO GPIOA
#define BEEP_ON GPIO_WriteBit(BEEP_GPIO, BEEP_PIN, Bit_SET)
#define BEEP_OFF GPIO_WriteBit(BEEP_GPIO, BEEP_PIN, Bit_RESET)
+#define BEEP2_ON GPIO_WriteBit(BEEP_GPIO, BEEP2_PIN, Bit_SET)
+#define BEEP2_OFF GPIO_WriteBit(BEEP_GPIO, BEEP2_PIN, Bit_RESET)
void Beep_Init(void);
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 54106ff..e30d2d7 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"
@@ -7,6 +7,7 @@
#define TAG_NUM_IN_SYS 256
#define DFT_RAND_DLY_TIM_MS 1
+extern double dist_cm;
void Dw1000_Init(void);
void Tag_App(void);
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 b9fae62..366cc6f 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"
@@ -48,6 +48,14 @@
Anchor_App();
#endif
//除UWB之外的其他代码...
+ if(dist_cm<=100)
+ {
+ BEEP_ON;
+ }
+ else
+ {
+ BEEP_OFF;
+ }
}
}
--
Gitblit v1.9.3