V1.15

zhyinch

2020-06-08 66596268c0f602ecc7ccbb34ea2b649108179eea

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

@@ -65,7 +65,7 @@
      save_com_map_to_flash();
#endif
   OUT485_ENABLE;
   g_com_map[VERSION] = 0x010e;	
   g_com_map[VERSION] = 0x010f;	
   dev_id = g_com_map[DEV_ID];
   slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]/4)+4;
   max_slotpos=g_com_map[COM_INTERVAL]/slottime;
@@ -111,6 +111,9 @@
extern u8 g_start_sync_flag,usart_send_flag,anc_report_num;
u16 heartbeat_timer,poll_timer;
int16_t sync_timer;
extern u8 flag_newsecond, tagpos_rec[50], tagpos_send[50],ancidlist_num;
uint32_t tagpos_binary;
extern u16 ancidlist_rec[20],ancidlist_send[20];
void IdleTask(void)
{
      main_logic();
@@ -121,6 +124,19 @@
      heartbeat_timer=0;
      if(g_com_map[HEARTBEAT]&&g_com_map[DEV_ROLE]==0)
      HeatBeat();
   }
   if(flag_newsecond)
   {
     flag_newsecond=0;
      tagpos_binary=0;
      memcpy(ancidlist_send,ancidlist_rec,ancidlist_num*2);
      ancidlist_num=0;
      for(u8 i=0;i<max_slotpos;i++)
      {
         if(tagpos_rec[i])
            tagpos_binary|=1<<i;
         tagpos_rec[i] = 0;
      }
   }

   if(g_com_map[DEV_ROLE]==0&&usart_send_flag)
@@ -166,7 +182,7 @@
   usart_send[1]=0xAA;
   usart_send_anc[0]=0x55;
   usart_send_anc[1]=0xAA;
	

   while(1)
   {
   g_start_sync_flag=0;