From 4a64e6c81db587706d9c92a9badf321d31264254 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 06 六月 2019 16:34:59 +0800
Subject: [PATCH] 用户测试1
---
源码/核心板/Src/stm32f10x_it.c | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 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 1e15360..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"
@@ -27,17 +27,19 @@
#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)
{uint16_t i;
time32_incr++;
g_UWB_com_interval++;
- if(g_Resttimer++>1000)
+ if(g_Resttimer++>10000)
{
NVIC_SystemReset();
}
@@ -45,9 +47,11 @@
// {
// dis_after_filter = DEFAULT_DISTANCE;
// }
-TagDistClear();
- main_logic();
-
+#ifdef WORK_MODE_ANCHOR
+ TagDistClear();
+ if(g_pairstart!=1)
+ main_logic();
+#endif
}
@@ -73,9 +77,24 @@
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