Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into fix/add_ar_tag_based_…
Browse files Browse the repository at this point in the history
…localizer_param
  • Loading branch information
SakodaShintaro committed Feb 13, 2024
2 parents 8b3b5a3 + 1cf2e8f commit 3caf083
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
ego_pass_first_margin_y: [3.0] # [[s]] time to vehicle margin vector for ego pass first situation (the module judges that ego don't have to stop at TTC + MARGIN < TTV condition)
ego_pass_first_additional_margin: 0.5 # [s] additional time margin for ego pass first situation to suppress chattering
ego_pass_later_margin_x: [0.0] # [[s]] time to vehicle margin vector for object pass first situation (the module judges that ego don't have to stop at TTV + MARGIN < TTC condition)
ego_pass_later_margin_y: [10.0] # [[s]] time to collision margin vector for object pass first situation (the module judges that ego don't have to stop at TTV + MARGIN < TTC condition)
ego_pass_later_margin_y: [13.0] # [[s]] time to collision margin vector for object pass first situation (the module judges that ego don't have to stop at TTV + MARGIN < TTC condition)
ego_pass_later_additional_margin: 0.5 # [s] additional time margin for object pass first situation to suppress chattering

no_stop_decision: # parameters to determine if it is safe to attempt stopping before the crosswalk
Expand Down
2 changes: 2 additions & 0 deletions autoware_launch/launch/planning_simulator.launch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
<!-- Map -->
<arg name="lanelet2_map_file" default="lanelet2_map.osm" description="lanelet2 map file name"/>
<arg name="pointcloud_map_file" default="pointcloud_map.pcd" description="pointcloud map file name"/>
<let name="rviz_initial_pose_auto_fix_target" value="vector_map"/>
<let name="gnss_initial_pose_auto_fix_target" value="vector_map"/>
<!-- System -->
<arg name="launch_system_monitor" default="false" description="launch system monitor"/>
<arg name="launch_dummy_diag_publisher" default="false" description="launch dummy diag publisher"/>
Expand Down

0 comments on commit 3caf083

Please sign in to comment.