From c20b80fe9dfe72220649bf1d85550e9f3ebc9549 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期日, 05 九月 2021 20:27:46 +0800
Subject: [PATCH] 增加中断接收模式,未测试。

---
 源码/核心板/Src/stm32f10x_it.c |   87 ++++++++++++++++++++++++-------------------
 1 files changed, 49 insertions(+), 38 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 7d85176..7012592 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"
@@ -32,64 +32,67 @@
 /* Tick timer count. */
 volatile uint32_t time32_incr;
 uint8_t tt=0;
-uint8_t g_start_send_flag = 0,sync_seq=0,usart_send_flag;
-u16 usart_timer=0;
+uint8_t g_start_send_flag = 0,sync_seq=0,usart_send_flag,waitsync_flag=0;
+u16 usart_timer=0,synclost_count=0;
 uint16_t sysscal;
-u16 tag_recv_timer, tag_timer;
+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;
-extern u16 tyncpoll_time;
-
+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++;		
-	if(sync_timer>=1010)
-		{sync_timer=0;}
+	neartimout_timer++;
 		
-	if(g_Resttimer++>2000)
-	{
-		//NVIC_SystemReset();
-	}
+	//GPIO_WriteBit(GPIOA, GPIO_Pin_8, Bit_RESET);			
+	if(sync_timer>=1000)
+		{
+            sync_timer=0;
+            
+			if(g_com_map[BASESYNCSEQ]==1)  //本模块是同步基站
+			{
+				synclost_count = 0;
+				current_syncid = 1;
+				sync_seq=0;
+					SyncPoll(sync_seq);
+			}
+            if(g_Resttimer++>12)
+            {
+                NVIC_SystemReset();
+            }
+		}		
 
-
-
-	
 	if(!g_com_map[DEV_ROLE])  //基站
 	{
 		tag_recv_timer++;
 		TagDistClear();
-		if(g_com_map[ALARM_DEV]!=0)
-			main_logic();
-		#ifdef USART_INTEGRATE_OUTPUT
-		if(usart_timer++>=g_com_map[COM_INTERVAL])
+	if(g_com_map[ANC_POLL])
 		{
-			usart_timer=0;
+			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(sync_timer==0)
-		{
-			TagListUpdate();
-			if(dev_id==0)
-				SyncPoll(0);
-		}
 	}else{		//标签同步处理
-		if((sync_timer-10)%g_com_map[COM_INTERVAL]==tyncpoll_time&&sync_timer>=10)
+		if(sync_timer==target_time)
 		{
-			GPIO_WriteBit(GPIOA, GPIO_Pin_9, Bit_SET);
+
+			last_polltime=sync_timer;
+		//	GPIO_WriteBit(GPIOA, GPIO_Pin_9, Bit_SET);
 		g_start_send_flag=1;
 		}
 		
@@ -101,7 +104,6 @@
 void SysTick_Handler(void)
 {
 	
-
 }
 
 /** 
@@ -115,7 +117,16 @@
 
   }   
 }
-
+u8 needanchorrx=1;
+void EXTI0_IRQHandler(void)
+{
+  if(EXTI_GetITStatus(EXTI_Line0)!= RESET)  
+  {  
+    EXTI_ClearITPendingBit(EXTI_Line0);
+    Anchor_App();
+    needanchorrx = 1;
+  }   
+}
 void USART1_IRQHandler(void)
 {
   if(USART_GetITStatus(EXT_UART, USART_IT_RXNE) != RESET)//?????????

--
Gitblit v1.9.3