更新:1、修复配置文件加载时范围判断错误导致参数加载失败的问题;
2、新增4份配置文件; 3、修复单跟踪模式下,会偶尔发送TWS波束的问题; 4、新增手动取消目标TAS跟踪时输出航迹更新信息,修复手动取消目标TAS跟踪航迹状态不更新的问题; 5、新增用户操作日志输出; Signed-off-by: waiwaylee <waiwaylee@foxmail.com>
This commit is contained in:
@@ -209,9 +209,8 @@ int model)
|
||||
//查找指定指纹的Track_idx
|
||||
int tas_track_idx = -1;
|
||||
for(auto& t : trust_track){
|
||||
if(t.Track_fingerprint == TAS_track_fingerprint){
|
||||
if(t.Track_fingerprint == TAS_track_fingerprint && t.manual_untracking_flag == 0){
|
||||
tas_track_idx = t.Track_Index;
|
||||
t.manual_tracking_flag = 1;
|
||||
t.Track_Mode = 1;
|
||||
break;
|
||||
}
|
||||
@@ -284,6 +283,8 @@ int Data_Process::track_clear_all(void)
|
||||
tas_ctrl.reset();
|
||||
last_beam_num = INT_MAX;
|
||||
|
||||
RDP_LOG_INFO("All track clear");
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -299,7 +300,7 @@ int Data_Process:: track_delete(int delete_track_num, //手动
|
||||
{
|
||||
|
||||
trust_track[j].manual_delete_flag=1;
|
||||
// RDP_LOG_DEBUG("Delete : {}", trust_track[j].Track_Index);
|
||||
RDP_LOG_INFO("Track <{}> deleted by user", trust_track[j].Track_Index);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -316,7 +317,7 @@ int Data_Process::primary_target_add(int track_index)
|
||||
if(trust_track[i].Track_Index==track_index)
|
||||
{
|
||||
trust_track[i].primary_target_flag = 1;
|
||||
//std::cout<< "Add primary target :" << trust_track[i].Track_Index << std::endl;
|
||||
RDP_LOG_INFO("Track <{}> is set as a primary target by the user", trust_track[i].Track_Index);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -332,7 +333,7 @@ int Data_Process::primary_target_cancel(int track_index)
|
||||
if(trust_track[i].Track_Index==track_index)
|
||||
{
|
||||
trust_track[i].primary_target_flag = 0;
|
||||
//std::cout<< "Cancel primary target :" << trust_track[i].Track_Index << std::endl;
|
||||
RDP_LOG_INFO("Track <{}> has been cancelled as a primary target by the user", trust_track[i].Track_Index);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -348,6 +349,8 @@ int Data_Process:: tracking_start(int track_index) //需要手动
|
||||
if(trust_track[i].Track_Index==track_index)
|
||||
{
|
||||
trust_track[i].manual_tracking_flag = 1;
|
||||
trust_track[i].manual_untracking_flag = 0;
|
||||
RDP_LOG_INFO("Track <{}> is set to tracking mode by the user", trust_track[i].Track_Index);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -363,7 +366,8 @@ int Data_Process:: tracking_stop(int track_index) //需要手动转
|
||||
if(trust_track[i].Track_Index==track_index)
|
||||
{
|
||||
trust_track[i].manual_tracking_flag = 0;
|
||||
trust_track[i].Track_Mode = 0;
|
||||
trust_track[i].manual_untracking_flag = 1;
|
||||
RDP_LOG_INFO("Track <{}> has been canceled from tracking mode by the user", trust_track[i].Track_Index);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user