Skip to content

Commit cd89943

Browse files
committed
Adjust color blob service interface
1 parent 296eab1 commit cd89943

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

clr_pick_and_place_demo/src/run_demo.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ class RunDemoNode : public rclcpp::Node
404404
RCLCPP_INFO(LOGGER, "Detecting CTB handle.");
405405
// Find red blob in wrist camera image
406406
auto request = std::make_shared<color_tools_msgs::srv::BlobCentroid::Request>();
407-
request->color = "red";
407+
request->request.color = "red";
408408
std::shared_ptr<color_tools_msgs::srv::BlobCentroid::Response> response;
409409
do
410410
{
@@ -413,17 +413,17 @@ class RunDemoNode : public rclcpp::Node
413413
std::shared_ptr<color_tools_msgs::srv::BlobCentroid::Request>,
414414
std::shared_ptr<color_tools_msgs::srv::BlobCentroid::Response>>(
415415
color_blob_client, request);
416-
if (response->centroid_pose.header.frame_id != "")
416+
if (response->result.centroid_pose.header.frame_id != "")
417417
{
418-
RCLCPP_INFO(LOGGER, "Blob frame id: %s", response->centroid_pose.header.frame_id.c_str());
418+
RCLCPP_INFO(LOGGER, "Blob frame id: %s", response->result.centroid_pose.header.frame_id.c_str());
419419
break;
420420
}
421-
else if (response->color_img.header.frame_id != "")
421+
else if (response->result.color_img.header.frame_id != "")
422422
{
423423
RCLCPP_ERROR(LOGGER,
424424
"Failed to find %s color blob in FOV. Move robot to "
425425
"provide new view.",
426-
request->color.c_str());
426+
request->request.color.c_str());
427427
return false;
428428
}
429429
else
@@ -432,13 +432,13 @@ class RunDemoNode : public rclcpp::Node
432432
"topics exist and data is flowing.");
433433
}
434434
std::this_thread::sleep_for(std::chrono::seconds(1));
435-
} while (response->color_img.header.frame_id == "");
435+
} while (response->result.color_img.header.frame_id == "");
436436

437437
// Transform waypoint from camera frame to planning frame
438-
geometry_msgs::msg::Pose local_pose = response->centroid_pose.pose;
438+
geometry_msgs::msg::Pose local_pose = response->result.centroid_pose.pose;
439439
geometry_msgs::msg::TransformStamped transform;
440440
geometry_msgs::msg::Pose global_pose;
441-
bool success = this->get_global_transform(response->centroid_pose.header.frame_id, transform);
441+
bool success = this->get_global_transform(response->result.centroid_pose.header.frame_id, transform);
442442
if (!success)
443443
{
444444
return false;

0 commit comments

Comments
 (0)