diff --git a/autoware_api_launch/launch/include/external_api_adaptor.launch.py b/autoware_api_launch/launch/include/external_api_adaptor.launch.py index a97ef50049b5e..3aafd3d1bb784 100644 --- a/autoware_api_launch/launch/include/external_api_adaptor.launch.py +++ b/autoware_api_launch/launch/include/external_api_adaptor.launch.py @@ -37,6 +37,7 @@ def generate_launch_description(): _create_api_node("engage", "Engage"), _create_api_node("fail_safe_state", "FailSafeState"), _create_api_node("initial_pose", "InitialPose"), + _create_api_node("localization_score", "LocalizationScore"), _create_api_node("map", "Map"), _create_api_node("operator", "Operator"), _create_api_node("metadata_packages", "MetadataPackages"), diff --git a/perception_launch/launch/object_recognition/detection/camera_lidar_fusion_based_detection.launch.xml b/perception_launch/launch/object_recognition/detection/camera_lidar_fusion_based_detection.launch.xml index 052449d050bc4..bc9977d83e81b 100644 --- a/perception_launch/launch/object_recognition/detection/camera_lidar_fusion_based_detection.launch.xml +++ b/perception_launch/launch/object_recognition/detection/camera_lidar_fusion_based_detection.launch.xml @@ -23,7 +23,7 @@ - + @@ -47,7 +47,7 @@ - + @@ -64,11 +64,13 @@ + + @@ -103,11 +105,13 @@ + + @@ -169,16 +173,19 @@ + + + diff --git a/perception_launch/launch/object_recognition/detection/camera_lidar_radar_fusion_based_detection.launch.xml b/perception_launch/launch/object_recognition/detection/camera_lidar_radar_fusion_based_detection.launch.xml index d2a59a4a4569b..802694e2eddca 100644 --- a/perception_launch/launch/object_recognition/detection/camera_lidar_radar_fusion_based_detection.launch.xml +++ b/perception_launch/launch/object_recognition/detection/camera_lidar_radar_fusion_based_detection.launch.xml @@ -1,9 +1,11 @@ - + + + @@ -48,6 +50,8 @@ + + @@ -55,14 +59,14 @@ - + - - - + + + diff --git a/perception_launch/launch/object_recognition/detection/detection.launch.xml b/perception_launch/launch/object_recognition/detection/detection.launch.xml index e30297a495630..1196988f07df7 100644 --- a/perception_launch/launch/object_recognition/detection/detection.launch.xml +++ b/perception_launch/launch/object_recognition/detection/detection.launch.xml @@ -1,12 +1,13 @@ - - + + + @@ -52,6 +53,8 @@ + + @@ -78,6 +81,8 @@ + + @@ -87,6 +92,8 @@ + + @@ -96,13 +103,15 @@ + + - + diff --git a/perception_launch/launch/object_recognition/detection/lidar_based_detection.launch.xml b/perception_launch/launch/object_recognition/detection/lidar_based_detection.launch.xml index aee2084c79269..9fa255e8230c3 100644 --- a/perception_launch/launch/object_recognition/detection/lidar_based_detection.launch.xml +++ b/perception_launch/launch/object_recognition/detection/lidar_based_detection.launch.xml @@ -6,10 +6,9 @@ - + - @@ -18,7 +17,7 @@ - + @@ -97,11 +96,13 @@ + + @@ -113,5 +114,4 @@ - diff --git a/perception_launch/launch/object_recognition/detection/lidar_radar_based_detection.launch.xml b/perception_launch/launch/object_recognition/detection/lidar_radar_based_detection.launch.xml index a0eef1825bf64..db1fc26863057 100644 --- a/perception_launch/launch/object_recognition/detection/lidar_radar_based_detection.launch.xml +++ b/perception_launch/launch/object_recognition/detection/lidar_radar_based_detection.launch.xml @@ -1,9 +1,11 @@ - + + + @@ -12,6 +14,8 @@ + + @@ -19,14 +23,14 @@ - + - - - + + + diff --git a/perception_launch/launch/object_recognition/detection/radar_based_detection.launch.xml b/perception_launch/launch/object_recognition/detection/radar_based_detection.launch.xml index 6fb6184d6ae3f..21de187f126e5 100644 --- a/perception_launch/launch/object_recognition/detection/radar_based_detection.launch.xml +++ b/perception_launch/launch/object_recognition/detection/radar_based_detection.launch.xml @@ -3,10 +3,10 @@ - - - - - + + + + + diff --git a/perception_launch/launch/object_recognition/prediction/prediction.launch.xml b/perception_launch/launch/object_recognition/prediction/prediction.launch.xml index bd322ff67954e..fd9d1ba6f3cda 100644 --- a/perception_launch/launch/object_recognition/prediction/prediction.launch.xml +++ b/perception_launch/launch/object_recognition/prediction/prediction.launch.xml @@ -1,5 +1,4 @@ - @@ -10,7 +9,6 @@ - - + diff --git a/perception_launch/launch/object_recognition/tracking/tracking.launch.xml b/perception_launch/launch/object_recognition/tracking/tracking.launch.xml index 64bcad42fa31a..aa4aec15373f3 100644 --- a/perception_launch/launch/object_recognition/tracking/tracking.launch.xml +++ b/perception_launch/launch/object_recognition/tracking/tracking.launch.xml @@ -1,7 +1,6 @@ - - + diff --git a/perception_launch/launch/perception.launch.xml b/perception_launch/launch/perception.launch.xml index 15411ff695930..5edc773478896 100644 --- a/perception_launch/launch/perception.launch.xml +++ b/perception_launch/launch/perception.launch.xml @@ -1,8 +1,8 @@ - + @@ -24,7 +24,11 @@ - + @@ -36,10 +40,11 @@ - - - - + + + + + @@ -49,12 +54,12 @@ - - - - - - + + + + + + @@ -87,13 +92,14 @@ + + - - + @@ -107,15 +113,14 @@ - + diff --git a/planning_launch/config/scenario_planning/lane_driving/behavior_planning/behavior_velocity_planner/crosswalk.param.yaml b/planning_launch/config/scenario_planning/lane_driving/behavior_planning/behavior_velocity_planner/crosswalk.param.yaml index 4ea3229d46e56..2cc5260e4ea9b 100644 --- a/planning_launch/config/scenario_planning/lane_driving/behavior_planning/behavior_velocity_planner/crosswalk.param.yaml +++ b/planning_launch/config/scenario_planning/lane_driving/behavior_planning/behavior_velocity_planner/crosswalk.param.yaml @@ -10,7 +10,7 @@ stop_position_threshold: 1.0 # [m] threshold for check whether the vehicle stop in front of crosswalk # param for ego velocity - slow_velocity: 2.78 # [m/s] target vehicle velocity when module receive slow down command from FOA (2.78 m/s = 10.0 kmph) + min_slow_down_velocity: 2.78 # [m/s] target vehicle velocity when module receive slow down command from FOA (2.78 m/s = 10.0 kmph) max_slow_down_jerk: -1.5 # [m/sss] minimum jerk deceleration for safe brake max_slow_down_accel: -2.5 # [m/ss] minimum accel deceleration for safe brake no_relax_velocity: 2.78 # [m/s] if the current velocity is less than X m/s, ego always stops at the stop position(not relax deceleration constraints 2.78 m/s = 10 kmph) diff --git a/system_launch/config/ad_service_state_monitor.planning_simulation.param.yaml b/system_launch/config/ad_service_state_monitor.planning_simulation.param.yaml index a3b20c4c94d31..b20ffec096e03 100644 --- a/system_launch/config/ad_service_state_monitor.planning_simulation.param.yaml +++ b/system_launch/config/ad_service_state_monitor.planning_simulation.param.yaml @@ -23,7 +23,6 @@ topic_configs: names: [ "/map/vector_map", - "/map/pointcloud_map", "/perception/object_recognition/objects", "/initialpose2d", "/planning/mission_planning/route", @@ -43,13 +42,6 @@ type: "autoware_auto_mapping_msgs/msg/HADMapBin" transient_local: True - /map/pointcloud_map: - module: "map" - timeout: 0.0 - warn_rate: 0.0 - type: "sensor_msgs/msg/PointCloud2" - transient_local: True - /perception/object_recognition/objects: module: "perception" timeout: 1.0 diff --git a/system_launch/config/system_error_monitor.planning_simulation.param.yaml b/system_launch/config/system_error_monitor.planning_simulation.param.yaml new file mode 100644 index 0000000000000..ce081b75b2836 --- /dev/null +++ b/system_launch/config/system_error_monitor.planning_simulation.param.yaml @@ -0,0 +1,50 @@ +# Description: +# name: diag name +# sf_at: diag level where it becomes Safe Fault +# lf_at: diag level where it becomes Latent Fault +# spf_at: diag level where it becomes Single Point Fault +# auto_recovery: Determines whether the system will automatically recover when it recovers from an error. +# +# Note: +# empty-value for sf_at, lf_at and spf_at is "none" +# default values are: +# sf_at: "none" +# lf_at: "warn" +# spf_at: "error" +# auto_recovery: "true" +--- +/**: + ros__parameters: + required_modules: + autonomous_driving: + /autoware/control/autonomous_driving/node_alive_monitoring: default + /autoware/control/autonomous_driving/performance_monitoring/lane_departure: default + /autoware/control/control_command_gate/node_alive_monitoring: default + + /autoware/localization/node_alive_monitoring: default + # /autoware/localization/performance_monitoring/matching_score: { sf_at: "warn", lf_at: "none", spf_at: "none" } + # /autoware/localization/performance_monitoring/localization_accuracy: default + + /autoware/map/node_alive_monitoring: default + + /autoware/perception/node_alive_monitoring: default + + /autoware/planning/node_alive_monitoring: default + /autoware/planning/performance_monitoring/trajectory_validation: default + + /autoware/sensing/node_alive_monitoring: default + + /autoware/system/node_alive_monitoring: default + /autoware/system/emergency_stop_operation: default + # /autoware/system/resource_monitoring: { sf_at: "warn", lf_at: "error", spf_at: "none" } + + /autoware/vehicle/node_alive_monitoring: default + + external_control: + /autoware/control/control_command_gate/node_alive_monitoring: default + /autoware/control/external_control/external_command_selector/node_alive_monitoring: default + + /autoware/system/node_alive_monitoring: default + /autoware/system/emergency_stop_operation: default + + /autoware/vehicle/node_alive_monitoring: default diff --git a/system_launch/launch/system.launch.xml b/system_launch/launch/system.launch.xml index 88aaca8527e64..6fff875192847 100644 --- a/system_launch/launch/system.launch.xml +++ b/system_launch/launch/system.launch.xml @@ -23,26 +23,32 @@ - - - - - + + + + + + + - - - - - - - - + + + + + + + + + + - - - + + + + +