From 8770b97111b845632246b08696f4362f6e88a5ee Mon Sep 17 00:00:00 2001
From: guanjiao <sqrgj@163.com>
Date: 星期六, 15 九月 2018 20:31:25 +0800
Subject: [PATCH] Merge branch 'dev_zyc' into Merge_anchor_and_tag
---
源码/核心板/Src/stm32f10x_it.c | 51 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 42 insertions(+), 9 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..c2822c2 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,55 @@
* 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 "dw_app.h"
+#include "global_param.h"
+#include "beep_logic_app.h"
+
/* Tick timer count. */
-volatile unsigned long time32_incr;
-volatile unsigned long time32_reset = 0;
+volatile uint32_t time32_incr;
+uint8_t tt=0;
+uint8_t g_start_send_flag = 0;
+
void SysTick_Handler(void)
{
time32_incr++;
- time32_reset++;
- if(time32_reset>10000)
- {
- NVIC_SystemReset();
+ g_UWB_com_interval++;
+ if(g_UWB_com_interval > 1000)
+ {
+ dis_after_filter = DEFAULT_DISTANCE;
}
+ main_logic();
+
+
+}
+
+/**
+ * @brief 中断服务函数
+ */
+void EXTI1_IRQHandler(void)
+{
+ if(EXTI_GetITStatus(EXTI_Line1)!= RESET)
+ {
+ EXTI_ClearITPendingBit(EXTI_Line1);
+
+ }
+}
+
+void RTCAlarm_IRQHandler(void)
+{
+ EXTI_ClearITPendingBit(EXTI_Line17);
+ RTC_ClearITPendingBit(RTC_FLAG_ALR);
+ g_start_send_flag = 1;
+ RTC_SET_ALARM(1);
+ tt++;
+ //GPIO_Toggle(GPIOA,LED_PIN);
+
+ //SYS.wake_id|=1<<17;
}
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/
--
Gitblit v1.9.3