From 2ad2b82d448645cc81409aa4765288da95931cb8 Mon Sep 17 00:00:00 2001
From: guanjiao <sqrgj@163.com>
Date: 星期六, 15 九月 2018 17:20:16 +0800
Subject: [PATCH] 1. 增加了“收不到信息1s后，停止报警”的功能 2. 将判断喇叭是否响的功能，在systick中断中实现
---
源码/核心板/Src/main.c | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 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 366cc6f..8e7059e 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"
@@ -6,22 +6,33 @@
#include "beep.h"
#include "dw_driver.h"
#include "dw_app.h"
+#include "stm32f10x_it.h"
+#include "serial_at_cmd_app.h"
+#include "global_param.h"
//#define WORK_MODE_TAG
#define WORK_MODE_ANCHOR
void Device_Init(void)
{
- Rcc_Init();
+// Rcc_Init();
+ SystemInit();
Nvic_Init();
Systick_Init();
Led_Init();
Beep_Init();
DW_GPIO_Init();
- Usart_Init();
+ Uart1_Init();
Spi_Init();
+
GPIO_PinRemapConfig(GPIO_Remap_SWJ_JTAGDisable, ENABLE);
+}
+
+void Program_Init(void)
+{
+ Usart1ParseDataCallback = UsartParseDataHandler;
+ parameter_init();
}
/*! ------------------------------------------------------------------------------------------------------------------
@@ -35,8 +46,9 @@
*/
int main(void)
{
-
+
Device_Init();
+ Program_Init();
Dw1000_Init();
/* Loop forever initiating ranging exchanges. */
@@ -47,16 +59,7 @@
#else
Anchor_App();
#endif
- //除UWB之外的其他代码...
- if(dist_cm<=100)
- {
- BEEP_ON;
- }
- else
- {
- BEEP_OFF;
- }
-
+
}
}
--
Gitblit v1.9.3