Merge branch 'main' into main

autowarefoundation · Oct 27, 2023 · 220d0c7 · 220d0c7
2 parents 5738159 + 5469244
commit 220d0c7
Show file tree

Hide file tree

Showing 4 changed files with 905 additions and 6 deletions.
diff --git a/...aunch/config/control/autonomous_emergency_braking/autonomous_emergency_braking.param.yaml b/...aunch/config/control/autonomous_emergency_braking/autonomous_emergency_braking.param.yaml
@@ -1,5 +1,6 @@
 /**:
   ros__parameters:
+    publish_debug_pointcloud: false
     use_predicted_trajectory: true
     use_imu_path: true
     voxel_grid_x: 0.05
@@ -11,7 +12,9 @@
     t_response: 1.0
     a_ego_min: -3.0
     a_obj_min: -1.0
-    prediction_time_horizon: 1.5
-    prediction_time_interval: 0.1
+    imu_prediction_time_horizon: 1.5
+    imu_prediction_time_interval: 0.1
+    mpc_prediction_time_horizon: 1.5
+    mpc_prediction_time_interval: 0.1
     collision_keeping_sec: 0.0
     aeb_hz: 10.0
diff --git a/...nning/lane_driving/behavior_planning/behavior_path_planner/avoidance/avoidance.param.yaml b/...nning/lane_driving/behavior_planning/behavior_path_planner/avoidance/avoidance.param.yaml
@@ -37,6 +37,7 @@
           avoid_margin_lateral: 1.0                    # [m]
           safety_buffer_lateral: 0.7                   # [m]
           safety_buffer_longitudinal: 0.0              # [m]
+          use_conservative_buffer_longitudinal: true   # [-] When set to true, the base_link2front is added to the longitudinal buffer before avoidance.
         truck:
           is_target: true
           execute_num: 1
@@ -47,6 +48,7 @@
           avoid_margin_lateral: 1.0
           safety_buffer_lateral: 0.7
           safety_buffer_longitudinal: 0.0
+          use_conservative_buffer_longitudinal: true
         bus:
           is_target: true
           execute_num: 1
@@ -57,6 +59,7 @@
           avoid_margin_lateral: 1.0
           safety_buffer_lateral: 0.7
           safety_buffer_longitudinal: 0.0
+          use_conservative_buffer_longitudinal: true
         trailer:
           is_target: true
           execute_num: 1
@@ -67,6 +70,7 @@
           avoid_margin_lateral: 1.0
           safety_buffer_lateral: 0.7
           safety_buffer_longitudinal: 0.0
+          use_conservative_buffer_longitudinal: true
         unknown:
           is_target: true
           execute_num: 1
@@ -77,6 +81,7 @@
           avoid_margin_lateral: 1.0
           safety_buffer_lateral: 0.7
           safety_buffer_longitudinal: 0.0
+          use_conservative_buffer_longitudinal: true
         bicycle:
           is_target: true
           execute_num: 1
@@ -87,6 +92,7 @@
           avoid_margin_lateral: 1.0
           safety_buffer_lateral: 1.0
           safety_buffer_longitudinal: 1.0
+          use_conservative_buffer_longitudinal: true
         motorcycle:
           is_target: true
           execute_num: 1
@@ -97,6 +103,7 @@
           avoid_margin_lateral: 1.0
           safety_buffer_lateral: 1.0
           safety_buffer_longitudinal: 1.0
+          use_conservative_buffer_longitudinal: true
         pedestrian:
           is_target: true
           execute_num: 1
@@ -107,6 +114,7 @@
           avoid_margin_lateral: 1.0
           safety_buffer_lateral: 1.0
           safety_buffer_longitudinal: 1.0
+          use_conservative_buffer_longitudinal: true
         lower_distance_for_polygon_expansion: 30.0      # [m]
         upper_distance_for_polygon_expansion: 100.0     # [m]
 

diff --git a/...planning/lane_driving/behavior_planning/behavior_velocity_planner/intersection.param.yaml b/...planning/lane_driving/behavior_planning/behavior_velocity_planner/intersection.param.yaml
@@ -56,6 +56,8 @@
           object_dist_to_stopline: 10.0 # [m]
         ignore_on_amber_traffic_light:
           object_expected_deceleration: 2.0 # [m/ss]
+        ignore_on_red_traffic_light:
+          object_margin_to_path: 2.0
 
       occlusion:
         enable: false