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 | 37 +++++++++++++++----------------------
1 files changed, 15 insertions(+), 22 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 03523c6..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"
@@ -23,32 +23,26 @@
/* 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;
+uint8_t tt=0;
+uint8_t g_start_send_flag = 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++;
+
}
/**
@@ -62,13 +56,12 @@
}
}
-uint8_t tt=0;
-uint8_t send_start=0;
+
void RTCAlarm_IRQHandler(void)
{
- EXTI_ClearITPendingBit(EXTI_Line17);
+ EXTI_ClearITPendingBit(EXTI_Line17);
RTC_ClearITPendingBit(RTC_FLAG_ALR);
- send_start=1;
+ g_start_send_flag = 1;
RTC_SET_ALARM(1);
tt++;
//GPIO_Toggle(GPIOA,LED_PIN);
--
Gitblit v1.9.3