zhyinch
2020-07-17 125d49c1d48d96611c1ec68df5dc870433b44581
源码/核心板/Src/stm32f10x_it.c
@@ -39,7 +39,7 @@
extern uint16_t g_Resttimer,heartbeat_timer,sync_timer;
extern uint8_t g_pairstart;
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;
void TIM3_IRQHandler(void)   //TIM3??
{
@@ -61,7 +61,7 @@
        TagListUpdate();
      }
      
   if(g_Resttimer++>2000)
   if(g_Resttimer++>12000)
   {
      NVIC_SystemReset();
   }
@@ -75,14 +75,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;      
@@ -107,8 +107,9 @@
      }
   }
   }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;