Merge branch 'tier4/universe' into autoware_msg

tier4 · Jun 3, 2024 · 939b75a · 939b75a
2 parents 015fb5a + 6c7980f
commit 939b75a
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 deletions.
diff --git a/autoware_iv_external_api_adaptor/src/converter/response_status.hpp b/autoware_iv_external_api_adaptor/src/converter/response_status.hpp
@@ -18,13 +18,15 @@
 #include <tier4_api_utils/tier4_api_utils.hpp>
 
 #include <autoware_adapi_v1_msgs/msg/response_status.hpp>
+#include <autoware_common_msgs/msg/response_status.hpp>
 #include <tier4_external_api_msgs/msg/response_status.hpp>
 
 namespace external_api::converter
 {
 
 using AdResponseStatus = autoware_adapi_v1_msgs::msg::ResponseStatus;
 using T4ResponseStatus = tier4_external_api_msgs::msg::ResponseStatus;
+using CommonResponseStatus = autoware_common_msgs::msg::ResponseStatus;
 
 inline T4ResponseStatus convert(const AdResponseStatus & ad)
 {
@@ -35,6 +37,15 @@ inline T4ResponseStatus convert(const AdResponseStatus & ad)
   }
 }
 
+inline T4ResponseStatus convert(const CommonResponseStatus & common)
+{
+  if (common.success) {
+    return tier4_api_utils::response_success(common.message);
+  } else {
+    return tier4_api_utils::response_error(common.message);
+  }
+}
+
 }  // namespace external_api::converter
 
 #endif  // CONVERTER__RESPONSE_STATUS_HPP_
diff --git a/autoware_iv_external_api_adaptor/src/initial_pose.cpp b/autoware_iv_external_api_adaptor/src/initial_pose.cpp
@@ -61,8 +61,9 @@ void InitialPose::setInitializePose(
   const tier4_external_api_msgs::srv::InitializePose::Response::SharedPtr response)
 {
   const auto req = std::make_shared<localization_interface::Initialize::Service::Request>();
-  req->pose.push_back(request->pose);
-  req->pose.back().pose.covariance = particle_covariance;
+  req->method = localization_interface::Initialize::Service::Request::AUTO;
+  req->pose_with_covariance.push_back(request->pose);
+  req->pose_with_covariance.back().pose.covariance = particle_covariance;
 
   try {
     const auto res = cli_localization_initialize_->call(req, initial_pose_timeout);
@@ -77,6 +78,7 @@ void InitialPose::setInitializePoseAuto(
   const tier4_external_api_msgs::srv::InitializePoseAuto::Response::SharedPtr response)
 {
   const auto req = std::make_shared<localization_interface::Initialize::Service::Request>();
+  req->method = localization_interface::Initialize::Service::Request::AUTO;
 
   try {
     const auto res = cli_localization_initialize_->call(req, initial_pose_timeout);

diff --git a/autoware_iv_external_api_adaptor/src/rtc_controller.cpp b/autoware_iv_external_api_adaptor/src/rtc_controller.cpp
@@ -107,8 +107,8 @@ RTCController::RTCController(const rclcpp::NodeOptions & options)
     std::make_unique<RTCModule>(this, "external_request_lane_change_left");
   ext_request_lane_change_right_ =
     std::make_unique<RTCModule>(this, "external_request_lane_change_right");
-  avoidance_left_ = std::make_unique<RTCModule>(this, "avoidance_left");
-  avoidance_right_ = std::make_unique<RTCModule>(this, "avoidance_right");
+  avoidance_left_ = std::make_unique<RTCModule>(this, "static_obstacle_avoidance_left");
+  avoidance_right_ = std::make_unique<RTCModule>(this, "static_obstacle_avoidance_right");
   avoidance_by_lc_left_ = std::make_unique<RTCModule>(this, "avoidance_by_lane_change_left");
   avoidance_by_lc_right_ = std::make_unique<RTCModule>(this, "avoidance_by_lane_change_right");
   goal_planner_ = std::make_unique<RTCModule>(this, "goal_planner");

diff --git a/build_depends.repos b/build_depends.repos
@@ -15,6 +15,10 @@ repositories:
     type: git
     url: https://github.com/autowarefoundation/autoware_adapi_msgs.git
     version: main
+  msg/autoware_internal_msgs:
+    type: git
+    url: https://github.com/autowarefoundation/autoware_internal_msgs.git
+    version: main
   universe/tier4_autoware_msgs:
     type: git
     url: https://github.com/tier4/tier4_autoware_msgs.git