Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit b1e1361

Browse files
committedMay 15, 2024·
feat: componentize-emergency-handler
Signed-off-by: TetsuKawa <kawaguchitnon@icloud.com>
1 parent 2c9a936 commit b1e1361

File tree

5 files changed

+12
-35
lines changed

5 files changed

+12
-35
lines changed
 

‎system/emergency_handler/CMakeLists.txt

+7-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,16 @@ project(emergency_handler)
44
find_package(autoware_cmake REQUIRED)
55
autoware_package()
66

7-
ament_auto_add_executable(emergency_handler
8-
src/emergency_handler/emergency_handler_node.cpp
7+
ament_auto_add_library(${PROJECT_NAME} SHARED
98
src/emergency_handler/emergency_handler_core.cpp
109
)
1110

11+
rclcpp_components_register_node(${PROJECT_NAME}
12+
PLUGIN "EmergencyHandler"
13+
EXECUTABLE ${PROJECT_NAME}_node
14+
EXECUTOR MultiThreadedExecutor
15+
)
16+
1217
ament_auto_package(INSTALL_TO_SHARE
1318
launch
1419
config

‎system/emergency_handler/launch/emergency_handler.launch.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<arg name="config_file" default="$(find-pkg-share emergency_handler)/config/emergency_handler.param.yaml"/>
1717

1818
<!-- emergency_handler -->
19-
<node pkg="emergency_handler" exec="emergency_handler" name="emergency_handler" output="screen">
19+
<node pkg="emergency_handler" exec="emergency_handler_node" name="emergency_handler" output="screen">
2020
<remap from="~/input/hazard_status" to="$(var input_hazard_status)"/>
2121
<remap from="~/input/prev_control_command" to="$(var input_prev_control_command)"/>
2222
<remap from="~/input/odometry" to="$(var input_odometry)"/>

‎system/emergency_handler/package.xml

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<depend>autoware_auto_vehicle_msgs</depend>
1919
<depend>nav_msgs</depend>
2020
<depend>rclcpp</depend>
21+
<depend>rclcpp_components</depend>
2122
<depend>std_msgs</depend>
2223
<depend>std_srvs</depend>
2324
<depend>tier4_system_msgs</depend>

‎system/emergency_handler/src/emergency_handler/emergency_handler_core.cpp

+3
Original file line numberDiff line numberDiff line change
@@ -459,3 +459,6 @@ bool EmergencyHandler::isStopped()
459459

460460
return false;
461461
}
462+
463+
#include <rclcpp_components/register_node_macro.hpp>
464+
RCLCPP_COMPONENTS_REGISTER_NODE(EmergencyHandler)

‎system/emergency_handler/src/emergency_handler/emergency_handler_node.cpp

-32
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.