diff --git a/.github/workflows/Documentation.yaml b/.github/workflows/Documentation.yaml index d719a7835c1..9be82e55abe 100644 --- a/.github/workflows/Documentation.yaml +++ b/.github/workflows/Documentation.yaml @@ -8,8 +8,6 @@ on: branches: - master pull_request: - branches: - - master jobs: generate: diff --git a/.github/workflows/InterfaceUpdateNotification.yaml b/.github/workflows/InterfaceUpdateNotification.yaml index a04927bf4ff..c21f003d728 100644 --- a/.github/workflows/InterfaceUpdateNotification.yaml +++ b/.github/workflows/InterfaceUpdateNotification.yaml @@ -1,8 +1,6 @@ name: Interface update notification on: pull_request: - branches: - - master paths: - openscenario/openscenario_interpreter_msgs/msg/*.msg - simulation/traffic_simulator_msgs/msg/*.msg diff --git a/.github/workflows/PostCheckList.yaml b/.github/workflows/PostCheckList.yaml index 052ce29d8cd..5eb68036b34 100644 --- a/.github/workflows/PostCheckList.yaml +++ b/.github/workflows/PostCheckList.yaml @@ -1,8 +1,6 @@ name: Post check list on: pull_request: - branches: - - master types: [opened, reopened] jobs: diff --git a/.github/workflows/SpellCheck.yaml b/.github/workflows/SpellCheck.yaml index df66e736e2f..596815db0cc 100644 --- a/.github/workflows/SpellCheck.yaml +++ b/.github/workflows/SpellCheck.yaml @@ -3,8 +3,6 @@ name: Spell check on: workflow_dispatch: pull_request: - branches: - - master jobs: spell-check: diff --git a/common/math/arithmetic/CHANGELOG.rst b/common/math/arithmetic/CHANGELOG.rst index 84454e2bb46..85db55d26a2 100644 --- a/common/math/arithmetic/CHANGELOG.rst +++ b/common/math/arithmetic/CHANGELOG.rst @@ -21,6 +21,19 @@ Changelog for package arithmetic * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +9.4.0 (2025-02-06) +------------------ +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge remote-tracking branch 'origin/master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Contributors: Tatsuya Yamasaki, yamacir-kit + +9.3.1 (2025-02-06) +------------------ +* Merge branch 'master' into chore/delete-target-branch-filter +* Contributors: Masaya Kataoka + 9.3.0 (2025-02-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/docker/traffic_simulator diff --git a/common/math/arithmetic/package.xml b/common/math/arithmetic/package.xml index 27388086dc8..897ed51090b 100644 --- a/common/math/arithmetic/package.xml +++ b/common/math/arithmetic/package.xml @@ -2,7 +2,7 @@ arithmetic - 9.3.0 + 9.4.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 c97c73cc06e..3dc89d277ca 100644 --- a/common/math/geometry/CHANGELOG.rst +++ b/common/math/geometry/CHANGELOG.rst @@ -21,6 +21,19 @@ Changelog for package geometry * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +9.4.0 (2025-02-06) +------------------ +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge remote-tracking branch 'origin/master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Contributors: Tatsuya Yamasaki, yamacir-kit + +9.3.1 (2025-02-06) +------------------ +* Merge branch 'master' into chore/delete-target-branch-filter +* Contributors: Masaya Kataoka + 9.3.0 (2025-02-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/docker/traffic_simulator diff --git a/common/math/geometry/package.xml b/common/math/geometry/package.xml index caad49f28e2..ed968d81faa 100644 --- a/common/math/geometry/package.xml +++ b/common/math/geometry/package.xml @@ -2,7 +2,7 @@ geometry - 9.3.0 + 9.4.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 a48237e315d..c3b33e85422 100644 --- a/common/scenario_simulator_exception/CHANGELOG.rst +++ b/common/scenario_simulator_exception/CHANGELOG.rst @@ -21,6 +21,19 @@ Changelog for package scenario_simulator_exception * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +9.4.0 (2025-02-06) +------------------ +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge remote-tracking branch 'origin/master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Contributors: Tatsuya Yamasaki, yamacir-kit + +9.3.1 (2025-02-06) +------------------ +* Merge branch 'master' into chore/delete-target-branch-filter +* Contributors: Masaya Kataoka + 9.3.0 (2025-02-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/docker/traffic_simulator diff --git a/common/scenario_simulator_exception/package.xml b/common/scenario_simulator_exception/package.xml index 43ecaea43d1..11dd2713830 100644 --- a/common/scenario_simulator_exception/package.xml +++ b/common/scenario_simulator_exception/package.xml @@ -2,7 +2,7 @@ scenario_simulator_exception - 9.3.0 + 9.4.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 b1358cb9966..77672bacdf2 100644 --- a/common/simple_junit/CHANGELOG.rst +++ b/common/simple_junit/CHANGELOG.rst @@ -21,6 +21,19 @@ Changelog for package junit_exporter * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +9.4.0 (2025-02-06) +------------------ +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge remote-tracking branch 'origin/master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Contributors: Tatsuya Yamasaki, yamacir-kit + +9.3.1 (2025-02-06) +------------------ +* Merge branch 'master' into chore/delete-target-branch-filter +* Contributors: Masaya Kataoka + 9.3.0 (2025-02-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/docker/traffic_simulator diff --git a/common/simple_junit/package.xml b/common/simple_junit/package.xml index a992f4a16b7..de5f7608040 100644 --- a/common/simple_junit/package.xml +++ b/common/simple_junit/package.xml @@ -2,7 +2,7 @@ simple_junit - 9.3.0 + 9.4.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 09627e62433..f813dae2ae8 100644 --- a/common/status_monitor/CHANGELOG.rst +++ b/common/status_monitor/CHANGELOG.rst @@ -21,6 +21,19 @@ Changelog for package status_monitor * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +9.4.0 (2025-02-06) +------------------ +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge remote-tracking branch 'origin/master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Contributors: Tatsuya Yamasaki, yamacir-kit + +9.3.1 (2025-02-06) +------------------ +* Merge branch 'master' into chore/delete-target-branch-filter +* Contributors: Masaya Kataoka + 9.3.0 (2025-02-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/docker/traffic_simulator diff --git a/common/status_monitor/package.xml b/common/status_monitor/package.xml index 236895a056f..d4e480583db 100644 --- a/common/status_monitor/package.xml +++ b/common/status_monitor/package.xml @@ -2,7 +2,7 @@ status_monitor - 9.3.0 + 9.4.0 none Tatsuya Yamasaki Apache License 2.0 diff --git a/external/concealer/CHANGELOG.rst b/external/concealer/CHANGELOG.rst index dc6b2a5ea5b..ff79e878c80 100644 --- a/external/concealer/CHANGELOG.rst +++ b/external/concealer/CHANGELOG.rst @@ -21,6 +21,27 @@ Changelog for package concealer * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +9.4.0 (2025-02-06) +------------------ +* Merge pull request `#1518 `_ from tier4/feature/support-latest-autoware-message-type + Support message type `autoware_internal_planning_msgs::msg::PathWithLaneId` +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Add new constant `concealer::default_architecture_type` +* Merge remote-tracking branch 'origin/master' into feature/support-latest-autoware-message-type +* Update function template `available` to prepare its own node +* Update the concealer node to use global arguments +* Add new architecture-type `awf/universe/20250130` +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Update `Subscriber` to handle multiple message types with priorities +* Support message type `autoware_internal_planning_msgs::msg::PathWithLaneId` +* Contributors: Tatsuya Yamasaki, yamacir-kit + +9.3.1 (2025-02-06) +------------------ +* Merge branch 'master' into chore/delete-target-branch-filter +* Contributors: Masaya Kataoka + 9.3.0 (2025-02-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/docker/traffic_simulator diff --git a/external/concealer/CMakeLists.txt b/external/concealer/CMakeLists.txt index 0c05bfd2e30..42b9bc0ca40 100644 --- a/external/concealer/CMakeLists.txt +++ b/external/concealer/CMakeLists.txt @@ -18,6 +18,7 @@ ament_auto_add_library(${PROJECT_NAME} SHARED src/execute.cpp src/field_operator_application.cpp src/is_package_exists.cpp + src/path_with_lane_id.cpp src/task_queue.cpp) target_link_libraries(${PROJECT_NAME} diff --git a/external/concealer/include/concealer/autoware_universe.hpp b/external/concealer/include/concealer/autoware_universe.hpp index 3e28ffe89c3..a528ddc4ae8 100644 --- a/external/concealer/include/concealer/autoware_universe.hpp +++ b/external/concealer/include/concealer/autoware_universe.hpp @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -34,7 +35,6 @@ #include #include #include -#include namespace concealer { @@ -50,17 +50,16 @@ class AutowareUniverse : public rclcpp::Node, using GearCommand = autoware_vehicle_msgs::msg::GearCommand; using GearReport = autoware_vehicle_msgs::msg::GearReport; using Odometry = nav_msgs::msg::Odometry; - using PathWithLaneId = tier4_planning_msgs::msg::PathWithLaneId; using PoseWithCovarianceStamped = geometry_msgs::msg::PoseWithCovarianceStamped; 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; - Subscriber getCommand; - Subscriber getGearCommand; - Subscriber getTurnIndicatorsCommand; - Subscriber getPathWithLaneId; + Subscriber getCommand; + Subscriber getGearCommand; + Subscriber getTurnIndicatorsCommand; + Subscriber getPathWithLaneId; Publisher setAcceleration; Publisher setOdometry; diff --git a/external/concealer/include/concealer/available.hpp b/external/concealer/include/concealer/available.hpp new file mode 100644 index 00000000000..91f8b6526ce --- /dev/null +++ b/external/concealer/include/concealer/available.hpp @@ -0,0 +1,27 @@ +// Copyright 2015 TIER IV, Inc. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#ifndef CONCEALER__AVAILABLE_HPP_ +#define CONCEALER__AVAILABLE_HPP_ + +namespace concealer +{ +template +constexpr auto available() -> bool +{ + return true; +} +} // namespace concealer + +#endif // CONCEALER__AVAILABLE_HPP_ diff --git a/external/concealer/include/concealer/convert.hpp b/external/concealer/include/concealer/convert.hpp new file mode 100644 index 00000000000..209bd78b52b --- /dev/null +++ b/external/concealer/include/concealer/convert.hpp @@ -0,0 +1,27 @@ +// Copyright 2015 TIER IV, Inc. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#ifndef CONCEALER__CONVERT_HPP_ +#define CONCEALER__CONVERT_HPP_ + +namespace concealer +{ +template +auto convert(const From & from) -> To +{ + return std::forward(from); +} +} // namespace concealer + +#endif // CONCEALER__CONVERT_HPP_ diff --git a/external/concealer/include/concealer/field_operator_application.hpp b/external/concealer/include/concealer/field_operator_application.hpp index 7118d87fdf7..9329861fb4c 100644 --- a/external/concealer/include/concealer/field_operator_application.hpp +++ b/external/concealer/include/concealer/field_operator_application.hpp @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -44,7 +45,6 @@ #include #include #include -#include #include #include #include @@ -78,7 +78,6 @@ struct FieldOperatorApplication : public rclcpp::Node, using Emergency = tier4_external_api_msgs::msg::Emergency; using LocalizationInitializationState = autoware_adapi_v1_msgs::msg::LocalizationInitializationState; using MrmState = autoware_adapi_v1_msgs::msg::MrmState; - using PathWithLaneId = tier4_planning_msgs::msg::PathWithLaneId; using Trajectory = tier4_planning_msgs::msg::Trajectory; using TurnIndicatorsCommand = autoware_vehicle_msgs::msg::TurnIndicatorsCommand; @@ -98,10 +97,10 @@ struct FieldOperatorApplication : public rclcpp::Node, #if __has_include() Subscriber getLocalizationState; #endif - Subscriber getMrmState; - Subscriber getPathWithLaneId; - Subscriber getTrajectory; - Subscriber getTurnIndicatorsCommand; + Subscriber getMrmState; + Subscriber getPathWithLaneId; + Subscriber getTrajectory; + Subscriber getTurnIndicatorsCommand; Service requestClearRoute; Service requestCooperateCommands; diff --git a/external/concealer/include/concealer/get_parameter.hpp b/external/concealer/include/concealer/get_parameter.hpp new file mode 100644 index 00000000000..aabee2c0ced --- /dev/null +++ b/external/concealer/include/concealer/get_parameter.hpp @@ -0,0 +1,43 @@ +// Copyright 2015 TIER IV, Inc. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#ifndef CONCEALER__GET_PARAMETER_HPP_ +#define CONCEALER__GET_PARAMETER_HPP_ + +#include + +namespace concealer +{ +static constexpr auto default_architecture_type = "awf/universe/20240605"; + +template +auto getParameter( + const rclcpp::node_interfaces::NodeParametersInterface::SharedPtr & node, + const std::string & name, T value = {}) +{ + if (not node->has_parameter(name)) { + node->declare_parameter(name, rclcpp::ParameterValue(value)); + } + return node->get_parameter(name).get_value(); +} + +template +auto getParameter(const std::string & name, T value = {}) +{ + auto node = rclcpp::Node("get_parameter", "simulation"); + return getParameter(node.get_node_parameters_interface(), name, value); +} +} // namespace concealer + +#endif // CONCEALER__GET_PARAMETER_HPP_ diff --git a/external/concealer/include/concealer/path_with_lane_id.hpp b/external/concealer/include/concealer/path_with_lane_id.hpp new file mode 100644 index 00000000000..45f1705f5d9 --- /dev/null +++ b/external/concealer/include/concealer/path_with_lane_id.hpp @@ -0,0 +1,66 @@ +// Copyright 2015 TIER IV, Inc. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#ifndef CONCEALER__PATH_WITH_LANE_ID_HPP_ +#define CONCEALER__PATH_WITH_LANE_ID_HPP_ + +#if __has_include() +#include +#endif + +#if __has_include() +#include +#endif + +#include +#include + +namespace concealer +{ +namespace priority +{ +using PathWithLaneId = decltype(std::tuple_cat( + std::declval) + autoware_internal_planning_msgs::msg::PathWithLaneId +#endif + > >(), + std::declval) + tier4_planning_msgs::msg::PathWithLaneId +#endif + > >())); + +static_assert(0 < std::tuple_size_v); +} // namespace priority + +#if __has_include() +template <> +auto available() -> bool; +#endif + +#if __has_include() +template <> +auto available() -> bool; +#endif + +#if __has_include() and \ + __has_include() +template <> +auto convert(const tier4_planning_msgs::msg::PathWithLaneId & from) + -> autoware_internal_planning_msgs::msg::PathWithLaneId; +#endif +} // namespace concealer + +#endif // CONCEALER__PATH_WITH_LANE_ID_HPP_ diff --git a/external/concealer/include/concealer/subscriber.hpp b/external/concealer/include/concealer/subscriber.hpp index ed6843fb1f7..48656418ee8 100644 --- a/external/concealer/include/concealer/subscriber.hpp +++ b/external/concealer/include/concealer/subscriber.hpp @@ -15,13 +15,19 @@ #ifndef CONCEALER__SUBSCRIBER_HPP_ #define CONCEALER__SUBSCRIBER_HPP_ +#include +#include #include #include +#include namespace concealer { +template +struct Subscriber; + template -struct Subscriber +struct Subscriber { typename Message::ConstSharedPtr current_value = std::make_shared(); @@ -33,24 +39,108 @@ struct Subscriber explicit Subscriber( const std::string & topic, const rclcpp::QoS & quality_of_service, Autoware & autoware, const Callback & callback) - : subscription(autoware.template create_subscription( - topic, quality_of_service, - [this, callback](const typename Message::ConstSharedPtr & message) { - if (std::atomic_store(¤t_value, message); current_value) { - callback((*this)()); - } - })) + : subscription( + available() ? autoware.template create_subscription( + topic, quality_of_service, + [this, callback](const typename Message::ConstSharedPtr & message) { + if (std::atomic_store(¤t_value, message); current_value) { + callback((*this)()); + } + }) + : nullptr) { } template explicit Subscriber( const std::string & topic, const rclcpp::QoS & quality_of_service, Autoware & autoware) - : subscription(autoware.template create_subscription( - topic, quality_of_service, [this](const typename Message::ConstSharedPtr & message) { - std::atomic_store(¤t_value, message); - })) + : subscription( + available() ? autoware.template create_subscription( + topic, quality_of_service, + [this](const typename Message::ConstSharedPtr & message) { + std::atomic_store(¤t_value, message); + }) + : nullptr) + { + } +}; + +template +struct Subscriber : public Subscriber +{ + typename Message::ConstSharedPtr current_value = nullptr; + + typename rclcpp::Subscription::SharedPtr subscription; + + auto operator()() const -> Message { + if (auto value = std::atomic_load(¤t_value)) { + return *value; + } else { + return convert(Subscriber::operator()()); + } + } + + template + explicit Subscriber( + const std::string & topic, const rclcpp::QoS & quality_of_service, Autoware & autoware, + const Callback & callback) + : Subscriber(topic, quality_of_service, autoware, callback), + subscription( + available() ? autoware.template create_subscription( + topic, quality_of_service, + [this, callback](const typename Message::ConstSharedPtr & message) { + if (std::atomic_store(¤t_value, message); current_value) { + callback((*this)()); + } + }) + : nullptr) + { + } + + template + explicit Subscriber( + const std::string & topic, const rclcpp::QoS & quality_of_service, Autoware & autoware) + : Subscriber(topic, quality_of_service, autoware), + subscription( + available() ? autoware.template create_subscription( + topic, quality_of_service, + [this](const typename Message::ConstSharedPtr & message) { + std::atomic_store(¤t_value, message); + }) + : nullptr) + { + } +}; + +template +struct Subscriber> : public Subscriber +{ + using type = std::tuple; + + using primary_type = std::tuple_element_t<0, type>; + + template + constexpr auto any(F f, const Subscriber & x) -> bool + { + if constexpr (0 < sizeof...(Ts)) { + return f(x) or any(f, static_cast &>(x)); + } else { + return f(x); + } + } + + template + explicit Subscriber(const std::string & topic, Ts &&... xs) + : Subscriber(topic, std::forward(xs)...) + { + auto subscription_available = [](const auto & x) { return static_cast(x.subscription); }; + + if (not any(subscription_available, static_cast &>(*this))) { + throw common::scenario_simulator_exception::Error( + "No viable subscription for topic ", std::quoted(topic), " in ", + getParameter("architecture_type"), "."); + } } }; } // namespace concealer diff --git a/external/concealer/package.xml b/external/concealer/package.xml index f97ddcde028..0dac1448bd8 100644 --- a/external/concealer/package.xml +++ b/external/concealer/package.xml @@ -2,7 +2,7 @@ concealer - 9.3.0 + 9.4.0 Provides a class 'Autoware' to conceal miscellaneous things to simplify Autoware management of the simulator. Tatsuya Yamasaki Apache License 2.0 @@ -13,6 +13,7 @@ autoware_adapi_v1_msgs autoware_control_msgs + autoware_internal_planning_msgs autoware_perception_msgs autoware_system_msgs autoware_vehicle_msgs diff --git a/external/concealer/src/autoware_universe.cpp b/external/concealer/src/autoware_universe.cpp index b67bdbe7fd1..4780a65fbac 100644 --- a/external/concealer/src/autoware_universe.cpp +++ b/external/concealer/src/autoware_universe.cpp @@ -16,8 +16,14 @@ namespace concealer { -AutowareUniverse::AutowareUniverse(bool simulate_localization) -: rclcpp::Node("concealer", "simulation", rclcpp::NodeOptions().use_global_arguments(false)), +/* + clang-format seems not to understand the constructor function try-block: it + misidentifies the try as a jump label and the formatting afterwards falls + apart. +*/ +// clang-format off +AutowareUniverse::AutowareUniverse(bool simulate_localization) try +: rclcpp::Node("concealer", "simulation"), getCommand("/control/command/control_cmd", rclcpp::QoS(1), *this), getGearCommand("/control/command/gear_cmd", rclcpp::QoS(1), *this), getTurnIndicatorsCommand("/control/command/turn_indicators_cmd", rclcpp::QoS(1), *this), @@ -161,6 +167,12 @@ AutowareUniverse::AutowareUniverse(bool simulate_localization) })) { } +catch (...) +{ + thrown = std::current_exception(); + is_thrown.store(true); +} +// clang-format on AutowareUniverse::~AutowareUniverse() { diff --git a/external/concealer/src/path_with_lane_id.cpp b/external/concealer/src/path_with_lane_id.cpp new file mode 100644 index 00000000000..5cdf2f88aa6 --- /dev/null +++ b/external/concealer/src/path_with_lane_id.cpp @@ -0,0 +1,67 @@ +// Copyright 2015 TIER IV, Inc. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#include +#include + +namespace concealer +{ +#if __has_include() +template <> +auto available() -> bool +{ + if (const auto architecture_type = + getParameter("architecture_type", default_architecture_type); + architecture_type.find("awf/universe") != std::string::npos) { + return "awf/universe/20250130" <= architecture_type; + } else { + return false; + } +} +#endif + +#if __has_include() +template <> +auto available() -> bool +{ + if (const auto architecture_type = + getParameter("architecture_type", default_architecture_type); + architecture_type.find("awf/universe") != std::string::npos) { + return architecture_type < "awf/universe/20250130"; + } else { + return false; + } +} +#endif + +#if __has_include() and \ + __has_include() +template <> +auto convert(const tier4_planning_msgs::msg::PathWithLaneId & from) + -> autoware_internal_planning_msgs::msg::PathWithLaneId +{ + auto to = autoware_internal_planning_msgs::msg::PathWithLaneId(); + to.header = from.header; + for (const auto & from_point : from.points) { + auto to_point = decltype(to.points)::value_type(); + to_point.point = from_point.point; + to_point.lane_ids = from_point.lane_ids; + to.points.push_back(to_point); + } + to.left_bound = from.left_bound; + to.right_bound = from.right_bound; + return to; +} +#endif +} // namespace concealer diff --git a/external/embree_vendor/CHANGELOG.rst b/external/embree_vendor/CHANGELOG.rst index a04f83c5f53..de976194f8d 100644 --- a/external/embree_vendor/CHANGELOG.rst +++ b/external/embree_vendor/CHANGELOG.rst @@ -24,6 +24,19 @@ Changelog for package embree_vendor * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +9.4.0 (2025-02-06) +------------------ +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge remote-tracking branch 'origin/master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Contributors: Tatsuya Yamasaki, yamacir-kit + +9.3.1 (2025-02-06) +------------------ +* Merge branch 'master' into chore/delete-target-branch-filter +* Contributors: Masaya Kataoka + 9.3.0 (2025-02-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/docker/traffic_simulator diff --git a/external/embree_vendor/package.xml b/external/embree_vendor/package.xml index a05d7dbf557..210259c04ae 100644 --- a/external/embree_vendor/package.xml +++ b/external/embree_vendor/package.xml @@ -2,7 +2,7 @@ embree_vendor - 9.3.0 + 9.4.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 3e62a1976e7..5748754732d 100644 --- a/map/kashiwanoha_map/CHANGELOG.rst +++ b/map/kashiwanoha_map/CHANGELOG.rst @@ -21,6 +21,19 @@ Changelog for package kashiwanoha_map * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +9.4.0 (2025-02-06) +------------------ +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge remote-tracking branch 'origin/master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Contributors: Tatsuya Yamasaki, yamacir-kit + +9.3.1 (2025-02-06) +------------------ +* Merge branch 'master' into chore/delete-target-branch-filter +* Contributors: Masaya Kataoka + 9.3.0 (2025-02-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/docker/traffic_simulator diff --git a/map/kashiwanoha_map/package.xml b/map/kashiwanoha_map/package.xml index 28986179046..9b672add252 100644 --- a/map/kashiwanoha_map/package.xml +++ b/map/kashiwanoha_map/package.xml @@ -2,7 +2,7 @@ kashiwanoha_map - 9.3.0 + 9.4.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 89efdbe0209..f8a35cc2220 100644 --- a/map/simple_cross_map/CHANGELOG.rst +++ b/map/simple_cross_map/CHANGELOG.rst @@ -9,6 +9,19 @@ Changelog for package simple_cross_map * Merge branch 'master' into feature/publish_empty_context * Contributors: Masaya Kataoka +9.4.0 (2025-02-06) +------------------ +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge remote-tracking branch 'origin/master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Contributors: Tatsuya Yamasaki, yamacir-kit + +9.3.1 (2025-02-06) +------------------ +* Merge branch 'master' into chore/delete-target-branch-filter +* Contributors: Masaya Kataoka + 9.3.0 (2025-02-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/docker/traffic_simulator diff --git a/map/simple_cross_map/package.xml b/map/simple_cross_map/package.xml index 2574e2d7a21..c0f49e214d5 100644 --- a/map/simple_cross_map/package.xml +++ b/map/simple_cross_map/package.xml @@ -2,7 +2,7 @@ simple_cross_map - 9.3.0 + 9.4.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 0f6ae1c5896..7e8ca54358a 100644 --- a/mock/cpp_mock_scenarios/CHANGELOG.rst +++ b/mock/cpp_mock_scenarios/CHANGELOG.rst @@ -21,6 +21,19 @@ Changelog for package cpp_mock_scenarios * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +9.4.0 (2025-02-06) +------------------ +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge remote-tracking branch 'origin/master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Contributors: Tatsuya Yamasaki, yamacir-kit + +9.3.1 (2025-02-06) +------------------ +* Merge branch 'master' into chore/delete-target-branch-filter +* Contributors: Masaya Kataoka + 9.3.0 (2025-02-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/docker/traffic_simulator diff --git a/mock/cpp_mock_scenarios/package.xml b/mock/cpp_mock_scenarios/package.xml index b999d1cea37..e6106c438d7 100644 --- a/mock/cpp_mock_scenarios/package.xml +++ b/mock/cpp_mock_scenarios/package.xml @@ -2,7 +2,7 @@ cpp_mock_scenarios - 9.3.0 + 9.4.0 C++ mock scenarios masaya Apache License 2.0 diff --git a/openscenario/openscenario_experimental_catalog/CHANGELOG.rst b/openscenario/openscenario_experimental_catalog/CHANGELOG.rst index 89b3f3c730a..79f9a2caf76 100644 --- a/openscenario/openscenario_experimental_catalog/CHANGELOG.rst +++ b/openscenario/openscenario_experimental_catalog/CHANGELOG.rst @@ -21,6 +21,19 @@ Changelog for package openscenario_experimental_catalog * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +9.4.0 (2025-02-06) +------------------ +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge remote-tracking branch 'origin/master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Contributors: Tatsuya Yamasaki, yamacir-kit + +9.3.1 (2025-02-06) +------------------ +* Merge branch 'master' into chore/delete-target-branch-filter +* Contributors: Masaya Kataoka + 9.3.0 (2025-02-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/docker/traffic_simulator diff --git a/openscenario/openscenario_experimental_catalog/package.xml b/openscenario/openscenario_experimental_catalog/package.xml index 3bdf37b9bf8..9d646104736 100644 --- a/openscenario/openscenario_experimental_catalog/package.xml +++ b/openscenario/openscenario_experimental_catalog/package.xml @@ -2,7 +2,7 @@ openscenario_experimental_catalog - 9.3.0 + 9.4.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 b4423adb1ba..a14e47a97ac 100644 --- a/openscenario/openscenario_interpreter/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter/CHANGELOG.rst @@ -32,6 +32,19 @@ Changelog for package openscenario_interpreter * add publish_empty_context parameter * Contributors: Masaya Kataoka +9.4.0 (2025-02-06) +------------------ +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge remote-tracking branch 'origin/master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Contributors: Tatsuya Yamasaki, yamacir-kit + +9.3.1 (2025-02-06) +------------------ +* Merge branch 'master' into chore/delete-target-branch-filter +* Contributors: Masaya Kataoka + 9.3.0 (2025-02-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/docker/traffic_simulator diff --git a/openscenario/openscenario_interpreter/package.xml b/openscenario/openscenario_interpreter/package.xml index 2c7f7a9fff9..286cc3d7184 100644 --- a/openscenario/openscenario_interpreter/package.xml +++ b/openscenario/openscenario_interpreter/package.xml @@ -2,7 +2,7 @@ openscenario_interpreter - 9.3.0 + 9.4.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 e490b9ad32c..de51e69d2ad 100644 --- a/openscenario/openscenario_interpreter_example/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter_example/CHANGELOG.rst @@ -21,6 +21,19 @@ Changelog for package openscenario_interpreter_example * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +9.4.0 (2025-02-06) +------------------ +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge remote-tracking branch 'origin/master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Contributors: Tatsuya Yamasaki, yamacir-kit + +9.3.1 (2025-02-06) +------------------ +* Merge branch 'master' into chore/delete-target-branch-filter +* Contributors: Masaya Kataoka + 9.3.0 (2025-02-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/docker/traffic_simulator diff --git a/openscenario/openscenario_interpreter_example/package.xml b/openscenario/openscenario_interpreter_example/package.xml index be0b885243d..c29c8fef442 100644 --- a/openscenario/openscenario_interpreter_example/package.xml +++ b/openscenario/openscenario_interpreter_example/package.xml @@ -3,7 +3,7 @@ openscenario_interpreter_example - 9.3.0 + 9.4.0 Examples for some TIER IV OpenSCENARIO Interpreter's features Tatsuya Yamasaki Apache License 2.0 diff --git a/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst b/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst index 1e629baebbd..fc3a3f0bde9 100644 --- a/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst @@ -21,6 +21,19 @@ Changelog for package openscenario_interpreter_msgs * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +9.4.0 (2025-02-06) +------------------ +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge remote-tracking branch 'origin/master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Contributors: Tatsuya Yamasaki, yamacir-kit + +9.3.1 (2025-02-06) +------------------ +* Merge branch 'master' into chore/delete-target-branch-filter +* Contributors: Masaya Kataoka + 9.3.0 (2025-02-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/docker/traffic_simulator diff --git a/openscenario/openscenario_interpreter_msgs/package.xml b/openscenario/openscenario_interpreter_msgs/package.xml index 9149e8367d2..a2359b83cac 100644 --- a/openscenario/openscenario_interpreter_msgs/package.xml +++ b/openscenario/openscenario_interpreter_msgs/package.xml @@ -2,7 +2,7 @@ openscenario_interpreter_msgs - 9.3.0 + 9.4.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 d0d7a634d7d..45cca36f4b8 100644 --- a/openscenario/openscenario_preprocessor/CHANGELOG.rst +++ b/openscenario/openscenario_preprocessor/CHANGELOG.rst @@ -21,6 +21,19 @@ Changelog for package openscenario_preprocessor * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +9.4.0 (2025-02-06) +------------------ +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge remote-tracking branch 'origin/master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Contributors: Tatsuya Yamasaki, yamacir-kit + +9.3.1 (2025-02-06) +------------------ +* Merge branch 'master' into chore/delete-target-branch-filter +* Contributors: Masaya Kataoka + 9.3.0 (2025-02-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/docker/traffic_simulator diff --git a/openscenario/openscenario_preprocessor/package.xml b/openscenario/openscenario_preprocessor/package.xml index 92bb73eedc1..2d80398621f 100644 --- a/openscenario/openscenario_preprocessor/package.xml +++ b/openscenario/openscenario_preprocessor/package.xml @@ -3,7 +3,7 @@ openscenario_preprocessor - 9.3.0 + 9.4.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 533142e1cc0..88191ece321 100644 --- a/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst +++ b/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst @@ -21,6 +21,19 @@ Changelog for package openscenario_preprocessor_msgs * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +9.4.0 (2025-02-06) +------------------ +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge remote-tracking branch 'origin/master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Contributors: Tatsuya Yamasaki, yamacir-kit + +9.3.1 (2025-02-06) +------------------ +* Merge branch 'master' into chore/delete-target-branch-filter +* Contributors: Masaya Kataoka + 9.3.0 (2025-02-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/docker/traffic_simulator diff --git a/openscenario/openscenario_preprocessor_msgs/package.xml b/openscenario/openscenario_preprocessor_msgs/package.xml index 871226a334f..501e32021d8 100644 --- a/openscenario/openscenario_preprocessor_msgs/package.xml +++ b/openscenario/openscenario_preprocessor_msgs/package.xml @@ -2,7 +2,7 @@ openscenario_preprocessor_msgs - 9.3.0 + 9.4.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 08f84ed1ee6..f9500254e29 100644 --- a/openscenario/openscenario_utility/CHANGELOG.rst +++ b/openscenario/openscenario_utility/CHANGELOG.rst @@ -24,6 +24,19 @@ Changelog for package openscenario_utility * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +9.4.0 (2025-02-06) +------------------ +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge remote-tracking branch 'origin/master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Contributors: Tatsuya Yamasaki, yamacir-kit + +9.3.1 (2025-02-06) +------------------ +* Merge branch 'master' into chore/delete-target-branch-filter +* Contributors: Masaya Kataoka + 9.3.0 (2025-02-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/docker/traffic_simulator diff --git a/openscenario/openscenario_utility/package.xml b/openscenario/openscenario_utility/package.xml index 8442a2a735b..92a1e60a091 100644 --- a/openscenario/openscenario_utility/package.xml +++ b/openscenario/openscenario_utility/package.xml @@ -2,7 +2,7 @@ openscenario_utility - 9.3.0 + 9.4.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 1245d83e12d..43eb3906ee6 100644 --- a/openscenario/openscenario_validator/CHANGELOG.rst +++ b/openscenario/openscenario_validator/CHANGELOG.rst @@ -10,6 +10,19 @@ Changelog for package openscenario_validator * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +9.4.0 (2025-02-06) +------------------ +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge remote-tracking branch 'origin/master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Contributors: Tatsuya Yamasaki, yamacir-kit + +9.3.1 (2025-02-06) +------------------ +* Merge branch 'master' into chore/delete-target-branch-filter +* Contributors: Masaya Kataoka + 9.3.0 (2025-02-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/docker/traffic_simulator diff --git a/openscenario/openscenario_validator/package.xml b/openscenario/openscenario_validator/package.xml index 3f80ac816d2..44c962c0b2d 100644 --- a/openscenario/openscenario_validator/package.xml +++ b/openscenario/openscenario_validator/package.xml @@ -2,7 +2,7 @@ openscenario_validator - 9.3.0 + 9.4.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 1cae526b448..0a6b94601d6 100644 --- a/rviz_plugins/openscenario_visualization/CHANGELOG.rst +++ b/rviz_plugins/openscenario_visualization/CHANGELOG.rst @@ -21,6 +21,19 @@ Changelog for package openscenario_visualization * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +9.4.0 (2025-02-06) +------------------ +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge remote-tracking branch 'origin/master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Contributors: Tatsuya Yamasaki, yamacir-kit + +9.3.1 (2025-02-06) +------------------ +* Merge branch 'master' into chore/delete-target-branch-filter +* Contributors: Masaya Kataoka + 9.3.0 (2025-02-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/docker/traffic_simulator diff --git a/rviz_plugins/openscenario_visualization/package.xml b/rviz_plugins/openscenario_visualization/package.xml index d26af9af6bc..649c4b30eb5 100644 --- a/rviz_plugins/openscenario_visualization/package.xml +++ b/rviz_plugins/openscenario_visualization/package.xml @@ -2,7 +2,7 @@ openscenario_visualization - 9.3.0 + 9.4.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 c8e81c51f3a..1fc12597bb2 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,19 @@ Changelog for package real_time_factor_control_rviz_plugin * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +9.4.0 (2025-02-06) +------------------ +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge remote-tracking branch 'origin/master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Contributors: Tatsuya Yamasaki, yamacir-kit + +9.3.1 (2025-02-06) +------------------ +* Merge branch 'master' into chore/delete-target-branch-filter +* Contributors: Masaya Kataoka + 9.3.0 (2025-02-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/docker/traffic_simulator 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 9afd0f4baf9..3adceb29a75 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 - 9.3.0 + 9.4.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 9bcf31210fc..ad0796589f1 100644 --- a/scenario_simulator_v2/CHANGELOG.rst +++ b/scenario_simulator_v2/CHANGELOG.rst @@ -21,6 +21,19 @@ Changelog for package scenario_simulator_v2 * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +9.4.0 (2025-02-06) +------------------ +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge remote-tracking branch 'origin/master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Contributors: Tatsuya Yamasaki, yamacir-kit + +9.3.1 (2025-02-06) +------------------ +* Merge branch 'master' into chore/delete-target-branch-filter +* Contributors: Masaya Kataoka + 9.3.0 (2025-02-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/docker/traffic_simulator diff --git a/scenario_simulator_v2/package.xml b/scenario_simulator_v2/package.xml index d6a887c4b99..af775df0bf8 100644 --- a/scenario_simulator_v2/package.xml +++ b/scenario_simulator_v2/package.xml @@ -2,7 +2,7 @@ scenario_simulator_v2 - 9.3.0 + 9.4.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 6383cde8ff9..934038f0daa 100644 --- a/simulation/behavior_tree_plugin/CHANGELOG.rst +++ b/simulation/behavior_tree_plugin/CHANGELOG.rst @@ -21,6 +21,19 @@ Changelog for package behavior_tree_plugin * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +9.4.0 (2025-02-06) +------------------ +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge remote-tracking branch 'origin/master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Contributors: Tatsuya Yamasaki, yamacir-kit + +9.3.1 (2025-02-06) +------------------ +* Merge branch 'master' into chore/delete-target-branch-filter +* Contributors: Masaya Kataoka + 9.3.0 (2025-02-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/docker/traffic_simulator diff --git a/simulation/behavior_tree_plugin/package.xml b/simulation/behavior_tree_plugin/package.xml index ea7b7ca5975..fe1b7549959 100644 --- a/simulation/behavior_tree_plugin/package.xml +++ b/simulation/behavior_tree_plugin/package.xml @@ -2,7 +2,7 @@ behavior_tree_plugin - 9.3.0 + 9.4.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 85c7979144f..9955970b543 100644 --- a/simulation/do_nothing_plugin/CHANGELOG.rst +++ b/simulation/do_nothing_plugin/CHANGELOG.rst @@ -21,6 +21,19 @@ Changelog for package do_nothing_plugin * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +9.4.0 (2025-02-06) +------------------ +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge remote-tracking branch 'origin/master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Contributors: Tatsuya Yamasaki, yamacir-kit + +9.3.1 (2025-02-06) +------------------ +* Merge branch 'master' into chore/delete-target-branch-filter +* Contributors: Masaya Kataoka + 9.3.0 (2025-02-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/docker/traffic_simulator diff --git a/simulation/do_nothing_plugin/package.xml b/simulation/do_nothing_plugin/package.xml index e0b42de40ad..10ff3988ca5 100644 --- a/simulation/do_nothing_plugin/package.xml +++ b/simulation/do_nothing_plugin/package.xml @@ -2,7 +2,7 @@ do_nothing_plugin - 9.3.0 + 9.4.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 07a7c9017e3..8c412547efe 100644 --- a/simulation/simple_sensor_simulator/CHANGELOG.rst +++ b/simulation/simple_sensor_simulator/CHANGELOG.rst @@ -21,6 +21,19 @@ Changelog for package simple_sensor_simulator * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +9.4.0 (2025-02-06) +------------------ +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge remote-tracking branch 'origin/master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Contributors: Tatsuya Yamasaki, yamacir-kit + +9.3.1 (2025-02-06) +------------------ +* Merge branch 'master' into chore/delete-target-branch-filter +* Contributors: Masaya Kataoka + 9.3.0 (2025-02-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/docker/traffic_simulator diff --git a/simulation/simple_sensor_simulator/package.xml b/simulation/simple_sensor_simulator/package.xml index 09aa2a4424c..ee45270abaa 100644 --- a/simulation/simple_sensor_simulator/package.xml +++ b/simulation/simple_sensor_simulator/package.xml @@ -1,7 +1,7 @@ simple_sensor_simulator - 9.3.0 + 9.4.0 simple_sensor_simulator package masaya kataoka diff --git a/simulation/simulation_interface/CHANGELOG.rst b/simulation/simulation_interface/CHANGELOG.rst index 65748ff033f..2b50c1acdb9 100644 --- a/simulation/simulation_interface/CHANGELOG.rst +++ b/simulation/simulation_interface/CHANGELOG.rst @@ -21,6 +21,19 @@ Changelog for package simulation_interface * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +9.4.0 (2025-02-06) +------------------ +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge remote-tracking branch 'origin/master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Contributors: Tatsuya Yamasaki, yamacir-kit + +9.3.1 (2025-02-06) +------------------ +* Merge branch 'master' into chore/delete-target-branch-filter +* Contributors: Masaya Kataoka + 9.3.0 (2025-02-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/docker/traffic_simulator diff --git a/simulation/simulation_interface/package.xml b/simulation/simulation_interface/package.xml index 7e16fb9d8ee..241bb9baf96 100644 --- a/simulation/simulation_interface/package.xml +++ b/simulation/simulation_interface/package.xml @@ -2,7 +2,7 @@ simulation_interface - 9.3.0 + 9.4.0 packages to define interface between simulator and scenario interpreter Masaya Kataoka Apache License 2.0 diff --git a/simulation/traffic_simulator/CHANGELOG.rst b/simulation/traffic_simulator/CHANGELOG.rst index 2f77df90b4a..2e94d3c635f 100644 --- a/simulation/traffic_simulator/CHANGELOG.rst +++ b/simulation/traffic_simulator/CHANGELOG.rst @@ -21,6 +21,19 @@ Changelog for package traffic_simulator * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +9.4.0 (2025-02-06) +------------------ +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge remote-tracking branch 'origin/master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Contributors: Tatsuya Yamasaki, yamacir-kit + +9.3.1 (2025-02-06) +------------------ +* Merge branch 'master' into chore/delete-target-branch-filter +* Contributors: Masaya Kataoka + 9.3.0 (2025-02-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/docker/traffic_simulator diff --git a/simulation/traffic_simulator/package.xml b/simulation/traffic_simulator/package.xml index c5f874186e5..8c9c8079f39 100644 --- a/simulation/traffic_simulator/package.xml +++ b/simulation/traffic_simulator/package.xml @@ -1,7 +1,7 @@ traffic_simulator - 9.3.0 + 9.4.0 control traffic flow masaya kataoka diff --git a/simulation/traffic_simulator_msgs/CHANGELOG.rst b/simulation/traffic_simulator_msgs/CHANGELOG.rst index 37323d6ecc2..24757c643e1 100644 --- a/simulation/traffic_simulator_msgs/CHANGELOG.rst +++ b/simulation/traffic_simulator_msgs/CHANGELOG.rst @@ -21,6 +21,19 @@ Changelog for package openscenario_msgs * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +9.4.0 (2025-02-06) +------------------ +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge remote-tracking branch 'origin/master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Contributors: Tatsuya Yamasaki, yamacir-kit + +9.3.1 (2025-02-06) +------------------ +* Merge branch 'master' into chore/delete-target-branch-filter +* Contributors: Masaya Kataoka + 9.3.0 (2025-02-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/docker/traffic_simulator diff --git a/simulation/traffic_simulator_msgs/package.xml b/simulation/traffic_simulator_msgs/package.xml index ebbea0f5898..73aa05b431e 100644 --- a/simulation/traffic_simulator_msgs/package.xml +++ b/simulation/traffic_simulator_msgs/package.xml @@ -2,7 +2,7 @@ traffic_simulator_msgs - 9.3.0 + 9.4.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 1e2fa720bb2..bdc7653808c 100644 --- a/test_runner/random_test_runner/CHANGELOG.rst +++ b/test_runner/random_test_runner/CHANGELOG.rst @@ -21,6 +21,19 @@ Changelog for package random_test_runner * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +9.4.0 (2025-02-06) +------------------ +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge remote-tracking branch 'origin/master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Contributors: Tatsuya Yamasaki, yamacir-kit + +9.3.1 (2025-02-06) +------------------ +* Merge branch 'master' into chore/delete-target-branch-filter +* Contributors: Masaya Kataoka + 9.3.0 (2025-02-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/docker/traffic_simulator diff --git a/test_runner/random_test_runner/package.xml b/test_runner/random_test_runner/package.xml index e2b7fc3baac..f772b024fb8 100644 --- a/test_runner/random_test_runner/package.xml +++ b/test_runner/random_test_runner/package.xml @@ -2,7 +2,7 @@ random_test_runner - 9.3.0 + 9.4.0 Random behavior test runner piotr-zyskowski-rai Apache License 2.0 diff --git a/test_runner/scenario_test_runner/CHANGELOG.rst b/test_runner/scenario_test_runner/CHANGELOG.rst index 2ada7d226a2..f1b1561e1ca 100644 --- a/test_runner/scenario_test_runner/CHANGELOG.rst +++ b/test_runner/scenario_test_runner/CHANGELOG.rst @@ -35,6 +35,22 @@ Changelog for package scenario_test_runner * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +9.4.0 (2025-02-06) +------------------ +* Merge pull request `#1518 `_ from tier4/feature/support-latest-autoware-message-type + Support message type `autoware_internal_planning_msgs::msg::PathWithLaneId` +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Merge remote-tracking branch 'origin/master' into feature/support-latest-autoware-message-type +* Add new architecture-type `awf/universe/20250130` +* Merge branch 'master' into feature/support-latest-autoware-message-type +* Contributors: Tatsuya Yamasaki, yamacir-kit + +9.3.1 (2025-02-06) +------------------ +* Merge branch 'master' into chore/delete-target-branch-filter +* Contributors: Masaya Kataoka + 9.3.0 (2025-02-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/docker/traffic_simulator 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 9ad03b6f027..ecc74a515f0 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 @@ -35,7 +35,8 @@ def architecture_types(): # awf/universe/20230906: autoware_perception_msgs/TrafficSignalArray for traffic lights # awf/universe/20240605: autoware_perception_msgs/TrafficLightGroupArray for traffic lights - return ["awf/universe/20230906", "awf/universe/20240605"] + # awf/universe/20250130: [Pilot.Auto >= 0.41.1] autoware_internal_planning_msgs/msg/PathWithLaneId for concealer + return ["awf/universe/20230906", "awf/universe/20240605", "awf/universe/20250130"] def default_autoware_launch_package_of(architecture_type): @@ -46,6 +47,7 @@ def default_autoware_launch_package_of(architecture_type): return { "awf/universe/20230906": "autoware_launch", "awf/universe/20240605": "autoware_launch", + "awf/universe/20250130": "autoware_launch", }[architecture_type] @@ -57,6 +59,7 @@ def default_autoware_launch_file_of(architecture_type): return { "awf/universe/20230906": "planning_simulator.launch.xml", "awf/universe/20240605": "planning_simulator.launch.xml", + "awf/universe/20250130": "planning_simulator.launch.xml", }[architecture_type] diff --git a/test_runner/scenario_test_runner/package.xml b/test_runner/scenario_test_runner/package.xml index 7c8c30c7a3e..72c370cd3a2 100644 --- a/test_runner/scenario_test_runner/package.xml +++ b/test_runner/scenario_test_runner/package.xml @@ -2,7 +2,7 @@ scenario_test_runner - 9.3.0 + 9.4.0 scenario test runner package Tatsuya Yamasaki Apache License 2.0