From 41776246aed24b42e1d05da230f6f114e02c87b6 Mon Sep 17 00:00:00 2001
From: guanjiao <sqrgj@163.com>
Date: 星期日, 27 五月 2018 17:39:52 +0800
Subject: [PATCH] 增加低通滤波与渐进报警功能
---
源码/核心板/Src/stm32f10x_it.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/stm32f10x_it.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/stm32f10x_it.c"
index ddb1ab7..14ddeec 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"
@@ -1,11 +1,11 @@
/**
******************************************************************************
- * @file Project/STM32F10x_StdPeriph_Template/stm32f10x_it.c
+ * @file Project/STM32F10x_StdPeriph_Template/stm32f10x_it.c
* @author MCD Application Team
* @version V3.4.0
* @date 10/15/2010
* @brief Main Interrupt Service Routines.
- * This file provides template for all exceptions handler and
+ * This file provides template for all exceptions handler and
* peripherals interrupt service routine.
******************************************************************************
* @copy
@@ -18,22 +18,37 @@
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
*
* <h2><center>© COPYRIGHT 2010 STMicroelectronics</center></h2>
- */
+ */
/* Includes ------------------------------------------------------------------*/
#include "stm32f10x_it.h"
#include "stm32f10x.h"
+#include "beep.h"
+
/* Tick timer count. */
-volatile unsigned long time32_incr;
-volatile unsigned long time32_reset = 0;
+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++;
- time32_reset++;
- if(time32_reset>10000)
+
+ if(s_cycle_time >= g_beep_off_time)
{
- NVIC_SystemReset();
+ 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++;
}
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/
--
Gitblit v1.9.3