Revert "Add diagnostics list to api_launch (#164)" (#168)

tier4 · Sep 16, 2021 · cd65b0c · cd65b0c
1 parent d89e352
commit cd65b0c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git a/autoware_api_launch/launch/autoware_api.launch.xml b/autoware_api_launch/launch/autoware_api.launch.xml
@@ -1,5 +1,4 @@
 <launch>
-  <arg name="diag_list_file_path" default="$(find-pkg-share autoware_iv_external_api_adaptor)/config/x1.yaml" />
 
   <!-- awapi (deprecated) -->
   <group>
@@ -9,9 +8,7 @@
   <!-- autoware api adaptor -->
   <group>
     <push-ros-namespace namespace="autoware_api"/>
-    <include file="$(find-pkg-share autoware_api_launch)/launch/include/external_api_adaptor.launch.py">
-      <arg name="diag_list_file_path" value="$(var diag_list_file_path)" />
-    </include>
+    <include file="$(find-pkg-share autoware_api_launch)/launch/include/external_api_adaptor.launch.py"/>
     <include file="$(find-pkg-share autoware_api_launch)/launch/include/internal_api_adaptor.launch.py"/>
     <include file="$(find-pkg-share autoware_api_launch)/launch/include/internal_api_relay.launch.xml"/>
   </group>

diff --git a/autoware_api_launch/launch/include/external_api_adaptor.launch.py b/autoware_api_launch/launch/include/external_api_adaptor.launch.py
@@ -13,7 +13,6 @@
 # limitations under the License.
 
 import launch
-from launch.substitutions import LaunchConfiguration
 from launch_ros.actions import ComposableNodeContainer
 from launch_ros.descriptions import ComposableNode
 
@@ -30,8 +29,7 @@ def _create_api_node(node_name, class_name, **kwargs):
 
 def generate_launch_description():
     components = [
-        _create_api_node('diagnostics', 'Diagnostics', parameters=[
-            {'diag_list_file_path': LaunchConfiguration('diag_list_file_path')}]),
+        _create_api_node('diagnostics', 'Diagnostics'),
         _create_api_node('door', 'Door'),
         _create_api_node('emergency', 'Emergency'),
         # _create_api_node('engage', 'Engage'),

diff --git a/sensing_launch/package.xml b/sensing_launch/package.xml
@@ -11,8 +11,8 @@
   <buildtool_depend>ament_cmake_auto</buildtool_depend>
 
   <exec_depend>gnss_poser</exec_depend>
-  <exec_depend>lidar_ros_driver</exec_depend>
   <exec_depend>livox_ros2_driver</exec_depend>
+  <exec_depend>lidar_ros_driver</exec_depend>
   <exec_depend>pointcloud_preprocessor</exec_depend>
   <exec_depend>tamagawa_imu_driver</exec_depend>
   <exec_depend>topic_tools</exec_depend>

diff --git a/vehicle_launch/package.xml b/vehicle_launch/package.xml
@@ -11,14 +11,14 @@
   <buildtool_depend>ament_cmake_auto</buildtool_depend>
 
   <exec_depend>camera_description</exec_depend>
-  <exec_depend>g30esli_interface</exec_depend>
-  <exec_depend>g30esli_interface_awiv_adapter</exec_depend>
   <exec_depend>imu_description</exec_depend>
   <exec_depend>livox_description</exec_depend>
   <exec_depend>robot_state_publisher</exec_depend>
   <exec_depend>simple_planning_simulator</exec_depend>
   <exec_depend>velodyne_description</exec_depend>
   <exec_depend>xacro</exec_depend>
+  <exec_depend>g30esli_interface</exec_depend>
+  <exec_depend>g30esli_interface_awiv_adapter</exec_depend>
 
   <test_depend>ament_lint_auto</test_depend>
   <test_depend>ament_lint_common</test_depend>