From f3a6daa409dfb287e517cf792a425435038e44df Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期二, 18 五月 2021 16:26:09 +0800
Subject: [PATCH] 修改基站类型未附值BUG
---
源码/核心板/Src/stm32f10x_it.c | 132 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 129 insertions(+), 3 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 fbfd9f6..d3d58d3 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"
@@ -23,11 +23,137 @@
/* Includes ------------------------------------------------------------------*/
#include "stm32f10x_it.h"
#include "stm32f10x.h"
+#include "dw_app.h"
+#include "global_param.h"
+#include "beep_logic_app.h"
+#include "led.h"
+#include "Usart.h"
+#include "beep.h"
+#include "dw_app.h"
/* Tick timer count. */
volatile uint32_t time32_incr;
-void SysTick_Handler(void)
+uint8_t tt=0;
+uint8_t g_start_send_flag = 0,sync_seq=0;
+uint16_t sysscal;
+u16 tag_recv_timer, tag_timer;
+extern uint16_t g_Resttimer,heartbeat_timer,sync_timer;
+extern uint8_t g_pairstart;
+u16 timer3;
+extern u16 tyncpoll_time;
+u8 delay_count=0;
+void TIM3_IRQHandler(void) //TIM3??
{
- time32_incr++;
+ if (TIM_GetITStatus(TIM3, TIM_IT_Update) != RESET) //??TIM3????????
+ {
+ TIM_ClearITPendingBit(TIM3, TIM_IT_Update ); //??TIMx??????
+ time32_incr++;
+ g_UWB_com_interval++;
+ heartbeat_timer++;
+ poll_timer++;
+
+ if(tag_timer++>=g_com_map[COM_INTERVAL])
+ {tag_timer=0;}
+ if(g_Resttimer++>10000)
+ {
+ NVIC_SystemReset();
+ }
+
+
+ sync_timer++;
+
+ if(!g_com_map[DEV_ROLE]) //基站
+ {
+ tag_recv_timer++;
+ TagDistClear();
+ if(g_com_map[ANC_POLL])
+ {
+ if((sync_timer-10)%g_com_map[COM_INTERVAL]==tyncpoll_time&&sync_timer>=10&&sync_timer!=1010)
+ {
+ g_start_send_flag=1;
+ }
+ }
+ // if(g_com_map[ALARM_DEV]!=0)
+ main_logic();
+ if(sync_timer==10)
+ {
+ GPIO_WriteBit(GPIOA, GPIO_Pin_9, Bit_SET);
+ }else{
+ GPIO_WriteBit(GPIOA, GPIO_Pin_9, Bit_RESET);
+ }
+ if(sync_timer>500&&dev_id!=0)
+ {
+ sync_seq=0xff;
+ }
+ if(sync_timer>=1010)
+ {
+ sync_timer=0;
+// if(synclost_timer++>20)
+// {
+// sync_mainbase=1;
+// }
+ if(sync_mainbase)
+ {
+ SyncPoll(0);
+ }
+ }
+ }else{ //标签同步处理
+ if(sync_timer>=1010)
+ {sync_timer=0;}
+ if((sync_timer-10)%g_com_map[COM_INTERVAL]==tyncpoll_time)
+ {
+ GPIO_WriteBit(GPIOA, GPIO_Pin_9, Bit_SET);
+ }
+ if((sync_timer-10)%g_com_map[COM_INTERVAL]==tyncpoll_time)
+ {
+ g_start_send_flag=1;
+ }
+
+ }
+
+ }
}
-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/
+//void SysTick_Handler(void)
+//{
+//
+
+//}
+
+/**
+ * @brief 中断服务函数
+ */
+void EXTI1_IRQHandler(void)
+{
+ if(EXTI_GetITStatus(EXTI_Line1)!= RESET)
+ {
+ EXTI_ClearITPendingBit(EXTI_Line1);
+
+ }
+}
+
+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++]);
+
+// }
+
+}
+void HardFault_Handler(void)
+{
+
+ while(1)
+ {
+ NVIC_SystemReset();
+ }
+}
--
Gitblit v1.9.3