Merge branch 'main' into fix/update_motion_velocity_smoother_param

autowarefoundation · Jan 18, 2024 · 895ee2d · 895ee2d
2 parents 1b284cf + d3811ef
commit 895ee2d
Show file tree

Hide file tree

Showing 13 changed files with 77 additions and 7 deletions.
diff --git a/autoware_launch/config/control/trajectory_follower/lateral/mpc.param.yaml b/autoware_launch/config/control/trajectory_follower/lateral/mpc.param.yaml
@@ -74,3 +74,5 @@
       update_steer_threshold: 0.035
       average_num: 1000
       steering_offset_limit: 0.02
+
+    debug_publish_predicted_trajectory: false  # publish debug predicted trajectory in Frenet coordinate
diff --git a/autoware_launch/config/localization/ekf_localizer.param.yaml b/autoware_launch/config/localization/ekf_localizer.param.yaml
@@ -23,6 +23,10 @@
     proc_stddev_vx_c: 10.0
     proc_stddev_wz_c: 5.0
 
+    #Simple1DFilter parameters
+    z_filter_proc_dev: 1.0
+    roll_filter_proc_dev: 0.01
+    pitch_filter_proc_dev: 0.01
     # for diagnostics
     pose_no_update_count_threshold_warn: 50
     pose_no_update_count_threshold_error: 100

