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 | 47 +++++++++++++++++++++++------------------------
1 files changed, 23 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 c7bee66..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"
@@ -33,25 +33,36 @@
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++>10000)
+ 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;
// }
-#ifdef WORK_MODE_ANCHOR
+//#ifdef WORK_MODE_ANCHOR
+ if(!g_com_map[DEV_ROLE])
+ {tag_recv_timer++;
TagDistClear();
- if(g_pairstart!=1)
+ //if(g_pairstart!=1)
main_logic();
-#endif
+ }
+//#endif
}
@@ -67,18 +78,6 @@
}
}
-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)//?????????
@@ -86,15 +85,15 @@
UART_CheckReceive();
}
- /*************************************************************
- if(USART_GetITStatus(USARTy, USART_IT_TXE) != RESET)
- {
+// if(USART_GetITStatus(USARTy, USART_IT_TXE) != RESET)
- USART_SendData(USARTy, TxBuffer1[TxCounter1++]);
+// {
- }
-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/
+// USART_SendData(USARTy, TxBuffer1[TxCounter1++]);
+
+// }
+
}
--
Gitblit v1.9.3