From be9861e4fc5ac9984218975f3d5594f1db848224 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期六, 13 十月 2018 12:48:56 +0800
Subject: [PATCH] 增加分段报警功能
---
源码/核心板/Src/stm32f10x_it.c | 25 +++++++++++++++++--------
1 files changed, 17 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 c2822c2..1e15360 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"
@@ -26,20 +26,26 @@
#include "dw_app.h"
#include "global_param.h"
#include "beep_logic_app.h"
-
+#include "led.h"
/* Tick timer count. */
volatile uint32_t time32_incr;
uint8_t tt=0;
uint8_t g_start_send_flag = 0;
-
+uint16_t sysscal;
+extern uint16_t g_Resttimer;
void SysTick_Handler(void)
-{
- time32_incr++;
+{uint16_t i;
+ time32_incr++;
g_UWB_com_interval++;
- if(g_UWB_com_interval > 1000)
- {
- dis_after_filter = DEFAULT_DISTANCE;
+ if(g_Resttimer++>1000)
+ {
+ NVIC_SystemReset();
}
+// if(g_UWB_com_interval > 1000)
+// {
+// dis_after_filter = DEFAULT_DISTANCE;
+// }
+TagDistClear();
main_logic();
@@ -59,12 +65,15 @@
void RTCAlarm_IRQHandler(void)
{
+ // LED0_BLINK;
+ RCC_Configuration();
+ // LED0_BLINK;
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;
}
--
Gitblit v1.9.3