Skip to content

Commit 1330d45

Browse files
authored
Merge branch 'feat/add-mrm-v0.6-launch-based-on-v3.0.0' into feat/add-mrm-state-publisher-to-mrm-stop-operator
2 parents d32f0ab + 974b4a6 commit 1330d45

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

launch/tier4_system_launch/launch/system.main.mrm-v0.6.tmp.launch.xml

+5-3
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@
116116
<group if="$(var use_diagnostic_graph)">
117117
<include file="$(find-pkg-share mrm_handler)/launch/mrm_handler.launch.xml">
118118
<arg name="config_file" value="$(var mrm_handler_param_path)"/>
119+
<arg name="output_mrm_state" value="/system/fail_safe/mrm_state/tmp"/>
119120
</include>
120121
</group>
121122

@@ -160,15 +161,16 @@
160161
<include file="$(find-pkg-share control_cmd_switcher)/launch/control_cmd_switcher.launch.xml"/>
161162
</group>
162163

163-
<!-- Leader Election Converter-->
164+
<!-- Leader Election Converter-->
164165
<group>
165166
<include file="$(find-pkg-share leader_election_converter)/launch/leader_election_converter.launch.xml"/>
167+
<arg name="input_mrm_state" value="/system/fail_safe/mrm_state/tmp"/>
166168
</group>
167169

168-
<!-- topic state montor for MRMv0.6 one host test-->
170+
<!-- topic state monitor for MRMv0.6 one host test-->
169171
<group>
170172
<include file="$(find-pkg-share topic_state_monitor)/launch/topic_state_monitor.launch.xml">
171-
<arg name="node_name_suffix" value="scenario_planning_trajectry"/>
173+
<arg name="node_name_suffix" value="scenario_planning_trajectory"/>
172174
<arg name="topic" value="/planning/scenario_planning/trajectory"/>
173175
<arg name="topic_type" value="autoware_auto_planning_msgs/msg/Trajectory"/>
174176
<arg name="diag_name" value="publish_to_sub_status"/>

launch/tier4_system_launch/package.xml

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
<exec_depend>leader_election_converter</exec_depend>
1818
<exec_depend>system_error_monitor</exec_depend>
1919
<exec_depend>system_monitor</exec_depend>
20+
<exec_depend>control_cmd_switcher</exec_depend>
21+
<exec_depend>leader_election_converter</exec_depend>
2022

2123
<test_depend>ament_lint_auto</test_depend>
2224
<test_depend>autoware_lint_common</test_depend>

system/leader_election_converter/src/common/converter/availability_converter.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ void AvailabilityConverter::convertToUdp(
7575
availability.pull_over = availability_msg->pull_over;
7676
udp_availability_sender_->send(availability);
7777
} else {
78-
RCLCPP_ERROR_THROTTLE(node_->get_logger(), *node_->get_clock(), 5000, "Failed to take control mode report");
78+
RCLCPP_ERROR_THROTTLE(
79+
node_->get_logger(), *node_->get_clock(), 5000, "Failed to take control mode report");
7980
}
8081
}
8182

0 commit comments

Comments
 (0)