diff --git a/control/ackermann_trajectory_control/.docker-compose.oci-overrides.yml b/control/ackermann_trajectory_control/.docker-compose.oci-overrides.yml index 32daffe0..3d9bc10d 100644 --- a/control/ackermann_trajectory_control/.docker-compose.oci-overrides.yml +++ b/control/ackermann_trajectory_control/.docker-compose.oci-overrides.yml @@ -2,7 +2,7 @@ # `../../utils/scripts/render_compose_sources.py` include: - - oci://ghcr.io/openads-project/ackermann_trajectory_control:compose-v1.5.0 + - oci://ghcr.io/openads-project/ackermann_trajectory_control/compose:v1.5.2 services: diff --git a/control/ackermann_trajectory_control/docker-compose.yml b/control/ackermann_trajectory_control/docker-compose.yml index 3f423945..9c525529 100644 --- a/control/ackermann_trajectory_control/docker-compose.yml +++ b/control/ackermann_trajectory_control/docker-compose.yml @@ -1,8 +1,8 @@ # Auto-generated by `../../utils/scripts/render_compose_sources.py` # based on `.docker-compose.oci-overrides.yml` with resolved includes # include: -# # https://github.com/openads-project/ackermann_trajectory_control/blob/v1.5.0/deployment/compose/docker-compose.yml -# - oci://ghcr.io/openads-project/ackermann_trajectory_control:compose-v1.5.0 +# # https://github.com/openads-project/ackermann_trajectory_control/blob/v1.5.2/deployment/compose/docker-compose.yml +# - oci://ghcr.io/openads-project/ackermann_trajectory_control/compose:v1.5.2 services: @@ -10,7 +10,7 @@ services: extends: file: ../../utils/compose/docker-compose.template.yml service: ros2-service - image: ghcr.io/openads-project/ackermann_trajectory_control:v1.5.0 + image: ghcr.io/openads-project/ackermann_trajectory_control:v1.5.2 environment: # --- name ------ # NAMESPACE: / @@ -30,8 +30,8 @@ services: # --- other ----- LOG_LEVEL: ${LOG_LEVEL:-info} USE_SIM_TIME: ${USE_SIM_TIME:-false} - PARAMS: ${PARAMS:-/docker-ros/ws/install/ackermann_trajectory_control/share/ackermann_trajectory_control/config/params.yml} - TRACE: ${TRACE:-False} + PARAMS: /docker-ros/ws/install/ackermann_trajectory_control/share/ackermann_trajectory_control/config/params.yml + ROS_TRACING: ${ROS_TRACING:-False} command: - /bin/bash - -ic @@ -42,7 +42,7 @@ services: log_level:=$${LOG_LEVEL} \ use_sim_time:=$${USE_SIM_TIME} \ params:=$${PARAMS} \ - trace:=$${TRACE} \ + ros_tracing:=$${ROS_TRACING} \ ego_data_topic:=$${EGO_DATA_TOPIC} \ trajectory_topic:=$${TRAJECTORY_TOPIC} \ lat_control_active_topic:=$${LAT_CONTROL_ACTIVE_TOPIC} \ diff --git a/demo/lanelet2_object_list_prediction/params.yml b/demo/lanelet2_object_list_prediction/params.yml index 949b608d..da910a46 100644 --- a/demo/lanelet2_object_list_prediction/params.yml +++ b/demo/lanelet2_object_list_prediction/params.yml @@ -5,4 +5,15 @@ lanelet_match_max_yaw_diff_rad: 1.57079632679 prediction_horizon_s: 8.0 prediction_sample_interval_s: 0.5 - unmatched_object_prediction_mode: static \ No newline at end of file + unmatched_object_prediction_mode: static + infeasible_prediction_probability: 0.0 + max_longitudinal_acceleration_mps2: 1.0 # maximum acceleration for regaining the current speed after slowing down + max_longitudinal_deceleration_mps2: 3.0 # maximum deceleration for slowing down, e.g. before a curve or a yield line + participant_specific_matching: + enable: true # match and route pedestrians and two-wheelers with their own traffic rules, preferring bicycle lanes for two-wheelers + allow_opposite_direction: true # predict two-wheelers without a legal lanelet match against a lanelet's direction + motion_limits: + enable: true # reduce the predicted speed in curves to respect the acceleration limits + max_lateral_acceleration_mps2: 3.0 # maximum lateral acceleration of predicted objects in curves + yielding: + enable: true # stop objects at yield lines for conflicting priority traffic diff --git a/demo/lanelet2_route_planning/params.yml b/demo/lanelet2_route_planning/params.yml index 31a84843..87332489 100644 --- a/demo/lanelet2_route_planning/params.yml +++ b/demo/lanelet2_route_planning/params.yml @@ -1,20 +1,27 @@ /**/*: ros__parameters: + ll2_map_server_name: /localization/lanelet2_map_server publish_frequency: 20.0 action_feedback_frequency: 1.0 sampling_distance: 1.0 + publish_frequency_global: 1.0 + sampling_max_lateral_error_global: 0.5 project_destination_to_reference_line: true destination_distance_threshold: 1.0 required_traveled_distance_proportion: 0.5 - enrich_route_ahead_ego_distance: 100.0 - enrich_route_behind_ego_distance: 10.0 + enrich_route_ahead_ego_distance: 300.0 + enrich_route_behind_ego_distance: 20.0 route_undershoot_distance: 10.0 route_overshoot_distance: 10.0 max_drivable_space_radius: 50.0 max_num_threads: 8 transform_timeout: 0.1 + diagnostic_updater: + period: 0.1 + use_fqn: true + # --- plan_route_action_client --- # waypoints: # - ", " @@ -22,4 +29,5 @@ # - ", , -1" # intermediate destination enable_random_destination: false enable_continuous_planning: false + continuous_planning_replanning_proportion: 0.6 cancel_route: false \ No newline at end of file diff --git a/demo/point_cloud_fusion/params.yml b/demo/point_cloud_fusion/params.yml index 9bf9d672..3f789f33 100644 --- a/demo/point_cloud_fusion/params.yml +++ b/demo/point_cloud_fusion/params.yml @@ -8,11 +8,17 @@ - "cloudini" - "cloudini" - sync_queue_size: 3 # Queue depth for approximate time synchronization + sync_queue_size: 5 # Queue depth for approximate time synchronization max_time_diff_sec: 0.05 # Maximum allowed timestamp difference (seconds) across inputs output_queue_size: 10 # Queue depth for fused output publisher age_penalty: 0.1 # Optional ApproximateTime tuning use_cuda: true # Runtime-reconfigurable CPU/CUDA backend selection (requires CUDA build for true) + motion_compensation: + enable: true # Compensate sensor capture skew and motion during each rotating scan + fixed_frame: map # World-fixed TF frame connecting target_frame and every sensor frame + time_field: t # UINT32 offset from header.stamp for each point + # time_scale_sec: 1.0e-9 # default: nanoseconds; override only for a nonstandard time field + tf_timeout_sec: 0.1 # Per-lookup timeout; unavailable motion TF falls back to rigid fusion fixed_points_per_input_cloud: 0 # 0=disabled range_limits: enable: false # Enable XYZ range filtering in target_frame diff --git a/demo/point_cloud_object_detection/params.yml b/demo/point_cloud_object_detection/params.yml index c3786b86..60d8c513 100644 --- a/demo/point_cloud_object_detection/params.yml +++ b/demo/point_cloud_object_detection/params.yml @@ -2,7 +2,6 @@ ros__parameters: # Core node configuration - prediction.server_url: "triton-server:8001" prediction.model_repository: "point-cloud-object-detection" prediction.model_version: "1" preprocessing.backend: "cuda" @@ -18,9 +17,10 @@ # Output filtering and object metadata postprocessing.class_score_threshold: 0.0 - # Object covariance defaults - # CONTINUOUS_STATE_COVARIANCE_UNKNOWN = -1.0 - output.variances: [-1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0] + # Object state covariances + # defaulting to CONTINUOUS_STATE_COVARIANCE_UNKNOWN=max(float64) for x, y, z, yaw, width, length, height as detected by detector + # defaulting to CONTINUOUS_STATE_COVARIANCE_INVALID=-1 for vel_lon, vel_lat, acc_lon, acc_lat as not detected by detector + output.variances: [1.7976931348623157e+308, 1.7976931348623157e+308, 1.7976931348623157e+308, -1.0, -1.0, -1.0, -1.0, 1.7976931348623157e+308, -1.0, 1.7976931348623157e+308, 1.7976931348623157e+308, 1.7976931348623157e+308] # Model input feature selection input.point_feature_field: "reflectivity" diff --git a/demo/simple_planner/params.yml b/demo/simple_planner/params.yml index 81c1c6c0..447130aa 100644 --- a/demo/simple_planner/params.yml +++ b/demo/simple_planner/params.yml @@ -14,30 +14,33 @@ n_states: 51 # number of states in published trajectory interpolation_type: 1 # 0: linear, 1: cubic spline v_ref: -1.0 # reference velocity (m/s). Set to '-1.0' to use velocity from route. - a_decel: -0.5 # desired deceleration for braking at stop lines or end of route (m/s^2) - must be < 0.0 - a_max_decel: -1.0 # maximum deceleration for safe-stop trajectories (m/s^2) - must be < 0.0 and <= a_decel + a_decel: -1.0 # desired deceleration for braking at stop lines or end of route (m/s^2) - must be < 0.0 + a_max_decel: -4.0 # maximum deceleration for safe-stop trajectories (m/s^2) - must be < 0.0 and <= a_decel trigger_turn_signals: False # true: planner will request turn signal services; false: planner will not trigger turn signals #### grid map parameters consider_grid_map: False # true: planner will consider grid map; false: planner will ignore grid map grid_map_timeout: 1.0 # time after which a received grid map is considered invalid (s) (use -1 for no timeout) - grid_occupied_threshold: 15 # minimum occupancy value that is considered blocked in the grid map + grid_occupied_threshold: 50 # minimum occupancy value that is considered blocked in the grid map consider_out_of_grid: False # true: points outside the grid map are treated as occupied; false: free grid_longitudinal_safety_distance: 1.5 # longitudinal ego-box margin; negative values shrink the box (m) grid_lateral_safety_distance: 0.0 # lateral ego-box margin; negative values shrink the box (m) - #### traffic light parameters + #### regulatory element parameters consider_traffic_lights: False # true: planner will consider traffic lights; false: planner will ignore traffic lights - offset_to_stop_line: 0.0 # additional distance to stop in front of a stop line (m) (default: 0.0 -> stops with front of vehicle at stop line) + consider_stop_signs: True # true: planner will consider stop signs; false: planner will ignore stop signs + consider_yield_signs: True # true: planner will consider yield signs; false: planner will ignore yield signs + offset_to_stop_line: 0.0 # additional distance to stop in front of a regulatory-element stop line (m) (default: 0.0 -> stops with front of vehicle at stop line) ignore_stop_line_threshold: 0.5 # a stop line will be ignored if the front of the vehicle has already passed the stop line by more than this threshold (m) - consider_future_states: False # true: trajectory will consider forecast of traffic light states; false: trajectory will only consider current traffic light state + consider_future_states: False # true: trajectory will consider forecast states of supported regulatory elements; false: only current states #### object parameters consider_objects: True # true: planner will consider perceived objects on the route; false: planner will ignore objects + ignore_objects_behind_ego: True # exclude objects with reference-point x < 0 in vehicle_frame_id object_timeout: 1.0 # time after which a received object list is considered invalid (s) (use -1 for no timeout) - min_prediction_prob: 0.0 # minimum probability for considering an object prediction branch; otherwise the most likely one is used + min_prediction_probability: 0.0 # consider predictions with probability > this threshold; otherwise use the most likely one object_longitudinal_safety_distance: 1.5 # longitudinal ego-box margin; negative values shrink the box (m) - object_lateral_safety_distance: 0.0 # lateral ego-box margin; negative values shrink the box (m) + object_lateral_safety_distance: -0.8 # lateral ego-box margin; negative values shrink the box (m) object_interaction_time_window: 0.5 # maximum time offset for counting a spatial overlap as interaction (s) object_velocity_reduction_step: 0.1 # velocity decrement per object-avoidance iteration (m/s) object_velocity_release_step: 0.5 # maximum velocity increase per cycle after hysteresis cleared object conflicts (m/s) diff --git a/demo/trajectory_optimization/params.yml b/demo/trajectory_optimization/params.yml index bc5f10f5..c2ab889d 100644 --- a/demo/trajectory_optimization/params.yml +++ b/demo/trajectory_optimization/params.yml @@ -9,11 +9,12 @@ standstill_threshold: 0.3 # threshold for standstill detection [m/s]. If all state velocities are below this threshold, publish standstill trajectory high_level_stabilization: False # init first trajectory point with: current EgoData (True); interpolation of last trajectory -> bi-level (False) consider_objects: 2 # consider objects in optimization: 0 = no, 1 = static (no prediction), 2 = dynamic (with prediction) + ignore_objects_behind_ego: True # exclude objects with reference-point x <= 0 in vehicle_frame_id min_prediction_probability: 0.0 # consider only predictions with probability > this threshold - consider_boundaries: 1 # consider route boundaries in optimization: 0 = no, 1 = suggested lane, 2 = including adjacent, 3 = drivable space + consider_boundaries: 3 # consider route boundaries in optimization: 0 = no, 1 = suggested lane, 2 = including adjacent, 3 = drivable space verbose: False # print debug infromation and solver statistics performance_logging: False # write one CSV record for each completed solver run - debug_visualization: True # publish debug visualization markers (e.g. obstacle circles) + debug_visualization: True # publish debug visualization markers for ego, objects and boundaries run_as_callback: False # run OCP once for each received reference trajectory (true) or on a timer (false) #### thresholds for bi-level stabilization @@ -22,28 +23,31 @@ bi_level_dYaw: 89.0 # maximum yaw difference before bi-level stabilization hits [degree] ### general parameters defining the ocp - model_name: 'karl' # name of the acados model - optimization_horizon: 5.0 # optimization horizon [s] (also used as build parameter in OCP) - n_shots: 50 # number of shooting intervals in optimization horizon (also used as build parameter in OCP) + model_name: 'karl' # name of the acados model + optimization_horizon: 5.0 # optimization horizon [s] (also used as build parameter in OCP) + n_shots: 50 # number of shooting intervals in optimization horizon (also used as build parameter in OCP) + two_stage_optimization: False # initialize the constrained OCP with a solve without object and boundary constraints + relaxed_solve_timeout_ms: 100.0 # timeout of the relaxed initialization solve [ms]; 0 disables the timeout + constrained_solve_timeout_ms: 100.0 # timeout of the fully constrained solve [ms]; 0 disables the timeout #### cost weights cost_weights: - - 0.02 # dlat (0) + - 0.1 # dlat (0) - 0.0 # psi (1) (considered if RWS model is used) - - 0.3 # overspeed (2) - - 0.1 # underspeed (3) + - 0.5 # overspeed (2) + - 0.4 # underspeed (3) - 0.15 # a_lat (4) - - 0.2 # a_lon_pos (5) + - 0.15 # a_lon_pos (5) - 0.1 # a_lon_neg (6) - 0.2 # j_lat (7) - 0.1 # j_lon_pos (8) - - 0.15 # j_lon_neg (9) + - 0.1 # j_lon_neg (9) - 0.1 # alpha (10) - 3.0 # endYaw (11) dynamic_weight: 1.0 # base for exponential weight # other cost params - thw: 2.0 # time headway [s] - d_min_obstacle_long: 1.0 # minimum distance to keep to obstacles in longitudinal direction [m] - d_min_obstacle_lat: 0.1 # minimum distance to keep to obstacles in lateral direction [m] - d_min_boundary_lat: -0.5 # minimum distance to keep to boundaries in lateral direction [m] + thw: 2.0 # desired time headway [s]; soft with object slacks + d_min_object_long: 3.0 # desired longitudinal object clearance [m]; soft with object slacks + d_min_object_lat: 0.75 # desired lateral object clearance [m]; soft with object slacks + d_min_boundary_lat: 0.0 # minimum distance to keep to boundaries in lateral direction [m] diff --git a/demo/utils/rviz/conf.rviz b/demo/utils/rviz/conf.rviz index 3d13077f..4549e9a3 100644 --- a/demo/utils/rviz/conf.rviz +++ b/demo/utils/rviz/conf.rviz @@ -300,6 +300,22 @@ Visualization Manager: Velocity Color: 255; 0; 255 Velocity scale: 1 Visualize Z dimension: true + - Background Alpha: 0.5 + Background Color: 20; 20; 20 + Bottom: 10 + Class: perception_msgs/EgoDataOverlay + Enabled: true + Height: 80 + Left: 10 + Name: Ego Overlay + Topic: + Depth: 5 + Durability Policy: Volatile + History Policy: Keep Last + Reliability Policy: Reliable + Value: /localization/ego_state_estimation/ego_data + Value: true + Width: 350 - Class: rviz_default_plugins/Image Enabled: true Max Value: 1 @@ -753,6 +769,23 @@ Visualization Manager: Opacity: 0.5 Value: true Value: true + - Action Feedback Topic: /planning/lanelet2_route_planning/plan_route/_action/feedback + Background Alpha: 0.5 + Background Color: 20; 20; 20 + Class: route_planning_msgs/RouteOverlay + Enabled: true + Height: 125 + Name: Route Overlay + Right: 10 + Top: 10 + Topic: + Depth: 5 + Durability Policy: Volatile + History Policy: Keep Last + Reliability Policy: Reliable + Value: /planning/lanelet2_route_planning/route + Value: true + Width: 135 - Alpha: 0.5 Class: trajectory_planning_msgs/Trajectory Enabled: true @@ -829,13 +862,13 @@ Visualization Manager: Enabled: true Name: Optimized Trajectory Namespaces: - ego-circles: true + ego-boxes: true Topic: Depth: 5 Durability Policy: Volatile History Policy: Keep Last Reliability Policy: Reliable - Value: /planning/trajectory_optimization/visualization/ego_circles + Value: /planning/trajectory_optimization/visualization/ego Value: true Enabled: true Global Options: diff --git a/docs/functional-architecture.md b/docs/functional-architecture.md index 2bf6c77b..d2768e2c 100644 --- a/docs/functional-architecture.md +++ b/docs/functional-architecture.md @@ -43,7 +43,7 @@ For communication between nodes, [common interfaces](https://github.com/ros2/com | OpenADService | Description | | --- | --- | | [lanelet2_route_planning](https://github.com/openads-project/lanelet2_route_planning) | Plans a route on a Lanelet2 map | -| [simple_planner](https://github.com/openads-project/simple_planner) | Generates route-following reference trajectories with safe-stop, traffic-light, turn-signal, and object-aware speed handling. | +| [simple_planner](https://github.com/openads-project/simple_planner) | Generates route-following reference trajectories with safe-stop, regulatory-element, occupancy-grid, turn-signal, and object-aware speed handling. | | [trajectory_optimization](https://github.com/openads-project/trajectory_optimization) | Periodically solves a nonlinear OCP to generate optimized trajectories for automated driving. | ### Control diff --git a/docs/integration-architecture.md b/docs/integration-architecture.md index 66ce4e60..3e2697e6 100644 --- a/docs/integration-architecture.md +++ b/docs/integration-architecture.md @@ -32,7 +32,7 @@ The override can then add or replace stack-specific values such as namespaces an ```yaml include: - - oci://ghcr.io/openads-project/trajectory_optimization:compose-v1.3.0 + - oci://ghcr.io/openads-project/trajectory_optimization/compose:v1.5.0 services: trajectory-optimization: diff --git a/localization/lanelet2_map_server/.docker-compose.oci-overrides.yml b/localization/lanelet2_map_server/.docker-compose.oci-overrides.yml index af69e344..6633a853 100644 --- a/localization/lanelet2_map_server/.docker-compose.oci-overrides.yml +++ b/localization/lanelet2_map_server/.docker-compose.oci-overrides.yml @@ -2,7 +2,7 @@ # `../../utils/scripts/render_compose_sources.py` include: - - oci://ghcr.io/openads-project/lanelet2_map_server:compose-v1.2.2 + - oci://ghcr.io/openads-project/lanelet2_map_server/compose:v1.2.4 services: diff --git a/localization/lanelet2_map_server/docker-compose.yml b/localization/lanelet2_map_server/docker-compose.yml index 32010551..39e56e8d 100644 --- a/localization/lanelet2_map_server/docker-compose.yml +++ b/localization/lanelet2_map_server/docker-compose.yml @@ -1,8 +1,8 @@ # Auto-generated by `../../utils/scripts/render_compose_sources.py` # based on `.docker-compose.oci-overrides.yml` with resolved includes # include: -# # https://github.com/openads-project/lanelet2_map_server/blob/v1.2.2/deployment/compose/docker-compose.yml -# - oci://ghcr.io/openads-project/lanelet2_map_server:compose-v1.2.2 +# # https://github.com/openads-project/lanelet2_map_server/blob/v1.2.4/deployment/compose/docker-compose.yml +# - oci://ghcr.io/openads-project/lanelet2_map_server/compose:v1.2.4 services: @@ -10,7 +10,7 @@ services: extends: file: ../../utils/compose/docker-compose.template.yml service: ros2-service - image: ghcr.io/openads-project/lanelet2_map_server:v1.2.2 + image: ghcr.io/openads-project/lanelet2_map_server:v1.2.4 environment: # --- name ------ # NAMESPACE: / @@ -22,7 +22,7 @@ services: # --- other ----- LOG_LEVEL: ${LOG_LEVEL:-info} USE_SIM_TIME: ${USE_SIM_TIME:-false} - PARAMS: ${PARAMS:-/docker-ros/ws/install/lanelet2_map_server/share/lanelet2_map_server/config/params.yml} + PARAMS: /docker-ros/ws/install/lanelet2_map_server/share/lanelet2_map_server/config/params.yml command: - /bin/bash - -ic diff --git a/monitoring/monitoring/.docker-compose.oci-overrides.yml b/monitoring/monitoring/.docker-compose.oci-overrides.yml index 0a9c3afc..fd0c381e 100644 --- a/monitoring/monitoring/.docker-compose.oci-overrides.yml +++ b/monitoring/monitoring/.docker-compose.oci-overrides.yml @@ -2,7 +2,7 @@ # `../../utils/scripts/render_compose_sources.py` include: - - oci://ghcr.io/openads-project/monitoring:compose-v1.0.0 + - oci://ghcr.io/openads-project/monitoring/compose:v26.10.20 services: diff --git a/monitoring/monitoring/docker-compose.yml b/monitoring/monitoring/docker-compose.yml index 2f9ecbbe..1b73b2e1 100644 --- a/monitoring/monitoring/docker-compose.yml +++ b/monitoring/monitoring/docker-compose.yml @@ -1,8 +1,8 @@ # Auto-generated by `../../utils/scripts/render_compose_sources.py` # based on `.docker-compose.oci-overrides.yml` with resolved includes # include: -# # https://github.com/openads-project/monitoring/blob/v1.0.0/deployment/compose/docker-compose.yml -# - oci://ghcr.io/openads-project/monitoring:compose-v1.0.0 +# # https://github.com/openads-project/monitoring/blob/v26.10.20/deployment/compose/docker-compose.yml +# - oci://ghcr.io/openads-project/monitoring/compose:v26.10.20 services: @@ -10,7 +10,7 @@ services: extends: file: ../../utils/compose/docker-compose.template.yml service: ros2-gpu-x11-service - image: ghcr.io/openads-project/monitoring:v1.0.0 + image: ghcr.io/openads-project/monitoring:v26.10.20 environment: # --- name ------ # NAMESPACE: / @@ -19,7 +19,7 @@ services: # --- other ----- LOG_LEVEL: ${LOG_LEVEL:-info} USE_SIM_TIME: ${USE_SIM_TIME:-false} - # CONFIG: ${CONFIG:-/docker-ros/ws/install/monitoring/share/monitoring/config/conf.rviz} + # CONFIG: /docker-ros/ws/install/monitoring/share/monitoring/config/conf.rviz CONFIG: /conf.rviz command: - /bin/bash diff --git a/perception/point_cloud_fusion/.docker-compose.oci-overrides.yml b/perception/point_cloud_fusion/.docker-compose.oci-overrides.yml index bab08fb9..df9a20f7 100644 --- a/perception/point_cloud_fusion/.docker-compose.oci-overrides.yml +++ b/perception/point_cloud_fusion/.docker-compose.oci-overrides.yml @@ -2,7 +2,7 @@ # `../../utils/scripts/render_compose_sources.py` include: - - oci://ghcr.io/openads-project/point_cloud_fusion:compose-v1.4.0 + - oci://ghcr.io/openads-project/point_cloud_fusion/compose:v1.5.1 services: diff --git a/perception/point_cloud_fusion/docker-compose.yml b/perception/point_cloud_fusion/docker-compose.yml index 8ef7f1ec..57bda482 100644 --- a/perception/point_cloud_fusion/docker-compose.yml +++ b/perception/point_cloud_fusion/docker-compose.yml @@ -1,8 +1,8 @@ # Auto-generated by `../../utils/scripts/render_compose_sources.py` # based on `.docker-compose.oci-overrides.yml` with resolved includes # include: -# # https://github.com/openads-project/point_cloud_fusion/blob/v1.4.0/deployment/compose/docker-compose.yml -# - oci://ghcr.io/openads-project/point_cloud_fusion:compose-v1.4.0 +# # https://github.com/openads-project/point_cloud_fusion/blob/v1.5.1/deployment/compose/docker-compose.yml +# - oci://ghcr.io/openads-project/point_cloud_fusion/compose:v1.5.1 services: @@ -10,7 +10,7 @@ services: extends: file: ../../utils/compose/docker-compose.template.yml service: ros2-gpu-service - image: ghcr.io/openads-project/point_cloud_fusion:v1.4.0 + image: ghcr.io/openads-project/point_cloud_fusion:v1.5.1 environment: # --- name ------ # NAMESPACE: / @@ -21,8 +21,8 @@ services: # --- other ----- LOG_LEVEL: ${LOG_LEVEL:-info} USE_SIM_TIME: ${USE_SIM_TIME:-false} - PARAMS: ${PARAMS:-/docker-ros/ws/install/point_cloud_fusion/share/point_cloud_fusion/config/params.yml} - TRACE: ${TRACE:-false} + PARAMS: /docker-ros/ws/install/point_cloud_fusion/share/point_cloud_fusion/config/params.yml + ROS_TRACING: ${ROS_TRACING:-false} command: - /bin/bash - -ic @@ -33,7 +33,7 @@ services: log_level:=$${LOG_LEVEL} \ use_sim_time:=$${USE_SIM_TIME} \ params:=$${PARAMS} \ - trace:=$${TRACE} \ + ros_tracing:=$${ROS_TRACING} \ point_cloud_topic:=$${POINT_CLOUD_TOPIC} # volumes: # - ./params.yml:/docker-ros/ws/install/point_cloud_fusion/share/point_cloud_fusion/config/params.yml diff --git a/perception/point_cloud_object_detection/.docker-compose.oci-overrides.yml b/perception/point_cloud_object_detection/.docker-compose.oci-overrides.yml index 0de56d5b..616f2b4c 100644 --- a/perception/point_cloud_object_detection/.docker-compose.oci-overrides.yml +++ b/perception/point_cloud_object_detection/.docker-compose.oci-overrides.yml @@ -2,7 +2,7 @@ # `../../utils/scripts/render_compose_sources.py` include: - - oci://ghcr.io/openads-project/point_cloud_object_detection:compose-v3.0.0 + - oci://ghcr.io/openads-project/point_cloud_object_detection/compose:v3.1.1 services: @@ -10,7 +10,7 @@ services: extends: file: ../../utils/compose/docker-compose.template.yml service: ros2-gpu-service - image: ghcr.io/openads-project/point_cloud_object_detection:v3.0.0-slim + image: ghcr.io/openads-project/point_cloud_object_detection:v3.1.1-slim environment: # --- name ------ NAMESPACE: /perception diff --git a/perception/point_cloud_object_detection/docker-compose.yml b/perception/point_cloud_object_detection/docker-compose.yml index 6a500d36..3dcfcbcc 100644 --- a/perception/point_cloud_object_detection/docker-compose.yml +++ b/perception/point_cloud_object_detection/docker-compose.yml @@ -1,8 +1,8 @@ # Auto-generated by `../../utils/scripts/render_compose_sources.py` # based on `.docker-compose.oci-overrides.yml` with resolved includes # include: -# # https://github.com/openads-project/point_cloud_object_detection/blob/v3.0.0/deployment/compose/docker-compose.yml -# - oci://ghcr.io/openads-project/point_cloud_object_detection:compose-v3.0.0 +# # https://github.com/openads-project/point_cloud_object_detection/blob/v3.1.1/deployment/compose/docker-compose.yml +# - oci://ghcr.io/openads-project/point_cloud_object_detection/compose:v3.1.1 services: @@ -10,8 +10,8 @@ services: extends: file: ../../utils/compose/docker-compose.template.yml service: ros2-gpu-service - # image: ghcr.io/openads-project/point_cloud_object_detection:v3.0.0 - image: ghcr.io/openads-project/point_cloud_object_detection:v3.0.0-slim + # image: ghcr.io/openads-project/point_cloud_object_detection:v3.1.1 + image: ghcr.io/openads-project/point_cloud_object_detection:v3.1.1-slim environment: # --- name ------ # NAMESPACE: / @@ -33,8 +33,9 @@ services: # --- other ----- LOG_LEVEL: ${LOG_LEVEL:-info} USE_SIM_TIME: ${USE_SIM_TIME:-false} - PARAMS: ${PARAMS:-/docker-ros/ws/install/point_cloud_object_detection/share/point_cloud_object_detection/config/params.yml} - TRACE: ${TRACE:-false} + PARAMS: /docker-ros/ws/install/point_cloud_object_detection/share/point_cloud_object_detection/config/params.yml + ROS_TRACING: ${ROS_TRACING:-false} + TRITON_SERVER_URL: triton-server:8001 command: - /bin/bash - -ic @@ -45,7 +46,8 @@ services: log_level:=$${LOG_LEVEL} \ use_sim_time:=$${USE_SIM_TIME} \ params:=$${PARAMS} \ - trace:=$${TRACE} \ + ros_tracing:=$${ROS_TRACING} \ + triton_server_url:=$${TRITON_SERVER_URL} \ point_cloud_topic:=$${POINT_CLOUD_TOPIC} \ object_list_topic:=$${OBJECT_LIST_TOPIC} \ no_detection_zone_topic:=$${NO_DETECTION_ZONE_TOPIC} \ diff --git a/planning/lanelet2_route_planning/.docker-compose.oci-overrides.yml b/planning/lanelet2_route_planning/.docker-compose.oci-overrides.yml index 6a43c256..89f70608 100644 --- a/planning/lanelet2_route_planning/.docker-compose.oci-overrides.yml +++ b/planning/lanelet2_route_planning/.docker-compose.oci-overrides.yml @@ -2,7 +2,7 @@ # `../../utils/scripts/render_compose_sources.py` include: - - oci://ghcr.io/openads-project/lanelet2_route_planning:compose-v1.2.0 + - oci://ghcr.io/openads-project/lanelet2_route_planning/compose:v2.1.0 services: diff --git a/planning/lanelet2_route_planning/docker-compose.yml b/planning/lanelet2_route_planning/docker-compose.yml index 87c75840..32ca3285 100644 --- a/planning/lanelet2_route_planning/docker-compose.yml +++ b/planning/lanelet2_route_planning/docker-compose.yml @@ -1,8 +1,8 @@ # Auto-generated by `../../utils/scripts/render_compose_sources.py` # based on `.docker-compose.oci-overrides.yml` with resolved includes # include: -# # https://github.com/openads-project/lanelet2_route_planning/blob/v1.2.0/deployment/compose/docker-compose.yml -# - oci://ghcr.io/openads-project/lanelet2_route_planning:compose-v1.2.0 +# # https://github.com/openads-project/lanelet2_route_planning/blob/v2.1.0/deployment/compose/docker-compose.yml +# - oci://ghcr.io/openads-project/lanelet2_route_planning/compose:v2.1.0 services: @@ -10,7 +10,7 @@ services: extends: file: ../../utils/compose/docker-compose.template.yml service: ros2-service - image: ghcr.io/openads-project/lanelet2_route_planning:v1.2.0 + image: ghcr.io/openads-project/lanelet2_route_planning:v2.1.0 environment: # --- name ------ # NAMESPACE: / @@ -21,10 +21,12 @@ services: EGO_DATA_TOPIC: /localization/ego_state_estimation/ego_data # --- outputs --- ROUTE_TOPIC: ~/route + GLOBAL_ROUTE_TOPIC: ~/global_route + DIAGNOSTICS_TOPIC: /diagnostics # --- other ----- LOG_LEVEL: ${LOG_LEVEL:-info} USE_SIM_TIME: ${USE_SIM_TIME:-false} - PARAMS: ${PARAMS:-/docker-ros/ws/install/lanelet2_route_planning/share/lanelet2_route_planning/config/params.yml} + PARAMS: /docker-ros/ws/install/lanelet2_route_planning/share/lanelet2_route_planning/config/params.yml command: - /bin/bash - -ic @@ -36,6 +38,8 @@ services: use_sim_time:=$${USE_SIM_TIME} \ params:=$${PARAMS} \ ego_data_topic:=$${EGO_DATA_TOPIC} \ - route_topic:=$${ROUTE_TOPIC} + route_topic:=$${ROUTE_TOPIC} \ + global_route_topic:=$${GLOBAL_ROUTE_TOPIC} \ + diagnostics_topic:=$${DIAGNOSTICS_TOPIC} # volumes: # - ./params.yml:/docker-ros/ws/install/lanelet2_route_planning/share/lanelet2_route_planning/config/params.yml diff --git a/planning/simple_planner/.docker-compose.oci-overrides.yml b/planning/simple_planner/.docker-compose.oci-overrides.yml index ad81d180..27b11bb0 100644 --- a/planning/simple_planner/.docker-compose.oci-overrides.yml +++ b/planning/simple_planner/.docker-compose.oci-overrides.yml @@ -2,7 +2,7 @@ # `../../utils/scripts/render_compose_sources.py` include: - - oci://ghcr.io/openads-project/simple_planner/compose:v1.4.0 + - oci://ghcr.io/openads-project/simple_planner/compose:v1.5.0 services: diff --git a/planning/simple_planner/docker-compose.yml b/planning/simple_planner/docker-compose.yml index d243f488..47b0dfe8 100644 --- a/planning/simple_planner/docker-compose.yml +++ b/planning/simple_planner/docker-compose.yml @@ -1,8 +1,8 @@ # Auto-generated by `../../utils/scripts/render_compose_sources.py` # based on `.docker-compose.oci-overrides.yml` with resolved includes # include: -# # https://github.com/openads-project/simple_planner/blob/v1.4.0/deployment/compose/docker-compose.yml -# - oci://ghcr.io/openads-project/simple_planner/compose:v1.4.0 +# # https://github.com/openads-project/simple_planner/blob/v1.5.0/deployment/compose/docker-compose.yml +# - oci://ghcr.io/openads-project/simple_planner/compose:v1.5.0 services: @@ -10,7 +10,7 @@ services: extends: file: ../../utils/compose/docker-compose.template.yml service: ros2-service - image: ghcr.io/openads-project/simple_planner:v1.4.0 + image: ghcr.io/openads-project/simple_planner:v1.5.0 environment: # --- name ------ # NAMESPACE: / @@ -33,8 +33,8 @@ services: HAZARD_LIGHTS_SERVICE: ~/enable_hazard_lights LOG_LEVEL: ${LOG_LEVEL:-info} USE_SIM_TIME: ${USE_SIM_TIME:-false} - PARAMS: ${PARAMS:-/docker-ros/ws/install/simple_planner/share/simple_planner/config/params.yml} - TRACE: ${TRACE:-false} + PARAMS: /docker-ros/ws/install/simple_planner/share/simple_planner/config/params.yml + ROS_TRACING: ${ROS_TRACING:-false} command: - /bin/bash - -ic @@ -45,7 +45,7 @@ services: log_level:=$${LOG_LEVEL} \ use_sim_time:=$${USE_SIM_TIME} \ params:=$${PARAMS} \ - trace:=$${TRACE} \ + ros_tracing:=$${ROS_TRACING} \ ego_data_topic:=$${EGO_DATA_TOPIC} \ object_list_topic:=$${OBJECT_LIST_TOPIC} \ route_topic:=$${ROUTE_TOPIC} \ diff --git a/planning/trajectory_optimization/.docker-compose.oci-overrides.yml b/planning/trajectory_optimization/.docker-compose.oci-overrides.yml index c9e17724..5027d423 100644 --- a/planning/trajectory_optimization/.docker-compose.oci-overrides.yml +++ b/planning/trajectory_optimization/.docker-compose.oci-overrides.yml @@ -2,7 +2,7 @@ # `../../utils/scripts/render_compose_sources.py` include: - - oci://ghcr.io/openads-project/trajectory_optimization/compose:v1.4.0 + - oci://ghcr.io/openads-project/trajectory_optimization/compose:v1.5.0 services: diff --git a/planning/trajectory_optimization/docker-compose.yml b/planning/trajectory_optimization/docker-compose.yml index 41632918..23fb6e01 100644 --- a/planning/trajectory_optimization/docker-compose.yml +++ b/planning/trajectory_optimization/docker-compose.yml @@ -1,8 +1,8 @@ # Auto-generated by `../../utils/scripts/render_compose_sources.py` # based on `.docker-compose.oci-overrides.yml` with resolved includes # include: -# # https://github.com/openads-project/trajectory_optimization/blob/v1.4.0/deployment/compose/docker-compose.yml -# - oci://ghcr.io/openads-project/trajectory_optimization/compose:v1.4.0 +# # https://github.com/openads-project/trajectory_optimization/blob/v1.5.0/deployment/compose/docker-compose.yml +# - oci://ghcr.io/openads-project/trajectory_optimization/compose:v1.5.0 services: @@ -10,7 +10,7 @@ services: extends: file: ../../utils/compose/docker-compose.template.yml service: ros2-service - image: ghcr.io/openads-project/trajectory_optimization:v1.4.0 + image: ghcr.io/openads-project/trajectory_optimization:v1.5.0 environment: # --- name ------ # NAMESPACE: / @@ -28,14 +28,14 @@ services: # --- outputs --- TRAJECTORY_TOPIC: ~/trajectory BOUNDARY_MARKER_TOPIC: ~/visualization/boundaries - EGO_CIRCLES_TOPIC: ~/visualization/ego_circles - OBJECT_CIRCLES_TOPIC: ~/visualization/object_circles + EGO_MARKER_TOPIC: ~/visualization/ego + OBJECT_MARKER_TOPIC: ~/visualization/objects # --- other ----- LOG_LEVEL: ${LOG_LEVEL:-info} USE_SIM_TIME: ${USE_SIM_TIME:-false} - PARAMS: ${PARAMS:-/docker-ros/ws/install/trajectory_optimization/share/trajectory_optimization/config/params.yml} + PARAMS: /docker-ros/ws/install/trajectory_optimization/share/trajectory_optimization/config/params.yml ROS_TRACING: ${ROS_TRACING:-false} - DRIVING_MODE: ${DRIVING_MODE:-ackermann} + DRIVING_MODE: ackermann command: - /bin/bash - -ic @@ -54,7 +54,7 @@ services: route_topic:=$${ROUTE_TOPIC} \ trajectory_topic:=$${TRAJECTORY_TOPIC} \ boundary_marker_topic:=$${BOUNDARY_MARKER_TOPIC} \ - ego_circles_topic:=$${EGO_CIRCLES_TOPIC} \ - object_circles_topic:=$${OBJECT_CIRCLES_TOPIC} + ego_marker_topic:=$${EGO_MARKER_TOPIC} \ + object_marker_topic:=$${OBJECT_MARKER_TOPIC} # volumes: # - ./params.yml:/docker-ros/ws/install/trajectory_optimization/share/trajectory_optimization/config/params.yml diff --git a/understanding/autoware_multi_object_tracker/.docker-compose.oci-overrides.yml b/understanding/autoware_multi_object_tracker/.docker-compose.oci-overrides.yml index 2f5e5f7f..4f7f2bd2 100644 --- a/understanding/autoware_multi_object_tracker/.docker-compose.oci-overrides.yml +++ b/understanding/autoware_multi_object_tracker/.docker-compose.oci-overrides.yml @@ -2,7 +2,7 @@ # `../../utils/scripts/render_compose_sources.py` include: - - oci://ghcr.io/thinking-cars/autoware_multi_object_tracker:compose-v1.1.0 + - oci://ghcr.io/thinking-cars/autoware_multi_object_tracker/compose:v1.1.1 services: diff --git a/understanding/autoware_multi_object_tracker/docker-compose.yml b/understanding/autoware_multi_object_tracker/docker-compose.yml index 0851e25c..9b8b607c 100644 --- a/understanding/autoware_multi_object_tracker/docker-compose.yml +++ b/understanding/autoware_multi_object_tracker/docker-compose.yml @@ -1,8 +1,8 @@ # Auto-generated by `../../utils/scripts/render_compose_sources.py` # based on `.docker-compose.oci-overrides.yml` with resolved includes # include: -# # https://github.com/thinking-cars/autoware_multi_object_tracker/blob/v1.1.0/deployment/compose/docker-compose.yml -# - oci://ghcr.io/thinking-cars/autoware_multi_object_tracker:compose-v1.1.0 +# # https://github.com/thinking-cars/autoware_multi_object_tracker/blob/v1.1.1/deployment/compose/docker-compose.yml +# - oci://ghcr.io/thinking-cars/autoware_multi_object_tracker/compose:v1.1.1 services: @@ -10,7 +10,7 @@ services: extends: file: ../../utils/compose/docker-compose.template.yml service: ros2-service - image: ghcr.io/thinking-cars/autoware_multi_object_tracker:v1.1.0 + image: ghcr.io/thinking-cars/autoware_multi_object_tracker:v1.1.1 environment: # --- name ------ # NAMESPACE: / @@ -37,24 +37,24 @@ services: OUTPUT_MERGED_OBJECTS: ~/merged_object_list LOG_LEVEL: ${LOG_LEVEL:-info} USE_SIM_TIME: ${USE_SIM_TIME:-false} - # INPUT_DETECTION01_CHANNEL: ${INPUT_DETECTION01_CHANNEL:-none} + # INPUT_DETECTION01_CHANNEL: none INPUT_DETECTION01_CHANNEL: untracked_objects - INPUT_DETECTION02_CHANNEL: ${INPUT_DETECTION02_CHANNEL:-none} - INPUT_DETECTION03_CHANNEL: ${INPUT_DETECTION03_CHANNEL:-none} - INPUT_DETECTION04_CHANNEL: ${INPUT_DETECTION04_CHANNEL:-none} - INPUT_DETECTION05_CHANNEL: ${INPUT_DETECTION05_CHANNEL:-none} - INPUT_DETECTION06_CHANNEL: ${INPUT_DETECTION06_CHANNEL:-none} - INPUT_DETECTION07_CHANNEL: ${INPUT_DETECTION07_CHANNEL:-none} - INPUT_DETECTION08_CHANNEL: ${INPUT_DETECTION08_CHANNEL:-none} - INPUT_DETECTION09_CHANNEL: ${INPUT_DETECTION09_CHANNEL:-none} - INPUT_DETECTION10_CHANNEL: ${INPUT_DETECTION10_CHANNEL:-none} - INPUT_DETECTION11_CHANNEL: ${INPUT_DETECTION11_CHANNEL:-none} - INPUT_DETECTION12_CHANNEL: ${INPUT_DETECTION12_CHANNEL:-none} - TRACKER_SETTING_PATH: ${TRACKER_SETTING_PATH:-} - DATA_ASSOCIATION_MATRIX_PATH: ${DATA_ASSOCIATION_MATRIX_PATH:-} - INPUT_CHANNELS_PATH: ${INPUT_CHANNELS_PATH:-} - PUBLISH_MERGED_OBJECTS: ${PUBLISH_MERGED_OBJECTS:-false} - EGO_SOURCE: ${EGO_SOURCE:-tf} + INPUT_DETECTION02_CHANNEL: none + INPUT_DETECTION03_CHANNEL: none + INPUT_DETECTION04_CHANNEL: none + INPUT_DETECTION05_CHANNEL: none + INPUT_DETECTION06_CHANNEL: none + INPUT_DETECTION07_CHANNEL: none + INPUT_DETECTION08_CHANNEL: none + INPUT_DETECTION09_CHANNEL: none + INPUT_DETECTION10_CHANNEL: none + INPUT_DETECTION11_CHANNEL: none + INPUT_DETECTION12_CHANNEL: none + TRACKER_SETTING_PATH: "" + DATA_ASSOCIATION_MATRIX_PATH: "" + INPUT_CHANNELS_PATH: "" + PUBLISH_MERGED_OBJECTS: false + EGO_SOURCE: tf command: - /bin/bash - -ic diff --git a/understanding/lanelet2_object_list_prediction/.docker-compose.oci-overrides.yml b/understanding/lanelet2_object_list_prediction/.docker-compose.oci-overrides.yml index 6c4d25b4..1579e410 100644 --- a/understanding/lanelet2_object_list_prediction/.docker-compose.oci-overrides.yml +++ b/understanding/lanelet2_object_list_prediction/.docker-compose.oci-overrides.yml @@ -2,7 +2,7 @@ # `../../utils/scripts/render_compose_sources.py` include: - - oci://ghcr.io/openads-project/lanelet2_object_list_prediction/compose:v1.0.2 + - oci://ghcr.io/openads-project/lanelet2_object_list_prediction/compose:v2.0.0 services: @@ -14,4 +14,6 @@ services: # --- name ------ NAMESPACE: /understanding # --- inputs ---- + EGO_DATA_TOPIC: /localization/ego_state_estimation/ego_data + ROUTE_TOPIC: /planning/lanelet2_route_planning/route TRACKED_OBJECT_LIST_TOPIC: /understanding/autoware_multi_object_tracker/object_list diff --git a/understanding/lanelet2_object_list_prediction/docker-compose.yml b/understanding/lanelet2_object_list_prediction/docker-compose.yml index 7f19c4e1..91b804dc 100644 --- a/understanding/lanelet2_object_list_prediction/docker-compose.yml +++ b/understanding/lanelet2_object_list_prediction/docker-compose.yml @@ -1,8 +1,8 @@ # Auto-generated by `../../utils/scripts/render_compose_sources.py` # based on `.docker-compose.oci-overrides.yml` with resolved includes # include: -# # https://github.com/openads-project/lanelet2_object_list_prediction/blob/v1.0.2/deployment/compose/docker-compose.yml -# - oci://ghcr.io/openads-project/lanelet2_object_list_prediction/compose:v1.0.2 +# # https://github.com/openads-project/lanelet2_object_list_prediction/blob/v2.0.0/deployment/compose/docker-compose.yml +# - oci://ghcr.io/openads-project/lanelet2_object_list_prediction/compose:v2.0.0 services: @@ -10,7 +10,7 @@ services: extends: file: ../../utils/compose/docker-compose.template.yml service: ros2-service - image: ghcr.io/openads-project/lanelet2_object_list_prediction:v1.0.2 + image: ghcr.io/openads-project/lanelet2_object_list_prediction:v2.0.0 environment: # --- name ------ # NAMESPACE: / @@ -19,12 +19,17 @@ services: # --- inputs ---- # TRACKED_OBJECT_LIST_TOPIC: ~/tracked_object_list TRACKED_OBJECT_LIST_TOPIC: /understanding/autoware_multi_object_tracker/object_list + # ROUTE_TOPIC: ~/route + ROUTE_TOPIC: /planning/lanelet2_route_planning/route + # EGO_DATA_TOPIC: ~/ego_data + EGO_DATA_TOPIC: /localization/ego_state_estimation/ego_data # --- outputs --- OBJECT_LIST_TOPIC: ~/object_list # --- other ----- LOG_LEVEL: ${LOG_LEVEL:-info} USE_SIM_TIME: ${USE_SIM_TIME:-false} - PARAMS: ${PARAMS:-/docker-ros/ws/install/lanelet2_object_list_prediction/share/lanelet2_object_list_prediction/config/params.yml} + PARAMS: /docker-ros/ws/install/lanelet2_object_list_prediction/share/lanelet2_object_list_prediction/config/params.yml + ROS_TRACING: ${ROS_TRACING:-false} command: - /bin/bash - -ic @@ -35,7 +40,10 @@ services: log_level:=$${LOG_LEVEL} \ use_sim_time:=$${USE_SIM_TIME} \ params:=$${PARAMS} \ + ros_tracing:=$${ROS_TRACING} \ tracked_object_list_topic:=$${TRACKED_OBJECT_LIST_TOPIC} \ + route_topic:=$${ROUTE_TOPIC} \ + ego_data_topic:=$${EGO_DATA_TOPIC} \ object_list_topic:=$${OBJECT_LIST_TOPIC} # volumes: # - ./params.yml:/docker-ros/ws/install/lanelet2_object_list_prediction/share/lanelet2_object_list_prediction/config/params.yml