测试完成，重改定时机制

zhyinch

2020-06-21 dbe67cd6a483817bfc234718c301ff419de6b4e7

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

@@ -46,6 +46,8 @@
}
u16 tyncpoll_time;
u16 slottime,max_slotpos;
extern u8 module_power;
extern u16 total_slotnum;
void Program_Init(void)
{   float temp;
   u16 temp2;
@@ -65,12 +67,17 @@
      save_com_map_to_flash();
#endif
   OUT485_ENABLE;
   g_com_map[VERSION] = 0x010e;	
   g_com_map[VERSION] = 0x0112;	
   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;
   tyncpoll_time=(g_com_map[DEV_ID]%max_slotpos)*slottime;   
	
   module_power = g_com_map[POWER];
   total_slotnum = 1000/g_com_map[COM_INTERVAL];
      if(module_power>67)
      {
         module_power=67;
      }
   
   if(g_com_map[DEV_ROLE])
   {
@@ -111,9 +118,12 @@
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();
		
         UART_CheckReceive();
      UART_CheckSend();
   if(heartbeat_timer>1000)
@@ -122,11 +132,24 @@
      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)
   {u16 checksum;
            usart_send_flag=0;
            usart_send_anc[2] = 5;//姝ｅ父妯″紡
            usart_send_anc[2] = 4;//姝ｅ父妯″紡
            usart_send_anc[3] = anc_report_num*6+2;//姝ｅ父妯″紡
            checksum = Checksum_u16(&usart_send_anc[2],anc_report_num*6+2);
            memcpy(&usart_send_anc[4+anc_report_num*6],&checksum,2);
@@ -150,6 +173,21 @@
      //   Delay_ms(100);
         SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //杞浣嶅洖鍒癰ootloader   
   }
         if(g_com_map[CNT_REBOOT]==1)
      {
         g_com_map[CNT_REBOOT]=0;
         g_com_map[MAP_SIGN_INDEX]=0;
         save_com_map_to_flash();
         delay_ms(100);
         SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //杞浣嶅洖鍒癰ootloader   
      }
      if(g_com_map[CNT_RESTART]==1)
      {
         g_com_map[CNT_RESTART]=0;
         save_com_map_to_flash();
         delay_ms(100);
            SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //杞浣嶅洖鍒癰ootloader   
      }

   }
int main(void)
@@ -166,7 +204,7 @@
   usart_send[1]=0xAA;
   usart_send_anc[0]=0x55;
   usart_send_anc[1]=0xAA;
	

   while(1)
   {
   g_start_sync_flag=0;