From 9e8a2b9c07fddcba3f0d2ae84c0c65f0f7f16c6a Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 27 一月 2022 20:37:12 +0800
Subject: [PATCH] 中断模式,超宽带芯片读取状态异常,没有超时标志位

---
 源码/核心板/Src/stm32f10x_it.c |   44 +++++++++++++++++++++++++++++++++++---------
 1 files changed, 35 insertions(+), 9 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 22aa618..a13ead0 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"
@@ -37,10 +37,11 @@
 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;
+extern uint8_t g_pairstart,getrange_success;
 u8 neartimout_timer=0,flag_syncbase=0,flag_newsecond=0;
-extern u16 tyncpoll_time;
+extern u16 tyncpoll_time,target_time;
 extern uint32_t synclost_timer,current_syncid;
+u8 needanchorrx=1;
 void TIM3_IRQHandler(void)   //TIM3??
 {
 	if (TIM_GetITStatus(TIM3, TIM_IT_Update) != RESET)  //??TIM3????????
@@ -55,15 +56,19 @@
 	//GPIO_WriteBit(GPIOA, GPIO_Pin_10, Bit_RESET);			
 	if(sync_timer>=1000)
 		{
+//			if(getrange_success==0)
+//			{
+//				NVIC_SystemReset();
+//			}
 			flag_newsecond=1;
 		//GPIO_WriteBit(GPIOA, GPIO_Pin_10, Bit_SET);	
 			sync_timer=0;
 		  TagListUpdate();
 		}
 		
-	if(g_Resttimer++>2000)
+	if(g_Resttimer++>10000)
 	{
-		NVIC_SystemReset();
+	//	NVIC_SystemReset();
 	}
 
 
@@ -75,14 +80,14 @@
 		TagDistClear();
 	if(g_com_map[ANC_POLL])
 		{
-			if(sync_timer%g_com_map[COM_INTERVAL]==tyncpoll_time&&sync_timer<990&&sync_timer!=last_polltime)
+			if(sync_timer==target_time)
 			{
-		//	g_start_send_flag=1;
+			g_start_send_flag=1;
 			}
 		}
 		
 		#ifdef USART_INTEGRATE_OUTPUT
-		if(sync_timer%g_com_map[COM_INTERVAL]==tyncpoll_time&&sync_timer<990)
+		if(sync_timer%g_com_map[COM_INTERVAL]==0)
 		{
 			
 			usart_send_flag=1;		
@@ -103,12 +108,14 @@
 		{
 			current_syncid = g_com_map[DEV_ID];
 			sync_seq=0;
-				SyncPoll(sync_seq,current_syncid);
+			//	SyncPoll(sync_seq,current_syncid);
+		//	needanchorrx = 1;
 		}
 	}
 	}else{		//标签同步处理
-		if(sync_timer%g_com_map[COM_INTERVAL]==tyncpoll_time&&sync_timer<990&&sync_timer!=last_polltime)
+		if(sync_timer==target_time)
 		{
+
 			last_polltime=sync_timer;
 		//	GPIO_WriteBit(GPIOA, GPIO_Pin_9, Bit_SET);
 		g_start_send_flag=1;
@@ -136,7 +143,18 @@
 
   }   
 }
+u32 status_reg;
 
+void EXTI0_IRQHandler(void)
+{
+  if(EXTI_GetITStatus(EXTI_Line0)!= RESET)  
+  {  
+		status_reg = dwt_read32bitreg(SYS_STATUS_ID);
+    EXTI_ClearITPendingBit(EXTI_Line0);
+    Anchor_App();
+    needanchorrx = 1;
+  }   
+}
 void USART1_IRQHandler(void)
 {
   if(USART_GetITStatus(EXT_UART, USART_IT_RXNE) != RESET)//?????????
@@ -155,4 +173,12 @@
 //  }    
 
 }
+void HardFalut_Handler(void)
+{
+	while(1)
+	{
+		NVIC_SystemReset();
+	}
+
+}
 

--
Gitblit v1.9.3