提交 b06a7bbf 编写于 作者: D deidaraho 提交者: Qi Luo

planning: fix open space proto merge issue

上级 3e6a2bd0
...@@ -295,7 +295,9 @@ class OpenSpaceInfo { ...@@ -295,7 +295,9 @@ class OpenSpaceInfo {
return &debug_instance_; return &debug_instance_;
} }
void sync_debug_instance() { debug_instance_ = *debug_; } void sync_debug_instance() {
debug_instance_.MergeFrom(*debug_);
}
void RecordDebug(apollo::planning_internal::Debug *ptr_debug); void RecordDebug(apollo::planning_internal::Debug *ptr_debug);
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include "cyber/common/log.h" #include "cyber/common/log.h"
#include "modules/planning/common/frame.h" #include "modules/planning/common/frame.h"
#include "modules/planning/common/planning_context.h"
#include "modules/planning/scenarios/util/util.h" #include "modules/planning/scenarios/util/util.h"
namespace apollo { namespace apollo {
...@@ -52,6 +53,13 @@ Stage::StageStatus PullOverStageRetryParking::Process( ...@@ -52,6 +53,13 @@ Stage::StageStatus PullOverStageRetryParking::Process(
return StageStatus::ERROR; return StageStatus::ERROR;
} }
*(frame->mutable_open_space_info()
->mutable_debug()
->mutable_planning_data()
->mutable_pull_over_status()) =
PlanningContext::Instance()->planning_status().pull_over();
frame->mutable_open_space_info()->sync_debug_instance();
scenario::util::PullOverStatus status = scenario::util::PullOverStatus status =
scenario::util::CheckADCPullOverOpenSpace(scenario_config_); scenario::util::CheckADCPullOverOpenSpace(scenario_config_);
if ((status == scenario::util::PASS_DESTINATION || if ((status == scenario::util::PASS_DESTINATION ||
...@@ -59,7 +67,6 @@ Stage::StageStatus PullOverStageRetryParking::Process( ...@@ -59,7 +67,6 @@ Stage::StageStatus PullOverStageRetryParking::Process(
FLAGS_enable_pull_over_exit) { FLAGS_enable_pull_over_exit) {
return FinishStage(); return FinishStage();
} }
return StageStatus::RUNNING; return StageStatus::RUNNING;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册