From 7d3477c256ef93ce3190c1d7740c90ee941311cd Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 07 四月 2022 21:00:49 +0800
Subject: [PATCH] V1.70

---
 源码/核心板/Src/stm32f10x_it.c |  135 ++++++++++++++++++++++++++++++++++++---------
 1 files changed, 108 insertions(+), 27 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 ab9ecfb..730b3f6 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"
@@ -28,41 +28,114 @@
 #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,pollsendtimer=0;
 uint16_t sysscal;
-u16 tag_recv_timer, tag_timer;
-extern uint16_t g_Resttimer,heartbeat_timer;
-extern uint8_t g_pairstart;
+u16 tag_recv_timer, tag_timer,last_polltime,userdata_timer;
+extern uint16_t g_Resttimer,heartbeat_timer,sync_timer;
+extern uint8_t g_pairstart,getrange_success;
+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();	
+    userdata_timer++;            
+	time32_incr++;
+	heartbeat_timer++;
+	sync_timer++;	
+	neartimout_timer++;
+	synclost_timer++;
+ if(g_com_map[DEV_ROLE]||g_com_map[ANC_POLL])
+  {            
+    if(pollsendtimer++>=g_com_map[COM_INTERVAL])   
+    {
+        pollsendtimer = 0;
+        g_start_send_flag = 1;
+    } 
+}    
+	//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++>10000)
+	{
+		//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%g_com_map[COM_INTERVAL]==0)
+		{
+			
+			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++;
-	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
-	if(!g_com_map[DEV_ROLE])
-	{tag_recv_timer++;
-	TagDistClear();
-	//if(g_pairstart!=1)
-		main_logic();
-	}
-//#endif	
 
 }
 
@@ -96,4 +169,12 @@
 //  }    
 
 }
+void HardFalut_Handler(void)
+{
+	while(1)
+	{
+		NVIC_SystemReset();
+	}
+
+}
 

--
Gitblit v1.9.3