Merge remote-tracking branch 'origin/main' into feature/dont_insert_s…

…top_point_crosswalk Signed-off-by: kyoichi-sugahara <[email protected]>
autowarefoundation · Oct 3, 2023 · dc0895c · dc0895c
2 parents 6898ef5 + b951b51
commit dc0895c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/autoware_launch/config/localization/localization_error_monitor.param.yaml b/autoware_launch/config/localization/localization_error_monitor.param.yaml
@@ -1,7 +1,7 @@
 /**:
   ros__parameters:
     scale: 3.0
-    error_ellipse_size: 1.0
-    warn_ellipse_size: 0.8
+    error_ellipse_size: 1.5
+    warn_ellipse_size: 1.2
     error_ellipse_size_lateral_direction: 0.3
     warn_ellipse_size_lateral_direction: 0.25
diff --git a/...io_planning/lane_driving/behavior_planning/behavior_velocity_planner/crosswalk.param.yaml b/...io_planning/lane_driving/behavior_planning/behavior_velocity_planner/crosswalk.param.yaml
@@ -54,7 +54,9 @@
         ## param for yielding
         disable_stop_for_yield_cancel: false # for the crosswalk where there is a traffic signal
         disable_yield_for_new_stopped_object: false # for the crosswalk where there is a traffic signal
-        timeout_no_intention_to_walk: 3.0 # [s] if the pedestrian does not move for X seconds after stopping before the crosswalk, the module judge that ego is able to pass first.
+        # if the pedestrian does not move for X seconds after stopping before the crosswalk, the module judge that ego is able to pass first.
+        distance_map_for_no_intention_to_walk: [1.0, 5.0] # [m] ascending order
+        timeout_map_for_no_intention_to_walk: [3.0, 0.0] # [s]
         timeout_ego_stop_for_yield: 3.0 # [s] the amount of time which ego should be stopping to query whether it yields or not
 
       # param for target object filtering

diff --git a/..._planning/lane_driving/behavior_planning/behavior_velocity_planner/out_of_lane.param.yaml b/..._planning/lane_driving/behavior_planning/behavior_velocity_planner/out_of_lane.param.yaml
@@ -24,8 +24,7 @@
 
       action:  # action to insert in the path if an object causes a conflict at an overlap
         skip_if_over_max_decel: true  # if true, do not take an action that would cause more deceleration than the maximum allowed
-        strict: true # if true, when a decision is taken to avoid entering a lane, the stop point will make sure no lane at all is entered by ego
-                     # if false, ego stops just before entering a lane but may then be overlapping another lane.
+        precision: 0.1  # [m] precision when inserting a stop pose in the path
         distance_buffer: 1.5  # [m] buffer distance to try to keep between the ego footprint and lane
         slowdown:
           distance_threshold: 30.0 # [m] insert a slowdown when closer than this distance from an overlap