Merge pull request #347 from tier4/sync-upstream

chore: sync upstream

autoware_api_launch/launch/autoware_api.launch.xml

@@ -2,6 +2,7 @@
 
   <arg name="respawn" default="true" />
   <arg name="launch_default_ad_api" default="true"/>
+  <arg name="max_message_size" default="1000000000" />
 
   <!-- AD API -->
   <group if="$(var launch_default_ad_api)">
@@ -31,6 +32,7 @@
   <!-- TODO: respawn will work once https://github.com/ros2/launch/pull/569 is released. I'll delete this comment when it's done. -->
   <include file="$(find-pkg-share rosbridge_server)/launch/rosbridge_websocket_launch.xml">
       <arg name="respawn" value="$(var respawn)"/>
+      <arg name="max_message_size" value="$(var max_message_size)"/>
   </include>
 
 </launch>

planning_launch/config/scenario_planning/common/motion_velocity_smoother/motion_velocity_smoother.param.yaml

@@ -32,8 +32,8 @@
     # resampling parameters for optimization
     max_trajectory_length: 200.0        # max trajectory length for resampling [m]
     min_trajectory_length: 150.0        # min trajectory length for resampling [m]
-    resample_time: 5.0                  # resample total time for dense sampling [s]
-    dense_resample_dt: 0.1              # resample time interval for dense sampling [s]
+    resample_time: 2.0                  # resample total time for dense sampling [s]
+    dense_resample_dt: 0.2              # resample time interval for dense sampling [s]
     dense_min_interval_distance: 0.1    # minimum points-interval length for dense sampling [m]
     sparse_resample_dt: 0.5             # resample time interval for sparse sampling [s]
     sparse_min_interval_distance: 4.0   # minimum points-interval length for sparse sampling [m]

planning_launch/config/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/drivable_area_expansion.param.yaml

@@ -0,0 +1,20 @@
+/**:
+  ros__parameters:
+    avoidance:
+      drivable_area_right_bound_offset: 0.0
+      drivable_area_left_bound_offset: 0.0
+    lane_change:
+      drivable_area_right_bound_offset: 0.0
+      drivable_area_left_bound_offset: 0.0
+    lane_following:
+      drivable_area_right_bound_offset: 0.0
+      drivable_area_left_bound_offset: 0.0
+    pull_out:
+      drivable_area_right_bound_offset: 0.0
+      drivable_area_left_bound_offset: 0.0
+    pull_over:
+      drivable_area_right_bound_offset: 0.0
+      drivable_area_left_bound_offset: 0.0
+    side_shift:
+      drivable_area_right_bound_offset: 0.0
+      drivable_area_left_bound_offset: 0.0

planning_launch/config/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/lane_following/lane_following.param.yaml

@@ -1,7 +1,4 @@
 /**:
   ros__parameters:
     lane_following:
-      expand_drivable_area: false
-      right_bound_offset: 0.5
-      left_bound_offset: 0.5
       lane_change_prepare_duration: 2.0

planning_launch/launch/scenario_planning/lane_driving/behavior_planning/behavior_planning.launch.py

@@ -121,6 +121,18 @@ def generate_launch_description():
     with open(pull_out_param_path, "r") as f:
         pull_out_param = yaml.safe_load(f)["/**"]["ros__parameters"]
 
+    drivable_area_expansion_param_path = os.path.join(
+        get_package_share_directory("planning_launch"),
+        "config",
+        "scenario_planning",
+        "lane_driving",
+        "behavior_planning",
+        "behavior_path_planner",
+        "drivable_area_expansion.param.yaml",
+    )
+    with open(drivable_area_expansion_param_path, "r") as f:
+        drivable_area_expansion_param = yaml.safe_load(f)["/**"]["ros__parameters"]
+
     behavior_path_planner_param_path = os.path.join(
         get_package_share_directory("planning_launch"),
         "config",
@@ -157,6 +169,7 @@ def generate_launch_description():
             lane_following_param,
             pull_over_param,
             pull_out_param,
+            drivable_area_expansion_param,
             behavior_path_planner_param,
             {
                 "planning_hz": 10.0,

planning_launch/launch/scenario_planning/lane_driving/behavior_planning/behavior_planning.launch.xml

@@ -15,6 +15,7 @@
     <param from="$(find-pkg-share planning_launch)/config/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/avoidance/avoidance.param.yaml" />
     <param from="$(find-pkg-share planning_launch)/config/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/lane_following/lane_following.param.yaml" />
     <param from="$(find-pkg-share planning_launch)/config/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/lane_change/lane_change.param.yaml" />
+    <param from="$(find-pkg-share planning_launch)/config/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/drivable_area_expansion.param.yaml" />
     <param from="$(find-pkg-share planning_launch)/config/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/behavior_path_planner.param.yaml" />
     <param name="enable_abort_lane_change" value="$(var use_perfect_lane_change)" />
     <param name="enable_collision_check_at_prepare_phase" value="$(var use_perfect_lane_change)" />

vehicle_launch/launch/vehicle_description.launch.xml

@@ -9,7 +9,7 @@
   <arg name="model" default="$(find-pkg-share vehicle_launch)/urdf/vehicle.xacro" description="path to the file of model settings (*.xacro)"/>
   <arg name="config_dir" default="$(find-pkg-share individual_params)/config/$(var vehicle_id)/$(var sensor_model)" description="path to the directory of calibration parameters"/>
   <node name="robot_state_publisher" pkg="robot_state_publisher" exec="robot_state_publisher">
-    <param name="robot_description" value="$(command 'xacro $(var model) vehicle_model:=$(var vehicle_model) sensor_model:=$(var sensor_model) config_dir:=$(var config_dir)')"/>
+    <param name="robot_description" value="$(command 'xacro $(var model) vehicle_model:=$(var vehicle_model) sensor_model:=$(var sensor_model) config_dir:=$(var config_dir)' 'warn')"/>
   </node>
 
 </launch>