From 4600e957ea602d04cb326b1161123f1299dc2ca7 Mon Sep 17 00:00:00 2001 From: Takayuki Murooka Date: Tue, 5 Dec 2023 15:08:30 +0000 Subject: [PATCH] hoge Signed-off-by: Takayuki Murooka --- .../control/vehicle_cmd_gate/vehicle_cmd_gate.param.yaml | 2 +- autoware_launch/config/planning/preset/default_preset.yaml | 2 +- .../behavior_velocity_planner/crosswalk.param.yaml | 4 ++-- .../obstacle_cruise_planner.param.yaml | 2 +- .../system/emergency_handler/emergency_handler.param.yaml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/autoware_launch/config/control/vehicle_cmd_gate/vehicle_cmd_gate.param.yaml b/autoware_launch/config/control/vehicle_cmd_gate/vehicle_cmd_gate.param.yaml index 7ad685217f..a05aba9e3b 100644 --- a/autoware_launch/config/control/vehicle_cmd_gate/vehicle_cmd_gate.param.yaml +++ b/autoware_launch/config/control/vehicle_cmd_gate/vehicle_cmd_gate.param.yaml @@ -2,7 +2,7 @@ ros__parameters: update_rate: 10.0 system_emergency_heartbeat_timeout: 0.5 - use_emergency_handling: false + use_emergency_handling: true check_external_emergency_heartbeat: false use_start_request: false enable_cmd_limit_filter: true diff --git a/autoware_launch/config/planning/preset/default_preset.yaml b/autoware_launch/config/planning/preset/default_preset.yaml index fa4a2e4308..81046a5f26 100644 --- a/autoware_launch/config/planning/preset/default_preset.yaml +++ b/autoware_launch/config/planning/preset/default_preset.yaml @@ -97,7 +97,7 @@ launch: - arg: name: motion_stop_planner_type - default: obstacle_stop_planner + default: obstacle_cruise_planner # option: obstacle_stop_planner # obstacle_cruise_planner # none diff --git a/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_velocity_planner/crosswalk.param.yaml b/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_velocity_planner/crosswalk.param.yaml index d9d2c407bb..762639950b 100644 --- a/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_velocity_planner/crosswalk.param.yaml +++ b/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_velocity_planner/crosswalk.param.yaml @@ -53,8 +53,8 @@ stop_object_velocity_threshold: 0.28 # [m/s] velocity threshold for the module to judge whether the objects is stopped (0.28 m/s = 1.0 kmph) min_object_velocity: 1.39 # [m/s] minimum object velocity (compare the estimated velocity by perception module with this parameter and adopt the larger one to calculate TTV. 1.39 m/s = 5.0 kmph) ## 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 + disable_stop_for_yield_cancel: true # for the crosswalk where there is a traffic signal + disable_yield_for_new_stopped_object: true # for the crosswalk where there is a traffic signal # 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] diff --git a/autoware_launch/config/planning/scenario_planning/lane_driving/motion_planning/obstacle_cruise_planner/obstacle_cruise_planner.param.yaml b/autoware_launch/config/planning/scenario_planning/lane_driving/motion_planning/obstacle_cruise_planner/obstacle_cruise_planner.param.yaml index 90e897fda3..4d38226c26 100644 --- a/autoware_launch/config/planning/scenario_planning/lane_driving/motion_planning/obstacle_cruise_planner/obstacle_cruise_planner.param.yaml +++ b/autoware_launch/config/planning/scenario_planning/lane_driving/motion_planning/obstacle_cruise_planner/obstacle_cruise_planner.param.yaml @@ -12,7 +12,7 @@ idling_time: 2.0 # idling time to detect front vehicle starting deceleration [s] min_ego_accel_for_rss: -1.0 # ego's acceleration to calculate RSS distance [m/ss] min_object_accel_for_rss: -1.0 # front obstacle's acceleration to calculate RSS distance [m/ss] - safe_distance_margin : 6.0 # This is also used as a stop margin [m] + safe_distance_margin : 5.0 # This is also used as a stop margin [m] terminal_safe_distance_margin : 3.0 # Stop margin at the goal. This value cannot exceed safe distance margin. [m] hold_stop_velocity_threshold: 0.01 # The maximum ego velocity to hold stopping [m/s] hold_stop_distance_threshold: 0.3 # The ego keeps stopping if the distance to stop changes within the threshold [m] diff --git a/autoware_launch/config/system/emergency_handler/emergency_handler.param.yaml b/autoware_launch/config/system/emergency_handler/emergency_handler.param.yaml index 652a984ce5..d064f2a2dd 100644 --- a/autoware_launch/config/system/emergency_handler/emergency_handler.param.yaml +++ b/autoware_launch/config/system/emergency_handler/emergency_handler.param.yaml @@ -7,7 +7,7 @@ timeout_takeover_request: 10.0 use_takeover_request: false use_parking_after_stopped: false - use_comfortable_stop: false + use_comfortable_stop: true # setting whether to turn hazard lamp on for each situation turning_hazard_on: