From 6d642856c6a9e5c817180308f1685900fd9b5ced Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 29 八月 2019 21:17:16 +0800
Subject: [PATCH] 修改超距bug
---
源码/核心板/Src/stm32f10x_it.c | 56 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 37 insertions(+), 19 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..ab9ecfb 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,27 +27,42 @@
#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;
+u16 tag_recv_timer, tag_timer;
+extern uint16_t g_Resttimer,heartbeat_timer;
+extern uint8_t g_pairstart;
+
void SysTick_Handler(void)
-{uint16_t i;
+{
time32_incr++;
g_UWB_com_interval++;
- if(g_Resttimer++>1000)
+ heartbeat_timer++;
+ poll_timer++;
+
+ if(tag_timer++>=g_com_map[COM_INTERVAL])
+ {tag_timer=0;}
+ if(g_Resttimer++>2000)
{
NVIC_SystemReset();
}
+
// if(g_UWB_com_interval > 1000)
// {
// dis_after_filter = DEFAULT_DISTANCE;
// }
-TagDistClear();
- main_logic();
-
+//#ifdef WORK_MODE_ANCHOR
+ if(!g_com_map[DEV_ROLE])
+ {tag_recv_timer++;
+ TagDistClear();
+ //if(g_pairstart!=1)
+ main_logic();
+ }
+//#endif
}
@@ -63,19 +78,22 @@
}
}
-void RTCAlarm_IRQHandler(void)
+void USART1_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;
+ 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