更新:1、修复取消TAS时的判断条件问题;
2、修复TWS时错误的将TAS航迹外推的问题; 3、修复非重点航迹消亡的条件判断的问题; 4、修改航迹指纹计算的问题; Signed-off-by: waiwaylee <waiwaylee@foxmail.com>
This commit is contained in:
@@ -205,7 +205,7 @@ void TAS_Ctrl::tas_target_del(std::vector<Trust_Track> *trust_track,
|
||||
for (size_t j=0;j<trust_track->size();j++){
|
||||
if(tas_target_queue[i].Index==(*trust_track)[j].Track_Index){
|
||||
track_index = static_cast<int>(j);
|
||||
if((*trust_track)[j].Track_Mode == 1 && (*trust_track)[j].manual_tracking_flag == 1){
|
||||
if((*trust_track)[j].Track_Mode == 1 && (*trust_track)[j].manual_untracking_flag != 1){
|
||||
flag=1;
|
||||
}
|
||||
break;
|
||||
@@ -362,7 +362,6 @@ void TAS_Ctrl::tas_beam_output(std::vector<Trust_Track> *trust_track
|
||||
if(earliest_track_idx == -1)
|
||||
{
|
||||
Tracking_beam->open_flag = 0;
|
||||
// RDP_LOG_INFO("TAS close {} {} {}", CPI_time, earliest_CPI_time, delta_T_last_track);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -378,19 +377,12 @@ void TAS_Ctrl::tas_beam_output(std::vector<Trust_Track> *trust_track
|
||||
|
||||
//目标距离
|
||||
Tracking_beam->Range=(float)range;
|
||||
|
||||
//目标方位
|
||||
Tracking_beam->Azi=(float)amzi/PI*180;
|
||||
// Tracking_beam->Azi+=6;
|
||||
|
||||
//目标俯仰角
|
||||
double elev=asin(H_track/range)/PI*180;
|
||||
|
||||
// if(elev<=0)
|
||||
// elev=0;
|
||||
// else if(elev>=40)
|
||||
// elev=40;
|
||||
// else
|
||||
// elev=elev;
|
||||
|
||||
Tracking_beam->Elev= max((float)elev, rdp_parameter.tas_beam_pitch_min);
|
||||
|
||||
//跟踪波束类型
|
||||
@@ -402,7 +394,7 @@ void TAS_Ctrl::tas_beam_output(std::vector<Trust_Track> *trust_track
|
||||
//跟踪波束开关开启
|
||||
Tracking_beam->open_flag=1;
|
||||
|
||||
// RDP_LOG_INFO("TAS <{}> output: range: {} azi: {} pit: {}", Tracking_beam->TAS_track_index, Tracking_beam->Range, Tracking_beam->Azi, Tracking_beam->Elev);
|
||||
RDP_LOG_DEBUG("TAS <{}-{}> : range: {} azi: {} pit: {}", (*trust_track)[earliest_track_idx].Track_Index, Tracking_beam->TAS_track_index, Tracking_beam->Range, Tracking_beam->Azi, Tracking_beam->Elev);
|
||||
}
|
||||
|
||||
int TAS_Ctrl::tas_auto_start(double v, double r, double h)
|
||||
|
||||
Reference in New Issue
Block a user