V2.30

zhyinch

2021-09-28 66b13717fce3890b464d0b43eb61b94ea7cdf56e

 源码/核心板/Src/stm32f10x_it.c

@@ -32,8 +32,8 @@
/* 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,last_polltime;
extern uint16_t g_Resttimer,heartbeat_timer,sync_timer;
@@ -46,19 +46,36 @@
   if (TIM_GetITStatus(TIM3, TIM_IT_Update) != RESET)  //??TIM3????????
      {
      TIM_ClearITPendingBit(TIM3, TIM_IT_Update  );  //??TIMx?????? 
   main_logic();		
//   main_logic();		
   time32_incr++;
   heartbeat_timer++;
   sync_timer++;   
   neartimout_timer++;
   synclost_timer++;      
   //GPIO_WriteBit(GPIOA, GPIO_Pin_10, Bit_RESET);			
   GPIO_WriteBit(GPIOA, GPIO_Pin_8, Bit_RESET);			
   if(sync_timer>=1000)
      {
      {uint8_t i;
         for(i=0;i<MAX_REGTAGNUM;i++)
         {
            if(regtag_map.remain_time[i]>0)
            {
               regtag_map.remain_time[i]--;
            }
         }
         if(pwtag.remain_time>0)
         {pwtag.remain_time--;}
         flag_newsecond=1;
      //GPIO_WriteBit(GPIOA, GPIO_Pin_10, Bit_SET);	
      GPIO_WriteBit(GPIOA, GPIO_Pin_8, Bit_SET);	
         sync_timer=0;
         synclost_count++;
        TagListUpdate();
         if(g_com_map[BASESYNCSEQ]==1)  //鏈ā鍧楁槸鍚屾鍩虹珯
         {
            synclost_count = 0;
            current_syncid = 1;
            sync_seq=0;
               SyncPoll(sync_seq);
         }
      }
      
   if(g_Resttimer++>12000)
@@ -88,24 +105,6 @@
         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)
      {