Merge pull request #528 from tier4/sync-awf-latest

chore: sync awf-latest
autowarefoundation · Oct 25, 2022 · 73c9d26 · 73c9d26
2 parents d953e7c + b0b7ff4
commit 73c9d26
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/control_launch/launch/control.launch.py b/control_launch/launch/control.launch.py
@@ -319,7 +319,7 @@ def add_launch_arg(name: str, default_value=None, description=None):
         "shift_decider_param_path",
         [
             FindPackageShare("control_launch"),
-            "/config/shift_decider/shift_decider_param.param.yaml",
+            "/config/shift_decider/shift_decider.param.yaml",
         ],
         "path to the parameter file of shift_decider",
     )

diff --git a/control_launch/launch/control.launch.xml b/control_launch/launch/control.launch.xml
@@ -3,7 +3,6 @@
   <arg name="lateral_controller_mode" description="options for lateral_controller_mode: mpc_follower, pure_pursuit"/>
   <arg name="lat_controller_param_path" default="$(find-pkg-share control_launch)/config/trajectory_follower/$(var lateral_controller_mode).param.yaml"/>
   <arg name="lon_controller_param_path" default="$(find-pkg-share control_launch)/config/trajectory_follower/longitudinal_controller.param.yaml" description="path to the longitudinal controller param file"/>
-  <arg name="latlon_muxer_param_path" default="$(find-pkg-share control_launch)/config/trajectory_follower/latlon_muxer.param.yaml"/>
   <arg name="vehicle_cmd_gate_param_path" default="$(find-pkg-share control_launch)/config/vehicle_cmd_gate/vehicle_cmd_gate.param.yaml"/>
   <arg name="operation_mode_transition_manager_param_path" default="$(find-pkg-share control_launch)/config/operation_mode_transition_manager/operation_mode_transition_manager.param.yaml"/>
   <arg name="shift_decider_param_path" default="$(find-pkg-share control_launch)/config/shift_decider/shift_decider.param.yaml"/>
@@ -13,7 +12,6 @@
     <arg name="lateral_controller_mode" value="$(var lateral_controller_mode)" />
     <arg name="lat_controller_param_path" value="$(var lat_controller_param_path)"/>
     <arg name="lon_controller_param_path" value="$(var lon_controller_param_path)"/>
-    <arg name="latlon_muxer_param_path" value="$(var latlon_muxer_param_path)"/>
     <arg name="vehicle_cmd_gate_param_path" value="$(var vehicle_cmd_gate_param_path)"/>
     <arg name="operation_mode_transition_manager_param_path" value="$(var operation_mode_transition_manager_param_path)"/>
     <arg name="shift_decider_param_path" value="$(var shift_decider_param_path)"/>