diff --git a/common/math/arithmetic/CHANGELOG.rst b/common/math/arithmetic/CHANGELOG.rst index 2918ca7301b..ffbec95e648 100644 --- a/common/math/arithmetic/CHANGELOG.rst +++ b/common/math/arithmetic/CHANGELOG.rst @@ -21,6 +21,74 @@ Changelog for package arithmetic * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + 6.2.5 (2024-12-09) ------------------ * Merge branch 'master' into fix/acc_by_slope diff --git a/common/math/arithmetic/package.xml b/common/math/arithmetic/package.xml index ad1468f6ef9..f6e3214ac47 100644 --- a/common/math/arithmetic/package.xml +++ b/common/math/arithmetic/package.xml @@ -2,7 +2,7 @@ arithmetic - 6.2.5 + 7.0.0 arithmetic library for scenario_simulator_v2 Tatsuya Yamasaki Apache License 2.0 diff --git a/common/math/geometry/CHANGELOG.rst b/common/math/geometry/CHANGELOG.rst index bea11f9f2a4..c5936ea71e6 100644 --- a/common/math/geometry/CHANGELOG.rst +++ b/common/math/geometry/CHANGELOG.rst @@ -21,6 +21,74 @@ Changelog for package geometry * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + 6.2.5 (2024-12-09) ------------------ * Merge branch 'master' into fix/acc_by_slope diff --git a/common/math/geometry/package.xml b/common/math/geometry/package.xml index f9c1621b14e..a9b603c7e7f 100644 --- a/common/math/geometry/package.xml +++ b/common/math/geometry/package.xml @@ -2,7 +2,7 @@ geometry - 6.2.5 + 7.0.0 geometry math library for scenario_simulator_v2 application Masaya Kataoka Apache License 2.0 diff --git a/common/scenario_simulator_exception/CHANGELOG.rst b/common/scenario_simulator_exception/CHANGELOG.rst index 393216ae40c..1151b1ff95c 100644 --- a/common/scenario_simulator_exception/CHANGELOG.rst +++ b/common/scenario_simulator_exception/CHANGELOG.rst @@ -21,6 +21,74 @@ Changelog for package scenario_simulator_exception * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + 6.2.5 (2024-12-09) ------------------ * Merge branch 'master' into fix/acc_by_slope diff --git a/common/scenario_simulator_exception/package.xml b/common/scenario_simulator_exception/package.xml index e8d5237ff1c..74d9979120a 100644 --- a/common/scenario_simulator_exception/package.xml +++ b/common/scenario_simulator_exception/package.xml @@ -2,7 +2,7 @@ scenario_simulator_exception - 6.2.5 + 7.0.0 Exception types for scenario simulator Tatsuya Yamasaki Apache License 2.0 diff --git a/common/simple_junit/CHANGELOG.rst b/common/simple_junit/CHANGELOG.rst index 87900b4c871..f753416d42b 100644 --- a/common/simple_junit/CHANGELOG.rst +++ b/common/simple_junit/CHANGELOG.rst @@ -21,6 +21,74 @@ Changelog for package junit_exporter * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + 6.2.5 (2024-12-09) ------------------ * Merge branch 'master' into fix/acc_by_slope diff --git a/common/simple_junit/package.xml b/common/simple_junit/package.xml index ee8bc1e4f54..18a6bd5e5b8 100644 --- a/common/simple_junit/package.xml +++ b/common/simple_junit/package.xml @@ -2,7 +2,7 @@ simple_junit - 6.2.5 + 7.0.0 Lightweight JUnit library for ROS 2 Masaya Kataoka Tatsuya Yamasaki diff --git a/common/status_monitor/CHANGELOG.rst b/common/status_monitor/CHANGELOG.rst index aead00ca9f4..d047520783c 100644 --- a/common/status_monitor/CHANGELOG.rst +++ b/common/status_monitor/CHANGELOG.rst @@ -21,6 +21,74 @@ Changelog for package status_monitor * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + 6.2.5 (2024-12-09) ------------------ * Merge branch 'master' into fix/acc_by_slope diff --git a/common/status_monitor/package.xml b/common/status_monitor/package.xml index 2f343f57745..46aa5e5e1ed 100644 --- a/common/status_monitor/package.xml +++ b/common/status_monitor/package.xml @@ -2,7 +2,7 @@ status_monitor - 6.2.5 + 7.0.0 none Tatsuya Yamasaki Apache License 2.0 diff --git a/dependency_humble.repos b/dependency_humble.repos index 726e7cceb6c..055e9c614e6 100644 --- a/dependency_humble.repos +++ b/dependency_humble.repos @@ -7,10 +7,11 @@ repositories: type: git url: https://github.com/autowarefoundation/autoware_msgs.git version: main - autoware_auto_msgs: + # TODO(youtalk): Remove autoware_common when https://github.com/autowarefoundation/autoware/issues/4911 is closed + autoware_common: type: git - url: https://github.com/tier4/autoware_auto_msgs.git - version: tier4/main + url: https://github.com/autowarefoundation/autoware_common.git + version: remove-autoware-cmake-utils autoware_cmake: type: git url: https://github.com/autowarefoundation/autoware_cmake.git diff --git a/docs/developer_guide/Communication.md b/docs/developer_guide/Communication.md index 17c3880e8b9..48d22522178 100644 --- a/docs/developer_guide/Communication.md +++ b/docs/developer_guide/Communication.md @@ -3,19 +3,19 @@ ### Subscribers -| topic | type | note | -|--------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------| -| `/autoware/state` | [`autoware_auto_system_msgs/msg/AutowareState`](https://github.com/tier4/autoware_auto_msgs/blob/tier4/main/autoware_auto_system_msgs/msg/AutowareState.idl)
or [`autoware_system_msgs/msg/AutowareState`](https://github.com/autowarefoundation/autoware_msgs/blob/main/autoware_system_msgs/msg/AutowareState.msg) | Used in UserDefinedValueCondition : `currentAutowareState` | -| `/control/command/control_cmd` | [`autoware_auto_control_msgs/msg/AckermannControlCommand`](https://github.com/tier4/autoware_auto_msgs/blob/tier4/main/autoware_auto_control_msgs/msg/AckermannControlCommand.idl) | | -| `/control/command/gear_cmd` | [`autoware_auto_vehicle_msgs/msg/GearCommand`](https://github.com/tier4/autoware_auto_msgs/blob/tier4/main/autoware_auto_vehicle_msgs/msg/GearCommand.idl) | | -| `/control/command/turn_indicators_cmd` | [`autoware_auto_vehicle_msgs/msg/TurnIndicatorsCommand`](https://github.com/tier4/autoware_auto_msgs/blob/tier4/main/autoware_auto_vehicle_msgs/msg/TurnIndicatorsCommand.idl) | Used in UserDefinedValueCondition : `currentTurnIndicatorsState` | -| `/parameter_events` | [`rcl_interfaces/msg/ParameterEvent`](https://github.com/ros2/rcl_interfaces/blob/master/rcl_interfaces/msg/ParameterEvent.msg) | | -| `/planning/scenario_planning/lane_driving/behavior_planning/path_with_lane_id` | [`autoware_auto_planning_msgs/msg/PathWithLaneId`](https://github.com/tier4/autoware_auto_msgs/blob/tier4/main/autoware_auto_planning_msgs/msg/PathWithLaneId.idl) | | -| `/planning/scenario_planning/trajectory` | [`autoware_auto_planning_msgs/msg/Trajectory`](https://github.com/tier4/autoware_auto_msgs/blob/tier4/main/autoware_auto_planning_msgs/msg/Trajectory.idl) | | -| `/system/emergency/emergency_state` | [`autoware_auto_system_msgs/msg/EmergencyState`](https://github.com/tier4/autoware_auto_msgs/blob/tier4/main/autoware_auto_system_msgs/msg/EmergencyState.idl) | Used in UserDefinedValueCondition : `currentEmergencyState` | -| `/api/fail_safe/mrm_state` | [`autoware_adapi_v1_msgs/msg/MrmState`](https://github.com/autowarefoundation/autoware_adapi_msgs/blob/main/autoware_adapi_v1_msgs/system/msg/MrmState.msg) | Used in UserDefinedValueCondition : `currentMinimumRiskManeuverState` | -| `/planning/scenario_planning/motion_velocity_optimizer/closest_jerk` | [`tier4_debug_msgs/msg/Float32Stamped`](https://github.com/tier4/tier4_autoware_msgs/blob/tier4/universe/tier4_debug_msgs/msg/Float32Stamped.msg) | Used in /simulation/openscenario_interpreter | -| `/api/external/get/rtc_status` | [`tier4_rtc_msgs::msg::CooperateStatusArray`](https://github.com/tier4/tier4_autoware_msgs/blob/tier4/universe/tier4_rtc_msgs/msg/CooperateStatusArray.msg) | | +| topic | type | note | +|--------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------| +| `/autoware/state` | [`autoware_system_msgs/msg/AutowareState`](https://github.com/autowarefoundation/autoware_msgs/tree/main/autoware_system_msgs/msg/AutowareState.msg) | Used in UserDefinedValueCondition : `currentAutowareState` | +| `/control/command/control_cmd` | [`autoware_control_msgs/msg/Control`](https://github.com/autowarefoundation/autoware_msgs/blob/main/autoware_control_msgs/msg/Control.msg) | | +| `/control/command/gear_cmd` | [`autoware_vehicle_msgs/msg/GearCommand`](https://github.com/autowarefoundation/autoware_msgs/blob/main/autoware_vehicle_msgs/msg/GearCommand.msg) | | +| `/control/command/turn_indicators_cmd` | [`autoware_vehicle_msgs/msg/TurnIndicatorsCommand`](https://github.com/autowarefoundation/autoware_msgs/blob/main/autoware_vehicle_msgs/msg/TurnIndicatorsCommand.msg) | Used in UserDefinedValueCondition : `currentTurnIndicatorsState` | +| `/parameter_events` | [`rcl_interfaces/msg/ParameterEvent`](https://github.com/ros2/rcl_interfaces/blob/master/rcl_interfaces/msg/ParameterEvent.msg) | | +| `/planning/scenario_planning/lane_driving/behavior_planning/path_with_lane_id` | [`tier4_planning_msgs/msg/PathWithLaneId`](https://github.com/tier4/tier4_autoware_msgs/blob/tier4/universe/tier4_planning_msgs/msg/PathWithLaneId.msg) | | +| `/api/iv_msgs/planning/scenario_planning/trajectory` | [`tier4_planning_msgs/msg/Trajectory`](https://github.com/tier4/tier4_autoware_msgs/blob/tier4/universe/tier4_planning_msgs/msg/Trajectory.msg) | | +| `/api/external/get/emergency` | [`tier4_external_api_msgs/msg/Emergency`](https://github.com/tier4/tier4_autoware_msgs/blob/tier4/universe/tier4_external_api_msgs/msg/Emergency.msg) | Used in UserDefinedValueCondition : `currentEmergencyState` | +| `/api/fail_safe/mrm_state` | [`autoware_adapi_v1_msgs/msg/MrmState`](https://github.com/autowarefoundation/autoware_adapi_msgs/blob/main/autoware_adapi_v1_msgs/system/msg/MrmState.msg) | Used in UserDefinedValueCondition : `currentMinimumRiskManeuverState` | +| `/planning/scenario_planning/motion_velocity_optimizer/closest_jerk` | [`tier4_debug_msgs/msg/Float32Stamped`](https://github.com/tier4/tier4_autoware_msgs/blob/tier4/universe/tier4_debug_msgs/msg/Float32Stamped.msg) | Used in /simulation/openscenario_interpreter | +| `/api/external/get/rtc_status` | [`tier4_rtc_msgs::msg::CooperateStatusArray`](https://github.com/tier4/tier4_autoware_msgs/blob/tier4/universe/tier4_rtc_msgs/msg/CooperateStatusArray.msg) | | ### Publishers @@ -27,20 +27,22 @@ | `/localization/acceleration` | [`geometry_msgs::msg::AccelWithCovarianceStamped`](https://github.com/ros2/common_interfaces/blob/rolling/geometry_msgs/msg/AccelWithCovarianceStamped.msg) | | | `/planning/mission_planning/checkpoint` | [`geometry_msgs/msg/PoseStamped`](https://github.com/ros2/common_interfaces/blob/master/geometry_msgs/msg/PoseStamped.msg) | | | `/planning/mission_planning/goal` | [`geometry_msgs/msg/PoseStamped`](https://github.com/ros2/common_interfaces/blob/master/geometry_msgs/msg/PoseStamped.msg) | | -| `/vehicle/status/control_mode` | [`autoware_auto_vehicle_msgs/msg/ControlModeReport`](https://github.com/tier4/autoware_auto_msgs/blob/tier4/main/autoware_auto_vehicle_msgs/msg/ControlModeReport.idl) | | -| `/vehicle/status/gear_status` | [`autoware_auto_vehicle_msgs/msg/GearReport`](https://github.com/tier4/autoware_auto_msgs/blob/tier4/main/autoware_auto_vehicle_msgs/msg/GearReport.idl) | | -| `/vehicle/status/steering_status` | [`autoware_auto_vehicle_msgs/msg/SteeringReport`](https://github.com/tier4/autoware_auto_msgs/blob/tier4/main/autoware_auto_vehicle_msgs/msg/SteeringReport.idl) | | -| `/vehicle/status/turn_indicators_status` | [`autoware_auto_vehicle_msgs/msg/TurnIndicatorsReport`](https://github.com/tier4/autoware_auto_msgs/blob/tier4/main/autoware_auto_vehicle_msgs/msg/TurnIndicatorsReport.idl) | | -| `/vehicle/status/velocity_status` | [`autoware_auto_vehicle_msgs/msg/VelocityReport`](https://github.com/tier4/autoware_auto_msgs/blob/tier4/main/autoware_auto_vehicle_msgs/msg/VelocityReport.idl) | | -| `/perception/object_recognition/detection/objects` | [`autoware_auto_perception_msgs/msg/DetectedObjects`](https://github.com/tier4/autoware_auto_msgs/blob/tier4/main/autoware_auto_perception_msgs/msg/DetectedObjects.idl) | [Simulated by simple_sensor_simulator](https://tier4.github.io/scenario_simulator_v2-docs/developer_guide/SimpleSensorSimulator/#object-detection-results-simulation) | -| `/perception/object_recognition/ground_truth/objects` | [`autoware_auto_perception_msgs/msg/TrackedObjects`](https://github.com/tier4/autoware_auto_msgs/blob/tier4/main/autoware_auto_perception_msgs/msg/TrackedObjects.idl) | [Simulated by simple_sensor_simulator](https://tier4.github.io/scenario_simulator_v2-docs/developer_guide/SimpleSensorSimulator/#object-detection-results-simulation) | +| `/vehicle/status/control_mode` | [`autoware_vehicle_msgs/msg/ControlModeReport`](https://github.com/autowarefoundation/autoware_msgs/tree/main/autoware_vehicle_msgs/msg/ControlModeReport.msg) | | +| `/vehicle/status/gear_status` | [`autoware_vehicle_msgs/msg/GearReport`](https://github.com/autowarefoundation/autoware_msgs/tree/main/autoware_vehicle_msgs/msg/GearReport.msg) | | +| `/vehicle/status/steering_status` | [`autoware_vehicle_msgs/msg/SteeringReport`](https://github.com/autowarefoundation/autoware_msgs/tree/main/autoware_vehicle_msgs/msg/SteeringReport.msg) | | +| `/vehicle/status/turn_indicators_status` | [`autoware_vehicle_msgs/msg/TurnIndicatorsReport`](https://github.com/autowarefoundation/autoware_msgs/tree/main/autoware_vehicle_msgs/msg/TurnIndicatorsReport.msg) | | +| `/vehicle/status/velocity_status` | [`autoware_vehicle_msgs/msg/VelocityReport`](https://github.com/autowarefoundation/autoware_msgs/tree/main/autoware_vehicle_msgs/msg/VelocityReport.msg) | | +| `/perception/object_recognition/detection/objects` | [`autoware_perception_msgs/msg/DetectedObjects`](https://github.com/autowarefoundation/autoware_msgs/blob/main/autoware_perception_msgs/msg/DetectedObjects.msg) | [Simulated by simple_sensor_simulator](https://tier4.github.io/scenario_simulator_v2-docs/developer_guide/SimpleSensorSimulator/#object-detection-results-simulation) | +| `/perception/object_recognition/ground_truth/objects` | [`autoware_perception_msgs/msg/TrackedObjects`](https://github.com/autowarefoundation/autoware_msgs/blob/main/autoware_perception_msgs/msg/TrackedObjects.msg) | [Simulated by simple_sensor_simulator](https://tier4.github.io/scenario_simulator_v2-docs/developer_guide/SimpleSensorSimulator/#object-detection-results-simulation) | | `/perception/obstacle_segmentation/pointcloud` | [`sensor_msgs/msg/PointCloud2`](https://github.com/ros2/common_interfaces/blob/master/sensor_msgs/msg/PointCloud2.msg) | [Simulated by simple_sensor_simulator](https://tier4.github.io/scenario_simulator_v2-docs/developer_guide/SimpleSensorSimulator/#lidar-simulation) | | `/perception/occupancy_grid_map/map` | [`nav_msgs/msg/OccupancyGrid`](https://github.com/ros2/common_interfaces/blob/master/nav_msgs/msg/OccupancyGrid.msg) | [Simulated by simple_sensor_simulator](https://tier4.github.io/scenario_simulator_v2-docs/developer_guide/SimpleSensorSimulator/#occupancy-grid-sensor-simulation) | | `/sensing/imu/imu_data` | [`sensor_msgs/msg/Imu`](https://github.com/ros2/common_interfaces/blob/master/sensor_msgs/msg/Imu.msg) | | -| `/perception/traffic_light_recognition/traffic_signals` | [`autoware_auto_perception_msgs/msg/TrafficSignalArray`](https://github.com/tier4/autoware_auto_msgs/blob/tier4/main/autoware_auto_perception_msgs/msg/TrafficSignalArray.idl) | for `architecture_type` equal to `awf/universe` | -| `/perception/traffic_light_recognition/internal/traffic_signals` | [`autoware_perception_msgs/msg/TrafficSignalArray`](https://github.com/autowarefoundation/autoware_msgs/blob/main/autoware_perception_msgs/msg/TrafficSignalArray.msg) | for `architecture_type` greater or equal to `awf/universe/20230906` | -| `/perception/traffic_light_recognition/external/traffic_signals` | [`autoware_perception_msgs/msg/TrafficSignalArray`](https://github.com/autowarefoundation/autoware_msgs/blob/main/autoware_perception_msgs/msg/TrafficSignalArray.msg) | | -| `/v2x/traffic_signals` | [`autoware_perception_msgs/msg/TrafficSignalArray`](https://github.com/autowarefoundation/autoware_msgs/blob/main/autoware_perception_msgs/msg/TrafficSignalArray.msg) | | +| `/perception/traffic_light_recognition/internal/traffic_signals` | [`autoware_perception_msgs/msg/TrafficSignalArray`](https://github.com/autowarefoundation/autoware_msgs/blob/main/autoware_perception_msgs/msg/TrafficSignalArray.msg) | Optical traffic light interface for `architecture_type` equal to `awf/universe/20230906` | +| `/perception/traffic_light_recognition/internal/traffic_signals` | [`autoware_perception_msgs/msg/TrafficLightGroupArray`](https://github.com/autowarefoundation/autoware_msgs/blob/main/autoware_perception_msgs/msg/TrafficLightGroupArray.msg) | Optical traffic light interface for `architecture_type` equal to `awf/universe/20240605` | +| `/perception/traffic_light_recognition/external/traffic_signals` | [`autoware_perception_msgs/msg/TrafficSignalArray`](https://github.com/autowarefoundation/autoware_msgs/blob/main/autoware_perception_msgs/msg/TrafficSignalArray.msg) | V2I traffic light interface for `architecture_type` equal to `awf/universe/20230906` | +| `/perception/traffic_light_recognition/external/traffic_signals` | [`autoware_perception_msgs/msg/TrafficLightGroupArray`](https://github.com/autowarefoundation/autoware_msgs/blob/main/autoware_perception_msgs/msg/TrafficLightGroupArray.msg) | V2I traffic light interface for `architecture_type` equal to `awf/universe/20240605` | +| `/v2x/traffic_signals` | [`autoware_perception_msgs/msg/TrafficSignalArray`](https://github.com/autowarefoundation/autoware_msgs/blob/main/autoware_perception_msgs/msg/TrafficSignalArray.msg) | Additional V2I traffic light interface for `architecture_type` equal to `awf/universe/20230906` | +| `/v2x/traffic_signals` | [`autoware_perception_msgs/msg/TrafficLightGroupArray`](https://github.com/autowarefoundation/autoware_msgs/blob/main/autoware_perception_msgs/msg/TrafficLightGroupArray.msg) | Additional V2I traffic light interface for `architecture_type` equal to `awf/universe/20240605` | [//]: # (| /rosout | rcl_interfaces/msg/Log | | |) [//]: # (| /tf | tf2_msgs/msg/TFMessage | | |) diff --git a/external/concealer/CHANGELOG.rst b/external/concealer/CHANGELOG.rst index f810b5ea752..bfee9cd9f14 100644 --- a/external/concealer/CHANGELOG.rst +++ b/external/concealer/CHANGELOG.rst @@ -21,6 +21,100 @@ Changelog for package concealer * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge pull request `#1454 `_ from tier4/RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* refactor: delete unused include +* refactor: delete unused include +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* docs: fix doxygen comment +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* chore: apply formatter +* fix: fix build errors +* refactor: delete unused include +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* chore: stop using autoware_auto_msgs +* Merge remote-tracking branch 'origin/RJD-736/autoware_msgs_support_new_traffic_light_group' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # external/concealer/src/autoware_universe.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Delete unused autoware_auto_system_msgs package +* Concealer: Delete unused autoware_planning_msgs +* PathWithLaneId: change autoware_msgs to tier4_planning_msgs +* Port TrafficSignalArray from autoware_auto_perception_msgs to autoware_perception_msgs +* Port AckermannControlCommand to Control +* Finish porting autoware_auto_planning_msgs to autoware_planning_msgs +* Port PathWithLaneId +* Port AutowareState +* Port ControlModeReport +* Port GearCommand +* Port GearReport +* Port SteeringReport +* Port TurnIndicatorsCommand +* Port TurnIndicatorsReport +* Port VelocityReport message +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + 6.2.5 (2024-12-09) ------------------ * Merge branch 'master' into fix/acc_by_slope diff --git a/external/concealer/include/concealer/autoware.hpp b/external/concealer/include/concealer/autoware.hpp index 12a50710a92..fcda771cf9f 100644 --- a/external/concealer/include/concealer/autoware.hpp +++ b/external/concealer/include/concealer/autoware.hpp @@ -16,10 +16,10 @@ #define CONCEALER__AUTOWARE_HPP_ #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include @@ -49,7 +49,7 @@ class Autoware : public rclcpp::Node, public ContinuousTransformBroadcaster double = 0; - virtual auto getGearCommand() const -> autoware_auto_vehicle_msgs::msg::GearCommand; + virtual auto getGearCommand() const -> autoware_vehicle_msgs::msg::GearCommand; virtual auto getSteeringAngle() const -> double = 0; @@ -59,16 +59,14 @@ class Autoware : public rclcpp::Node, public ContinuousTransformBroadcaster double = 0; virtual auto getTurnIndicatorsCommand() const - -> autoware_auto_vehicle_msgs::msg::TurnIndicatorsCommand; + -> autoware_vehicle_msgs::msg::TurnIndicatorsCommand; - virtual auto getVehicleCommand() const -> std::tuple< - autoware_auto_control_msgs::msg::AckermannControlCommand, - autoware_auto_vehicle_msgs::msg::GearCommand> = 0; + virtual auto getVehicleCommand() const + -> std::tuple = 0; virtual auto getRouteLanelets() const -> std::vector = 0; - virtual auto getControlModeReport() const - -> autoware_auto_vehicle_msgs::msg::ControlModeReport = 0; + virtual auto getControlModeReport() const -> autoware_vehicle_msgs::msg::ControlModeReport = 0; auto set(const geometry_msgs::msg::Accel &) -> void; diff --git a/external/concealer/include/concealer/autoware_universe.hpp b/external/concealer/include/concealer/autoware_universe.hpp index 8e96c0f4abf..d1b4a7bcc8d 100644 --- a/external/concealer/include/concealer/autoware_universe.hpp +++ b/external/concealer/include/concealer/autoware_universe.hpp @@ -15,19 +15,19 @@ #ifndef CONCEALER__AUTOWARE_UNIVERSE_HPP_ #define CONCEALER__AUTOWARE_UNIVERSE_HPP_ -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include #include +#include namespace concealer { @@ -38,30 +38,30 @@ namespace concealer class AutowareUniverse : public Autoware { // clang-format off - using ControlModeCommand = autoware_auto_vehicle_msgs::srv::ControlModeCommand; - using ControlModeReport = autoware_auto_vehicle_msgs::msg::ControlModeReport; - using GearCommand = autoware_auto_vehicle_msgs::msg::GearCommand; - using GearReport = autoware_auto_vehicle_msgs::msg::GearReport; - using TurnIndicatorsCommand = autoware_auto_vehicle_msgs::msg::TurnIndicatorsCommand; - using PathWithLaneId = autoware_auto_planning_msgs::msg::PathWithLaneId; - using SteeringReport = autoware_auto_vehicle_msgs::msg::SteeringReport; - using VelocityReport = autoware_auto_vehicle_msgs::msg::VelocityReport; - using TurnIndicatorsReport = autoware_auto_vehicle_msgs::msg::TurnIndicatorsReport; - using AckermannControlCommand = autoware_auto_control_msgs::msg::AckermannControlCommand; using AccelWithCovarianceStamped = geometry_msgs::msg::AccelWithCovarianceStamped; - - SubscriberWrapper getAckermannControlCommand; - SubscriberWrapper getGearCommandImpl; - SubscriberWrapper getTurnIndicatorsCommand; - SubscriberWrapper getPathWithLaneId; - - PublisherWrapper setAcceleration; - PublisherWrapper setOdometry; - PublisherWrapper setSteeringReport; - PublisherWrapper setGearReport; - PublisherWrapper setControlModeReport; - PublisherWrapper setVelocityReport; - PublisherWrapper setTurnIndicatorsReport; + using Control = autoware_control_msgs::msg::Control; + using ControlModeCommand = autoware_vehicle_msgs::srv::ControlModeCommand; + using ControlModeReport = autoware_vehicle_msgs::msg::ControlModeReport; + using GearCommand = autoware_vehicle_msgs::msg::GearCommand; + using GearReport = autoware_vehicle_msgs::msg::GearReport; + using PathWithLaneId = tier4_planning_msgs::msg::PathWithLaneId; + using SteeringReport = autoware_vehicle_msgs::msg::SteeringReport; + using TurnIndicatorsCommand = autoware_vehicle_msgs::msg::TurnIndicatorsCommand; + using TurnIndicatorsReport = autoware_vehicle_msgs::msg::TurnIndicatorsReport; + using VelocityReport = autoware_vehicle_msgs::msg::VelocityReport; + + SubscriberWrapper getCommand; + SubscriberWrapper getGearCommandImpl; + SubscriberWrapper getTurnIndicatorsCommand; + SubscriberWrapper getPathWithLaneId; + + PublisherWrapper setAcceleration; + PublisherWrapper setOdometry; + PublisherWrapper setSteeringReport; + PublisherWrapper setGearReport; + PublisherWrapper setControlModeReport; + PublisherWrapper setVelocityReport; + PublisherWrapper setTurnIndicatorsReport; // clang-format on rclcpp::Service::SharedPtr control_mode_request_server; @@ -103,7 +103,7 @@ class AutowareUniverse : public Autoware auto getGearSign() const -> double override; - auto getVehicleCommand() const -> std::tuple override; + auto getVehicleCommand() const -> std::tuple override; auto getRouteLanelets() const -> std::vector override; diff --git a/external/concealer/include/concealer/field_operator_application.hpp b/external/concealer/include/concealer/field_operator_application.hpp index 57b7e0b4776..2e35afb5ef6 100644 --- a/external/concealer/include/concealer/field_operator_application.hpp +++ b/external/concealer/include/concealer/field_operator_application.hpp @@ -20,10 +20,8 @@ #include #include -#include -#include -#include -#include +#include +#include #include #include #include @@ -147,7 +145,7 @@ class FieldOperatorApplication : public rclcpp::Node virtual auto restrictTargetSpeed(double) const -> double = 0; virtual auto getTurnIndicatorsCommand() const - -> autoware_auto_vehicle_msgs::msg::TurnIndicatorsCommand; + -> autoware_vehicle_msgs::msg::TurnIndicatorsCommand; virtual auto rethrow() const noexcept(false) -> void; @@ -159,11 +157,11 @@ class FieldOperatorApplication : public rclcpp::Node }; } // namespace concealer -namespace autoware_auto_vehicle_msgs::msg +namespace autoware_vehicle_msgs::msg { auto operator<<(std::ostream &, const TurnIndicatorsCommand &) -> std::ostream &; auto operator>>(std::istream &, TurnIndicatorsCommand &) -> std::istream &; -} // namespace autoware_auto_vehicle_msgs::msg +} // namespace autoware_vehicle_msgs::msg #endif // CONCEALER__AUTOWARE_USER_HPP_ diff --git a/external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp b/external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp index 481a33b87c0..cd6e156170c 100644 --- a/external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp +++ b/external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp @@ -19,24 +19,14 @@ #include #endif -#if __has_include() -#include -#endif - -#if __has_include() -#include -#endif - #include #include #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include #include #include #include @@ -47,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -62,13 +53,8 @@ class FieldOperatorApplicationFor friend struct TransitionAssertion>; // clang-format off - SubscriberWrapper getAckermannControlCommand; -#if __has_include() - SubscriberWrapper getAutowareState; -#endif -#if __has_include() - SubscriberWrapper getAutowareAutoState; -#endif + SubscriberWrapper getCommand; + SubscriberWrapper getAutowareState; SubscriberWrapper getCooperateStatusArray; SubscriberWrapper getEmergencyState; #if __has_include() @@ -76,7 +62,7 @@ class FieldOperatorApplicationFor #endif SubscriberWrapper getMrmState; SubscriberWrapper getTrajectory; - SubscriberWrapper getTurnIndicatorsCommandImpl; + SubscriberWrapper getTurnIndicatorsCommandImpl; ServiceWithValidation requestClearRoute; ServiceWithValidation requestCooperateCommands; @@ -145,35 +131,16 @@ class FieldOperatorApplicationFor auto sendSIGINT() -> void override; public: - SubscriberWrapper getPathWithLaneId; + SubscriberWrapper getPathWithLaneId; public: template CONCEALER_PUBLIC explicit FieldOperatorApplicationFor(Ts &&... xs) : FieldOperatorApplication(std::forward(xs)...), // clang-format off - getAckermannControlCommand("/control/command/control_cmd", rclcpp::QoS(1), *this), -#if __has_include() + getCommand("/control/command/control_cmd", rclcpp::QoS(1), *this), getAutowareState("/autoware/state", rclcpp::QoS(1), *this, [this](const auto & v) { - /* - There are multiple places that assignments to `autoware_state` in the callback for the /autoware/state topic to accommodate multiple messages. - But only one of them is used as long as correct configuration Autoware is. - Even if the topic comes in multiple types, as long as the content is the same, - there is basically no problem, but there is a possibility that potential problems may occur. - */ autoware_state = getAutowareStateString(v.state); }), -#endif -#if __has_include() - getAutowareAutoState("/autoware/state", rclcpp::QoS(1), *this, [this](const auto & v) { - /* - There are multiple places that assignments to `autoware_state` in the callback for the /autoware/state topic to accommodate multiple messages. - But only one of them is used as long as correct configuration Autoware is. - Even if the topic comes in multiple types, as long as the content is the same, - there is basically no problem, but there is a possibility that potential problems may occur. - */ - autoware_state = getAutowareStateString(v.state); - }), -#endif getCooperateStatusArray("/api/external/get/rtc_status", rclcpp::QoS(1), *this, [this](const auto & v) { latest_cooperate_status_array = v; }), getEmergencyState("/api/external/get/emergency", rclcpp::QoS(1), *this, [this](const auto & v) { receiveEmergencyState(v); }), #if __has_include() @@ -209,7 +176,7 @@ class FieldOperatorApplicationFor auto getWaypoints() const -> traffic_simulator_msgs::msg::WaypointsArray override; auto getTurnIndicatorsCommand() const - -> autoware_auto_vehicle_msgs::msg::TurnIndicatorsCommand override; + -> autoware_vehicle_msgs::msg::TurnIndicatorsCommand override; auto getEmergencyStateName() const -> std::string override; diff --git a/external/concealer/package.xml b/external/concealer/package.xml index 2cfd8e79166..0803d4c4cfb 100644 --- a/external/concealer/package.xml +++ b/external/concealer/package.xml @@ -2,7 +2,7 @@ concealer - 6.2.5 + 7.0.0 Provides a class 'Autoware' to conceal miscellaneous things to simplify Autoware management of the simulator. Tatsuya Yamasaki Apache License 2.0 @@ -12,11 +12,10 @@ autoware_adapi_v1_msgs - autoware_auto_control_msgs - autoware_auto_perception_msgs - autoware_auto_planning_msgs - autoware_auto_system_msgs - autoware_auto_vehicle_msgs + autoware_control_msgs + autoware_perception_msgs + autoware_system_msgs + autoware_vehicle_msgs tier4_external_api_msgs diff --git a/external/concealer/src/autoware.cpp b/external/concealer/src/autoware.cpp index a209e4c8f84..f29cbd93e2d 100644 --- a/external/concealer/src/autoware.cpp +++ b/external/concealer/src/autoware.cpp @@ -24,11 +24,11 @@ Autoware::Autoware() { } -auto Autoware::getGearCommand() const -> autoware_auto_vehicle_msgs::msg::GearCommand +auto Autoware::getGearCommand() const -> autoware_vehicle_msgs::msg::GearCommand { static auto gear_command = []() { - autoware_auto_vehicle_msgs::msg::GearCommand gear_command; - gear_command.command = autoware_auto_vehicle_msgs::msg::GearCommand::DRIVE; + autoware_vehicle_msgs::msg::GearCommand gear_command; + gear_command.command = autoware_vehicle_msgs::msg::GearCommand::DRIVE; return gear_command; }(); gear_command.stamp = now(); @@ -44,13 +44,11 @@ auto Autoware::set(const geometry_msgs::msg::Twist & twist) -> void { current_tw auto Autoware::set(const geometry_msgs::msg::Pose & pose) -> void { current_pose.store(pose); } -auto Autoware::getTurnIndicatorsCommand() const - -> autoware_auto_vehicle_msgs::msg::TurnIndicatorsCommand +auto Autoware::getTurnIndicatorsCommand() const -> autoware_vehicle_msgs::msg::TurnIndicatorsCommand { static auto turn_indicators_command = []() { - autoware_auto_vehicle_msgs::msg::TurnIndicatorsCommand turn_indicators_command; - turn_indicators_command.command = - autoware_auto_vehicle_msgs::msg::TurnIndicatorsCommand::NO_COMMAND; + autoware_vehicle_msgs::msg::TurnIndicatorsCommand turn_indicators_command; + turn_indicators_command.command = autoware_vehicle_msgs::msg::TurnIndicatorsCommand::NO_COMMAND; return turn_indicators_command; }(); turn_indicators_command.stamp = now(); diff --git a/external/concealer/src/autoware_universe.cpp b/external/concealer/src/autoware_universe.cpp index 78395952151..02aea619014 100644 --- a/external/concealer/src/autoware_universe.cpp +++ b/external/concealer/src/autoware_universe.cpp @@ -17,7 +17,7 @@ namespace concealer { AutowareUniverse::AutowareUniverse() -: getAckermannControlCommand("/control/command/control_cmd", rclcpp::QoS(1), *this), +: getCommand("/control/command/control_cmd", rclcpp::QoS(1), *this), getGearCommandImpl("/control/command/gear_cmd", rclcpp::QoS(1), *this), getTurnIndicatorsCommand("/control/command/turn_indicators_cmd", rclcpp::QoS(1), *this), getPathWithLaneId( @@ -85,17 +85,14 @@ auto AutowareUniverse::stopAndJoin() -> void auto AutowareUniverse::getAcceleration() const -> double { - return getAckermannControlCommand().longitudinal.acceleration; + return getCommand().longitudinal.acceleration; } -auto AutowareUniverse::getVelocity() const -> double -{ - return getAckermannControlCommand().longitudinal.speed; -} +auto AutowareUniverse::getVelocity() const -> double { return getCommand().longitudinal.velocity; } auto AutowareUniverse::getSteeringAngle() const -> double { - return getAckermannControlCommand().lateral.steering_tire_angle; + return getCommand().lateral.steering_tire_angle; } auto AutowareUniverse::updateLocalization() -> void @@ -176,9 +173,9 @@ auto AutowareUniverse::getGearSign() const -> double : 1.0; } -auto AutowareUniverse::getVehicleCommand() const -> std::tuple +auto AutowareUniverse::getVehicleCommand() const -> std::tuple { - return std::make_tuple(getAckermannControlCommand(), getGearCommand()); + return std::make_tuple(getCommand(), getGearCommand()); } auto AutowareUniverse::getRouteLanelets() const -> std::vector diff --git a/external/concealer/src/field_operator_application.cpp b/external/concealer/src/field_operator_application.cpp index 9247027ab73..747c204a68c 100644 --- a/external/concealer/src/field_operator_application.cpp +++ b/external/concealer/src/field_operator_application.cpp @@ -147,12 +147,11 @@ auto FieldOperatorApplication::shutdownAutoware() -> void } auto FieldOperatorApplication::getTurnIndicatorsCommand() const - -> autoware_auto_vehicle_msgs::msg::TurnIndicatorsCommand + -> autoware_vehicle_msgs::msg::TurnIndicatorsCommand { static auto turn_indicators_command = []() { - autoware_auto_vehicle_msgs::msg::TurnIndicatorsCommand turn_indicators_command; - turn_indicators_command.command = - autoware_auto_vehicle_msgs::msg::TurnIndicatorsCommand::NO_COMMAND; + autoware_vehicle_msgs::msg::TurnIndicatorsCommand turn_indicators_command; + turn_indicators_command.command = autoware_vehicle_msgs::msg::TurnIndicatorsCommand::NO_COMMAND; return turn_indicators_command; }(); turn_indicators_command.stamp = now(); @@ -162,15 +161,15 @@ auto FieldOperatorApplication::getTurnIndicatorsCommand() const auto FieldOperatorApplication::rethrow() const -> void { task_queue.rethrow(); } } // namespace concealer -namespace autoware_auto_vehicle_msgs::msg +namespace autoware_vehicle_msgs::msg { auto operator<<( - std::ostream & out, const autoware_auto_vehicle_msgs::msg::TurnIndicatorsCommand & message) + std::ostream & out, const autoware_vehicle_msgs::msg::TurnIndicatorsCommand & message) -> std::ostream & { -#define CASE(IDENTIFIER) \ - case autoware_auto_vehicle_msgs::msg::TurnIndicatorsCommand::IDENTIFIER: \ - out << #IDENTIFIER; \ +#define CASE(IDENTIFIER) \ + case autoware_vehicle_msgs::msg::TurnIndicatorsCommand::IDENTIFIER: \ + out << #IDENTIFIER; \ break switch (message.command) { @@ -189,11 +188,11 @@ auto operator<<( return out; } -auto operator>>(std::istream & is, autoware_auto_vehicle_msgs::msg::TurnIndicatorsCommand & message) +auto operator>>(std::istream & is, autoware_vehicle_msgs::msg::TurnIndicatorsCommand & message) -> std::istream & { #define STATE(IDENTIFIER) \ - {#IDENTIFIER, autoware_auto_vehicle_msgs::msg::TurnIndicatorsCommand::IDENTIFIER} + {#IDENTIFIER, autoware_vehicle_msgs::msg::TurnIndicatorsCommand::IDENTIFIER} std::unordered_map state_dictionary{ STATE(DISABLE), @@ -215,4 +214,4 @@ auto operator>>(std::istream & is, autoware_auto_vehicle_msgs::msg::TurnIndicato return is; } -} // namespace autoware_auto_vehicle_msgs::msg +} // namespace autoware_vehicle_msgs::msg diff --git a/external/concealer/src/field_operator_application_for_autoware_universe.cpp b/external/concealer/src/field_operator_application_for_autoware_universe.cpp index 072a42b628f..e75ff70ab01 100644 --- a/external/concealer/src/field_operator_application_for_autoware_universe.cpp +++ b/external/concealer/src/field_operator_application_for_autoware_universe.cpp @@ -400,7 +400,7 @@ auto FieldOperatorApplicationFor::getWaypoints() const } auto FieldOperatorApplicationFor::getTurnIndicatorsCommand() const - -> autoware_auto_vehicle_msgs::msg::TurnIndicatorsCommand + -> autoware_vehicle_msgs::msg::TurnIndicatorsCommand { return getTurnIndicatorsCommandImpl(); } diff --git a/external/embree_vendor/CHANGELOG.rst b/external/embree_vendor/CHANGELOG.rst index b8484b3ca78..d8076f4cae3 100644 --- a/external/embree_vendor/CHANGELOG.rst +++ b/external/embree_vendor/CHANGELOG.rst @@ -24,6 +24,74 @@ Changelog for package embree_vendor * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + 6.2.5 (2024-12-09) ------------------ * Merge branch 'master' into fix/acc_by_slope diff --git a/external/embree_vendor/package.xml b/external/embree_vendor/package.xml index d03f0e7fcf3..e9ea9025c11 100644 --- a/external/embree_vendor/package.xml +++ b/external/embree_vendor/package.xml @@ -2,7 +2,7 @@ embree_vendor - 6.2.5 + 7.0.0 vendor packages for intel raytracing kernel library masaya Apache 2.0 diff --git a/map/kashiwanoha_map/CHANGELOG.rst b/map/kashiwanoha_map/CHANGELOG.rst index 4490a236b5f..cd5eb9f6491 100644 --- a/map/kashiwanoha_map/CHANGELOG.rst +++ b/map/kashiwanoha_map/CHANGELOG.rst @@ -21,6 +21,76 @@ Changelog for package kashiwanoha_map * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge pull request `#1468 `_ from tier4/feature/lane-change-everywhere +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* chore: use 'solid' as a subtype of linestrings between road and road shoulder +* Contributors: Kotaro Yoshimoto + 6.2.5 (2024-12-09) ------------------ * Merge branch 'master' into fix/acc_by_slope diff --git a/map/kashiwanoha_map/map/road_shoulder_added/lanelet2_map.osm b/map/kashiwanoha_map/map/road_shoulder_added/lanelet2_map.osm index 3b9d6e47cee..ef36562172b 100644 --- a/map/kashiwanoha_map/map/road_shoulder_added/lanelet2_map.osm +++ b/map/kashiwanoha_map/map/road_shoulder_added/lanelet2_map.osm @@ -3477,7 +3477,7 @@ - + @@ -3489,7 +3489,7 @@ - + @@ -3501,7 +3501,7 @@ - + diff --git a/map/kashiwanoha_map/package.xml b/map/kashiwanoha_map/package.xml index d7a4a6781c9..1f90ffe02a6 100644 --- a/map/kashiwanoha_map/package.xml +++ b/map/kashiwanoha_map/package.xml @@ -2,7 +2,7 @@ kashiwanoha_map - 6.2.5 + 7.0.0 map package for kashiwanoha Masaya Kataoka Apache License 2.0 diff --git a/map/simple_cross_map/CHANGELOG.rst b/map/simple_cross_map/CHANGELOG.rst index 3aa43e8d4c2..2609e18e217 100644 --- a/map/simple_cross_map/CHANGELOG.rst +++ b/map/simple_cross_map/CHANGELOG.rst @@ -9,6 +9,62 @@ Changelog for package simple_cross_map * Merge branch 'master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + 6.2.5 (2024-12-09) ------------------ * Merge branch 'master' into fix/acc_by_slope diff --git a/map/simple_cross_map/package.xml b/map/simple_cross_map/package.xml index e4e4a7afab3..21100000215 100644 --- a/map/simple_cross_map/package.xml +++ b/map/simple_cross_map/package.xml @@ -2,7 +2,7 @@ simple_cross_map - 6.2.5 + 7.0.0 map package for simple cross Masaya Kataoka Apache License 2.0 diff --git a/mock/cpp_mock_scenarios/CHANGELOG.rst b/mock/cpp_mock_scenarios/CHANGELOG.rst index 6e340328c6d..7324aafffb5 100644 --- a/mock/cpp_mock_scenarios/CHANGELOG.rst +++ b/mock/cpp_mock_scenarios/CHANGELOG.rst @@ -21,6 +21,80 @@ Changelog for package cpp_mock_scenarios * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge pull request `#1454 `_ from tier4/RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* fix: replace "awf/universe" with "awf/universe/20240605" for architecture_type +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* fix mock_test.launch.py to follow master +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Fix cpp_mock_scenarios launch parameters +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge pull request `#1468 `_ from tier4/feature/lane-change-everywhere +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* replace true with false for include_opposite_direction option +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + 6.2.5 (2024-12-09) ------------------ * Merge branch 'master' into fix/acc_by_slope diff --git a/mock/cpp_mock_scenarios/launch/mock_test.launch.py b/mock/cpp_mock_scenarios/launch/mock_test.launch.py index 5dfb3e1043e..13a245a09af 100644 --- a/mock/cpp_mock_scenarios/launch/mock_test.launch.py +++ b/mock/cpp_mock_scenarios/launch/mock_test.launch.py @@ -70,7 +70,7 @@ def on_stdout_output(event: launch.Event) -> None: print(Color.GREEN + "Scenario Succeed" + Color.END) def architecture_types(): - return ["awf/universe", "awf/universe/20230906", "awf/universe/20240605"] + return ["awf/universe/20230906", "awf/universe/20240605"] def default_autoware_launch_package_of(architecture_type): @@ -79,7 +79,6 @@ def default_autoware_launch_package_of(architecture_type): f"architecture_type := {architecture_type} is not supported. Choose one of {architecture_types()}." ) return { - "awf/universe": "autoware_launch", "awf/universe/20230906": "autoware_launch", "awf/universe/20240605": "autoware_launch", }[architecture_type] @@ -91,7 +90,6 @@ def default_autoware_launch_file_of(architecture_type): f"architecture_type := {architecture_type} is not supported. Choose one of {architecture_types()}." ) return { - "awf/universe": "planning_simulator.launch.xml", "awf/universe/20230906": "planning_simulator.launch.xml", "awf/universe/20240605": "planning_simulator.launch.xml", }[architecture_type] @@ -101,7 +99,7 @@ def default_rviz_config_file(): def launch_setup(context, *args, **kwargs): # fmt: off - architecture_type = LaunchConfiguration("architecture_type", default="awf/universe/20230906") + architecture_type = LaunchConfiguration("architecture_type", default="awf/universe/20240605") autoware_launch_file = LaunchConfiguration("autoware_launch_file", default=default_autoware_launch_file_of(architecture_type.perform(context))) autoware_launch_package = LaunchConfiguration("autoware_launch_package", default=default_autoware_launch_package_of(architecture_type.perform(context))) consider_acceleration_by_road_slope = LaunchConfiguration("consider_acceleration_by_road_slope", default=False) diff --git a/mock/cpp_mock_scenarios/package.xml b/mock/cpp_mock_scenarios/package.xml index a1f17dbfeea..83b675be3d8 100644 --- a/mock/cpp_mock_scenarios/package.xml +++ b/mock/cpp_mock_scenarios/package.xml @@ -2,7 +2,7 @@ cpp_mock_scenarios - 6.2.5 + 7.0.0 C++ mock scenarios masaya Apache License 2.0 diff --git a/mock/cpp_mock_scenarios/src/cpp_scenario_node.cpp b/mock/cpp_mock_scenarios/src/cpp_scenario_node.cpp index 35508fae892..1fed1889c2b 100644 --- a/mock/cpp_mock_scenarios/src/cpp_scenario_node.cpp +++ b/mock/cpp_mock_scenarios/src/cpp_scenario_node.cpp @@ -113,7 +113,7 @@ void CppScenarioNode::spawnEgoEntity( api_.attachOccupancyGridSensor([this] { simulation_api_schema::OccupancyGridSensorConfiguration configuration; // clang-format off - configuration.set_architecture_type(api_.getROS2Parameter("architecture_type", "awf/universe")); + configuration.set_architecture_type(api_.getROS2Parameter("architecture_type", "awf/universe/20240605")); configuration.set_entity("ego"); configuration.set_filter_by_range(true); configuration.set_height(200); diff --git a/mock/cpp_mock_scenarios/src/measurement/get_distance_in_lane_coordinate_distance.cpp b/mock/cpp_mock_scenarios/src/measurement/get_distance_in_lane_coordinate_distance.cpp index ece59da5244..21131356179 100644 --- a/mock/cpp_mock_scenarios/src/measurement/get_distance_in_lane_coordinate_distance.cpp +++ b/mock/cpp_mock_scenarios/src/measurement/get_distance_in_lane_coordinate_distance.cpp @@ -80,7 +80,7 @@ class GetDistanceInLaneCoordinateScenario : public cpp_mock_scenarios::CppScenar if (from_entity->isInLanelet() && to_entity->isInLanelet()) { return traffic_simulator::distance::longitudinalDistance( from_entity->getCanonicalizedLaneletPose().value(), - to_entity->getCanonicalizedLaneletPose().value(), false, true, + to_entity->getCanonicalizedLaneletPose().value(), false, false, traffic_simulator::RoutingConfiguration(), api_.getHdmapUtils()); } return std::nullopt; diff --git a/openscenario/openscenario_experimental_catalog/CHANGELOG.rst b/openscenario/openscenario_experimental_catalog/CHANGELOG.rst index bba714478bd..0e6f94cf1b9 100644 --- a/openscenario/openscenario_experimental_catalog/CHANGELOG.rst +++ b/openscenario/openscenario_experimental_catalog/CHANGELOG.rst @@ -21,6 +21,74 @@ Changelog for package openscenario_experimental_catalog * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + 6.2.5 (2024-12-09) ------------------ * Merge branch 'master' into fix/acc_by_slope diff --git a/openscenario/openscenario_experimental_catalog/package.xml b/openscenario/openscenario_experimental_catalog/package.xml index c322062fe55..b7bc016fa2c 100644 --- a/openscenario/openscenario_experimental_catalog/package.xml +++ b/openscenario/openscenario_experimental_catalog/package.xml @@ -2,7 +2,7 @@ openscenario_experimental_catalog - 6.2.5 + 7.0.0 TIER IV experimental catalogs for OpenSCENARIO Tatsuya Yamasaki Apache License 2.0 diff --git a/openscenario/openscenario_interpreter/CHANGELOG.rst b/openscenario/openscenario_interpreter/CHANGELOG.rst index 1ce9a964bc4..d9efb5ec129 100644 --- a/openscenario/openscenario_interpreter/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter/CHANGELOG.rst @@ -32,6 +32,76 @@ Changelog for package openscenario_interpreter * add publish_empty_context parameter * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge pull request `#1454 `_ from tier4/RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* fix: replace "awf/universe" with "awf/universe/20240605" for architecture_type +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + 6.2.5 (2024-12-09) ------------------ * Merge branch 'master' into fix/acc_by_slope diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/simulator_core.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/simulator_core.hpp index 453f74413cc..fb7aca4340a 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/simulator_core.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/simulator_core.hpp @@ -385,7 +385,7 @@ class SimulatorCore }; // clang-format off - configuration.set_architecture_type(core->getROS2Parameter("architecture_type", "awf/universe")); + configuration.set_architecture_type(core->getROS2Parameter("architecture_type", "awf/universe/20240605")); configuration.set_entity(entity_ref); configuration.set_horizontal_resolution(degree_to_radian(controller.properties.template get("pointcloudHorizontalResolution", 1.0))); configuration.set_lidar_sensor_delay(controller.properties.template get("pointcloudPublishingDelay")); @@ -409,7 +409,7 @@ class SimulatorCore core->attachDetectionSensor([&]() { simulation_api_schema::DetectionSensorConfiguration configuration; // clang-format off - configuration.set_architecture_type(core->getROS2Parameter("architecture_type", "awf/universe")); + configuration.set_architecture_type(core->getROS2Parameter("architecture_type", "awf/universe/20240605")); configuration.set_entity(entity_ref); configuration.set_detect_all_objects_in_range(controller.properties.template get("isClairvoyant")); configuration.set_object_recognition_delay(controller.properties.template get("detectedObjectPublishingDelay")); @@ -426,7 +426,7 @@ class SimulatorCore core->attachOccupancyGridSensor([&]() { simulation_api_schema::OccupancyGridSensorConfiguration configuration; // clang-format off - configuration.set_architecture_type(core->getROS2Parameter("architecture_type", "awf/universe")); + configuration.set_architecture_type(core->getROS2Parameter("architecture_type", "awf/universe/20240605")); configuration.set_entity(entity_ref); configuration.set_filter_by_range(controller.properties.template get("isClairvoyant")); configuration.set_height(200); @@ -441,7 +441,7 @@ class SimulatorCore core->attachPseudoTrafficLightDetector([&]() { simulation_api_schema::PseudoTrafficLightDetectorConfiguration configuration; configuration.set_architecture_type( - core->getROS2Parameter("architecture_type", "awf/universe")); + core->getROS2Parameter("architecture_type", "awf/universe/20240605")); return configuration; }()); diff --git a/openscenario/openscenario_interpreter/package.xml b/openscenario/openscenario_interpreter/package.xml index 6d52f2379db..189fc370650 100644 --- a/openscenario/openscenario_interpreter/package.xml +++ b/openscenario/openscenario_interpreter/package.xml @@ -2,7 +2,7 @@ openscenario_interpreter - 6.2.5 + 7.0.0 OpenSCENARIO 1.2.0 interpreter package for Autoware Tatsuya Yamasaki Apache License 2.0 diff --git a/openscenario/openscenario_interpreter_example/CHANGELOG.rst b/openscenario/openscenario_interpreter_example/CHANGELOG.rst index 7e129fd267c..58277e25f72 100644 --- a/openscenario/openscenario_interpreter_example/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter_example/CHANGELOG.rst @@ -21,6 +21,80 @@ Changelog for package openscenario_interpreter_example * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge pull request `#1454 `_ from tier4/RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Apply clang format +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/RJD-736/autoware_msgs_support_new_traffic_light_group' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # external/concealer/src/autoware_universe.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Port AutowareState +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + 6.2.5 (2024-12-09) ------------------ * Merge branch 'master' into fix/acc_by_slope diff --git a/openscenario/openscenario_interpreter_example/package.xml b/openscenario/openscenario_interpreter_example/package.xml index 80213fb269e..7b79d5418f6 100644 --- a/openscenario/openscenario_interpreter_example/package.xml +++ b/openscenario/openscenario_interpreter_example/package.xml @@ -3,14 +3,14 @@ openscenario_interpreter_example - 6.2.5 + 7.0.0 Examples for some TIER IV OpenSCENARIO Interpreter's features Tatsuya Yamasaki Apache License 2.0 ament_cmake - autoware_auto_system_msgs + autoware_system_msgs boost libboost-dev rclcpp diff --git a/openscenario/openscenario_interpreter_example/src/timeout.cpp b/openscenario/openscenario_interpreter_example/src/timeout.cpp index 7559a3dcc60..55738bc2415 100644 --- a/openscenario/openscenario_interpreter_example/src/timeout.cpp +++ b/openscenario/openscenario_interpreter_example/src/timeout.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include +#include #include #include @@ -85,13 +85,11 @@ int main(const int argc, char const * const * const argv) using tier4_simulation_msgs::msg::UserDefinedValue; using tier4_simulation_msgs::msg::UserDefinedValueType; - autoware_auto_system_msgs::msg::AutowareState status; + autoware_system_msgs::msg::AutowareState status; - auto subscription = node->create_subscription( + auto subscription = node->create_subscription( "/autoware/state", rclcpp::QoS(1).reliable(), - [&](const autoware_auto_system_msgs::msg::AutowareState::SharedPtr message) { - status = *message; - }); + [&](const autoware_system_msgs::msg::AutowareState::SharedPtr message) { status = *message; }); auto publisher = node->create_publisher("/timeout", rclcpp::QoS(1).reliable()); @@ -99,7 +97,7 @@ int main(const int argc, char const * const * const argv) { static auto duration_since_autoware_engaged = std::chrono::high_resolution_clock::now(); - if (status.state != autoware_auto_system_msgs::msg::AutowareState::DRIVING) { + if (status.state != autoware_system_msgs::msg::AutowareState::DRIVING) { duration_since_autoware_engaged = std::chrono::high_resolution_clock::now(); } diff --git a/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst b/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst index 32b632abdae..3a0dbbbd85b 100644 --- a/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst @@ -21,6 +21,74 @@ Changelog for package openscenario_interpreter_msgs * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + 6.2.5 (2024-12-09) ------------------ * Merge branch 'master' into fix/acc_by_slope diff --git a/openscenario/openscenario_interpreter_msgs/package.xml b/openscenario/openscenario_interpreter_msgs/package.xml index 1a0a77f251a..a2b749e70d0 100644 --- a/openscenario/openscenario_interpreter_msgs/package.xml +++ b/openscenario/openscenario_interpreter_msgs/package.xml @@ -2,7 +2,7 @@ openscenario_interpreter_msgs - 6.2.5 + 7.0.0 ROS message types for package openscenario_interpreter Yamasaki Tatsuya Apache License 2.0 diff --git a/openscenario/openscenario_preprocessor/CHANGELOG.rst b/openscenario/openscenario_preprocessor/CHANGELOG.rst index 10688984493..45aa124d2ab 100644 --- a/openscenario/openscenario_preprocessor/CHANGELOG.rst +++ b/openscenario/openscenario_preprocessor/CHANGELOG.rst @@ -21,6 +21,74 @@ Changelog for package openscenario_preprocessor * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + 6.2.5 (2024-12-09) ------------------ * Merge branch 'master' into fix/acc_by_slope diff --git a/openscenario/openscenario_preprocessor/package.xml b/openscenario/openscenario_preprocessor/package.xml index 94dbc2ba29c..8e1cf8e1c32 100644 --- a/openscenario/openscenario_preprocessor/package.xml +++ b/openscenario/openscenario_preprocessor/package.xml @@ -3,7 +3,7 @@ openscenario_preprocessor - 6.2.5 + 7.0.0 Example package for TIER IV OpenSCENARIO Interpreter Kotaro Yoshimoto Apache License 2.0 diff --git a/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst b/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst index e75a7c47c14..cd4d1c1d339 100644 --- a/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst +++ b/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst @@ -21,6 +21,74 @@ Changelog for package openscenario_preprocessor_msgs * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + 6.2.5 (2024-12-09) ------------------ * Merge branch 'master' into fix/acc_by_slope diff --git a/openscenario/openscenario_preprocessor_msgs/package.xml b/openscenario/openscenario_preprocessor_msgs/package.xml index 7413832ba9c..f944de3e947 100644 --- a/openscenario/openscenario_preprocessor_msgs/package.xml +++ b/openscenario/openscenario_preprocessor_msgs/package.xml @@ -2,7 +2,7 @@ openscenario_preprocessor_msgs - 6.2.5 + 7.0.0 ROS message types for package openscenario_preprocessor Kotaro Yoshimoto Apache License 2.0 diff --git a/openscenario/openscenario_utility/CHANGELOG.rst b/openscenario/openscenario_utility/CHANGELOG.rst index b7863d2aee9..1fc991b6a01 100644 --- a/openscenario/openscenario_utility/CHANGELOG.rst +++ b/openscenario/openscenario_utility/CHANGELOG.rst @@ -24,6 +24,74 @@ Changelog for package openscenario_utility * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + 6.2.5 (2024-12-09) ------------------ * Merge branch 'master' into fix/acc_by_slope diff --git a/openscenario/openscenario_utility/package.xml b/openscenario/openscenario_utility/package.xml index da5f59bad9b..baf21f54724 100644 --- a/openscenario/openscenario_utility/package.xml +++ b/openscenario/openscenario_utility/package.xml @@ -2,7 +2,7 @@ openscenario_utility - 6.2.5 + 7.0.0 Utility tools for ASAM OpenSCENARIO 1.2.0 Tatsuya Yamasaki Apache License 2.0 diff --git a/openscenario/openscenario_validator/CHANGELOG.rst b/openscenario/openscenario_validator/CHANGELOG.rst index 7bed6772e3c..cec132f84ec 100644 --- a/openscenario/openscenario_validator/CHANGELOG.rst +++ b/openscenario/openscenario_validator/CHANGELOG.rst @@ -10,6 +10,74 @@ Changelog for package openscenario_validator * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + 6.2.5 (2024-12-09) ------------------ * Merge branch 'master' into fix/acc_by_slope diff --git a/openscenario/openscenario_validator/package.xml b/openscenario/openscenario_validator/package.xml index e91001455ab..fc8cccc8550 100644 --- a/openscenario/openscenario_validator/package.xml +++ b/openscenario/openscenario_validator/package.xml @@ -2,7 +2,7 @@ openscenario_validator - 6.2.5 + 7.0.0 Validator for OpenSCENARIO 1.3 Kotaro Yoshimoto Apache License 2.0 diff --git a/rviz_plugins/openscenario_visualization/CHANGELOG.rst b/rviz_plugins/openscenario_visualization/CHANGELOG.rst index 84c0494c482..92bcf0fc007 100644 --- a/rviz_plugins/openscenario_visualization/CHANGELOG.rst +++ b/rviz_plugins/openscenario_visualization/CHANGELOG.rst @@ -21,6 +21,74 @@ Changelog for package openscenario_visualization * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + 6.2.5 (2024-12-09) ------------------ * Merge branch 'master' into fix/acc_by_slope diff --git a/rviz_plugins/openscenario_visualization/package.xml b/rviz_plugins/openscenario_visualization/package.xml index 722759c8b5e..f400f471349 100644 --- a/rviz_plugins/openscenario_visualization/package.xml +++ b/rviz_plugins/openscenario_visualization/package.xml @@ -2,7 +2,7 @@ openscenario_visualization - 6.2.5 + 7.0.0 Visualization tools for simulation results Masaya Kataoka Kyoichi Sugahara diff --git a/rviz_plugins/real_time_factor_control_rviz_plugin/CHANGELOG.rst b/rviz_plugins/real_time_factor_control_rviz_plugin/CHANGELOG.rst index 30cff4fbc72..1a482062317 100644 --- a/rviz_plugins/real_time_factor_control_rviz_plugin/CHANGELOG.rst +++ b/rviz_plugins/real_time_factor_control_rviz_plugin/CHANGELOG.rst @@ -21,6 +21,74 @@ Changelog for package real_time_factor_control_rviz_plugin * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + 6.2.5 (2024-12-09) ------------------ * Merge branch 'master' into fix/acc_by_slope diff --git a/rviz_plugins/real_time_factor_control_rviz_plugin/package.xml b/rviz_plugins/real_time_factor_control_rviz_plugin/package.xml index 86fc1a3409c..65fceb3047c 100644 --- a/rviz_plugins/real_time_factor_control_rviz_plugin/package.xml +++ b/rviz_plugins/real_time_factor_control_rviz_plugin/package.xml @@ -2,7 +2,7 @@ real_time_factor_control_rviz_plugin - 6.2.5 + 7.0.0 Slider controlling real time factor value. Paweł Lech Apache License 2.0 diff --git a/scenario_simulator_v2/CHANGELOG.rst b/scenario_simulator_v2/CHANGELOG.rst index ed1e17c058b..266932b7f88 100644 --- a/scenario_simulator_v2/CHANGELOG.rst +++ b/scenario_simulator_v2/CHANGELOG.rst @@ -21,6 +21,74 @@ Changelog for package scenario_simulator_v2 * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + 6.2.5 (2024-12-09) ------------------ * Merge branch 'master' into fix/acc_by_slope diff --git a/scenario_simulator_v2/package.xml b/scenario_simulator_v2/package.xml index 4546f342b5e..0845fa1e7eb 100644 --- a/scenario_simulator_v2/package.xml +++ b/scenario_simulator_v2/package.xml @@ -2,7 +2,7 @@ scenario_simulator_v2 - 6.2.5 + 7.0.0 scenario testing framework for Autoware Masaya Kataoka Apache License 2.0 diff --git a/simulation/behavior_tree_plugin/CHANGELOG.rst b/simulation/behavior_tree_plugin/CHANGELOG.rst index ac720e494e7..b699f100bb5 100644 --- a/simulation/behavior_tree_plugin/CHANGELOG.rst +++ b/simulation/behavior_tree_plugin/CHANGELOG.rst @@ -21,6 +21,74 @@ Changelog for package behavior_tree_plugin * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + 6.2.5 (2024-12-09) ------------------ * Merge branch 'master' into fix/acc_by_slope diff --git a/simulation/behavior_tree_plugin/package.xml b/simulation/behavior_tree_plugin/package.xml index 076971a8b9c..862137bf157 100644 --- a/simulation/behavior_tree_plugin/package.xml +++ b/simulation/behavior_tree_plugin/package.xml @@ -2,7 +2,7 @@ behavior_tree_plugin - 6.2.5 + 7.0.0 Behavior tree plugin for traffic_simulator masaya Apache 2.0 diff --git a/simulation/do_nothing_plugin/CHANGELOG.rst b/simulation/do_nothing_plugin/CHANGELOG.rst index 38f4d4c50dc..b54d16b55e4 100644 --- a/simulation/do_nothing_plugin/CHANGELOG.rst +++ b/simulation/do_nothing_plugin/CHANGELOG.rst @@ -21,6 +21,74 @@ Changelog for package do_nothing_plugin * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + 6.2.5 (2024-12-09) ------------------ * Merge branch 'master' into fix/acc_by_slope diff --git a/simulation/do_nothing_plugin/package.xml b/simulation/do_nothing_plugin/package.xml index e786dbf745a..01ad3e54707 100644 --- a/simulation/do_nothing_plugin/package.xml +++ b/simulation/do_nothing_plugin/package.xml @@ -2,7 +2,7 @@ do_nothing_plugin - 6.2.5 + 7.0.0 Behavior plugin for do nothing Masaya Kataoka Apache 2.0 diff --git a/simulation/simple_sensor_simulator/CHANGELOG.rst b/simulation/simple_sensor_simulator/CHANGELOG.rst index 40ce0d4836d..ca1c8360096 100644 --- a/simulation/simple_sensor_simulator/CHANGELOG.rst +++ b/simulation/simple_sensor_simulator/CHANGELOG.rst @@ -21,6 +21,94 @@ Changelog for package simple_sensor_simulator * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge pull request `#1454 `_ from tier4/RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* chore: apply linter +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* fix: replace "awf/universe" with "awf/universe/20240605" for architecture_type +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* refactor: added handling when autoware_perception_msgs/msg/traffic_signal_array.hpp is not present +* chore: delete wrongly doubled word +* docs: update comment +* docs: update comment +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* docs: delete comment for unsupported "awf/universe" +* fix: delete autoware_auto_xx_msgs from include +* fix: delete unsupported architecture_type "awf/universe" +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Apply clang format +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge pull request `#1277 `_ from tier4/RJD-736/autoware_msgs_support_new_traffic_light_group + Rjd 736/autoware msgs support new traffic light group +* Merge remote-tracking branch 'origin/RJD-736/autoware_msgs_support_new_traffic_light_group' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # external/concealer/src/autoware_universe.cpp +* feat(traffic_simulator): support TrafficLightGroupArray in SimpleSensorSimulator +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Port DetectedObjects and TrackedObjects +* Port TrafficSignalArray from autoware_auto_perception_msgs to autoware_perception_msgs +* Port GearCommand +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + 6.2.5 (2024-12-09) ------------------ * Merge pull request `#1477 `_ from tier4/fix/acc_by_slope diff --git a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/detection_sensor/detection_sensor.hpp b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/detection_sensor/detection_sensor.hpp index f5545a0d9d4..ec4dcf6ef18 100644 --- a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/detection_sensor/detection_sensor.hpp +++ b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/detection_sensor/detection_sensor.hpp @@ -57,7 +57,7 @@ class DetectionSensorBase const std::vector & lidar_detected_entities) = 0; }; -template +template class DetectionSensor : public DetectionSensorBase { const typename rclcpp::Publisher::SharedPtr detected_objects_publisher; @@ -66,10 +66,10 @@ class DetectionSensor : public DetectionSensorBase std::default_random_engine random_engine_; - std::queue> + std::queue> detected_objects_queue; - std::queue> + std::queue> ground_truth_objects_queue; public: diff --git a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp index 55050bbea5d..2e830f26883 100644 --- a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp +++ b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp @@ -17,8 +17,8 @@ #include -#include -#include +#include +#include #include #include #include @@ -29,6 +29,15 @@ #include #include +// This message will be deleted in the future +#if __has_include() +#include +#endif + +#if __has_include() +#include +#endif + namespace simple_sensor_simulator { class SensorSimulation @@ -57,8 +66,8 @@ class SensorSimulation -> void { if (configuration.architecture_type().find("awf/universe") != std::string::npos) { - using Message = autoware_auto_perception_msgs::msg::DetectedObjects; - using GroundTruthMessage = autoware_auto_perception_msgs::msg::TrackedObjects; + using Message = autoware_perception_msgs::msg::DetectedObjects; + using GroundTruthMessage = autoware_perception_msgs::msg::TrackedObjects; detection_sensors_.push_back(std::make_unique>( current_simulation_time, configuration, node.create_publisher("/perception/object_recognition/detection/objects", 1), diff --git a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/traffic_lights/traffic_lights_detector.hpp b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/traffic_lights/traffic_lights_detector.hpp index f075c03887e..294136cbc1a 100644 --- a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/traffic_lights/traffic_lights_detector.hpp +++ b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/traffic_lights/traffic_lights_detector.hpp @@ -15,13 +15,16 @@ #ifndef SIMPLE_SENSOR_SIMULATOR__SENSOR_SIMULATION__TRAFFIC_LIGHTS__TRAFFIC_LIGHTS_DETECTOR_HPP_ #define SIMPLE_SENSOR_SIMULATOR__SENSOR_SIMULATION__TRAFFIC_LIGHTS__TRAFFIC_LIGHTS_DETECTOR_HPP_ -#include -#include #include #include #include #include +// This message will be deleted in the future +#if __has_include() +#include +#endif + #if __has_include() #include #endif @@ -60,19 +63,20 @@ class TrafficLightsDetector TrafficLightsDetector in SimpleSensorSimulator publishes using architecture-dependent topics: "/perception/traffic_light_recognition/internal/traffic_signals" for >= "awf/universe/20240605" "/perception/traffic_light_recognition/internal/traffic_signals" for == "awf/universe/20230906" - "/perception/traffic_light_recognition/traffic_signals" for "awf/universe" - V2ITrafficLights in TrafficSimulator publishes publishes using architecture-independent topics ("awf/universe..."): + V2ITrafficLights in TrafficSimulator publishes using architecture-independent topics ("awf/universe..."): "/v2x/traffic_signals" and "/perception/traffic_light_recognition/external/traffic_signals" */ if (architecture_type == "awf/universe") { - using Message = autoware_auto_perception_msgs::msg::TrafficSignalArray; - return std::make_unique>( - &node, "/perception/traffic_light_recognition/traffic_signals"); + throw common::SemanticError( + "This version of scenario_simulator_v2 does not support ", std::quoted(architecture_type), + " as ", std::quoted("architecture_type"), ". Please use older version."); +#if __has_include() } else if (architecture_type == "awf/universe/20230906") { using Message = autoware_perception_msgs::msg::TrafficSignalArray; return std::make_unique>( &node, "/perception/traffic_light_recognition/internal/traffic_signals"); +#endif #if __has_include() } else if (architecture_type >= "awf/universe/20240605") { using Message = autoware_perception_msgs::msg::TrafficLightGroupArray; diff --git a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/vehicle_simulation/vehicle_model/sim_model_delay_steer_acc_geared.hpp b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/vehicle_simulation/vehicle_model/sim_model_delay_steer_acc_geared.hpp index 1704f7872d2..5f81e8a9eb3 100644 --- a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/vehicle_simulation/vehicle_model/sim_model_delay_steer_acc_geared.hpp +++ b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/vehicle_simulation/vehicle_model/sim_model_delay_steer_acc_geared.hpp @@ -148,7 +148,7 @@ class SimModelDelaySteerAccGeared : public SimModelInterface * @brief update state considering current gear * @param [in] state current state * @param [in] prev_state previous state - * @param [in] gear current gear (defined in autoware_auto_msgs/GearCommand) + * @param [in] gear current gear (defined in autoware_vehicle_msgs/GearCommand) * @param [in] dt delta time to update state */ void updateStateWithGear( diff --git a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/vehicle_simulation/vehicle_model/sim_model_delay_steer_map_acc_geared.hpp b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/vehicle_simulation/vehicle_model/sim_model_delay_steer_map_acc_geared.hpp index c91ec05a327..c1ce9daac15 100644 --- a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/vehicle_simulation/vehicle_model/sim_model_delay_steer_map_acc_geared.hpp +++ b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/vehicle_simulation/vehicle_model/sim_model_delay_steer_map_acc_geared.hpp @@ -327,7 +327,7 @@ class SimModelDelaySteerMapAccGeared : public SimModelInterface * @brief update state considering current gear * @param [in] state current state * @param [in] prev_state previous state - * @param [in] gear current gear (defined in autoware_auto_msgs/GearCommand) + * @param [in] gear current gear (defined in autoware_vehicle_msgs/GearCommand) * @param [in] dt delta time to update state */ void updateStateWithGear( diff --git a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/vehicle_simulation/vehicle_model/sim_model_ideal_steer_acc_geared.hpp b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/vehicle_simulation/vehicle_model/sim_model_ideal_steer_acc_geared.hpp index c0c5a9822c5..41d26841830 100644 --- a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/vehicle_simulation/vehicle_model/sim_model_ideal_steer_acc_geared.hpp +++ b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/vehicle_simulation/vehicle_model/sim_model_ideal_steer_acc_geared.hpp @@ -105,7 +105,7 @@ class SimModelIdealSteerAccGeared : public SimModelInterface * @brief update state considering current gear * @param [in] state current state * @param [in] prev_state previous state - * @param [in] gear current gear (defined in autoware_auto_msgs/GearCommand) + * @param [in] gear current gear (defined in autoware_vehicle_msgs/GearCommand) * @param [in] dt delta time to update state */ void updateStateWithGear( diff --git a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/vehicle_simulation/vehicle_model/sim_model_interface.hpp b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/vehicle_simulation/vehicle_model/sim_model_interface.hpp index 3fab57e9f50..559c02ee1b4 100644 --- a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/vehicle_simulation/vehicle_model/sim_model_interface.hpp +++ b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/vehicle_simulation/vehicle_model/sim_model_interface.hpp @@ -15,7 +15,7 @@ #ifndef SIMPLE_PLANNING_SIMULATOR__VEHICLE_MODEL__SIM_MODEL_INTERFACE_HPP_ #define SIMPLE_PLANNING_SIMULATOR__VEHICLE_MODEL__SIM_MODEL_INTERFACE_HPP_ -#include +#include #include /** @@ -30,8 +30,8 @@ class SimModelInterface Eigen::VectorXd state_; //!< @brief vehicle state vector Eigen::VectorXd input_; //!< @brief vehicle input vector - //!< @brief gear command defined in autoware_auto_msgs/GearCommand - uint8_t gear_ = autoware_auto_vehicle_msgs::msg::GearCommand::DRIVE; + //!< @brief gear command defined in autoware_vehicle_msgs/GearCommand + uint8_t gear_ = autoware_vehicle_msgs::msg::GearCommand::DRIVE; public: /** @@ -72,7 +72,7 @@ class SimModelInterface /** * @brief set gear - * @param [in] gear gear command defined in autoware_auto_msgs/GearCommand + * @param [in] gear gear command defined in autoware_vehicle_msgs/GearCommand */ void setGear(const uint8_t gear); diff --git a/simulation/simple_sensor_simulator/package.xml b/simulation/simple_sensor_simulator/package.xml index 7deeb2d06d8..30d0cc939da 100644 --- a/simulation/simple_sensor_simulator/package.xml +++ b/simulation/simple_sensor_simulator/package.xml @@ -1,7 +1,7 @@ simple_sensor_simulator - 6.2.5 + 7.0.0 simple_sensor_simulator package masaya kataoka @@ -35,7 +35,6 @@ tf2_ros tf2 - autoware_auto_perception_msgs autoware_perception_msgs boost eigen diff --git a/simulation/simple_sensor_simulator/src/sensor_simulation/detection_sensor/detection_sensor.cpp b/simulation/simple_sensor_simulator/src/sensor_simulation/detection_sensor/detection_sensor.cpp index 23b38f4b094..dc6c1837f0d 100644 --- a/simulation/simple_sensor_simulator/src/sensor_simulation/detection_sensor/detection_sensor.cpp +++ b/simulation/simple_sensor_simulator/src/sensor_simulation/detection_sensor/detection_sensor.cpp @@ -13,8 +13,8 @@ // limitations under the License. #include -#include -#include +#include +#include #include #include #include @@ -77,28 +77,28 @@ auto make(const traffic_simulator_msgs::EntityStatus & status) -> unique_identif template <> auto make(const traffic_simulator_msgs::EntityStatus & status) - -> autoware_auto_perception_msgs::msg::ObjectClassification + -> autoware_perception_msgs::msg::ObjectClassification { - auto object_classification = autoware_auto_perception_msgs::msg::ObjectClassification(); + auto object_classification = autoware_perception_msgs::msg::ObjectClassification(); object_classification.label = [&]() { switch (status.subtype().value()) { case traffic_simulator_msgs::EntitySubtype::CAR: - return autoware_auto_perception_msgs::msg::ObjectClassification::CAR; + return autoware_perception_msgs::msg::ObjectClassification::CAR; case traffic_simulator_msgs::EntitySubtype::TRUCK: - return autoware_auto_perception_msgs::msg::ObjectClassification::TRUCK; + return autoware_perception_msgs::msg::ObjectClassification::TRUCK; case traffic_simulator_msgs::EntitySubtype::BUS: - return autoware_auto_perception_msgs::msg::ObjectClassification::BUS; + return autoware_perception_msgs::msg::ObjectClassification::BUS; case traffic_simulator_msgs::EntitySubtype::TRAILER: - return autoware_auto_perception_msgs::msg::ObjectClassification::TRAILER; + return autoware_perception_msgs::msg::ObjectClassification::TRAILER; case traffic_simulator_msgs::EntitySubtype::MOTORCYCLE: - return autoware_auto_perception_msgs::msg::ObjectClassification::MOTORCYCLE; + return autoware_perception_msgs::msg::ObjectClassification::MOTORCYCLE; case traffic_simulator_msgs::EntitySubtype::BICYCLE: - return autoware_auto_perception_msgs::msg::ObjectClassification::BICYCLE; + return autoware_perception_msgs::msg::ObjectClassification::BICYCLE; case traffic_simulator_msgs::EntitySubtype::PEDESTRIAN: - return autoware_auto_perception_msgs::msg::ObjectClassification::PEDESTRIAN; + return autoware_perception_msgs::msg::ObjectClassification::PEDESTRIAN; default: - return autoware_auto_perception_msgs::msg::ObjectClassification::UNKNOWN; + return autoware_perception_msgs::msg::ObjectClassification::UNKNOWN; } }(); @@ -136,9 +136,9 @@ auto make(const traffic_simulator_msgs::EntityStatus & status) -> geometry_msgs: template <> auto make(const traffic_simulator_msgs::EntityStatus & status) - -> autoware_auto_perception_msgs::msg::DetectedObjectKinematics + -> autoware_perception_msgs::msg::DetectedObjectKinematics { - auto kinematics = autoware_auto_perception_msgs::msg::DetectedObjectKinematics(); + auto kinematics = autoware_perception_msgs::msg::DetectedObjectKinematics(); kinematics.pose_with_covariance.pose = make(status); @@ -165,9 +165,9 @@ auto make(const traffic_simulator_msgs::EntityStatus & status) switch (status.subtype().value()) { case traffic_simulator_msgs::EntitySubtype::BICYCLE: case traffic_simulator_msgs::EntitySubtype::MOTORCYCLE: - return autoware_auto_perception_msgs::msg::DetectedObjectKinematics::SIGN_UNKNOWN; + return autoware_perception_msgs::msg::DetectedObjectKinematics::SIGN_UNKNOWN; default: - return autoware_auto_perception_msgs::msg::DetectedObjectKinematics::UNAVAILABLE; + return autoware_perception_msgs::msg::DetectedObjectKinematics::UNAVAILABLE; } }(); @@ -176,35 +176,35 @@ auto make(const traffic_simulator_msgs::EntityStatus & status) template <> auto make(const traffic_simulator_msgs::EntityStatus & status) - -> autoware_auto_perception_msgs::msg::Shape + -> autoware_perception_msgs::msg::Shape { - auto shape = autoware_auto_perception_msgs::msg::Shape(); + auto shape = autoware_perception_msgs::msg::Shape(); simulation_interface::toMsg(status.bounding_box().dimensions(), shape.dimensions); - shape.type = autoware_auto_perception_msgs::msg::Shape::BOUNDING_BOX; + shape.type = autoware_perception_msgs::msg::Shape::BOUNDING_BOX; return shape; } template <> auto make(const traffic_simulator_msgs::EntityStatus & status) - -> autoware_auto_perception_msgs::msg::DetectedObject + -> autoware_perception_msgs::msg::DetectedObject { - auto detected_object = autoware_auto_perception_msgs::msg::DetectedObject(); + auto detected_object = autoware_perception_msgs::msg::DetectedObject(); detected_object.classification.push_back( - make(status)); + make(status)); detected_object.kinematics = - make(status); - detected_object.shape = make(status); + make(status); + detected_object.shape = make(status); return detected_object; } template <> auto make( const traffic_simulator_msgs::EntityStatus & status, - const autoware_auto_perception_msgs::msg::DetectedObject & detected_object) - -> autoware_auto_perception_msgs::msg::TrackedObject + const autoware_perception_msgs::msg::DetectedObject & detected_object) + -> autoware_perception_msgs::msg::TrackedObject { // ref: https://github.com/autowarefoundation/autoware.universe/blob/main/common/perception_utils/src/conversion.cpp - auto tracked_object = autoware_auto_perception_msgs::msg::TrackedObject(); + auto tracked_object = autoware_perception_msgs::msg::TrackedObject(); // clang-format off tracked_object.object_id = make(status); tracked_object.existence_probability = detected_object.existence_probability; @@ -250,8 +250,7 @@ struct DefaultNoiseApplicator auto operator=(DefaultNoiseApplicator &&) = delete; - auto operator()(autoware_auto_perception_msgs::msg::DetectedObjects detected_objects) - -> decltype(auto) + auto operator()(autoware_perception_msgs::msg::DetectedObjects detected_objects) -> decltype(auto) { auto position_noise_distribution = std::normal_distribution<>(0.0, detection_sensor_configuration.pos_noise_stddev()); @@ -291,7 +290,7 @@ struct CustomNoiseApplicator : public DefaultNoiseApplicator This class inherits from DefaultNoiseApplicator, so you can use its data members, or you can explicitly call DefaultNoiseApplicator::operator(). */ - // auto operator()(autoware_auto_perception_msgs::msg::DetectedObjects detected_objects) + // auto operator()(autoware_perception_msgs::msg::DetectedObjects detected_objects) // -> decltype(auto) // { // return detected_objects; @@ -299,7 +298,7 @@ struct CustomNoiseApplicator : public DefaultNoiseApplicator }; template <> -auto DetectionSensor::update( +auto DetectionSensor::update( const double current_simulation_time, const std::vector & statuses, const rclcpp::Time & current_ros_time, const std::vector & lidar_detected_entities) @@ -310,11 +309,11 @@ auto DetectionSensor::updat -0.002) { previous_simulation_time_ = current_simulation_time; - autoware_auto_perception_msgs::msg::DetectedObjects detected_objects; + autoware_perception_msgs::msg::DetectedObjects detected_objects; detected_objects.header.stamp = current_ros_time; detected_objects.header.frame_id = "map"; - autoware_auto_perception_msgs::msg::TrackedObjects ground_truth_objects; + autoware_perception_msgs::msg::TrackedObjects ground_truth_objects; ground_truth_objects.header = detected_objects.header; const auto ego_entity_status = findEgoEntityStatusToWhichThisSensorIsAttached(statuses); @@ -330,11 +329,10 @@ auto DetectionSensor::updat for (const auto & status : statuses) { if (is_in_range(status)) { - const auto detected_object = - make(status); + const auto detected_object = make(status); detected_objects.objects.push_back(detected_object); ground_truth_objects.objects.push_back( - make(status, detected_object)); + make(status, detected_object)); } } diff --git a/simulation/simple_sensor_simulator/src/simple_sensor_simulator.cpp b/simulation/simple_sensor_simulator/src/simple_sensor_simulator.cpp index a4b64bfd044..ea98c5ad36b 100644 --- a/simulation/simple_sensor_simulator/src/simple_sensor_simulator.cpp +++ b/simulation/simple_sensor_simulator/src/simple_sensor_simulator.cpp @@ -166,7 +166,7 @@ auto ScenarioSimulator::updateEntityStatus( if ( req.overwrite_ego_status() or ego_entity_simulation_->autoware->getControlModeReport().mode == - autoware_auto_vehicle_msgs::msg::ControlModeReport::MANUAL) { + autoware_vehicle_msgs::msg::ControlModeReport::MANUAL) { ego_entity_simulation_->autoware->setManualMode(); traffic_simulator_msgs::msg::EntityStatus ego_status_msg; simulation_interface::toMsg(status, ego_status_msg); diff --git a/simulation/simple_sensor_simulator/src/vehicle_simulation/vehicle_model/sim_model_delay_steer_acc_geared.cpp b/simulation/simple_sensor_simulator/src/vehicle_simulation/vehicle_model/sim_model_delay_steer_acc_geared.cpp index 74002da0849..64fe47c3c11 100644 --- a/simulation/simple_sensor_simulator/src/vehicle_simulation/vehicle_model/sim_model_delay_steer_acc_geared.cpp +++ b/simulation/simple_sensor_simulator/src/vehicle_simulation/vehicle_model/sim_model_delay_steer_acc_geared.cpp @@ -13,7 +13,7 @@ // limitations under the License. #include -#include +#include #include SimModelDelaySteerAccGeared::SimModelDelaySteerAccGeared( @@ -131,7 +131,7 @@ void SimModelDelaySteerAccGeared::updateStateWithGear( state(IDX::ACCX) = (state(IDX::VX) - prev_state(IDX::VX)) / std::max(dt, 1.0e-5); }; - using autoware_auto_vehicle_msgs::msg::GearCommand; + using autoware_vehicle_msgs::msg::GearCommand; if ( gear == GearCommand::DRIVE || gear == GearCommand::DRIVE_2 || gear == GearCommand::DRIVE_3 || gear == GearCommand::DRIVE_4 || gear == GearCommand::DRIVE_5 || gear == GearCommand::DRIVE_6 || diff --git a/simulation/simple_sensor_simulator/src/vehicle_simulation/vehicle_model/sim_model_delay_steer_map_acc_geared.cpp b/simulation/simple_sensor_simulator/src/vehicle_simulation/vehicle_model/sim_model_delay_steer_map_acc_geared.cpp index 033581b66a5..936f4a7b104 100644 --- a/simulation/simple_sensor_simulator/src/vehicle_simulation/vehicle_model/sim_model_delay_steer_map_acc_geared.cpp +++ b/simulation/simple_sensor_simulator/src/vehicle_simulation/vehicle_model/sim_model_delay_steer_map_acc_geared.cpp @@ -13,7 +13,7 @@ // limitations under the License. #include -#include +#include #include // copied from https://github.com/tier4/autoware.universe/blob/v0.17.0/common/interpolation/src/linear_interpolation.cpp @@ -280,7 +280,7 @@ Eigen::VectorXd SimModelDelaySteerMapAccGeared::calcModel( void SimModelDelaySteerMapAccGeared::updateStateWithGear( Eigen::VectorXd & state, const Eigen::VectorXd & prev_state, const uint8_t gear, const double dt) { - using autoware_auto_vehicle_msgs::msg::GearCommand; + using autoware_vehicle_msgs::msg::GearCommand; if ( gear == GearCommand::DRIVE || gear == GearCommand::DRIVE_2 || gear == GearCommand::DRIVE_3 || gear == GearCommand::DRIVE_4 || gear == GearCommand::DRIVE_5 || gear == GearCommand::DRIVE_6 || diff --git a/simulation/simple_sensor_simulator/src/vehicle_simulation/vehicle_model/sim_model_ideal_steer_acc_geared.cpp b/simulation/simple_sensor_simulator/src/vehicle_simulation/vehicle_model/sim_model_ideal_steer_acc_geared.cpp index 0976349bb0e..615a06f11f6 100644 --- a/simulation/simple_sensor_simulator/src/vehicle_simulation/vehicle_model/sim_model_ideal_steer_acc_geared.cpp +++ b/simulation/simple_sensor_simulator/src/vehicle_simulation/vehicle_model/sim_model_ideal_steer_acc_geared.cpp @@ -13,7 +13,7 @@ // limitations under the License. #include -#include +#include #include SimModelIdealSteerAccGeared::SimModelIdealSteerAccGeared(double wheelbase) @@ -69,7 +69,7 @@ void SimModelIdealSteerAccGeared::updateStateWithGear( state(IDX::YAW) = prev_state(IDX::YAW); }; - using autoware_auto_vehicle_msgs::msg::GearCommand; + using autoware_vehicle_msgs::msg::GearCommand; if ( gear == GearCommand::DRIVE || gear == GearCommand::DRIVE_2 || gear == GearCommand::DRIVE_3 || gear == GearCommand::DRIVE_4 || gear == GearCommand::DRIVE_5 || gear == GearCommand::DRIVE_6 || diff --git a/simulation/simple_sensor_simulator/test/src/sensor_simulation/lidar/test_lidar_sensor.hpp b/simulation/simple_sensor_simulator/test/src/sensor_simulation/lidar/test_lidar_sensor.hpp index 54bf61a03b0..9a70ef80bf1 100644 --- a/simulation/simple_sensor_simulator/test/src/sensor_simulation/lidar/test_lidar_sensor.hpp +++ b/simulation/simple_sensor_simulator/test/src/sensor_simulation/lidar/test_lidar_sensor.hpp @@ -31,7 +31,8 @@ using namespace simple_sensor_simulator; class LidarSensorTest : public ::testing::Test { protected: - LidarSensorTest() : config_(utils::constructLidarConfiguration("ego", "awf/universe", 0.0, 0.5)) + LidarSensorTest() + : config_(utils::constructLidarConfiguration("ego", "awf/universe/20240605", 0.0, 0.5)) { rclcpp::init(0, nullptr); node_ = std::make_shared("lidar_sensor_test_node"); diff --git a/simulation/simple_sensor_simulator/test/src/sensor_simulation/lidar/test_raycaster.hpp b/simulation/simple_sensor_simulator/test/src/sensor_simulation/lidar/test_raycaster.hpp index 641e59cf104..a42b70643c3 100644 --- a/simulation/simple_sensor_simulator/test/src/sensor_simulation/lidar/test_raycaster.hpp +++ b/simulation/simple_sensor_simulator/test/src/sensor_simulation/lidar/test_raycaster.hpp @@ -35,7 +35,7 @@ class RaycasterTest : public ::testing::Test protected: RaycasterTest() : raycaster_(std::make_unique()), - config_(utils::constructLidarConfiguration("ego", "awf/universe", 0.0, 0.1)), + config_(utils::constructLidarConfiguration("ego", "awf/universe/20240605", 0.0, 0.1)), origin_(utils::makePose(0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0)), box_pose_(utils::makePose(5.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0)) { diff --git a/simulation/simulation_interface/CHANGELOG.rst b/simulation/simulation_interface/CHANGELOG.rst index 9ec6cca4ef3..773d73013ec 100644 --- a/simulation/simulation_interface/CHANGELOG.rst +++ b/simulation/simulation_interface/CHANGELOG.rst @@ -21,6 +21,83 @@ Changelog for package simulation_interface * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge pull request `#1454 `_ from tier4/RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Fix GitHub CI test job +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Apply clang format +* Fix SpellCheck GitHub Action +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/RJD-736/autoware_msgs_support_new_traffic_light_group' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # external/concealer/src/autoware_universe.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Port AckermannControlCommand to Control +* Port GearCommand +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + 6.2.5 (2024-12-09) ------------------ * Merge branch 'master' into fix/acc_by_slope diff --git a/simulation/simulation_interface/CMakeLists.txt b/simulation/simulation_interface/CMakeLists.txt index 6e2cc1fb292..00f59161a4d 100644 --- a/simulation/simulation_interface/CMakeLists.txt +++ b/simulation/simulation_interface/CMakeLists.txt @@ -23,8 +23,8 @@ include(FindProtobuf REQUIRED) ament_auto_find_build_dependencies() set(PROTO_FILES - "proto/autoware_auto_control_msgs.proto" - "proto/autoware_auto_vehicle_msgs.proto" + "proto/autoware_control_msgs.proto" + "proto/autoware_vehicle_msgs.proto" "proto/builtin_interfaces.proto" "proto/geometry_msgs.proto" "proto/rosgraph_msgs.proto" diff --git a/simulation/simulation_interface/include/simulation_interface/conversions.hpp b/simulation/simulation_interface/include/simulation_interface/conversions.hpp index 4ec8320616b..0bd1f09e53f 100644 --- a/simulation/simulation_interface/include/simulation_interface/conversions.hpp +++ b/simulation/simulation_interface/include/simulation_interface/conversions.hpp @@ -22,8 +22,8 @@ #include #include -#include -#include +#include +#include #include #include #include @@ -172,17 +172,15 @@ void toMsg(const std_msgs::Header & proto, std_msgs::msg::Header & header); auto toProto(const PACKAGE::msg::TYPENAME &, PACKAGE::TYPENAME &)->void; \ auto toMsg(const PACKAGE::TYPENAME &, PACKAGE::msg::TYPENAME &)->void -DEFINE_CONVERSION(autoware_auto_control_msgs, AckermannLateralCommand); -DEFINE_CONVERSION(autoware_auto_control_msgs, LongitudinalCommand); -DEFINE_CONVERSION(autoware_auto_control_msgs, AckermannControlCommand); -DEFINE_CONVERSION(autoware_auto_vehicle_msgs, GearCommand); +DEFINE_CONVERSION(autoware_control_msgs, Lateral); +DEFINE_CONVERSION(autoware_control_msgs, Longitudinal); +DEFINE_CONVERSION(autoware_control_msgs, Control); +DEFINE_CONVERSION(autoware_vehicle_msgs, GearCommand); #undef DEFINE_CONVERSION auto toProto( - const std::tuple< - autoware_auto_control_msgs::msg::AckermannControlCommand, - autoware_auto_vehicle_msgs::msg::GearCommand> &, + const std::tuple &, traffic_simulator_msgs::VehicleCommand &) -> void; template diff --git a/simulation/simulation_interface/package.xml b/simulation/simulation_interface/package.xml index 18268636068..9cbff0ec53e 100644 --- a/simulation/simulation_interface/package.xml +++ b/simulation/simulation_interface/package.xml @@ -2,7 +2,7 @@ simulation_interface - 6.2.5 + 7.0.0 packages to define interface between simulator and scenario interpreter Masaya Kataoka Apache License 2.0 @@ -10,9 +10,8 @@ ament_cmake ament_cmake_auto - autoware_auto_control_msgs - autoware_auto_vehicle_msgs - autoware_auto_perception_msgs + autoware_control_msgs + autoware_vehicle_msgs boost builtin_interfaces geometry_msgs diff --git a/simulation/simulation_interface/proto/autoware_auto_control_msgs.proto b/simulation/simulation_interface/proto/autoware_auto_control_msgs.proto deleted file mode 100644 index 9b65d53125c..00000000000 --- a/simulation/simulation_interface/proto/autoware_auto_control_msgs.proto +++ /dev/null @@ -1,24 +0,0 @@ -syntax = "proto3"; - -import "builtin_interfaces.proto"; - -package autoware_auto_control_msgs; - -message AckermannLateralCommand { - builtin_interfaces.Time stamp = 1; - float steering_tire_angle = 2; - float steering_tire_rotation_rate = 3; -} - -message LongitudinalCommand { - builtin_interfaces.Time stamp = 1; - float speed = 2; - float acceleration = 3; - float jerk = 4; -} - -message AckermannControlCommand { - builtin_interfaces.Time stamp = 1; - AckermannLateralCommand lateral = 2; - LongitudinalCommand longitudinal = 3; -} diff --git a/simulation/simulation_interface/proto/autoware_control_msgs.proto b/simulation/simulation_interface/proto/autoware_control_msgs.proto new file mode 100644 index 00000000000..1a760f54da4 --- /dev/null +++ b/simulation/simulation_interface/proto/autoware_control_msgs.proto @@ -0,0 +1,30 @@ +syntax = "proto3"; + +import "builtin_interfaces.proto"; + +package autoware_control_msgs; + +message Lateral { + builtin_interfaces.Time stamp = 1; + builtin_interfaces.Time control_time = 2; + float steering_tire_angle = 3; + float steering_tire_rotation_rate = 4; + bool is_defined_steering_tire_rotation_rate = 5; +} + +message Longitudinal { + builtin_interfaces.Time stamp = 1; + builtin_interfaces.Time control_time = 2; + float velocity = 3; + float acceleration = 4; + float jerk = 5; + bool is_defined_acceleration = 6; + bool is_defined_jerk = 7; +} + +message Control { + builtin_interfaces.Time stamp = 1; + builtin_interfaces.Time control_time = 2; + Lateral lateral = 3; + Longitudinal longitudinal = 4; +} diff --git a/simulation/simulation_interface/proto/autoware_auto_vehicle_msgs.proto b/simulation/simulation_interface/proto/autoware_vehicle_msgs.proto similarity index 94% rename from simulation/simulation_interface/proto/autoware_auto_vehicle_msgs.proto rename to simulation/simulation_interface/proto/autoware_vehicle_msgs.proto index 6b0b314a780..cf1f9767f7c 100644 --- a/simulation/simulation_interface/proto/autoware_auto_vehicle_msgs.proto +++ b/simulation/simulation_interface/proto/autoware_vehicle_msgs.proto @@ -2,7 +2,7 @@ syntax = "proto3"; import "builtin_interfaces.proto"; -package autoware_auto_vehicle_msgs; +package autoware_vehicle_msgs; enum GearCommand_Constants { NONE = 0; diff --git a/simulation/simulation_interface/proto/traffic_simulator_msgs.proto b/simulation/simulation_interface/proto/traffic_simulator_msgs.proto index 3e7a8be5b91..0f571a5cff8 100644 --- a/simulation/simulation_interface/proto/traffic_simulator_msgs.proto +++ b/simulation/simulation_interface/proto/traffic_simulator_msgs.proto @@ -1,7 +1,7 @@ syntax = "proto3"; -import "autoware_auto_control_msgs.proto"; -import "autoware_auto_vehicle_msgs.proto"; +import "autoware_control_msgs.proto"; +import "autoware_vehicle_msgs.proto"; import "geometry_msgs.proto"; package traffic_simulator_msgs; @@ -147,8 +147,8 @@ message Waypoints { } message VehicleCommand { - autoware_auto_control_msgs.AckermannControlCommand ackermann_control_command = 1; - autoware_auto_vehicle_msgs.GearCommand gear_command = 2; + autoware_control_msgs.Control control = 1; + autoware_vehicle_msgs.GearCommand gear_command = 2; } /** diff --git a/simulation/simulation_interface/src/conversions.cpp b/simulation/simulation_interface/src/conversions.cpp index 1804eb11c1a..5d006d319e9 100644 --- a/simulation/simulation_interface/src/conversions.cpp +++ b/simulation/simulation_interface/src/conversions.cpp @@ -490,8 +490,7 @@ void toMsg(const std_msgs::Header & proto, std_msgs::msg::Header & header) } void toProto( - const autoware_auto_control_msgs::msg::AckermannLateralCommand & message, - autoware_auto_control_msgs::AckermannLateralCommand & proto) + const autoware_control_msgs::msg::Lateral & message, autoware_control_msgs::Lateral & proto) { toProto(message.stamp, *proto.mutable_stamp()); proto.set_steering_tire_angle(message.steering_tire_angle); @@ -499,8 +498,7 @@ void toProto( } void toMsg( - const autoware_auto_control_msgs::AckermannLateralCommand & proto, - autoware_auto_control_msgs::msg::AckermannLateralCommand & message) + const autoware_control_msgs::Lateral & proto, autoware_control_msgs::msg::Lateral & message) { toMsg(proto.stamp(), message.stamp); message.steering_tire_angle = proto.steering_tire_angle(); @@ -508,28 +506,27 @@ void toMsg( } void toProto( - const autoware_auto_control_msgs::msg::LongitudinalCommand & message, - autoware_auto_control_msgs::LongitudinalCommand & proto) + const autoware_control_msgs::msg::Longitudinal & message, + autoware_control_msgs::Longitudinal & proto) { toProto(message.stamp, *proto.mutable_stamp()); - proto.set_speed(message.speed); + proto.set_velocity(message.velocity); proto.set_acceleration(message.acceleration); proto.set_jerk(message.jerk); } void toMsg( - const autoware_auto_control_msgs::LongitudinalCommand & proto, - autoware_auto_control_msgs::msg::LongitudinalCommand & message) + const autoware_control_msgs::Longitudinal & proto, + autoware_control_msgs::msg::Longitudinal & message) { toMsg(proto.stamp(), message.stamp); - message.speed = proto.speed(); + message.velocity = proto.velocity(); message.acceleration = proto.acceleration(); message.jerk = proto.jerk(); } void toProto( - const autoware_auto_control_msgs::msg::AckermannControlCommand & message, - autoware_auto_control_msgs::AckermannControlCommand & proto) + const autoware_control_msgs::msg::Control & message, autoware_control_msgs::Control & proto) { toProto(message.stamp, *proto.mutable_stamp()); toProto(message.lateral, *proto.mutable_lateral()); @@ -537,8 +534,7 @@ void toProto( } void toMsg( - const autoware_auto_control_msgs::AckermannControlCommand & proto, - autoware_auto_control_msgs::msg::AckermannControlCommand & message) + const autoware_control_msgs::Control & proto, autoware_control_msgs::msg::Control & message) { toMsg(proto.stamp(), message.stamp); toMsg(proto.lateral(), message.lateral); @@ -546,14 +542,14 @@ void toMsg( } auto toProto( - const autoware_auto_vehicle_msgs::msg::GearCommand & message, - autoware_auto_vehicle_msgs::GearCommand & proto) -> void + const autoware_vehicle_msgs::msg::GearCommand & message, + autoware_vehicle_msgs::GearCommand & proto) -> void { toProto(message.stamp, *proto.mutable_stamp()); -#define CASE(NAME) \ - case autoware_auto_vehicle_msgs::msg::GearCommand::NAME: \ - proto.set_command(autoware_auto_vehicle_msgs::GearCommand_Constants::NAME); \ +#define CASE(NAME) \ + case autoware_vehicle_msgs::msg::GearCommand::NAME: \ + proto.set_command(autoware_vehicle_msgs::GearCommand_Constants::NAME); \ break switch (message.command) { @@ -586,20 +582,19 @@ auto toProto( } auto toMsg( - const autoware_auto_vehicle_msgs::GearCommand & proto, - autoware_auto_vehicle_msgs::msg::GearCommand & message) -> void + const autoware_vehicle_msgs::GearCommand & proto, + autoware_vehicle_msgs::msg::GearCommand & message) -> void { toMsg(proto.stamp(), message.stamp); message.command = proto.command(); } auto toProto( - const std::tuple< - autoware_auto_control_msgs::msg::AckermannControlCommand, - autoware_auto_vehicle_msgs::msg::GearCommand> & message, + const std::tuple & + message, traffic_simulator_msgs::VehicleCommand & proto) -> void { - toProto(std::get<0>(message), *proto.mutable_ackermann_control_command()); + toProto(std::get<0>(message), *proto.mutable_control()); toProto(std::get<1>(message), *proto.mutable_gear_command()); } diff --git a/simulation/simulation_interface/test/expect_equal_macros.hpp b/simulation/simulation_interface/test/expect_equal_macros.hpp index 2620c1af700..f3862a9bb6b 100644 --- a/simulation/simulation_interface/test/expect_equal_macros.hpp +++ b/simulation/simulation_interface/test/expect_equal_macros.hpp @@ -156,14 +156,14 @@ * @brief Expect equal macros for autoware related messages. */ #define EXPECT_CONTROL_COMMAND_EQ(MSG, PROTO) \ - EXPECT_DOUBLE_EQ(MSG.longitudinal.speed, PROTO.longitudinal().speed()); \ + EXPECT_DOUBLE_EQ(MSG.longitudinal.velocity, PROTO.longitudinal().velocity()); \ EXPECT_DOUBLE_EQ(MSG.longitudinal.acceleration, PROTO.longitudinal().acceleration()); \ EXPECT_DOUBLE_EQ(MSG.lateral.steering_tire_angle, PROTO.lateral().steering_tire_angle()); \ EXPECT_DOUBLE_EQ( \ MSG.lateral.steering_tire_rotation_rate, PROTO.lateral().steering_tire_rotation_rate()); #define EXPECT_VEHICLE_COMMAND_EQ(CONTROL_MSG, GEAR_MSG, EMERGENCY_MSG, PROTO) \ - EXPECT_CONTROL_COMMAND_EQ(CONTROL_MSG, PROTO.ackermann_control_command()); \ + EXPECT_CONTROL_COMMAND_EQ(CONTROL_MSG, PROTO.control()); \ EXPECT_DOUBLE_EQ(GEAR_MSG.command, PROTO.gear_command().data()); \ EXPECT_DOUBLE_EQ(EMERGENCY_MSG.emergency, PROTO.vehicle_emergency_stamped().emergency()); diff --git a/simulation/simulation_interface/test/test_conversions.cpp b/simulation/simulation_interface/test/test_conversions.cpp index 0a7bf9bccb7..833baa4fd6d 100644 --- a/simulation/simulation_interface/test/test_conversions.cpp +++ b/simulation/simulation_interface/test/test_conversions.cpp @@ -438,20 +438,20 @@ TEST(Conversion, Clock) EXPECT_CLOCK_EQ(msg, proto); } -TEST(Conversion, AckermannControlCommand) +TEST(Conversion, Control) { - autoware_auto_control_msgs::AckermannControlCommand proto; - autoware_auto_control_msgs::msg::AckermannControlCommand msg; + autoware_control_msgs::Control proto; + autoware_control_msgs::msg::Control msg; msg.longitudinal.acceleration = 3; msg.lateral.steering_tire_angle = 1.4; msg.lateral.steering_tire_rotation_rate = 13.4; - msg.longitudinal.speed = 11.3; + msg.longitudinal.velocity = 11.3; simulation_interface::toProto(msg, proto); EXPECT_CONTROL_COMMAND_EQ(msg, proto); msg.longitudinal.acceleration = 0; msg.lateral.steering_tire_angle = 0; msg.lateral.steering_tire_rotation_rate = 0; - msg.longitudinal.speed = 0; + msg.longitudinal.velocity = 0; simulation_interface::toMsg(proto, msg); EXPECT_CONTROL_COMMAND_EQ(msg, proto); } diff --git a/simulation/traffic_simulator/CHANGELOG.rst b/simulation/traffic_simulator/CHANGELOG.rst index f938eceaca1..ebe8a1143ae 100644 --- a/simulation/traffic_simulator/CHANGELOG.rst +++ b/simulation/traffic_simulator/CHANGELOG.rst @@ -21,6 +21,108 @@ Changelog for package traffic_simulator * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge pull request `#1454 `_ from tier4/RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* chore: apply linter +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* fix: replace "awf/universe" with "awf/universe/20240605" for architecture_type +* chore: delete a test using autoware_auto_perception_msgs +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* refactor: added handling when autoware_perception_msgs/msg/traffic_signal_array.hpp is not present +* chore: delete wrongly doubled word +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* fix: delete autoware_auto_xx_msgs from include +* Merge branch 'master' into RJD-736/autoware_msgs_support +* apply linter +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Fix conflicts in includes +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Revert "add autoware\_ prefix" + This reverts commit a3591f038b30ca35f9188d552556a482a2ffbe17. +* add autoware\_ prefix +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge pull request `#1277 `_ from tier4/RJD-736/autoware_msgs_support_new_traffic_light_group + Rjd 736/autoware msgs support new traffic light group +* Merge remote-tracking branch 'origin/RJD-736/autoware_msgs_support_new_traffic_light_group' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # external/concealer/src/autoware_universe.cpp +* feat(traffic_simulator): support TrafficLightGroup for V2I traffic lights +* feat(traffic_simulator): support TrafficLightGroupArray in TrafficLightPublisher +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Delete unused autoware_auto_system_msgs package +* Port DetectedObjects and TrackedObjects +* Port TrafficSignalArray from autoware_auto_perception_msgs to autoware_perception_msgs +* Port AckermannControlCommand to Control +* Port HADMapBin to LaneletMapBin +* Port GearCommand +* Delete unused vehicle_state_command and vehicle_control_command +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski, Yutaka Kondo + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge pull request `#1468 `_ from tier4/feature/lane-change-everywhere +* fix:　disable default argument value for include_oppsite_direction in HdMapUtils::getLeftLaneletIds/getRightLaneletIds +* Merge branch 'master' into feature/lane-change-everywhere +* fix: fit test constants to latest algorithm +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* replace true with false for include_opposite_direction option +* fix:　use lanelet2 functions correctly in HdMapUtils::getLeftLaneletIds/getRightLaneletIds +* chore: fix linelint error +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* feat: allow lane-change everywhere in `VEHICLE_WITH_ROAD_SHOULDER` routing graph +* Contributors: Kotaro Yoshimoto + 6.2.5 (2024-12-09) ------------------ * Merge branch 'master' into fix/acc_by_slope diff --git a/simulation/traffic_simulator/include/traffic_simulator/api/api.hpp b/simulation/traffic_simulator/include/traffic_simulator/api/api.hpp index dc8f68045d3..c319cd48e12 100644 --- a/simulation/traffic_simulator/include/traffic_simulator/api/api.hpp +++ b/simulation/traffic_simulator/include/traffic_simulator/api/api.hpp @@ -17,8 +17,6 @@ #include -#include -#include #include #include #include @@ -72,7 +70,7 @@ class API std::make_shared(node, configuration, node_parameters_)), traffic_lights_ptr_(std::make_shared( node, entity_manager_ptr_->getHdmapUtils(), - getROS2Parameter("architecture_type", "awf/universe"))), + getROS2Parameter("architecture_type", "awf/universe/20240605"))), traffic_controller_ptr_(std::make_shared( entity_manager_ptr_->getHdmapUtils(), [this]() { return entity_manager_ptr_->getEntityNames(); }, diff --git a/simulation/traffic_simulator/include/traffic_simulator/entity/ego_entity.hpp b/simulation/traffic_simulator/include/traffic_simulator/entity/ego_entity.hpp index be45228aba2..2c2359df9fa 100644 --- a/simulation/traffic_simulator/include/traffic_simulator/entity/ego_entity.hpp +++ b/simulation/traffic_simulator/include/traffic_simulator/entity/ego_entity.hpp @@ -16,7 +16,6 @@ #define TRAFFIC_SIMULATOR__ENTITY__EGO_ENTITY_HPP_ #include -#include #include #include #include diff --git a/simulation/traffic_simulator/include/traffic_simulator/entity/entity_base.hpp b/simulation/traffic_simulator/include/traffic_simulator/entity/entity_base.hpp index e47d6f743b6..19d160c73d1 100644 --- a/simulation/traffic_simulator/include/traffic_simulator/entity/entity_base.hpp +++ b/simulation/traffic_simulator/include/traffic_simulator/entity/entity_base.hpp @@ -15,8 +15,8 @@ #ifndef TRAFFIC_SIMULATOR__ENTITY__ENTITY_BASE_HPP_ #define TRAFFIC_SIMULATOR__ENTITY__ENTITY_BASE_HPP_ -#include -#include +#include +#include #include #include #include diff --git a/simulation/traffic_simulator/include/traffic_simulator/hdmap_utils/hdmap_utils.hpp b/simulation/traffic_simulator/include/traffic_simulator/hdmap_utils/hdmap_utils.hpp index 07dced38f8f..0f34b2c7c97 100644 --- a/simulation/traffic_simulator/include/traffic_simulator/hdmap_utils/hdmap_utils.hpp +++ b/simulation/traffic_simulator/include/traffic_simulator/hdmap_utils/hdmap_utils.hpp @@ -28,10 +28,10 @@ #include #include -#include #include #include #include +#include #include #include #include @@ -204,7 +204,7 @@ class HdMapUtils auto getLeftLaneletIds( const lanelet::Id, const traffic_simulator::RoutingGraphType, - const bool include_opposite_direction = true) const -> lanelet::Ids; + const bool include_opposite_direction) const -> lanelet::Ids; auto getLongitudinalDistance( const traffic_simulator_msgs::msg::LaneletPose & from_pose, @@ -269,7 +269,7 @@ class HdMapUtils auto getRightLaneletIds( const lanelet::Id, const traffic_simulator::RoutingGraphType, - const bool include_opposite_direction = true) const -> lanelet::Ids; + const bool include_opposite_direction) const -> lanelet::Ids; auto getRightOfWayLaneletIds(const lanelet::Ids &) const -> std::unordered_map; @@ -367,12 +367,12 @@ class HdMapUtils auto toLaneletPoses( const geometry_msgs::msg::Pose &, const lanelet::Id, const double matching_distance = 5.0, - const bool include_opposite_direction = true, + const bool include_opposite_direction = false, const traffic_simulator::RoutingGraphType type = traffic_simulator::RoutingConfiguration().routing_graph_type) const -> std::vector; - auto toMapBin() const -> autoware_auto_mapping_msgs::msg::HADMapBin; + auto toMapBin() const -> autoware_map_msgs::msg::LaneletMapBin; auto toMapPoints(const lanelet::Id, const std::vector & s) const -> std::vector; @@ -486,7 +486,7 @@ class HdMapUtils auto getVectorFromPose(const geometry_msgs::msg::Pose &, const double magnitude) const -> geometry_msgs::msg::Vector3; - auto mapCallback(const autoware_auto_mapping_msgs::msg::HADMapBin &) const -> void; + auto mapCallback(const autoware_map_msgs::msg::LaneletMapBin &) const -> void; auto overwriteLaneletsCenterline() -> void; diff --git a/simulation/traffic_simulator/include/traffic_simulator/hdmap_utils/traffic_rules.hpp b/simulation/traffic_simulator/include/traffic_simulator/hdmap_utils/traffic_rules.hpp index 7acbbeb5e5b..d16133ee5f0 100644 --- a/simulation/traffic_simulator/include/traffic_simulator/hdmap_utils/traffic_rules.hpp +++ b/simulation/traffic_simulator/include/traffic_simulator/hdmap_utils/traffic_rules.hpp @@ -66,6 +66,9 @@ class GermanRoadShoulderPassableVehicle : public lanelet::traffic_rules::GermanV return startsWith(this->participant(), participant); }); } + + lanelet::traffic_rules::LaneChangeType laneChangeType( + const lanelet::ConstLineString3d &, bool) const override; }; } // namespace hdmap_utils #endif // TRAFFIC_SIMULATOR__HDMAP_UTILS__TRAFFIC_RULES_HPP_ diff --git a/simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_lights.hpp b/simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_lights.hpp index 4893edf995c..cd4c366c46e 100644 --- a/simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_lights.hpp +++ b/simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_lights.hpp @@ -15,8 +15,10 @@ #ifndef TRAFFIC_SIMULATOR__TRAFFIC_LIGHTS__TRAFFIC_LIGHTS_HPP_ #define TRAFFIC_SIMULATOR__TRAFFIC_LIGHTS__TRAFFIC_LIGHTS_HPP_ -#include +// This message will be deleted in the future +#if __has_include() #include +#endif #if __has_include() #include @@ -92,17 +94,23 @@ class V2ITrafficLights : public TrafficLightsBase const std::string & topic_name) -> std::unique_ptr { /* - V2ITrafficLights in TrafficSimulator publishes publishes using architecture-independent topics ("awf/universe..."): + V2ITrafficLights in TrafficSimulator publishes using architecture-independent topics ("awf/universe..."): "/v2x/traffic_signals" and "/perception/traffic_light_recognition/external/traffic_signals" TrafficLightsDetector in SimpleSensorSimulator publishes using architecture-dependent topics: "/perception/traffic_light_recognition/internal/traffic_signals" for >= "awf/universe/20230906" "/perception/traffic_light_recognition/traffic_signals" for "awf/universe" */ - if (architecture_type <= "awf/universe/20230906") { + if (architecture_type == "awf/universe") { + throw common::SemanticError( + "This version of scenario_simulator_v2 does not support ", std::quoted(architecture_type), + " as ", std::quoted("architecture_type"), ". Please use older version."); +#if __has_include() + } else if (architecture_type <= "awf/universe/20230906") { return std::make_unique< TrafficLightPublisher>( node_ptr, topic_name); +#endif #if __has_include() } else if (architecture_type >= "awf/universe/20240605") { return std::make_unique< diff --git a/simulation/traffic_simulator/package.xml b/simulation/traffic_simulator/package.xml index 8b67d1ab862..8113d65ce1e 100644 --- a/simulation/traffic_simulator/package.xml +++ b/simulation/traffic_simulator/package.xml @@ -1,7 +1,7 @@ traffic_simulator - 6.2.5 + 7.0.0 control traffic flow masaya kataoka @@ -36,8 +36,8 @@ tf2_geometry_msgs tf2_ros tier4_debug_msgs - autoware_auto_perception_msgs autoware_perception_msgs + autoware_map_msgs tinyxml2_vendor pluginlib traffic_simulator_msgs diff --git a/simulation/traffic_simulator/src/api/api.cpp b/simulation/traffic_simulator/src/api/api.cpp index 235e72291cd..51b4f3a572c 100644 --- a/simulation/traffic_simulator/src/api/api.cpp +++ b/simulation/traffic_simulator/src/api/api.cpp @@ -151,7 +151,7 @@ bool API::attachDetectionSensor( double object_recognition_delay) { return attachDetectionSensor(helper::constructDetectionSensorConfiguration( - entity_name, getROS2Parameter("architecture_type", "awf/universe"), 0.1, + entity_name, getROS2Parameter("architecture_type", "awf/universe/20240605"), 0.1, detection_sensor_range, detect_all_objects_in_range, pos_noise_stddev, random_seed, probability_of_lost, object_recognition_delay)); } @@ -184,7 +184,8 @@ bool API::attachLidarSensor( const helper::LidarType lidar_type) { return attachLidarSensor(helper::constructLidarConfiguration( - lidar_type, entity_name, getROS2Parameter("architecture_type", "awf/universe"), + lidar_type, entity_name, + getROS2Parameter("architecture_type", "awf/universe/20240605"), lidar_sensor_delay)); } diff --git a/simulation/traffic_simulator/src/entity/ego_entity.cpp b/simulation/traffic_simulator/src/entity/ego_entity.cpp index e5305a1bafa..d9f67535928 100644 --- a/simulation/traffic_simulator/src/entity/ego_entity.cpp +++ b/simulation/traffic_simulator/src/entity/ego_entity.cpp @@ -39,7 +39,7 @@ auto EgoEntity::makeFieldOperatorApplication( -> std::unique_ptr { if (const auto architecture_type = - getParameter(node_parameters, "architecture_type", "awf/universe"); + getParameter(node_parameters, "architecture_type", "awf/universe/20240605"); architecture_type.find("awf/universe") != std::string::npos) { auto parameters = getParameter>(node_parameters, "autoware.", {}); diff --git a/simulation/traffic_simulator/src/entity/entity_base.cpp b/simulation/traffic_simulator/src/entity/entity_base.cpp index 3ce8416daec..35d1700be20 100644 --- a/simulation/traffic_simulator/src/entity/entity_base.cpp +++ b/simulation/traffic_simulator/src/entity/entity_base.cpp @@ -790,7 +790,7 @@ auto EntityBase::requestSynchronize( lane_changeable_routing_configuration.allow_lane_change = true; const auto entity_distance = longitudinalDistance( - entity_lanelet_pose.value(), entity_target, true, true, + entity_lanelet_pose.value(), entity_target, true, false, lane_changeable_routing_configuration, hdmap_utils_ptr_); if (!entity_distance.has_value()) { THROW_SEMANTIC_ERROR( @@ -806,7 +806,7 @@ auto EntityBase::requestSynchronize( const auto target_entity_distance = longitudinalDistance( CanonicalizedLaneletPose(target_entity_lanelet_pose, hdmap_utils_ptr_), target_sync_pose, - true, true, lane_changeable_routing_configuration, hdmap_utils_ptr_); + true, false, lane_changeable_routing_configuration, hdmap_utils_ptr_); if (!target_entity_distance.has_value() || target_entity_distance.value() < 0.0) { RCLCPP_WARN_ONCE( rclcpp::get_logger("traffic_simulator"), diff --git a/simulation/traffic_simulator/src/hdmap_utils/hdmap_utils.cpp b/simulation/traffic_simulator/src/hdmap_utils/hdmap_utils.cpp index b6f9406a8d8..650fb0fd802 100644 --- a/simulation/traffic_simulator/src/hdmap_utils/hdmap_utils.cpp +++ b/simulation/traffic_simulator/src/hdmap_utils/hdmap_utils.cpp @@ -220,11 +220,12 @@ auto HdMapUtils::countLaneChanges( if (auto followings = getNextLaneletIds(previous, routing_configuration.routing_graph_type); std::find(followings.begin(), followings.end(), current) == followings.end()) { - if (auto lefts = getLeftLaneletIds(previous, routing_configuration.routing_graph_type); + if (auto lefts = + getLeftLaneletIds(previous, routing_configuration.routing_graph_type, false); std::find(lefts.begin(), lefts.end(), current) != lefts.end()) { lane_changes.first++; } else if (auto rights = - getRightLaneletIds(previous, routing_configuration.routing_graph_type); + getRightLaneletIds(previous, routing_configuration.routing_graph_type, false); std::find(rights.begin(), rights.end(), current) != rights.end()) { lane_changes.second++; } @@ -1183,11 +1184,11 @@ auto HdMapUtils::getLeftLaneletIds( const bool include_opposite_direction) const -> lanelet::Ids { if (include_opposite_direction) { + throw common::Error( + "HdMapUtils::getLeftLaneletIds with include_opposite_direction=true is not implemented yet."); + } else { return getLaneletIds( routing_graphs_->routing_graph(type)->lefts(lanelet_map_ptr_->laneletLayer.get(lanelet_id))); - } else { - return getLaneletIds(routing_graphs_->routing_graph(type)->adjacentLefts( - lanelet_map_ptr_->laneletLayer.get(lanelet_id))); } } @@ -1196,11 +1197,12 @@ auto HdMapUtils::getRightLaneletIds( const bool include_opposite_direction) const -> lanelet::Ids { if (include_opposite_direction) { + throw common::Error( + "HdMapUtils::getRightLaneletIds with include_opposite_direction=true is not implemented " + "yet."); + } else { return getLaneletIds( routing_graphs_->routing_graph(type)->rights(lanelet_map_ptr_->laneletLayer.get(lanelet_id))); - } else { - return getLaneletIds(routing_graphs_->routing_graph(type)->adjacentRights( - lanelet_map_ptr_->laneletLayer.get(lanelet_id))); } } @@ -1531,7 +1533,7 @@ auto HdMapUtils::getLongitudinalDistance( } } -auto HdMapUtils::toMapBin() const -> autoware_auto_mapping_msgs::msg::HADMapBin +auto HdMapUtils::toMapBin() const -> autoware_map_msgs::msg::LaneletMapBin { std::stringstream ss; boost::archive::binary_oarchive oa(ss); @@ -1539,7 +1541,7 @@ auto HdMapUtils::toMapBin() const -> autoware_auto_mapping_msgs::msg::HADMapBin auto id_counter = lanelet::utils::getId(); oa << id_counter; std::string tmp_str = ss.str(); - autoware_auto_mapping_msgs::msg::HADMapBin msg; + autoware_map_msgs::msg::LaneletMapBin msg; msg.data.clear(); msg.data.resize(tmp_str.size()); msg.data.assign(tmp_str.begin(), tmp_str.end()); diff --git a/simulation/traffic_simulator/src/hdmap_utils/traffic_rules.cpp b/simulation/traffic_simulator/src/hdmap_utils/traffic_rules.cpp index 2140970be62..08b3c948461 100644 --- a/simulation/traffic_simulator/src/hdmap_utils/traffic_rules.cpp +++ b/simulation/traffic_simulator/src/hdmap_utils/traffic_rules.cpp @@ -19,3 +19,11 @@ lanelet::traffic_rules::RegisterTrafficRules germanRoadShoulderPassableVehicleRules( hdmap_utils::Locations::RoadShoulderPassableGermany, lanelet::Participants::Vehicle); + +lanelet::traffic_rules::LaneChangeType +hdmap_utils::GermanRoadShoulderPassableVehicle::laneChangeType( + const lanelet::ConstLineString3d &, bool) const +{ + /// @note allow lane-changes everywhere even if prohibited by lanelet2 map, because lane-change settings are not for entities but only for Autoware. + return lanelet::traffic_rules::LaneChangeType::Both; +} diff --git a/simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp b/simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp index f00cfcc0eac..b682f38e27c 100644 --- a/simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +++ b/simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp @@ -12,45 +12,22 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include #include #include #include +// This message will be deleted in the future +#if __has_include() +#include +#endif + #if __has_include() #include #endif namespace traffic_simulator { -template <> -auto TrafficLightPublisher::generateMessage( - const rclcpp::Time & current_ros_time, - const simulation_api_schema::UpdateTrafficLightsRequest & request, const std::string & frame) - -> std::unique_ptr -{ - auto message = std::make_unique(); - - message->header.frame_id = frame; - message->header.stamp = current_ros_time; - - using TrafficLightType = autoware_auto_perception_msgs::msg::TrafficSignal; - using TrafficLightBulbType = TrafficLightType::_lights_type::value_type; - - for (const auto & traffic_light : request.states()) { - TrafficLightType traffic_light_message; - traffic_light_message.map_primitive_id = traffic_light.id(); - for (const auto & bulb_status : traffic_light.traffic_light_status()) { - TrafficLightBulbType light_bulb_message; - simulation_interface::toMsg(bulb_status, light_bulb_message); - traffic_light_message.lights.push_back(light_bulb_message); - } - message->signals.push_back(traffic_light_message); - } - return message; -} - +#if __has_include() template <> auto TrafficLightPublisher::generateMessage( const rclcpp::Time & current_ros_time, @@ -81,6 +58,7 @@ auto TrafficLightPublisher::g } return message; } +#endif // __has_include() template <> auto TrafficLightPublisher::generateMessage( diff --git a/simulation/traffic_simulator/test/src/traffic_lights/test_traffic_lights.cpp b/simulation/traffic_simulator/test/src/traffic_lights/test_traffic_lights.cpp index edc0c7283ef..ec5d0bc7beb 100644 --- a/simulation/traffic_simulator/test/src/traffic_lights/test_traffic_lights.cpp +++ b/simulation/traffic_simulator/test/src/traffic_lights/test_traffic_lights.cpp @@ -54,7 +54,8 @@ class TrafficLightsTest : public testing::Test .altitude(0.0)); std::unique_ptr lights = - std::make_unique(node_ptr, hdmap_utils_ptr, "awf/universe"); + std::make_unique( + node_ptr, hdmap_utils_ptr, "awf/universe/20240605"); }; TEST_F(TrafficLightsTest, isAnyTrafficLightChanged) diff --git a/simulation/traffic_simulator/test/src/traffic_lights/test_traffic_lights_internal_common.cpp b/simulation/traffic_simulator/test/src/traffic_lights/test_traffic_lights_internal_common.cpp index 19049f322df..e1c9f8777f6 100644 --- a/simulation/traffic_simulator/test/src/traffic_lights/test_traffic_lights_internal_common.cpp +++ b/simulation/traffic_simulator/test/src/traffic_lights/test_traffic_lights_internal_common.cpp @@ -399,44 +399,6 @@ TYPED_TEST(TrafficLightsInternalTest, generateTrafficSimulatorV1Msg) EXPECT_NEAR(msg.traffic_lights[0].traffic_light_bulbs[1].confidence, expected_confidence, eps); } -TYPED_TEST(TrafficLightsInternalTest, generateAutowareAutoPerceptionMsg) -{ - constexpr double expected_confidence{0.7}; - constexpr const char * frame = "camera_link"; - - this->lights->setTrafficLightsState(this->id, "red solidOn circle, yellow flashing circle"); - this->lights->setTrafficLightsConfidence(this->id, expected_confidence); - - const auto msg = *traffic_simulator::TrafficLightPublisher< - autoware_auto_perception_msgs::msg::TrafficSignalArray>:: - generateMessage( - this->node_ptr->get_clock()->now(), - this->lights->generateUpdateTrafficLightsRequest(), frame); - - const double expected_time = - static_cast(getTime(this->node_ptr->get_clock()->now())) * 1e-9; - const double actual_time = static_cast(getTime(msg.header)) * 1e-9; - EXPECT_NEAR(actual_time, expected_time, timing_eps); - - EXPECT_EQ(msg.signals.size(), static_cast(1)); - EXPECT_EQ(msg.signals.front().lights.size(), static_cast(2)); - - EXPECT_EQ(msg.header.frame_id, frame); - EXPECT_EQ(msg.signals[0].map_primitive_id, this->id); - - using TrafficLight = autoware_auto_perception_msgs::msg::TrafficLight; - // we use this order, because signals are parsed in reverse - EXPECT_EQ(msg.signals[0].lights[0].color, TrafficLight::AMBER); - EXPECT_EQ(msg.signals[0].lights[0].status, TrafficLight::FLASHING); - EXPECT_EQ(msg.signals[0].lights[0].shape, TrafficLight::CIRCLE); - EXPECT_NEAR(msg.signals[0].lights[0].confidence, expected_confidence, eps); - - EXPECT_EQ(msg.signals[0].lights[1].color, TrafficLight::RED); - EXPECT_EQ(msg.signals[0].lights[1].status, TrafficLight::SOLID_ON); - EXPECT_EQ(msg.signals[0].lights[1].shape, TrafficLight::CIRCLE); - EXPECT_NEAR(msg.signals[0].lights[1].confidence, expected_confidence, eps); -} - TYPED_TEST(TrafficLightsInternalTest, generateAutowarePerceptionTrafficSignalMsg) { constexpr double expected_confidence{0.7}; diff --git a/simulation/traffic_simulator/test/src/utils/test_distance.cpp b/simulation/traffic_simulator/test/src/utils/test_distance.cpp index ebe1558fb98..d288117c96b 100644 --- a/simulation/traffic_simulator/test/src/utils/test_distance.cpp +++ b/simulation/traffic_simulator/test/src/utils/test_distance.cpp @@ -524,7 +524,7 @@ TEST_F(distanceTest_IntersectionMap, longitudinalDistance_adjacent_noOpposite_ch pose_from.value(), pose_to.value(), true, false, lane_changeable_routing_configuration, hdmap_utils_ptr); ASSERT_TRUE(result.has_value()); - EXPECT_NEAR(result.value(), 103.0, 1.0); + EXPECT_DOUBLE_EQ(result.value(), 97.648110014340688); } { const auto pose_from = traffic_simulator::toCanonicalizedLaneletPose( @@ -540,7 +540,7 @@ TEST_F(distanceTest_IntersectionMap, longitudinalDistance_adjacent_noOpposite_ch pose_from.value(), pose_to.value(), true, false, lane_changeable_routing_configuration, hdmap_utils_ptr); ASSERT_TRUE(result.has_value()); - EXPECT_NEAR(result.value(), 131.0, 1.0); + EXPECT_DOUBLE_EQ(result.value(), 127.99532311325152); } } diff --git a/simulation/traffic_simulator_msgs/CHANGELOG.rst b/simulation/traffic_simulator_msgs/CHANGELOG.rst index 34781b72e18..cf8105964a2 100644 --- a/simulation/traffic_simulator_msgs/CHANGELOG.rst +++ b/simulation/traffic_simulator_msgs/CHANGELOG.rst @@ -21,6 +21,74 @@ Changelog for package openscenario_msgs * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + 6.2.5 (2024-12-09) ------------------ * Merge branch 'master' into fix/acc_by_slope diff --git a/simulation/traffic_simulator_msgs/package.xml b/simulation/traffic_simulator_msgs/package.xml index 254a06e6dd1..e7c090973f2 100644 --- a/simulation/traffic_simulator_msgs/package.xml +++ b/simulation/traffic_simulator_msgs/package.xml @@ -2,7 +2,7 @@ traffic_simulator_msgs - 6.2.5 + 7.0.0 ROS messages for openscenario Masaya Kataoka Apache License 2.0 diff --git a/test_runner/random_test_runner/CHANGELOG.rst b/test_runner/random_test_runner/CHANGELOG.rst index 1ed8c43913a..91e98512908 100644 --- a/test_runner/random_test_runner/CHANGELOG.rst +++ b/test_runner/random_test_runner/CHANGELOG.rst @@ -21,6 +21,84 @@ Changelog for package random_test_runner * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge pull request `#1454 `_ from tier4/RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* fix: DataTypes/stringFromArchitectureType_correct in random_test_runner +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* fix: replace "awf/universe" with "awf/universe/20240605" for architecture_type +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Revert "add autoware\_ prefix" + This reverts commit a3591f038b30ca35f9188d552556a482a2ffbe17. +* add autoware\_ prefix +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski, Yutaka Kondo + +6.3.1 (2024-12-10) +------------------ +* Merge pull request `#1474 `_ from tier4/fix/sonor-cloud-issue-8-3 + Fix Sonor Cloud Issue8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Fix Sonor Cloud Issue: should be declared "const". +* Contributors: Masaya Kataoka, Taiga Takano + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + 6.2.5 (2024-12-09) ------------------ * Merge branch 'master' into fix/acc_by_slope diff --git a/test_runner/random_test_runner/include/random_test_runner/lanelet_utils.hpp b/test_runner/random_test_runner/include/random_test_runner/lanelet_utils.hpp index 5203d1068cd..e5de867a84a 100644 --- a/test_runner/random_test_runner/include/random_test_runner/lanelet_utils.hpp +++ b/test_runner/random_test_runner/include/random_test_runner/lanelet_utils.hpp @@ -51,19 +51,19 @@ class LaneletUtils double computeDistance( const traffic_simulator_msgs::msg::LaneletPose & p1, - const traffic_simulator_msgs::msg::LaneletPose & p2); + const traffic_simulator_msgs::msg::LaneletPose & p2) const; std::optional getOppositeLaneLet( const traffic_simulator_msgs::msg::LaneletPose & pose); std::vector getLanesWithinDistance( const traffic_simulator_msgs::msg::LaneletPose & pose, double min_distance, double max_distance); - std::vector getLaneletIds(); + std::vector getLaneletIds() const; geometry_msgs::msg::PoseStamped toMapPose( - const traffic_simulator_msgs::msg::LaneletPose & lanelet_pose, const bool fill_pitch); + const traffic_simulator_msgs::msg::LaneletPose & lanelet_pose, const bool fill_pitch) const; std::vector getRoute(int64_t from_lanelet_id, int64_t to_lanelet_id); - double getLaneletLength(int64_t lanelet_id); - bool isInLanelet(int64_t lanelet_id, double s); + double getLaneletLength(int64_t lanelet_id) const; + bool isInLanelet(int64_t lanelet_id, double s) const; private: lanelet::LaneletMapPtr lanelet_map_ptr_; diff --git a/test_runner/random_test_runner/package.xml b/test_runner/random_test_runner/package.xml index df2c6a80e94..4438911c445 100644 --- a/test_runner/random_test_runner/package.xml +++ b/test_runner/random_test_runner/package.xml @@ -2,7 +2,7 @@ random_test_runner - 6.2.5 + 7.0.0 Random behavior test runner piotr-zyskowski-rai Apache License 2.0 diff --git a/test_runner/random_test_runner/src/data_types.cpp b/test_runner/random_test_runner/src/data_types.cpp index 03e5fa3adc5..56f67f3fb43 100644 --- a/test_runner/random_test_runner/src/data_types.cpp +++ b/test_runner/random_test_runner/src/data_types.cpp @@ -46,7 +46,7 @@ std::string stringFromArchitectureType(const ArchitectureType architecture_type) case ArchitectureType::AWF_AUTO: return "awf/auto"; case ArchitectureType::AWF_UNIVERSE: - return "awf/universe"; + return "awf/universe/20240605"; case ArchitectureType::TIER4_PROPOSAL: return "tier4/proposal"; default: diff --git a/test_runner/random_test_runner/src/lanelet_utils.cpp b/test_runner/random_test_runner/src/lanelet_utils.cpp index dd462c9ff00..e228a0e7bb9 100644 --- a/test_runner/random_test_runner/src/lanelet_utils.cpp +++ b/test_runner/random_test_runner/src/lanelet_utils.cpp @@ -47,10 +47,13 @@ LaneletUtils::LaneletUtils(const boost::filesystem::path & filename) std::make_shared(filename, geographic_msgs::msg::GeoPoint()); } -std::vector LaneletUtils::getLaneletIds() { return hdmap_utils_ptr_->getLaneletIds(); } +std::vector LaneletUtils::getLaneletIds() const +{ + return hdmap_utils_ptr_->getLaneletIds(); +} geometry_msgs::msg::PoseStamped LaneletUtils::toMapPose( - const traffic_simulator_msgs::msg::LaneletPose & lanelet_pose, const bool fill_pitch) + const traffic_simulator_msgs::msg::LaneletPose & lanelet_pose, const bool fill_pitch) const { return hdmap_utils_ptr_->toMapPose(lanelet_pose, fill_pitch); } @@ -60,14 +63,14 @@ std::vector LaneletUtils::getRoute(int64_t from_lanelet_id, int64_t to_ return hdmap_utils_ptr_->getRoute(from_lanelet_id, to_lanelet_id); } -double LaneletUtils::getLaneletLength(int64_t lanelet_id) +double LaneletUtils::getLaneletLength(int64_t lanelet_id) const { return hdmap_utils_ptr_->getLaneletLength(lanelet_id); } double LaneletUtils::computeDistance( const traffic_simulator_msgs::msg::LaneletPose & p1, - const traffic_simulator_msgs::msg::LaneletPose & p2) + const traffic_simulator_msgs::msg::LaneletPose & p2) const { auto p1_g = hdmap_utils_ptr_->toMapPose(p1).pose.position; auto p2_g = hdmap_utils_ptr_->toMapPose(p2).pose.position; @@ -78,7 +81,7 @@ double LaneletUtils::computeDistance( return std::sqrt(d.x * d.x + d.y * d.y + d.z * d.z); } -bool LaneletUtils::isInLanelet(int64_t lanelet_id, double s) +bool LaneletUtils::isInLanelet(int64_t lanelet_id, double s) const { return hdmap_utils_ptr_->isInLanelet(lanelet_id, s); } diff --git a/test_runner/random_test_runner/test/test_data_types.cpp b/test_runner/random_test_runner/test/test_data_types.cpp index bd63016e902..12929d6d4d4 100644 --- a/test_runner/random_test_runner/test/test_data_types.cpp +++ b/test_runner/random_test_runner/test/test_data_types.cpp @@ -60,7 +60,7 @@ TEST(DataTypes, architectureTypeFromString_incorrect) TEST(DataTypes, stringFromArchitectureType_correct) { EXPECT_EQ(stringFromArchitectureType(ArchitectureType::AWF_AUTO), "awf/auto"); - EXPECT_EQ(stringFromArchitectureType(ArchitectureType::AWF_UNIVERSE), "awf/universe"); + EXPECT_EQ(stringFromArchitectureType(ArchitectureType::AWF_UNIVERSE), "awf/universe/20240605"); EXPECT_EQ(stringFromArchitectureType(ArchitectureType::TIER4_PROPOSAL), "tier4/proposal"); } diff --git a/test_runner/scenario_test_runner/CHANGELOG.rst b/test_runner/scenario_test_runner/CHANGELOG.rst index 8c37732039e..e2d016367e9 100644 --- a/test_runner/scenario_test_runner/CHANGELOG.rst +++ b/test_runner/scenario_test_runner/CHANGELOG.rst @@ -35,6 +35,82 @@ Changelog for package scenario_test_runner * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge pull request `#1454 `_ from tier4/RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge pull request `#1277 `_ from tier4/RJD-736/autoware_msgs_support_new_traffic_light_group + Rjd 736/autoware msgs support new traffic light group +* Merge remote-tracking branch 'origin/RJD-736/autoware_msgs_support_new_traffic_light_group' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # external/concealer/src/autoware_universe.cpp +* fix: correct new architecture_type name +* chore(scenario_test_runner): add new architecture_type and delete old one in launch file +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + 6.2.5 (2024-12-09) ------------------ * Merge branch 'master' into fix/acc_by_slope diff --git a/test_runner/scenario_test_runner/launch/scenario_test_runner.launch.py b/test_runner/scenario_test_runner/launch/scenario_test_runner.launch.py index eaf5a2ab722..98897b9badf 100755 --- a/test_runner/scenario_test_runner/launch/scenario_test_runner.launch.py +++ b/test_runner/scenario_test_runner/launch/scenario_test_runner.launch.py @@ -33,10 +33,9 @@ def architecture_types(): - # awf/universe: autoware_auto_perception_msgs/TrafficSignalArray for traffic lights # awf/universe/20230906: autoware_perception_msgs/TrafficSignalArray for traffic lights # awf/universe/20240605: autoware_perception_msgs/TrafficLightGroupArray for traffic lights - return ["awf/universe", "awf/universe/20230906", "awf/universe/20240605"] + return ["awf/universe/20230906", "awf/universe/20240605"] def default_autoware_launch_package_of(architecture_type): @@ -45,7 +44,6 @@ def default_autoware_launch_package_of(architecture_type): f"architecture_type := {architecture_type} is not supported. Choose one of {architecture_types()}." ) return { - "awf/universe": "autoware_launch", "awf/universe/20230906": "autoware_launch", "awf/universe/20240605": "autoware_launch", }[architecture_type] @@ -57,7 +55,6 @@ def default_autoware_launch_file_of(architecture_type): f"architecture_type := {architecture_type} is not supported. Choose one of {architecture_types()}." ) return { - "awf/universe": "planning_simulator.launch.xml", "awf/universe/20230906": "planning_simulator.launch.xml", "awf/universe/20240605": "planning_simulator.launch.xml", }[architecture_type] @@ -69,7 +66,7 @@ def default_rviz_config_file(): def launch_setup(context, *args, **kwargs): # fmt: off - architecture_type = LaunchConfiguration("architecture_type", default="awf/universe/20230906") + architecture_type = LaunchConfiguration("architecture_type", default="awf/universe/20240605") autoware_launch_file = LaunchConfiguration("autoware_launch_file", default=default_autoware_launch_file_of(architecture_type.perform(context))) autoware_launch_package = LaunchConfiguration("autoware_launch_package", default=default_autoware_launch_package_of(architecture_type.perform(context))) consider_acceleration_by_road_slope = LaunchConfiguration("consider_acceleration_by_road_slope", default=False) diff --git a/test_runner/scenario_test_runner/package.xml b/test_runner/scenario_test_runner/package.xml index 09df3396d27..58ba79dc752 100644 --- a/test_runner/scenario_test_runner/package.xml +++ b/test_runner/scenario_test_runner/package.xml @@ -2,7 +2,7 @@ scenario_test_runner - 6.2.5 + 7.0.0 scenario test runner package Tatsuya Yamasaki Apache License 2.0