Merge pull request #242 from tier4/beta-to-tier4-main-sync

chore: sync beta branch beta/v0.12.0 with tier4/main
tier4 · Sep 15, 2023 · 3aaf25f · 3aaf25f
2 parents 9877b91 + 6175a0a
commit 3aaf25f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/...g/lane_driving/motion_planning/obstacle_cruise_planner/obstacle_cruise_planner.param.yaml b/...g/lane_driving/motion_planning/obstacle_cruise_planner/obstacle_cruise_planner.param.yaml
@@ -20,6 +20,10 @@
       nearest_dist_deviation_threshold: 3.0 # [m] for finding nearest index
       nearest_yaw_deviation_threshold: 1.57 # [rad] for finding nearest index
       min_behavior_stop_margin: 3.0 # [m]
+      stop_on_curve:
+        enable_approaching: false
+        additional_safe_distance_margin: 3.0 # [m]
+        min_safe_distance_margin: 3.0 # [m]
       suppress_sudden_obstacle_stop: true
 
       stop_obstacle_type:

diff --git a/autoware_launch/rviz/autoware.rviz b/autoware_launch/rviz/autoware.rviz
@@ -16,8 +16,6 @@ Panels:
     Expanded: ~
     Name: Views
     Splitter Ratio: 0.5
-  - Class: tier4_localization_rviz_plugin/InitialPoseButtonPanel
-    Name: InitialPoseButtonPanel
   - Class: AutowareDateTimePanel
     Name: AutowareDateTimePanel
   - Class: rviz_plugins::AutowareStatePanel