From 96ca4b1952c1c4bf85704208f53c97b45a875b04 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期一, 01 十月 2018 12:25:53 +0800
Subject: [PATCH] 更改距离设置格式
---
源码/核心板/Src/stm32f10x_it.c | 43 +++++++++++++++++++------------------------
1 files changed, 19 insertions(+), 24 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..69e2a34 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,28 @@
/* 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;
+uint16_t sysscal;
void SysTick_Handler(void)
-{
- static uint32_t s_cycle_time = 0;
- time32_incr++;
+{uint16_t i;
+ time32_incr++;
+ g_UWB_com_interval++;
-// if(s_cycle_time >= g_beep_off_time)
-// {
-// s_cycle_time = 0;
+// if(g_UWB_com_interval > 1000)
+// {
+// dis_after_filter = DEFAULT_DISTANCE;
// }
-// 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++;
+TagDistClear();
+ main_logic();
+
+
}
/**
@@ -62,13 +58,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