From dbe67cd6a483817bfc234718c301ff419de6b4e7 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期日, 21 六月 2020 23:38:53 +0800
Subject: [PATCH] 测试完成，重改定时机制
---
源码/核心板/Src/stm32f10x_it.c | 124 +++++++++++++++++++++++++++++++++++------
1 files changed, 105 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 c2822c2..77ee444 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,21 +26,101 @@
#include "dw_app.h"
#include "global_param.h"
#include "beep_logic_app.h"
-
+#include "led.h"
+#include "Usart.h"
+#include "dw_app.h"
/* Tick timer count. */
volatile uint32_t time32_incr;
uint8_t tt=0;
-uint8_t g_start_send_flag = 0;
+uint8_t g_start_send_flag = 0,sync_seq=0,usart_send_flag;
+u16 usart_timer=0;
+uint16_t sysscal;
+u16 tag_recv_timer, tag_timer,last_polltime;
+extern uint16_t g_Resttimer,heartbeat_timer,sync_timer;
+extern uint8_t g_pairstart;
+u8 neartimout_timer=0,flag_syncbase=0,flag_newsecond=0;
+extern u16 tyncpoll_time,target_time;
+extern uint32_t synclost_timer,current_syncid;
+void TIM3_IRQHandler(void) //TIM3??
+{
+ if (TIM_GetITStatus(TIM3, TIM_IT_Update) != RESET) //??TIM3????????
+ {
+ TIM_ClearITPendingBit(TIM3, TIM_IT_Update ); //??TIMx??????
+ main_logic();
+ time32_incr++;
+ heartbeat_timer++;
+ sync_timer++;
+ neartimout_timer++;
+ synclost_timer++;
+ //GPIO_WriteBit(GPIOA, GPIO_Pin_10, Bit_RESET);
+ if(sync_timer>=1000)
+ {
+ flag_newsecond=1;
+ //GPIO_WriteBit(GPIOA, GPIO_Pin_10, Bit_SET);
+ sync_timer=0;
+ TagListUpdate();
+ }
+
+ if(g_Resttimer++>2000)
+ {
+// NVIC_SystemReset();
+ }
+
+
+
+
+ if(!g_com_map[DEV_ROLE]) //基站
+ {
+ tag_recv_timer++;
+ TagDistClear();
+ if(g_com_map[ANC_POLL])
+ {
+ if(sync_timer==target_time)
+ {
+ g_start_send_flag=1;
+ }
+ }
+
+ #ifdef USART_INTEGRATE_OUTPUT
+ if(sync_timer==target_time)
+ {
+
+ usart_send_flag=1;
+ }
+ #endif
+ if(sync_timer>500&&dev_id!=0)
+ {
+ sync_seq=0xff;
+ }
+ if(synclost_timer>SYNCLOST_TIME)
+ {
+ //flag_syncbase=1;
+ }
+
+ if(flag_syncbase) //本模块是同步基站
+ {
+ if(sync_timer==995)
+ {
+ current_syncid = g_com_map[DEV_ID];
+ sync_seq=0;
+ SyncPoll(sync_seq,current_syncid);
+ }
+ }
+ }else{ //标签同步处理
+ if(sync_timer==target_time)
+ {
+ last_polltime=sync_timer;
+ // GPIO_WriteBit(GPIOA, GPIO_Pin_9, Bit_SET);
+ g_start_send_flag=1;
+ }
+
+ }
+
+ }
+}
void SysTick_Handler(void)
{
- time32_incr++;
- g_UWB_com_interval++;
- if(g_UWB_com_interval > 1000)
- {
- dis_after_filter = DEFAULT_DISTANCE;
- }
- main_logic();
}
@@ -57,16 +137,22 @@
}
}
-void RTCAlarm_IRQHandler(void)
+void USART1_IRQHandler(void)
{
- EXTI_ClearITPendingBit(EXTI_Line17);
- RTC_ClearITPendingBit(RTC_FLAG_ALR);
- g_start_send_flag = 1;
- RTC_SET_ALARM(1);
- tt++;
- //GPIO_Toggle(GPIOA,LED_PIN);
-
- //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