增加基站状态输出，增加map表对比

zhyinch

2021-08-17 d3a77da7be3808ce65448dbfa9d43d13ba9e0ecd

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

@@ -63,10 +63,10 @@
      {module_power=MAX_RFPOWER;}
      if(module_power<0)
      {module_power=0;}
      if(g_com_map[MAX_REPORT_ANC_NUM]>10)
      {g_com_map[MAX_REPORT_ANC_NUM]=10;}
      if(g_com_map[MAX_REPORT_ANC_NUM]<1)
      {g_com_map[MAX_REPORT_ANC_NUM]=1;}
//      if(g_com_map[MAX_REPORT_ANC_NUM]>10)
//      {g_com_map[MAX_REPORT_ANC_NUM]=10;}
//      if(g_com_map[MAX_REPORT_ANC_NUM]<1)
//      {g_com_map[MAX_REPORT_ANC_NUM]=1;}
      if(g_com_map[IMU_THRES]>10)
      {g_com_map[IMU_THRES]=10;}
      if(g_com_map[IMU_THRES]<1)
@@ -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;
@@ -125,6 +125,7 @@
   {
      g_Tagdist[i]=0x1ffff;
   }
     memcpy(g_com_map2,g_com_map,COM_MAP_SIZE);
}

/*! ------------------------------------------------------------------------------------------------------------------
@@ -150,6 +151,8 @@
   }else{
      hbsend[6] = 1;
   }
    if(intheight!=0)
        intheight+=(int16_t)g_com_map[MAX_REPORT_ANC_NUM];
   memcpy(&hbsend[7],&intheight,4); 
checksum = Checksum_u16(&hbsend[2],12);
memcpy(&hbsend[14],&checksum,2);
@@ -169,6 +172,14 @@
   UART_CheckSend();
    UART2_CheckReceive();
 
    if( memcmp(g_com_map2,g_com_map,COM_MAP_SIZE)!=0)
    {
        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)
   {
      heartbeat_timer=0;
@@ -206,6 +217,7 @@
   {
   uint32_t result = 0;
      u16 tmp = 0xAAAA;
        SendAnchorState(SM_UPDATE);
   __disable_irq();
   result = FLASH_Prepare(0x8004A38, 2);
   if(result)
@@ -219,14 +231,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;