Skip to content

Commit c7d7baa

Browse files
authored
Update tool srvs (#71)
* Add AddTool Srv * Consolidate DetachTool/RemoveTool srvs * Remove no longer needed fields in AttachTool srv
1 parent d16616e commit c7d7baa

File tree

5 files changed

+41
-20
lines changed

5 files changed

+41
-20
lines changed

moveit_studio_msgs/moveit_studio_agent_msgs/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@ set(msg_files
2929
)
3030

3131
set(srv_files
32+
"srv/AddTool.srv"
3233
"srv/AttachTool.srv"
33-
"srv/DetachTool.srv"
34+
"srv/DetachOrRemoveTool.srv"
3435
"srv/ClearStoredParameters.srv"
3536
"srv/EditWaypoints.srv"
3637
"srv/GetAgentInfo.srv"
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Service to add tools in the planning scene.
2+
# The tool is given as a URDF string, and is attached to a specific frame in the planning scene with a relative pose.
3+
# Once the tool is added, its collision shapes will be updated in the planning scene according to the tool joint values,
4+
# if those are published in /joint_states.
5+
6+
# The name of the tool to add to the planning scene.
7+
# It must not be in the planning scene already, otherwise an error will be returned.
8+
string tool_name
9+
10+
# The tool URDF.
11+
string tool_urdf
12+
13+
# The pose at which the tool will be added.
14+
# Use a pose stamped so we can define the frame relative to which the tool will be added.
15+
geometry_msgs/PoseStamped tool_pose
16+
17+
---
18+
# If the operation was successful.
19+
bool success
20+
21+
# If the operation was not successful, a message describing the error.
22+
string message

moveit_studio_msgs/moveit_studio_agent_msgs/srv/AttachTool.srv

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,17 @@
11
# Service to attach articulated tools to the robot.
2-
# The tool is given as a URDF string, and is attached to a specific link on the robot with a relative pose.
2+
# The tool given must already exist in the planning scene, and is attached to a specific link on the robot at the
3+
# current transform between the link and the tool.
34
# Once the tool is attached, its collision shapes will be updated in the planning scene according to the tool
45
# joint values, if those are published in /joint_states.
56

67
# The name of the tool to attach.
78
# It must not be attached already, otherwise an error will be returned.
89
string tool_name
910

10-
# The tool URDF.
11-
string tool_urdf
12-
1311
# The name of the robot link to attach to.
1412
# It must exist in the robot URDF, otherwise an error will be returned.
1513
string parent_link_name
1614

17-
# The relative transform of the tool with respect to the parent link.
18-
geometry_msgs/Transform tool_pose
19-
2015
# Robot links this tool is allowed to collide with.
2116
string[] allowed_collision_links
2217

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Service to detach tools from the robot or remove them from the scene.
2+
3+
# The name of the tool to detach or remove.
4+
# If using this srv with the 'detach_tool' service, the tool must have been
5+
# attached to the robot previously.
6+
# If using this srv with the 'remove_tool_from_scene', the tool must have been
7+
# added to the scene previously.
8+
string tool_name
9+
10+
---
11+
# If the operation was successful.
12+
bool success
13+
14+
# If the operation was not successful, a message describing the error.
15+
string message

moveit_studio_msgs/moveit_studio_agent_msgs/srv/DetachTool.srv

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)