V1.2 修改继电器报警错误

yincheng.zhong

2023-11-23 ae0ac687e1b68ed3c067deb67dffaea9582f329c

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

@@ -94,10 +94,6 @@
   {
     g_com_map[COM_INTERVAL]=100;
   }
    if(dist_threshold<300)
      {dist_threshold = 300;}
      if(dist_threshold>15000)
      {dist_threshold = 15000;}
}
u16 JDQ_time;
int16_t g_commap_antdelay;
@@ -146,26 +142,29 @@
        
   OUT485_ENABLE;
   ComMapCheck();   
   g_com_map[VERSION] = 1<<8|63;
   g_com_map[VERSION] = 1<<8|2;
    FLASH_Read(FLASH_HARDWARE_FLAG, (uint8_t*)&g_com_map[HARDWAREFLAG_INDEX], 16);
    dist_threshold = (g_com_map[SPEEDFILTER_THRES]*10)/(1000/g_com_map[COM_INTERVAL]);
     if(dist_threshold<300)
      {dist_threshold = 300;}
      if(dist_threshold>15000)
      {dist_threshold = 15000;}
    g_commap_antdelay = g_com_map[ANT_LENGTH];
    JDQ_time = g_com_map[WAR_JDQ_TIME]*10;
   g_com_map[SW_TYPE] =    SW_FANGZHUANG;
   dev_id = g_com_map[DEV_ID];
        group_id=g_com_map[GROUP_ID];
    group_id=g_com_map[GROUP_ID];
   slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]*SLOT_SCALE)+3;
   max_slotpos=g_com_map[COM_INTERVAL]/slottime;
   tyncpoll_time=(g_com_map[DEV_ID]%max_slotpos)*slottime;   
   module_power = g_com_map[POWER];
   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;
      }
    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])
   {
@@ -304,6 +303,8 @@
      {
            SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //杞浣嶅洖鍒癰ootloader   
      }
        g_com_map[RELAY1_STATE_INDEX] = READ_RELAY1;
      g_com_map[RELAY2_STATE_INDEX] = READ_RELAY2;

   }
    
@@ -314,7 +315,7 @@
   //StartUpTest();
   Program_Init();
   Dw1000_Init();
  delay_ms(10);	
    delay_ms(10);	
   Dw1000_App_Init();
    /* Loop forever initiating ranging exchanges. */
   RCC_APB1PeriphClockCmd(RCC_APB1Periph_PWR, ENABLE);