Merge pull request autowarefoundation#387 from tier4/sync-awf-upstream

chore: sync awf/autoware_launch
badai-nguyen · Aug 30, 2023 · 76c9046 · 76c9046
2 parents d9c5939 + 0d4342c
commit 76c9046
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
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
@@ -42,7 +42,13 @@
         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_additional_margin: 0.5 # [s] additional time margin for object pass first situation to suppress chattering
-        max_offset_to_crosswalk_for_yield: 0.0 # [m] maximum offset from ego's front to crosswalk for yield. Positive value means in front of the crosswalk.
+
+        no_stop_decision:
+          max_offset_to_crosswalk_for_yield: 0.0 # [m] maximum offset from ego's front to crosswalk for yield. Positive value means in front of the crosswalk.
+          min_acc: -1.0   # min acceleration [m/ss]
+          min_jerk: -1.0  # min jerk [m/sss]
+          max_jerk: 1.0   # max jerk [m/sss]
+
         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

diff --git a/...planning/lane_driving/behavior_planning/behavior_velocity_planner/intersection.param.yaml b/...planning/lane_driving/behavior_planning/behavior_velocity_planner/intersection.param.yaml
@@ -48,6 +48,7 @@
         denoise_kernel: 1.0 # [m]
         possible_object_bbox: [1.5, 2.5] # [m x m]
         ignore_parked_vehicle_speed_threshold: 0.8333 # == 3.0km/h
+        stop_release_margin_time: 1.5 # [s]
 
       enable_rtc:
         intersection: true # If set to true, the scene modules require approval from the rtc (request to cooperate) function. If set to false, the modules can be executed without requiring rtc approval

diff --git a/autoware_launch/launch/components/tier4_perception_component.launch.xml b/autoware_launch/launch/components/tier4_perception_component.launch.xml
@@ -101,5 +101,9 @@
 
     <!-- traffic light recognition -->
     <arg name="traffic_light_arbiter_param_path" value="$(find-pkg-share autoware_launch)/config/perception/traffic_light_arbiter/traffic_light_arbiter.param.yaml"/>
+    <arg name="traffic_light_fine_detector_model_path" value="$(find-pkg-share traffic_light_fine_detector)/data"/>
+    <arg name="traffic_light_fine_detector_model_name" value="tlr_yolox_s_batch_6"/>
+    <arg name="traffic_light_classifier_model_path" value="$(find-pkg-share traffic_light_classifier)/data"/>
+    <arg name="traffic_light_classifier_model_name" value="traffic_light_classifier_mobilenetv2_batch_6"/>
   </include>
 </launch>