From 4a99709fbaf35e70ab7102c902e2c4caab74b96c Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 18 十月 2018 16:27:33 +0800
Subject: [PATCH] Revert "Revert "配对完成，有bug""
---
源码/核心板/Src/stm32f10x_it.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 51 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 620a1ca..c7bee66 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,32 @@
#include "dw_app.h"
#include "global_param.h"
#include "beep_logic_app.h"
-
+#include "led.h"
+#include "Usart.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;
+extern uint8_t g_pairstart;
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++>10000)
+ {
+ NVIC_SystemReset();
}
- main_logic();
-
+// if(g_UWB_com_interval > 1000)
+// {
+// dis_after_filter = DEFAULT_DISTANCE;
+// }
+#ifdef WORK_MODE_ANCHOR
+ TagDistClear();
+ if(g_pairstart!=1)
+ main_logic();
+#endif
}
@@ -55,4 +67,34 @@
}
}
+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++;
+ //SYS.wake_id|=1<<17;
+}
+void USART1_IRQHandler(void)
+{
+ if(USART_GetITStatus(EXT_UART, USART_IT_RXNE) != RESET)//?????????
+ {
+ UART_CheckReceive();
+ }
+
+ /*************************************************************
+
+ if(USART_GetITStatus(USARTy, USART_IT_TXE) != RESET)
+
+ {
+
+ USART_SendData(USARTy, TxBuffer1[TxCounter1++]);
+
+ }
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/
+}
+
--
Gitblit v1.9.3