Skip to content

Commit

Permalink
fix(autoware_external_cmd_converter): fix check_topic_state
Browse files Browse the repository at this point in the history
Signed-off-by: shtokuda <[email protected]>
  • Loading branch information
shtokuda committed Jul 8, 2024
1 parent 06afbd5 commit 6f72a60
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions vehicle/autoware_external_cmd_converter/src/node.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,9 @@ void ExternalCmdConverterNode::check_topic_status(
{
using diagnostic_msgs::msg::DiagnosticStatus;
DiagnosticStatus status;

current_gate_mode_ = gate_mode_sub_.takeData();

if (!check_emergency_stop_topic_timeout()) {
status.level = DiagnosticStatus::ERROR;
status.message = "emergency stop topic is timeout";
Expand All @@ -195,6 +198,10 @@ void ExternalCmdConverterNode::check_topic_status(

bool ExternalCmdConverterNode::check_emergency_stop_topic_timeout()
{
if (current_gate_mode_ && current_gate_mode_->data == tier4_control_msgs::msg::GateMode::AUTO) {
latest_emergency_stop_heartbeat_received_time_ = nullptr;
}

if (!latest_emergency_stop_heartbeat_received_time_) {
return wait_for_first_topic_;
}
Expand All @@ -205,8 +212,6 @@ bool ExternalCmdConverterNode::check_emergency_stop_topic_timeout()

bool ExternalCmdConverterNode::check_remote_topic_rate()
{
current_gate_mode_ = gate_mode_sub_.takeData();

if (!current_gate_mode_) {
return true;
}
Expand Down

0 comments on commit 6f72a60

Please sign in to comment.