Skip to content

Commit

Permalink
Merge pull request #1549 from tier4/feat/delete_emergency_handler
Browse files Browse the repository at this point in the history
feat(emergency_handler): delete package (autowarefoundation#8917)
  • Loading branch information
rej55 authored Sep 20, 2024
2 parents f1adaed + 05acc9e commit 0eb2e35
Show file tree
Hide file tree
Showing 13 changed files with 5 additions and 1,069 deletions.
1 change: 0 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,6 @@ system/diagnostic_graph_utils/** [email protected]
system/dummy_diag_publisher/** [email protected] [email protected]
system/dummy_infrastructure/** [email protected]
system/duplicated_node_checker/** [email protected] [email protected] [email protected]
system/emergency_handler/** [email protected] [email protected] [email protected]
system/hazard_status_converter/** [email protected]
system/mrm_comfortable_stop_operator/** [email protected] [email protected]
system/mrm_emergency_stop_operator/** [email protected] [email protected]
Expand Down
28 changes: 2 additions & 26 deletions launch/tier4_system_launch/launch/system.launch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<launch>
<!-- Parameter files -->
<arg name="component_state_monitor_topic_path"/>
<arg name="emergency_handler_param_path"/>
<arg name="duplicated_node_checker_param_path"/>
<arg name="processing_time_checker_param_path"/>
<arg name="mrm_comfortable_stop_operator_param_path"/>
Expand All @@ -26,8 +25,6 @@
<arg name="run_mode" default="online" description="options: online, logging_simulation, planning_simulation"/>
<arg name="sensor_model" description="sensor model name"/>

<!-- Emergency handler will be replaced by MRM handler. -->
<arg name="use_emergency_handler" default="false" description="use emergency handler packages"/>
<arg name="mrm_handler_param_path"/>
<arg name="diagnostic_graph_aggregator_param_path"/>
<arg name="diagnostic_graph_aggregator_graph_path"/>
Expand Down Expand Up @@ -97,27 +94,6 @@
</include>
</group>

<!-- Error Monitor -->
<group if="$(var use_emergency_handler)">
<let name="config_file" value="$(var system_error_monitor_param_path)" if="$(eval &quot;'$(var run_mode)'=='online'&quot;)"/>
<let name="config_file" value="$(var system_error_monitor_param_path)" if="$(eval &quot;'$(var run_mode)'=='logging_simulation'&quot;)"/>
<let name="config_file" value="$(var system_error_monitor_planning_simulator_param_path)" if="$(eval &quot;'$(var run_mode)'=='planning_simulation'&quot;)"/>
<include file="$(find-pkg-share system_error_monitor)/launch/system_error_monitor.launch.xml">
<arg name="config_file" value="$(var config_file)"/>
<arg name="extra_agg_config_file_sensing" value="$(var sensor_launch_pkg)/config/diagnostic_aggregator/sensor_kit.param.yaml"/>
<arg name="extra_agg_config_file_system" value="$(var diagnostic_aggregator_system_param_path)"/>
<arg name="extra_agg_config_file_vehicle" value="$(var diagnostic_aggregator_vehicle_param_path)"/>
<arg name="use_emergency_hold" value="false"/>
</include>
</group>

<!-- Emergency Handler -->
<group if="$(var use_emergency_handler)">
<include file="$(find-pkg-share emergency_handler)/launch/emergency_handler.launch.xml">
<arg name="config_file" value="$(var emergency_handler_param_path)"/>
</include>
</group>

<!-- Diagnostic Graph Aggregator -->
<group>
<include file="$(find-pkg-share system_diagnostic_monitor)/launch/system_diagnostic_monitor.launch.xml">
Expand All @@ -127,12 +103,12 @@
</group>

<!-- Hazard Status Converter -->
<group unless="$(var use_emergency_handler)">
<group>
<include file="$(find-pkg-share hazard_status_converter)/launch/hazard_status_converter.launch.xml"/>
</group>

<!-- MRM Handler -->
<group unless="$(var use_emergency_handler)">
<group>
<include file="$(find-pkg-share mrm_handler)/launch/mrm_handler.launch.xml">
<arg name="config_file" value="$(var mrm_handler_param_path)"/>
</include>
Expand Down
1 change: 0 additions & 1 deletion launch/tier4_system_launch/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
<buildtool_depend>autoware_cmake</buildtool_depend>

<exec_depend>component_state_monitor</exec_depend>
<exec_depend>emergency_handler</exec_depend>
<exec_depend>system_error_monitor</exec_depend>
<exec_depend>system_monitor</exec_depend>

Expand Down
6 changes: 3 additions & 3 deletions launch/tier4_system_launch/system_launch.drawio.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 0 additions & 20 deletions system/emergency_handler/CMakeLists.txt

This file was deleted.

42 changes: 0 additions & 42 deletions system/emergency_handler/README.md

This file was deleted.

12 changes: 0 additions & 12 deletions system/emergency_handler/config/emergency_handler.param.yaml

This file was deleted.

Loading

0 comments on commit 0eb2e35

Please sign in to comment.