V1.63

zhyinch

2021-11-15 51b6c7e11c8863fe4710305431c5718a9d0d1985

 Ô´Âë/ºËÐÄ°å/Src/main.c

@@ -72,7 +72,8 @@
   {
     g_com_map[COM_INTERVAL]=100;
   }
   g_com_map[VERSION] = 0x0121;	
   g_com_map[VERSION] = 0x013F;
   g_com_map[SW_TYPE] =    SW_FANGZHUANG;
   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;
@@ -81,23 +82,24 @@
   total_slotnum = 1000/g_com_map[COM_INTERVAL];
         vel_factor=g_com_map[FILTER_COEFFICIENT];
      pos_factor=g_com_map[FILTER_COEFFICIENT];

      if(module_power>67)
      {
         module_power=67;
      }
   
   if(g_com_map[DEV_ROLE])
   {
   printf("标签ID: %d .\r\n",dev_id);
   printf("通讯间隔: %d ms.\r\n",g_com_map[COM_INTERVAL]);
   printf("单次通讯基站数量: %d个.\r\n",g_com_map[MAX_REPORT_ANC_NUM]);
   }else{
	
   anchor_type = dev_id%g_com_map[MAX_REPORT_ANC_NUM];
   printf("基站ID: %x .\r\n",dev_id);
   printf("基站类型: %c .\r\n",anchor_type+0x41);
   printf("单次通讯基站数量: %d个.\r\n",g_com_map[MAX_REPORT_ANC_NUM]);
   }
//   if(g_com_map[DEV_ROLE])
//   {
//   printf("标签ID: %d .\r\n",dev_id);
//   printf("通讯间隔: %d ms.\r\n",g_com_map[COM_INTERVAL]);
//   printf("单次通讯基站数量: %d个.\r\n",g_com_map[MAX_REPORT_ANC_NUM]);
//   }else{
//	
//   anchor_type = dev_id%g_com_map[MAX_REPORT_ANC_NUM];
//   printf("基站ID: %x .\r\n",dev_id);
//   printf("基站类型: %c .\r\n",anchor_type+0x41);
//   printf("单次通讯基站数量: %d个.\r\n",g_com_map[MAX_REPORT_ANC_NUM]);
//   }
   OUT485_DISABLE;
//   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]);
@@ -154,16 +156,16 @@
   }
   if(flag_newsecond)
   {
      uint32_t temp23;
         temp23 =  dwt_read32bitreg(CHAN_CTRL_ID) ;
         if(temp23!=0x4A480022)
         {
            temp23 =  dwt_read32bitreg(CHAN_CTRL_ID) ;
               if(temp23!=0x4A480022)
               {
                  NVIC_SystemReset();
               }
            }
//      uint32_t temp23;
//         temp23 =  dwt_read32bitreg(CHAN_CTRL_ID) ;
//         if(temp23!=0x4A480022)
//         {
//            temp23 =  dwt_read32bitreg(CHAN_CTRL_ID) ;
//               if(temp23!=0x4A480022)
//               {
//                  NVIC_SystemReset();
//               }
//            }
     flag_newsecond=0;
      tagpos_binary=0;
      memcpy(ancidlist_send,ancidlist_rec,ancidlist_num*2);
@@ -221,12 +223,12 @@
         delay_ms(100);
            SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader   
      }
            if(g_com_map[MAP_SIGN_INDEX]!=0x55AA||g_com_map[COM_INTERVAL]==0)
            if(g_com_map[MAP_SIGN_INDEX]!=0x55AA||g_com_map[COM_INTERVAL]==0||g_com_map[COM_INTERVAL]>1000)
      {
            SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader   
      }

   }
   } 
int main(void)
{