Merge pull request #720 from tier4/sync-beta-upstream

chore: sync beta upstream
tier4 · Aug 1, 2024 · b0f0d3a · b0f0d3a
2 parents c8b2ab9 + 00b80fd
commit b0f0d3a
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/...oware_behavior_path_static_obstacle_avoidance_module/static_obstacle_avoidance.param.yaml b/...oware_behavior_path_static_obstacle_avoidance_module/static_obstacle_avoidance.param.yaml
@@ -138,8 +138,11 @@
 
         # params for avoidance of vehicle type objects that are ambiguous as to whether they are parked.
         avoidance_for_ambiguous_vehicle:
-          enable: false                                  # [-]
-          closest_distance_to_wait_and_see: 10.0        # [m]
+          # policy for ego behavior for ambiguous vehicle.
+          # "auto"   : generate candidate path. if RTC is running as AUTO mode, the ego avoids it automatically.
+          # "manual" : generate candidate path and wait operator approval even if RTC is running as AUTO mode.
+          # "ignore" : never avoid it.
+          policy: "ignore"                              # [-]
           condition:
             th_stopped_time: 3.0                        # [s]
             th_moving_distance: 1.0                     # [m]
@@ -149,11 +152,18 @@
             crosswalk:
               front_distance: 30.0                      # [m]
               behind_distance: 30.0                     # [m]
+          wait_and_see:
+            target_behaviors: ["MERGING", "DEVIATING"]  # [-]
+            th_closest_distance: 10.0                   # [m]
 
         # params for filtering objects that are in intersection
         intersection:
           yaw_deviation: 0.349                          # [rad] (default 20.0deg)
 
+        freespace:
+          condition:
+            th_stopped_time: 5.0                        # [-]
+
       # For safety check
       safety_check:
         # safety check target type