Skip to content

Commit

Permalink
kinematic_constraints: update header frames (#1890)
Browse files Browse the repository at this point in the history
  • Loading branch information
AndyZe committed Jan 26, 2023
1 parent eb53117 commit 63a2c70
Showing 1 changed file with 14 additions and 0 deletions.
14 changes: 14 additions & 0 deletions moveit_core/kinematic_constraints/src/utils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -251,11 +251,13 @@ bool updatePoseConstraint(moveit_msgs::msg::Constraints& constraints, const std:
{
// Convert message types so the existing functions can be used
geometry_msgs::msg::PointStamped point;
point.header = pose.header;
point.point.x = pose.pose.position.x;
point.point.y = pose.pose.position.y;
point.point.z = pose.pose.position.z;

geometry_msgs::msg::QuaternionStamped quat_stamped;
quat_stamped.header = pose.header;
quat_stamped.quaternion = pose.pose.orientation;

return updatePositionConstraint(constraints, link_name, point) &&
Expand Down Expand Up @@ -286,6 +288,12 @@ bool updateOrientationConstraint(moveit_msgs::msg::Constraints& constraints, con
{
if (constraint.link_name == link_name)
{
if (quat.header.frame_id.empty())
{
RCLCPP_ERROR(LOGGER, "Cannot update orientation constraint, frame_id in the header is empty");
return false;
}
constraint.header = quat.header;
constraint.orientation = quat.quaternion;
return true;
}
Expand All @@ -311,6 +319,12 @@ bool updatePositionConstraint(moveit_msgs::msg::Constraints& constraints, const
{
if (constraint.link_name == link_name)
{
if (goal_point.header.frame_id.empty())
{
RCLCPP_ERROR(LOGGER, "Cannot update position constraint, frame_id in the header is empty");
return false;
}
constraint.header = goal_point.header;
constraint.constraint_region.primitive_poses.at(0).position.x = goal_point.point.x;
constraint.constraint_region.primitive_poses.at(0).position.y = goal_point.point.y;
constraint.constraint_region.primitive_poses.at(0).position.z = goal_point.point.z;
Expand Down

0 comments on commit 63a2c70

Please sign in to comment.