Skip to content

Commit 8039774

Browse files
Merge pull request autowarefoundation#1094 from tier4/sync-beta-upstream
chore: sync beta upstream
2 parents 792d217 + 3af2e23 commit 8039774

File tree

4 files changed

+8
-2
lines changed

4 files changed

+8
-2
lines changed

autoware_launch/config/perception/obstacle_segmentation/ground_segmentation/ground_segmentation.param.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
ros__parameters:
33
additional_lidars: []
44
ransac_input_topics: []
5-
use_single_frame_filter: False
6-
use_time_series_filter: True
75

86
common_crop_box_filter:
97
parameters:

autoware_launch/config/system/mrm_handler/mrm_handler.param.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
use_parking_after_stopped: false
1212
use_pull_over: false
1313
use_comfortable_stop: true
14+
is_mrm_recoverable: true
1415

1516
# setting whether to turn hazard lamp on for each situation
1617
turning_hazard_on:

autoware_launch/launch/components/tier4_perception_component.launch.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
<arg name="use_detection_by_tracker" default="true" description="launch detection_by_tracker function"/>
1313
<arg name="use_radar_tracking_fusion" default="true" description="if true, radar objects are merged in tracking module. Otherwise, radar objects are merged in detection module."/>
1414
<arg name="use_object_filter" default="true" description="launch object filter to filter-out detected object"/>
15+
<arg name="use_obstacle_segmentation_single_frame_filter" default="false" description="use single frame filter at the ground segmentation"/>
16+
<arg name="use_obstacle_segmentation_time_series_filter" default="true" description="use time series filter at the ground segmentation"/>
1517

1618
<arg name="occupancy_grid_map_method" default="pointcloud_based" description="options: pointcloud_based, laserscan_based, multi_lidar_pointcloud_based"/>
1719
<arg name="occupancy_grid_map_updater" default="binary_bayes_filter" description="options: binary_bayes_filter"/>
@@ -74,6 +76,9 @@
7476
<arg name="use_object_filter" value="$(var use_object_filter)"/>
7577
<arg name="objects_filter_method" value="$(var detected_objects_filter_method)"/>
7678
<arg name="objects_validation_method" value="$(var detected_objects_validation_method)"/>
79+
<arg name="use_obstacle_segmentation_single_frame_filter" value="$(var use_obstacle_segmentation_single_frame_filter)"/>
80+
<arg name="use_obstacle_segmentation_time_series_filter" value="$(var use_obstacle_segmentation_time_series_filter)"/>
81+
7782
<arg name="data_path" value="$(var data_path)"/>
7883
<arg name="input/pointcloud" value="/sensing/lidar/concatenated/pointcloud"/>
7984
<arg name="pointpainting_model_path" value="/opt/autoware/mlmodels/pointpainting"/>

autoware_launch/launch/components/tier4_system_component.launch.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
<arg name="mrm_handler_param_path" value="$(find-pkg-share autoware_launch)/config/system/mrm_handler/mrm_handler.param.yaml"/>
3232
<arg name="diagnostic_graph_aggregator_param_path" value="$(var diagnostic_graph_aggregator_param_path)"/>
3333
<arg name="diagnostic_graph_aggregator_graph_path" value="$(var diagnostic_graph_aggregator_graph_path)"/>
34+
35+
<arg name="launch_system_recover_operator" value="false"/>
3436
</include>
3537

3638
<!-- For logging of diagnostics_graph error -->

0 commit comments

Comments
 (0)