zhyinch
2021-08-23 e80c06f1244bf23bfb1b46e093cdb1edb6bb0f20
源码/核心板/Src/main.c
@@ -94,7 +94,7 @@
#endif
   OUT485_ENABLE;
   ComMapCheck();
   g_com_map[VERSION] = 0x0218;
   g_com_map[VERSION] = 0x0219;
   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;
@@ -120,12 +120,13 @@
//   printf("DEVICE PAIRID: %d .\r\n",g_com_map[PAIR_ID]);
//   printf("DEVICE ALARM DISTANCE: 1.%d 2.%d 3.%d .\r\n",g_com_map[ALARM_DISTANCE1],g_com_map[ALARM_DISTANCE2],g_com_map[ALARM_DISTANCE3]);
    memcpy(g_com_map2,g_com_map,COM_MAP_SIZE);
   for(i=0;i<255;i++)
   {
      g_Tagdist[i]=0x1ffff;
        IdleTask();
   }
     memcpy(g_com_map2,g_com_map,COM_MAP_SIZE);
}
/*! ------------------------------------------------------------------------------------------------------------------
@@ -176,8 +177,6 @@
    {
        SendAnchorState(SM_MAPERROR);
           delay_ms(100);
      //   STMFLASH_Write_NoCheck(0x8004A38,0xAAAA);
      //   Delay_ms(100);
         SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //杞浣嶅洖鍒癰ootloader   
    }
   if(heartbeat_timer>1000)
@@ -213,39 +212,6 @@
            anc_report_num=0;      
   }
   #endif
   if(g_com_map[CNT_UPDATE]==1)
   {
   uint32_t result = 0;
      u16 tmp = 0xAAAA;
        SendAnchorState(SM_UPDATE);
   __disable_irq();
   result = FLASH_Prepare(0x8004A38, 2);
   if(result)
      result = FLASH_Write(0x8004A38, (const uint8_t*)&tmp, 2);
   __enable_irq();
      printf("杩涘叆鍗囩骇妯″紡\r\n");
   g_com_map[CNT_UPDATE]=0;
   save_com_map_to_flash();
   delay_ms(100);
      //   STMFLASH_Write_NoCheck(0x8004A38,0xAAAA);
      //   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
      }
            if(g_com_map[MAP_SIGN_INDEX]!=0x55AA)
      {
            SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //杞浣嶅洖鍒癰ootloader   
@@ -277,7 +243,7 @@
      Tag_App();
   }
      IdleTask();      
if(g_com_map[DEV_ROLE]==0)
if(g_com_map[DEV_ROLE]!=1)
      Anchor_App();
   }