Merge pull request #172 from tier4/sync-awf-upstream

chore: sync awf/autoware_launch
tier4 · May 31, 2023 · 8778929 · 8778929
2 parents 4c1c9d1 + 0207a00
commit 8778929
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 0 deletions.
diff --git a/...g/lane_driving/behavior_planning/behavior_path_planner/lane_change/lane_change.param.yaml b/...g/lane_driving/behavior_planning/behavior_path_planner/lane_change/lane_change.param.yaml
@@ -50,5 +50,7 @@
       aborting_time: 5.0                        # [s]
       abort_max_lateral_jerk: 100.0             # [m/s3]
 
+      finish_judge_lateral_threshold: 0.2        # [m]
+
       # debug
       publish_debug_marker: false
diff --git a/..._driving/behavior_planning/behavior_velocity_planner/behavior_velocity_planner.param.yaml b/..._driving/behavior_planning/behavior_velocity_planner/behavior_velocity_planner.param.yaml
@@ -12,6 +12,7 @@
     launch_run_out: false
     launch_speed_bump: false
     launch_out_of_lane: true
+    launch_no_drivable_lane: false
     forward_path_length: 1000.0
     backward_path_length: 5.0
     stop_line_extend_length: 5.0

diff --git a/...ning/lane_driving/behavior_planning/behavior_velocity_planner/no_drivable_lane.param.yaml b/...ning/lane_driving/behavior_planning/behavior_velocity_planner/no_drivable_lane.param.yaml
@@ -0,0 +1,5 @@
+/**:
+  ros__parameters:
+    no_drivable_lane:
+      stop_margin: 1.5 # Stop margin before the no drivable lane [m]
+      print_debug_info: false
diff --git a/autoware_launch/launch/components/tier4_planning_component.launch.xml b/autoware_launch/launch/components/tier4_planning_component.launch.xml
@@ -58,6 +58,7 @@
     <arg name="run_out_param_path" value="$(var behavior_velocity_config_path)/run_out.param.yaml"/>
     <arg name="speed_bump_param_path" value="$(var behavior_velocity_config_path)/speed_bump.param.yaml"/>
     <arg name="out_of_lane_param_path" value="$(var behavior_velocity_config_path)/out_of_lane.param.yaml"/>
+    <arg name="no_drivable_lane_param_path" value="$(var behavior_velocity_config_path)/no_drivable_lane.param.yaml"/>
     <arg name="behavior_velocity_planner_param_path" value="$(var behavior_velocity_config_path)/behavior_velocity_planner.param.yaml"/>
 
     <!-- parking -->

diff --git a/autoware_launch/rviz/autoware.rviz b/autoware_launch/rviz/autoware.rviz
@@ -1639,6 +1639,18 @@ Visualization Manager:
                             Reliability Policy: Reliable
                             Value: /planning/scenario_planning/lane_driving/behavior_planning/behavior_velocity_planner/virtual_wall/out_of_lane
                           Value: true
+                        - Class: rviz_default_plugins/MarkerArray
+                          Enabled: true
+                          Name: VirtualWall (NoDrivableLane)
+                          Namespaces:
+                            {}
+                          Topic:
+                            Depth: 5
+                            Durability Policy: Volatile
+                            History Policy: Keep Last
+                            Reliability Policy: Reliable
+                            Value: /planning/scenario_planning/lane_driving/behavior_planning/behavior_velocity_planner/virtual_wall/no_drivable_lane
+                          Value: true
                       Enabled: true
                       Name: VirtualWall
                     - Class: rviz_common/Group
@@ -1909,6 +1921,18 @@ Visualization Manager:
                             Reliability Policy: Reliable
                             Value: /planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/debug/dynamic_avoidance
                           Value: false
+                        - Class: rviz_default_plugins/MarkerArray
+                          Enabled: false
+                          Name: NoDrivableLane
+                          Namespaces:
+                            {}
+                          Topic:
+                            Depth: 5
+                            Durability Policy: Volatile
+                            History Policy: Keep Last
+                            Reliability Policy: Reliable
+                            Value: /planning/scenario_planning/lane_driving/behavior_planning/behavior_velocity_planner/debug/no_drivable_lane
+                          Value: false
                       Enabled: false
                       Name: DebugMarker
                     - Class: rviz_common/Group