diff --git a/.../object_recognition/detection/image_projection_based_fusion/roi_cluster_fusion.param.yaml b/.../object_recognition/detection/image_projection_based_fusion/roi_cluster_fusion.param.yaml
@@ -0,0 +1,12 @@
+/**:
+  ros__parameters:
+    fusion_distance: 100.0
+    trust_object_distance: 100.0
+    trust_object_iou_mode: "iou"
+    non_trust_object_iou_mode: "iou_x"
+    use_cluster_semantic_type: false
+    only_allow_inside_cluster: true
+    roi_scale_factor: 1.1
+    iou_threshold: 0.65
+    unknown_iou_threshold: 0.1
+    remove_unknown: true
diff --git a/...recognition/detection/image_projection_based_fusion/roi_detected_object_fusion.param.yaml b/...recognition/detection/image_projection_based_fusion/roi_detected_object_fusion.param.yaml
@@ -0,0 +1,19 @@
+/**:
+  ros__parameters:
+    # UNKNOWN, CAR, TRUCK, BUS, TRAILER, MOTORBIKE, BICYCLE, PEDESTRIAN
+    passthrough_lower_bound_probability_thresholds: [0.35, 0.35, 0.35, 0.35, 0.35, 0.35, 0.35, 0.50]
+    trust_distances: [50.0, 100.0, 100.0, 100.0, 100.0, 50.0, 50.0, 50.0]
+    min_iou_threshold: 0.5
+    use_roi_probability: false
+    roi_probability_threshold: 0.5
+
+    can_assign_matrix:
+      #UNKNOWN, CAR, TRUCK, BUS, TRAILER, MOTORBIKE, BICYCLE, PEDESTRIAN <-roi_msg
+      [1,       0,   0,     0,   0,       0,         0,       0,         # UNKNOWN <-detected_objects
+       0,       1,   1,     1,   1,       0,         0,       0,         # CAR
+       0,       1,   1,     1,   1,       0,         0,       0,         # TRUCK
+       0,       1,   1,     1,   1,       0,         0,       0,         # BUS
+       0,       1,   1,     1,   1,       0,         0,       0,         # TRAILER
+       0,       0,   0,     0,   0,       1,         1,       1,         # MOTORBIKE
+       0,       0,   0,     0,   0,       1,         1,       1,         # BICYCLE
+       0,       0,   0,     0,   0,       1,         1,       1]         # PEDESTRIAN
diff --git a/...ject_recognition/detection/image_projection_based_fusion/roi_pointcloud_fusion.param.yaml b/...ject_recognition/detection/image_projection_based_fusion/roi_pointcloud_fusion.param.yaml
@@ -0,0 +1,5 @@
+/**:
+  ros__parameters:
+    fuse_unknown_only: true
+    min_cluster_size: 2
+    cluster_2d_tolerance: 0.5
diff --git a/autoware_launch/config/planning/preset/default_preset.yaml b/autoware_launch/config/planning/preset/default_preset.yaml
@@ -112,7 +112,7 @@ launch:
 
   - arg:
       name: launch_surround_obstacle_checker
-      default: "true"
+      default: "false"
 
   # parking modules
   - arg:

diff --git a/...nning/lane_driving/behavior_planning/behavior_path_planner/avoidance/avoidance.param.yaml b/...nning/lane_driving/behavior_planning/behavior_path_planner/avoidance/avoidance.param.yaml
@@ -122,7 +122,8 @@
           motorcycle: true                               # [-]
           pedestrian: true                               # [-]
         # detection range
-        object_check_goal_distance: 20.0                # [m]
+        object_check_goal_distance: 20.0                 # [m]
+        object_check_return_pose_distance: 20.0          # [m]
         # filtering parking objects
         threshold_distance_object_is_on_center: 1.0     # [m]
         object_check_shiftable_ratio: 0.6               # [-]

diff --git a/...voidance_by_lc/avoidance_by_lc.param.yaml → ...hange/avoidance_by_lane_change.param.yaml b/...voidance_by_lc/avoidance_by_lc.param.yaml → ...hange/avoidance_by_lane_change.param.yaml
diff --git a/...ning/lane_driving/behavior_planning/behavior_path_planner/scene_module_manager.param.yaml b/...ning/lane_driving/behavior_planning/behavior_path_planner/scene_module_manager.param.yaml
@@ -53,7 +53,7 @@
 
     goal_planner:
       enable_rtc: false
-      enable_simultaneous_execution_as_approved_module: false
+      enable_simultaneous_execution_as_approved_module: true
       enable_simultaneous_execution_as_candidate_module: false
       keep_last: true
       priority: 1
@@ -67,7 +67,7 @@
       priority: 4
       max_module_size: 1
 
-    avoidance_by_lc:
+    avoidance_by_lane_change:
       enable_rtc: false
       enable_simultaneous_execution_as_approved_module: false
       enable_simultaneous_execution_as_candidate_module: false

diff --git a/...ne_driving/behavior_planning/behavior_path_planner/start_planner/start_planner.param.yaml b/...ne_driving/behavior_planning/behavior_path_planner/start_planner/start_planner.param.yaml
@@ -32,7 +32,7 @@
       # search start pose backward
       enable_back: true
       search_priority: "efficient_path"  # "efficient_path" or "short_back_distance"
-      max_back_distance: 30.0
+      max_back_distance: 20.0
       backward_search_resolution: 2.0
       backward_path_update_duration: 3.0
       ignore_distance_from_lane_end: 15.0

diff --git a/autoware_launch/launch/components/tier4_perception_component.launch.xml b/autoware_launch/launch/components/tier4_perception_component.launch.xml
@@ -48,6 +48,18 @@
       name="object_recognition_detection_fusion_sync_param_path"
       value="$(find-pkg-share autoware_launch)/config/perception/object_recognition/detection/image_projection_based_fusion/roi_sync.param.yaml"
     />
+    <arg
+      name="object_recognition_detection_roi_cluster_fusion_param_path"
+      value="$(find-pkg-share autoware_launch)/config/perception/object_recognition/detection/image_projection_based_fusion/roi_cluster_fusion.param.yaml"
+    />
+    <arg
+      name="object_recognition_detection_roi_pointcloud_fusion_param_path"
+      value="$(find-pkg-share autoware_launch)/config/perception/object_recognition/detection/image_projection_based_fusion/roi_pointcloud_fusion.param.yaml"
+    />
+    <arg
+      name="object_recognition_detection_roi_detected_object_fusion_param_path"
+      value="$(find-pkg-share autoware_launch)/config/perception/object_recognition/detection/image_projection_based_fusion/roi_detected_object_fusion.param.yaml"
+    />
     <arg
       name="object_recognition_detection_obstacle_pointcloud_based_validator_param_path"
       value="$(find-pkg-share autoware_launch)/config/perception/object_recognition/detection/detected_object_validation/obstacle_pointcloud_based_validator.param.yaml"

diff --git a/autoware_launch/launch/components/tier4_planning_component.launch.xml b/autoware_launch/launch/components/tier4_planning_component.launch.xml
@@ -8,7 +8,6 @@
     <arg name="vehicle_param_file" value="$(find-pkg-share $(var vehicle_model)_description)/config/vehicle_info.param.yaml"/>
     <arg name="use_pointcloud_container" value="$(var use_pointcloud_container)"/>
     <arg name="pointcloud_container_name" value="$(var pointcloud_container_name)"/>
-    <arg name="launch_surround_obstacle_checker" value="false"/>
 
     <!-- common -->
     <arg name="common_config_path" value="$(find-pkg-share autoware_launch)/config/planning/scenario_planning/common"/>
@@ -25,7 +24,7 @@
     <arg name="behavior_path_planner_scene_module_manager_param_path" value="$(var behavior_path_config_path)/scene_module_manager.param.yaml"/>
     <arg name="behavior_path_planner_side_shift_module_param_path" value="$(var behavior_path_config_path)/side_shift/side_shift.param.yaml"/>
     <arg name="behavior_path_planner_avoidance_module_param_path" value="$(var behavior_path_config_path)/avoidance/avoidance.param.yaml"/>
-    <arg name="behavior_path_planner_avoidance_by_lc_module_param_path" value="$(var behavior_path_config_path)/avoidance_by_lc/avoidance_by_lc.param.yaml"/>
+    <arg name="behavior_path_planner_avoidance_by_lc_module_param_path" value="$(var behavior_path_config_path)/avoidance_by_lane_change/avoidance_by_lane_change.param.yaml"/>
     <arg name="behavior_path_planner_dynamic_avoidance_module_param_path" value="$(var behavior_path_config_path)/dynamic_avoidance/dynamic_avoidance.param.yaml"/>
     <arg name="behavior_path_planner_lane_change_module_param_path" value="$(var behavior_path_config_path)/lane_change/lane_change.param.yaml"/>
     <arg name="behavior_path_planner_goal_planner_module_param_path" value="$(var behavior_path_config_path)/goal_planner/goal_planner.param.yaml"/>

diff --git a/autoware_launch/rviz/autoware.rviz b/autoware_launch/rviz/autoware.rviz
@@ -3649,6 +3649,22 @@ Visualization Manager:
                   Value: true
               Enabled: true
               Name: Objects Of Interest
+            - Class: rviz_plugins/StringStampedOverlayDisplay
+              Enabled: true
+              Font Size: 15
+              Left: 1024
+              Max Letter Num: 100
+              Name: StringStampedOverlayDisplay
+              Text Color: 25; 255; 240
+              Top: 128
+              Topic:
+                Depth: 5
+                Durability Policy: Volatile
+                History Policy: Keep Last
+                Reliability Policy: Reliable
+                Value: /planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/debug/internal_state
+              Value: true
+              Value height offset: 0
           Enabled: true
           Name: Planning
         - Class: rviz_common/Group