From 65027653e9a6073d226dbda648713afa027b8e84 Mon Sep 17 00:00:00 2001
From: Yuki Takagi <yuki.takagi@tier4.jp>
Date: Mon, 10 Jun 2024 16:42:59 +0900
Subject: [PATCH] fix

Signed-off-by: Yuki Takagi <yuki.takagi@tier4.jp>
---
 launch/tier4_control_launch/launch/control.launch.py        | 5 ++++-
 launch/tier4_control_launch/package.xml                     | 2 +-
 .../node.hpp                                                | 6 +++---
 vehicle/autoware_external_cmd_converter/src/node.cpp        | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)
 rename vehicle/autoware_external_cmd_converter/include/{external_cmd_converter => autoware_external_cmd_converter}/node.hpp (96%)

diff --git a/launch/tier4_control_launch/launch/control.launch.py b/launch/tier4_control_launch/launch/control.launch.py
index 977410e9d1ee3..4174f6bc39230 100644
--- a/launch/tier4_control_launch/launch/control.launch.py
+++ b/launch/tier4_control_launch/launch/control.launch.py
@@ -290,7 +290,10 @@ def launch_setup(context, *args, **kwargs):
     # external cmd converter
     external_cmd_converter_loader = IncludeLaunchDescription(
         PythonLaunchDescriptionSource(
-            [FindPackageShare("autoware_external_cmd_converter"), "/launch/external_cmd_converter.launch.py"]
+            [
+                FindPackageShare("autoware_external_cmd_converter"),
+                "/launch/external_cmd_converter.launch.py",
+            ]
         ),
         launch_arguments=[
             ("use_intra_process", LaunchConfiguration("use_intra_process")),
diff --git a/launch/tier4_control_launch/package.xml b/launch/tier4_control_launch/package.xml
index f4293e2af1ca6..33f0ea5318654 100644
--- a/launch/tier4_control_launch/package.xml
+++ b/launch/tier4_control_launch/package.xml
@@ -11,11 +11,11 @@
   <buildtool_depend>ament_cmake_auto</buildtool_depend>
   <buildtool_depend>autoware_cmake</buildtool_depend>
 
+  <exec_depend>autoware_external_cmd_converter</exec_depend>
   <exec_depend>autoware_external_cmd_selector</exec_depend>
   <exec_depend>autoware_lane_departure_checker</exec_depend>
   <exec_depend>autoware_vehicle_cmd_gate</exec_depend>
   <exec_depend>control_evaluator</exec_depend>
-  <exec_depend>autoware_external_cmd_converter</exec_depend>
   <exec_depend>external_cmd_selector</exec_depend>
   <exec_depend>shift_decider</exec_depend>
   <exec_depend>trajectory_follower_node</exec_depend>
diff --git a/vehicle/autoware_external_cmd_converter/include/external_cmd_converter/node.hpp b/vehicle/autoware_external_cmd_converter/include/autoware_external_cmd_converter/node.hpp
similarity index 96%
rename from vehicle/autoware_external_cmd_converter/include/external_cmd_converter/node.hpp
rename to vehicle/autoware_external_cmd_converter/include/autoware_external_cmd_converter/node.hpp
index 23bad7312f262..128de17e66aea 100644
--- a/vehicle/autoware_external_cmd_converter/include/external_cmd_converter/node.hpp
+++ b/vehicle/autoware_external_cmd_converter/include/autoware_external_cmd_converter/node.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef AUTOWARE_EXTERNAL_CMD_CONVERTER__NODE_HPP_
-#define AUTOWARE_EXTERNAL_CMD_CONVERTER__NODE_HPP_
+#ifndef EXTERNAL_CMD_CONVERTER__NODE_HPP_
+#define EXTERNAL_CMD_CONVERTER__NODE_HPP_
 
 #include <diagnostic_updater/diagnostic_updater.hpp>
 #include <raw_vehicle_cmd_converter/accel_map.hpp>
@@ -101,4 +101,4 @@ class ExternalCmdConverterNode : public rclcpp::Node
 
 }  // namespace autoware::external_cmd_converter
 
-#endif  // AUTOWARE_EXTERNAL_CMD_CONVERTER__NODE_HPP_
+#endif  // EXTERNAL_CMD_CONVERTER__NODE_HPP_
diff --git a/vehicle/autoware_external_cmd_converter/src/node.cpp b/vehicle/autoware_external_cmd_converter/src/node.cpp
index c203a27e1fdaa..50d03d025b8d0 100644
--- a/vehicle/autoware_external_cmd_converter/src/node.cpp
+++ b/vehicle/autoware_external_cmd_converter/src/node.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "external_cmd_converter/node.hpp"
+#include "autoware_external_cmd_converter/node.hpp"
 
 #include <algorithm>
 #include <memory>