V1.67 测试完成

zhyinch

2022-08-10 ee92c0770f3d386bdd58189f1b395b342f79ec34

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

@@ -37,9 +37,9 @@
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,dissucc_times;
u8 neartimout_timer=0,flag_syncbase=0,flag_newsecond=0;
extern u16 tyncpoll_time;
extern u16 tyncpoll_time,target_time,success_ancid;
extern uint32_t synclost_timer,current_syncid;
void TIM3_IRQHandler(void)   //TIM3??
{
@@ -55,13 +55,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;
            dissucc_times = 0;
            success_ancid = 0;
        TagListUpdate();
      }
      
   if(g_Resttimer++>2000)
   if(g_Resttimer++>10000)
   {
      NVIC_SystemReset();
   }
@@ -75,14 +81,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;      
@@ -97,22 +103,28 @@
         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);
      }
   }
//      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%g_com_map[COM_INTERVAL]==tyncpoll_time&&sync_timer<990&&sync_timer!=last_polltime)
      if(sync_timer%20==0)
      {
         last_polltime=sync_timer;

      //   last_polltime=sync_timer;
      //   GPIO_WriteBit(GPIOA, GPIO_Pin_9, Bit_SET);
      g_start_send_flag=1;
      }
//        if(sync_timer>900&&(dissucc_flag2&dissucc_flag2)==0)
//        {
//            if(sync_timer%10==0)
//            g_start_send_flag=1;
//        } 
      
   }

@@ -155,4 +167,12 @@
//  }    

}
void HardFalut_Handler(void)
{
   while(1)
   {
      NVIC_SystemReset();
   }

}