zhyinch
2020-08-22 058a874b0572507e34eeec50194ba8e99976564f
源码/核心板/Src/main.c
@@ -67,9 +67,9 @@
      save_com_map_to_flash();
#endif
   OUT485_ENABLE;
   g_com_map[VERSION] = 0x0112;
   g_com_map[VERSION] = 0x011A;
   dev_id = g_com_map[DEV_ID];
   slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]/4)+4;
   slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]*SLOT_SCALE)+3;
   max_slotpos=g_com_map[COM_INTERVAL]/slottime;
   tyncpoll_time=(g_com_map[DEV_ID]%max_slotpos)*slottime;   
   module_power = g_com_map[POWER];
@@ -121,6 +121,7 @@
extern u8 flag_newsecond, tagpos_rec[50], tagpos_send[50],ancidlist_num;
uint32_t tagpos_binary;
extern u16 ancidlist_rec[20],ancidlist_send[20];
extern u16 target_time;
void IdleTask(void)
{
      
@@ -145,7 +146,9 @@
         tagpos_rec[i] = 0;
      }
   }
   if(target_time>1000)
   {target_time-=1000;}
   #ifdef USART_INTEGRATE_OUTPUT
   if(g_com_map[DEV_ROLE]==0&&usart_send_flag)
   {u16 checksum;
            usart_send_flag=0;
@@ -156,6 +159,7 @@
            UART_PushFrame(usart_send_anc,6+anc_report_num*6);
            anc_report_num=0;      
   }
   #endif
   if(g_com_map[CNT_UPDATE]==1)
   {
   uint32_t result = 0;
@@ -188,6 +192,10 @@
         delay_ms(100);
            SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //杞浣嶅洖鍒癰ootloader   
      }
            if(g_com_map[MAP_SIGN_INDEX]!=0x55AA)
      {
            SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //杞浣嶅洖鍒癰ootloader
      }
   }
int main(void)