Merge pull request autowarefoundation#943 from tier4/sync-beta-upstream

chore: sync beta upstream
tier4 · Aug 19, 2024 · ea09ea0 · ea09ea0
2 parents 21a26c3 + f934e27
commit ea09ea0
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/...re_launch/config/perception/object_recognition/prediction/map_based_prediction.param.yaml b/...re_launch/config/perception/object_recognition/prediction/map_based_prediction.param.yaml
@@ -50,3 +50,8 @@
       consider_only_routable_neighbours: false
 
     reference_path_resolution: 0.5 #[m]
+
+    # debug parameters
+    publish_processing_time: true
+    publish_processing_time_detail: true
+    publish_debug_markers: true
diff --git a/...lane_driving/behavior_planning/behavior_path_planner/goal_planner/goal_planner.param.yaml b/...lane_driving/behavior_planning/behavior_path_planner/goal_planner/goal_planner.param.yaml
@@ -55,6 +55,7 @@
         maximum_jerk: 1.0
         path_priority: "efficient_path" # "efficient_path" or "close_goal"
         efficient_path_order: ["SHIFT", "ARC_FORWARD", "ARC_BACKWARD"] # only lane based pull over(exclude freespace parking)
+        lane_departure_check_expansion_margin: 0.0
 
         # shift parking
         shift_parking:

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
@@ -6,7 +6,6 @@
 
       backward_length_buffer_for_end_of_lane: 3.0 # [m]
       backward_length_buffer_for_blocking_object: 3.0 # [m]
-      lane_change_finish_judge_buffer: 2.0      # [m]
 
       lane_changing_lateral_jerk: 0.5              # [m/s3]
 
@@ -27,6 +26,11 @@
       min_longitudinal_acc: -1.0
       max_longitudinal_acc: 1.0
 
+      skip_process:
+        longitudinal_distance_diff_threshold:
+          prepare: 1.0
+          lane_changing: 1.0
+
       # safety check
       safety_check:
         allow_loose_check_for_cancel: true
@@ -39,6 +43,14 @@
           lateral_distance_max_threshold: 2.0
           longitudinal_distance_min_threshold: 3.0
           longitudinal_velocity_delta_time: 0.8
+        parked:
+          expected_front_deceleration: -1.0
+          expected_rear_deceleration: -2.0
+          rear_vehicle_reaction_time: 1.0
+          rear_vehicle_safety_time_margin: 0.8
+          lateral_distance_max_threshold: 1.0
+          longitudinal_distance_min_threshold: 3.0
+          longitudinal_velocity_delta_time: 0.0
         cancel:
           expected_front_deceleration: -1.0
           expected_rear_deceleration: -2.0
@@ -109,7 +121,9 @@
         overhang_tolerance: 0.0             # [m]
         unsafe_hysteresis_threshold: 5      # [/]
 
-      finish_judge_lateral_threshold: 0.2        # [m]
+      lane_change_finish_judge_buffer: 2.0      # [m]
+      finish_judge_lateral_threshold: 0.1        # [m]
+      finish_judge_lateral_angle_deviation: 1.0 # [deg]
 
       # debug
       publish_debug_marker: true