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/stm32f10x_it.c | 28 ++++++++++------------------
1 files changed, 10 insertions(+), 18 deletions(-)
diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/stm32f10x_it.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/stm32f10x_it.c"
index 8de836d..620a1ca 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/stm32f10x_it.c"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/stm32f10x_it.c"
@@ -23,32 +23,24 @@
/* Includes ------------------------------------------------------------------*/
#include "stm32f10x_it.h"
#include "stm32f10x.h"
-#include "beep.h"
+#include "dw_app.h"
+#include "global_param.h"
+#include "beep_logic_app.h"
/* Tick timer count. */
volatile uint32_t time32_incr;
-volatile uint32_t g_beep_on_time = 0;
-volatile uint32_t g_beep_off_time = 0;
-
void SysTick_Handler(void)
{
- static uint32_t s_cycle_time = 0;
time32_incr++;
+ g_UWB_com_interval++;
+ if(g_UWB_com_interval > 1000)
+ {
+ dis_after_filter = DEFAULT_DISTANCE;
+ }
+ main_logic();
-// if(s_cycle_time >= g_beep_off_time)
-// {
-// s_cycle_time = 0;
-// }
-// else if(s_cycle_time > g_beep_on_time && s_cycle_time < g_beep_off_time)
-// {
-// BEEP_OFF;
-// }
-// else if(s_cycle_time <= g_beep_on_time)
-// {
-// BEEP_ON;
-// }
- s_cycle_time++;
+
}
/**
--
Gitblit v1.9.3