fix package name

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>
autowarefoundation · Aug 20, 2024 · f6bb20a · f6bb20a
1 parent d05fb8d
commit f6bb20a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/launch/tier4_autoware_api_launch/launch/autoware_api.launch.xml b/launch/tier4_autoware_api_launch/launch/autoware_api.launch.xml
@@ -16,7 +16,7 @@
 
   <!-- AD API -->
   <group>
-    <include file="$(find-pkg-share default_adapi)/launch/default_adapi.launch.py" if="$(var launch_default_adapi)"/>
+    <include file="$(find-pkg-share autoware_default_adapi)/launch/default_adapi.launch.py" if="$(var launch_default_adapi)"/>
     <include file="$(find-pkg-share ad_api_adaptors)/launch/rviz_adaptors.launch.xml" if="$(var launch_rviz_adaptors)"/>
   </group>
 

diff --git a/system/autoware_default_adapi/CMakeLists.txt b/system/autoware_default_adapi/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.14)
-project(autoware::default_adapi)
+project(autoware_default_adapi)
 
 find_package(autoware_cmake REQUIRED)
 autoware_package()

diff --git a/...lt_adapi/config/default_ad_api.param.yaml → ...ult_adapi/config/default_adapi.param.yaml b/...lt_adapi/config/default_ad_api.param.yaml → ...ult_adapi/config/default_adapi.param.yaml
@@ -1,8 +1,8 @@
-/default_adapi/node/autoware_state:
+/adapi/node/autoware_state:
   ros__parameters:
     update_rate: 10.0
 
-/default_adapi/node/motion:
+/adapi/node/motion:
   ros__parameters:
     require_accept_start: false
     stop_check_duration: 1.0
diff --git a/...ult_adapi/launch/default_ad_api.launch.py → ...ault_adapi/launch/default_adapi.launch.py b/...ult_adapi/launch/default_ad_api.launch.py → ...ault_adapi/launch/default_adapi.launch.py
@@ -25,7 +25,7 @@
 
 def create_api_node(node_name, class_name, **kwargs):
     return ComposableNode(
-        namespace="default_adapi/node",
+        namespace="adapi/node",
         name=node_name,
         package="autoware_default_adapi",
         plugin="autoware::default_adapi::" + class_name,
@@ -34,7 +34,7 @@ def create_api_node(node_name, class_name, **kwargs):
 
 
 def get_default_config():
-    path = FindPackageShare("default_adapi")
+    path = FindPackageShare("autoware_default_adapi")
     path = PathJoinSubstitution([path, "config/default_adapi.param.yaml"])
     return path
 
@@ -57,15 +57,15 @@ def generate_launch_description():
         create_api_node("vehicle_door", "VehicleDoorNode"),
     ]
     container = ComposableNodeContainer(
-        namespace="default_adapi",
+        namespace="adapi",
         name="container",
         package="rclcpp_components",
         executable="component_container_mt",
-        ros_arguments=["--log-level", "default_adapi.container:=WARN"],
+        ros_arguments=["--log-level", "adapi.container:=WARN"],
         composable_node_descriptions=components,
     )
     web_server = Node(
-        namespace="default_adapi",
+        namespace="adapi",
         package="autoware_default_adapi",
         name="web_server",
         executable="web_server.py",