1
zhyinch
2021-08-07 55e36bbbabc1afed172689543d507b6a25d3932c
源码/核心板/Src/main.c
@@ -94,7 +94,7 @@
#endif
   OUT485_ENABLE;
   ComMapCheck();
   g_com_map[VERSION] = 0x0217;
   g_com_map[VERSION] = 0x0218;
   dev_id = g_com_map[DEV_ID];
   slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]*SLOT_SCALE)+3;
   max_slotpos=g_com_map[COM_INTERVAL]/slottime;
@@ -221,14 +221,14 @@
      //   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_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;