Merge branch 'main' into feature/concatenate_node_load_from_param

autowarefoundation · Dec 9, 2024 · 897de50 · 897de50
2 parents aaafd80 + 3e652bf
commit 897de50
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/common_sensor_launch/launch/nebula_node_container.launch.py b/common_sensor_launch/launch/nebula_node_container.launch.py
@@ -103,8 +103,8 @@ def create_parameter_dict(*args):
 
     nodes.append(
         ComposableNode(
-            package="glog_component",
-            plugin="GlogComponent",
+            package="autoware_glog_component",
+            plugin="autoware::glog_component::GlogComponent",
             name="glog_component",
         )
     )

diff --git a/sample_sensor_kit_launch/launch/sensing.launch.xml b/sample_sensor_kit_launch/launch/sensing.launch.xml
@@ -28,7 +28,7 @@
     </include>
 
     <!-- Vehicle Velocity Converter  -->
-    <include file="$(find-pkg-share vehicle_velocity_converter)/launch/vehicle_velocity_converter.launch.xml">
+    <include file="$(find-pkg-share autoware_vehicle_velocity_converter)/launch/vehicle_velocity_converter.launch.xml">
       <arg name="input_vehicle_velocity_topic" value="/vehicle/status/velocity_status"/>
       <arg name="output_twist_with_covariance" value="/sensing/vehicle_velocity_converter/twist_with_covariance"/>
     </include>

diff --git a/sample_sensor_kit_launch/package.xml b/sample_sensor_kit_launch/package.xml
@@ -12,6 +12,7 @@
 
   <exec_depend>autoware_gnss_poser</exec_depend>
   <exec_depend>autoware_pointcloud_preprocessor</exec_depend>
+  <exec_depend>autoware_vehicle_velocity_converter</exec_depend>
   <exec_depend>common_sensor_launch</exec_depend>
   <exec_depend>tamagawa_imu_driver</exec_depend>
   <exec_depend>topic_tools</exec_depend>