diff --git a/autoware_launch/config/perception/object_recognition/detection/detected_object_validation/object_lanelet_filter.param.yaml b/autoware_launch/config/perception/object_recognition/detection/detected_object_validation/object_lanelet_filter.param.yaml index 99050d9738..d15b2c81cf 100644 --- a/autoware_launch/config/perception/object_recognition/detection/detected_object_validation/object_lanelet_filter.param.yaml +++ b/autoware_launch/config/perception/object_recognition/detection/detected_object_validation/object_lanelet_filter.param.yaml @@ -19,3 +19,5 @@ enabled: false velocity_yaw_threshold: 0.785398 # [rad] (45 deg) object_speed_threshold: 3.0 # [m/s] + debug: false + lanelet_extra_margin: 0.0 diff --git a/autoware_launch/config/perception/object_recognition/detection/object_filter/object_lanelet_filter.param.yaml b/autoware_launch/config/perception/object_recognition/detection/object_filter/object_lanelet_filter.param.yaml index fb6f1131e1..da9b694564 100644 --- a/autoware_launch/config/perception/object_recognition/detection/object_filter/object_lanelet_filter.param.yaml +++ b/autoware_launch/config/perception/object_recognition/detection/object_filter/object_lanelet_filter.param.yaml @@ -19,3 +19,5 @@ enabled: false velocity_yaw_threshold: 0.785398 # [rad] (45 deg) object_speed_threshold: 3.0 # [m/s] + debug: false + lanelet_extra_margin: 0.0 diff --git a/autoware_launch/config/perception/object_recognition/detection/object_filter/radar_lanelet_filter.param.yaml b/autoware_launch/config/perception/object_recognition/detection/object_filter/radar_lanelet_filter.param.yaml index 330a4605a1..a784fcb8c0 100644 --- a/autoware_launch/config/perception/object_recognition/detection/object_filter/radar_lanelet_filter.param.yaml +++ b/autoware_launch/config/perception/object_recognition/detection/object_filter/radar_lanelet_filter.param.yaml @@ -19,3 +19,5 @@ enabled: false velocity_yaw_threshold: 0.785398 # [rad] (45 deg) object_speed_threshold: 3.0 # [m/s] + debug: false + lanelet_extra_margin: 0.0 diff --git a/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/lane_change/lane_change.param.yaml b/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/lane_change/lane_change.param.yaml index fe8915c784..27349f077d 100644 --- a/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/lane_change/lane_change.param.yaml +++ b/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/lane_change/lane_change.param.yaml @@ -11,7 +11,8 @@ # trajectory generation trajectory: - prepare_duration: 4.0 + max_prepare_duration: 4.0 + min_prepare_duration: 2.0 lateral_jerk: 0.5 min_longitudinal_acc: -1.0 max_longitudinal_acc: 1.0 @@ -20,6 +21,7 @@ min_lane_changing_velocity: 2.78 lon_acc_sampling_num: 5 lat_acc_sampling_num: 3 + lane_changing_decel_factor: 0.5 # delay lane change delay_lane_change: diff --git a/autoware_launch/config/system/diagnostic_graph_aggregator/autoware-awsim.yaml b/autoware_launch/config/system/diagnostic_graph_aggregator/autoware-awsim.yaml deleted file mode 100644 index 937cfdeb65..0000000000 --- a/autoware_launch/config/system/diagnostic_graph_aggregator/autoware-awsim.yaml +++ /dev/null @@ -1,5 +0,0 @@ -files: - - { path: $(find-pkg-share autoware_launch)/config/system/system_diagnostic_monitor/autoware-main.yaml } - -edits: - - { type: remove, path: /autoware/system/duplicated_node_checker } diff --git a/autoware_launch/config/system/diagnostic_graph_aggregator/autoware-main.yaml b/autoware_launch/config/system/diagnostic_graph_aggregator/autoware-main.yaml deleted file mode 100644 index c96dd5ed46..0000000000 --- a/autoware_launch/config/system/diagnostic_graph_aggregator/autoware-main.yaml +++ /dev/null @@ -1,2 +0,0 @@ -files: - - { path: $(find-pkg-share autoware_launch)/config/system/system_diagnostic_monitor/autoware-main.yaml } diff --git a/autoware_launch/config/system/diagnostics/autoware-awsim.yaml b/autoware_launch/config/system/diagnostics/autoware-awsim.yaml new file mode 100644 index 0000000000..4abae34a31 --- /dev/null +++ b/autoware_launch/config/system/diagnostics/autoware-awsim.yaml @@ -0,0 +1,5 @@ +files: + - { path: $(dirname)/autoware-main.yaml } + +edits: + - { type: remove, path: /autoware/system/duplicated_node_checker } diff --git a/autoware_launch/config/system/system_diagnostic_monitor/autoware-main.yaml b/autoware_launch/config/system/diagnostics/autoware-main.yaml similarity index 100% rename from autoware_launch/config/system/system_diagnostic_monitor/autoware-main.yaml rename to autoware_launch/config/system/diagnostics/autoware-main.yaml diff --git a/autoware_launch/config/system/system_diagnostic_monitor/control.yaml b/autoware_launch/config/system/diagnostics/control.yaml similarity index 100% rename from autoware_launch/config/system/system_diagnostic_monitor/control.yaml rename to autoware_launch/config/system/diagnostics/control.yaml diff --git a/autoware_launch/config/system/dummy_diag_publisher/dummy_diag_publisher.param.yaml b/autoware_launch/config/system/diagnostics/dummy_diag_publisher.param.yaml similarity index 100% rename from autoware_launch/config/system/dummy_diag_publisher/dummy_diag_publisher.param.yaml rename to autoware_launch/config/system/diagnostics/dummy_diag_publisher.param.yaml diff --git a/autoware_launch/config/system/system_diagnostic_monitor/hardware.yaml b/autoware_launch/config/system/diagnostics/hardware.yaml similarity index 100% rename from autoware_launch/config/system/system_diagnostic_monitor/hardware.yaml rename to autoware_launch/config/system/diagnostics/hardware.yaml diff --git a/autoware_launch/config/system/system_diagnostic_monitor/localization.yaml b/autoware_launch/config/system/diagnostics/localization.yaml similarity index 100% rename from autoware_launch/config/system/system_diagnostic_monitor/localization.yaml rename to autoware_launch/config/system/diagnostics/localization.yaml diff --git a/autoware_launch/config/system/system_diagnostic_monitor/map.yaml b/autoware_launch/config/system/diagnostics/map.yaml similarity index 100% rename from autoware_launch/config/system/system_diagnostic_monitor/map.yaml rename to autoware_launch/config/system/diagnostics/map.yaml diff --git a/autoware_launch/config/system/system_diagnostic_monitor/perception.yaml b/autoware_launch/config/system/diagnostics/perception.yaml similarity index 100% rename from autoware_launch/config/system/system_diagnostic_monitor/perception.yaml rename to autoware_launch/config/system/diagnostics/perception.yaml diff --git a/autoware_launch/config/system/system_diagnostic_monitor/planning.yaml b/autoware_launch/config/system/diagnostics/planning.yaml similarity index 100% rename from autoware_launch/config/system/system_diagnostic_monitor/planning.yaml rename to autoware_launch/config/system/diagnostics/planning.yaml diff --git a/autoware_launch/config/system/system_diagnostic_monitor/system.yaml b/autoware_launch/config/system/diagnostics/system.yaml similarity index 100% rename from autoware_launch/config/system/system_diagnostic_monitor/system.yaml rename to autoware_launch/config/system/diagnostics/system.yaml diff --git a/autoware_launch/config/system/system_diagnostic_monitor/vehicle.yaml b/autoware_launch/config/system/diagnostics/vehicle.yaml similarity index 100% rename from autoware_launch/config/system/system_diagnostic_monitor/vehicle.yaml rename to autoware_launch/config/system/diagnostics/vehicle.yaml diff --git a/autoware_launch/launch/autoware.launch.xml b/autoware_launch/launch/autoware.launch.xml index 29378cc0c8..b125d23186 100644 --- a/autoware_launch/launch/autoware.launch.xml +++ b/autoware_launch/launch/autoware.launch.xml @@ -37,7 +37,7 @@ - + @@ -52,7 +52,7 @@ - + diff --git a/autoware_launch/launch/components/tier4_system_component.launch.xml b/autoware_launch/launch/components/tier4_system_component.launch.xml index 5bb8403dc2..31cc739683 100644 --- a/autoware_launch/launch/components/tier4_system_component.launch.xml +++ b/autoware_launch/launch/components/tier4_system_component.launch.xml @@ -1,7 +1,7 @@ - + @@ -14,7 +14,7 @@ - + diff --git a/autoware_launch/launch/e2e_simulator.launch.xml b/autoware_launch/launch/e2e_simulator.launch.xml index 3237754c48..c4fd15b41c 100644 --- a/autoware_launch/launch/e2e_simulator.launch.xml +++ b/autoware_launch/launch/e2e_simulator.launch.xml @@ -71,7 +71,7 @@ - + diff --git a/autoware_launch/launch/logging_simulator.launch.xml b/autoware_launch/launch/logging_simulator.launch.xml index f1a9ad5fab..123bd01ed3 100644 --- a/autoware_launch/launch/logging_simulator.launch.xml +++ b/autoware_launch/launch/logging_simulator.launch.xml @@ -65,7 +65,7 @@ - + diff --git a/autoware_launch/launch/planning_simulator.launch.xml b/autoware_launch/launch/planning_simulator.launch.xml index be175553b7..3c56e11412 100644 --- a/autoware_launch/launch/planning_simulator.launch.xml +++ b/autoware_launch/launch/planning_simulator.launch.xml @@ -70,7 +70,7 @@ - + diff --git a/autoware_launch/launch/pointcloud_container.launch.py b/autoware_launch/launch/pointcloud_container.launch.py index 650e555e27..d7e31a3e9b 100644 --- a/autoware_launch/launch/pointcloud_container.launch.py +++ b/autoware_launch/launch/pointcloud_container.launch.py @@ -39,7 +39,7 @@ def add_launch_arg(name: str, default_value=None): ) glog_component = ComposableNode( - package="glog_component", + package="autoware_glog_component", plugin="GlogComponent", name="glog_component", namespace="pointcloud_container", diff --git a/autoware_launch/package.xml b/autoware_launch/package.xml index 678c08d7b6..52101d1034 100644 --- a/autoware_launch/package.xml +++ b/autoware_launch/package.xml @@ -12,7 +12,7 @@ ament_cmake_auto ad_api_adaptors - global_parameter_loader + autoware_global_parameter_loader python3-bson python3-tornado rviz2 diff --git a/autoware_launch/rviz/planning_bev.rviz b/autoware_launch/rviz/planning_bev.rviz index 4b7ce39e51..533b601ccf 100644 --- a/autoware_launch/rviz/planning_bev.rviz +++ b/autoware_launch/rviz/planning_bev.rviz @@ -118,7 +118,7 @@ Visualization Manager: Depth: 5 Durability Policy: Volatile History Policy: Keep Last - Reliability Policy: Best Effort + Reliability Policy: Reliable Value: /robot_description Enabled: true Links: