V1.11 修复读取参数回复BUG

zhyinch

2020-04-16 a26a36940097da7c033be9199219374801d9b32c

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

@@ -32,13 +32,15 @@
/* Tick timer count. */
volatile uint32_t time32_incr;
uint8_t tt=0;
uint8_t g_start_send_flag = 0,sync_seq=0;
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;
extern uint16_t g_Resttimer,heartbeat_timer,sync_timer;
extern uint8_t g_pairstart;
u16 timer3;
u8 neartimout_timer=0;
extern u16 tyncpoll_time;

void TIM3_IRQHandler(void)   //TIM3??
{
   if (TIM_GetITStatus(TIM3, TIM_IT_Update) != RESET)  //??TIM3????????
@@ -48,13 +50,13 @@
   time32_incr++;
   heartbeat_timer++;
   sync_timer++;   
			
   neartimout_timer++;		
   if(sync_timer>=1010)
      {sync_timer=0;}
      
   if(g_Resttimer++>2000)
   {
      NVIC_SystemReset();
      //NVIC_SystemReset();
   }


@@ -66,7 +68,13 @@
      TagDistClear();
      if(g_com_map[ALARM_DEV]!=0)
         main_logic();

      #ifdef USART_INTEGRATE_OUTPUT
      if(usart_timer++>=g_com_map[COM_INTERVAL])
      {
         usart_timer=0;
         usart_send_flag=1;		
      }
      #endif
      if(sync_timer>500&&dev_id!=0)
      {
       sync_seq=0xff;
@@ -79,7 +87,7 @@
            SyncPoll(0);
      }
   }else{      //鏍囩鍚屾澶勭悊
            if((sync_timer-10)%g_com_map[COM_INTERVAL]==tyncpoll_time&&sync_timer>=10)
      if((sync_timer-10)%g_com_map[COM_INTERVAL]==tyncpoll_time&&sync_timer>=10)
      {
         GPIO_WriteBit(GPIOA, GPIO_Pin_9, Bit_SET);
      g_start_send_flag=1;