V2.24 去掉恢复出厂设置操作，修改最大功率到67

zhyinch

2021-08-04 f1e45e1c6903f7327e8c322099f2abc07794b662

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

@@ -21,13 +21,14 @@
   Nvic_Init();
//   Systick_Init();
   TIM3_Int_Init();
   Led_Init();

   Beep_Init();
   DW_GPIO_Init();
   Uart1_Init();
    Uart2_Init();
   Spi_Init();
   ADC_Configuration();
	
    Led_Init();
   GPIO_PinRemapConfig(GPIO_Remap_SWJ_JTAGDisable, ENABLE);
}
u8 anchor_type;
@@ -58,14 +59,14 @@
   {
     g_com_map[COM_INTERVAL]=1000;
   }
    if(module_power>67)
      {module_power=67;}
    if(module_power>MAX_RFPOWER)
      {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)
@@ -86,12 +87,14 @@
//   g_com_map[MAX_REPORT_ANC_NUM]=3;
//      g_com_map[NEARBASE_NUM]=1;  
//      g_com_map[NEARBASE_ID1]=2;
   g_com_map[ANC_FLAG]=1;
      save_com_map_to_flash();
//   g_com_map[ANC_FLAG]=1;
//      save_com_map_to_flash();
   g_com_map[BASESYNCSEQ]=1;
   g_com_map[SYNCBASEID]=1;
#endif
   OUT485_ENABLE;
   ComMapCheck();
   g_com_map[VERSION] = 0x0200;	
   g_com_map[VERSION] = 0x0217;	
   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;
@@ -99,7 +102,9 @@
   module_power = g_com_map[POWER];
   total_slotnum = 1000/g_com_map[COM_INTERVAL];
   anchor_type = dev_id%3;
 
	

		
   if(g_com_map[DEV_ROLE])
   {
   printf("鏍囩ID: %d .\r\n",dev_id);
@@ -118,7 +123,7 @@
   
   for(i=0;i<255;i++)
   {
      g_Tagdist[i]=0xffff;
      g_Tagdist[i]=0x1ffff;
   }
}

@@ -131,8 +136,25 @@
 *
 * @return none
 */
extern float GetPressAndHeight(void);
extern u16 synclost_count;
extern float Height;
int32_t intheight;
void HeatBeat(void)
{ 
{ u16 checksum;
    GetPressAndHeight();
    intheight = Height*100;//+g_com_map[MAX_REPORT_ANC_NUM];
   if(synclost_count>5)
   {
      hbsend[6] = 0;
   }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);
UART_PushFrame(hbsend,16);
}
extern u8 g_start_sync_flag,usart_send_flag,anc_report_num;
@@ -145,27 +167,29 @@
void IdleTask(void)
{
      
         UART_CheckReceive();
      UART_CheckSend();
   UART_CheckReceive();
   UART_CheckSend();
    UART2_CheckReceive();
 
   if(heartbeat_timer>1000)
   {
      heartbeat_timer=0;
      if(g_com_map[HEARTBEAT]&&g_com_map[DEV_ROLE]==0)
      HeatBeat();
   }
   if(flag_newsecond)
   {
     flag_newsecond=0;
      tagpos_binary=0;
      memcpy(ancidlist_send,ancidlist_rec,ancidlist_num*2);
      ancidlist_num=0;
      for(u8 i=0;i<max_slotpos;i++)
      {
         if(tagpos_rec[i])
            tagpos_binary|=1<<i;
         tagpos_rec[i] = 0;
      }
   }
//   if(flag_newsecond)
//   {
//     flag_newsecond=0;
//      tagpos_binary=0;
//      memcpy(ancidlist_send,ancidlist_rec,ancidlist_num*2);
//      ancidlist_num=0;
//      for(u8 i=0;i<max_slotpos;i++)
//      {
//         if(tagpos_rec[i])
//            tagpos_binary|=1<<i;
//         tagpos_rec[i] = 0;
//      }
//   }
   if(target_time>1000)
   {target_time-=1000;}
   #ifdef USART_INTEGRATE_OUTPUT
@@ -197,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;
@@ -224,6 +248,7 @@
   Device_Init();
   Program_Init();
   Dw1000_Init();
    BarInit();
  delay_ms(10);   
   Dw1000_App_Init();
    /* Loop forever initiating ranging exchanges. */