V1.22

zhyinch

2020-04-27 5bfa1bc693623159c5059067f8db7589fabd04a1

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

@@ -32,14 +32,15 @@
/* Tick timer count. */
volatile uint32_t time32_incr;
uint8_t tt=0;
uint8_t g_start_send_flag = 0,sync_seq=0,usart_timer=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;
u8 neartimout_timer=0;
extern u16 tyncpoll_time, checksum;;
extern u8 anc_report_num;
extern u16 tyncpoll_time;

void TIM3_IRQHandler(void)   //TIM3??
{
   if (TIM_GetITStatus(TIM3, TIM_IT_Update) != RESET)  //??TIM3????????
@@ -65,17 +66,20 @@
   {
      tag_recv_timer++;
      TagDistClear();
      if(g_com_map[ALARM_DEV]!=0)
   if(g_com_map[ANC_POLL])
      {
         if((sync_timer-10)%g_com_map[COM_INTERVAL]==tyncpoll_time&&sync_timer>=10&&sync_timer!=1010)
         {
         g_start_send_flag=1;
         }
      }
      //if(g_com_map[ALARM_DEV]!=0)
         main_logic();
      #ifdef USART_INTEGRATE_OUTPUT
      if(usart_timer++>g_com_map[COM_INTERVAL])
      if(usart_timer++>=g_com_map[COM_INTERVAL])
      {
         usart_timer=0;
         usart_send[2] = anc_report_num;//姝ｅ父妯″紡
            checksum = Checksum_u16(&usart_send[2],anc_report_num*6+1);
            memcpy(&usart_send[3+anc_report_num*6],&checksum,2);
            UART_PushFrame(usart_send,5+anc_report_num*6);
anc_report_num=0;			
         usart_send_flag=1;		
      }
      #endif
      if(sync_timer>500&&dev_id!=0)
@@ -90,9 +94,9 @@
            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&&sync_timer!=1010)
      {
         GPIO_WriteBit(GPIOA, GPIO_Pin_9, Bit_SET);
      //   GPIO_WriteBit(GPIOA, GPIO_Pin_9, Bit_SET);
      g_start_send_flag=1;
      }