V1.35 大连电牵，测试版本。配置回复变成立即回复，收到数据才不重启

zhyinch

2020-11-17 c8fa9e7b73d663fd1ee78632d38cea1b49c14d39

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

@@ -35,28 +35,39 @@
uint8_t g_start_send_flag = 0,sync_seq=0,usart_send_flag;
u16 usart_timer=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;

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();		
   time32_incr++;
   heartbeat_timer++;
   sync_timer++;   
   neartimout_timer++;		
   if(sync_timer>=1010)
      {sync_timer=0;}
   neartimout_timer++;
   synclost_timer++;		
   //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++>2000)
   if(g_Resttimer++>5000)
   {
      //NVIC_SystemReset();
      NVIC_SystemReset();
   }


@@ -66,12 +77,18 @@
   {
      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
@@ -79,17 +96,26 @@
      {
       sync_seq=0xff;
      }

      if(sync_timer==0)
      if(synclost_timer>SYNCLOST_TIME)
      {
         TagListUpdate();
         if(dev_id==0)
            SyncPoll(0);
         flag_syncbase=1;
      }
   }else{      //鏍囩鍚屾澶勭悊
      if((sync_timer-10)%g_com_map[COM_INTERVAL]==tyncpoll_time&&sync_timer>=10)

      if(flag_syncbase)  //鏈ā鍧楁槸鍚屾鍩虹珯
      {
         GPIO_WriteBit(GPIOA, GPIO_Pin_9, Bit_SET);
      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;
      }
      
@@ -134,4 +160,12 @@
//  }    

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

}