Skip to content

Commit c1015c5

Browse files
committed
Update AdmittanceParameters for multi-tip
* Pass in a list of AdmittanceParameters to the FollowJointTrajectoryWithAdmittance action, one per tip. * Move tip specific fields (absolute_force_torque_threshold) into the AdmittanceParameters msg.
1 parent 069d153 commit c1015c5

File tree

3 files changed

+27
-18
lines changed

3 files changed

+27
-18
lines changed

moveit_studio_msgs/moveit_pro_controllers_msgs/action/FollowJointTrajectoryWithAdmittance.action

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,10 @@ float64[] path_tolerance
1414
# If empty, default tolerances from configs will be used.
1515
float64[] goal_tolerance
1616

17-
# The absolute force or torque threshold value for each Cartesian axis at which
18-
# the controller will stop executing if exceeded.
19-
# If the absolute value of a measured FTS value exceeds the corresponding
20-
# threshold, the trajectory goal is aborted with 'error_code' set to
21-
# FORCE_TORQUE_THRESHOLD_EXCEEDED.
22-
# If empty, default threshold values from configs will be used.
23-
float64[] absolute_force_torque_threshold
24-
25-
# "Joint Trajectory with Admittance Controller" control parameters.
26-
# These include stiffness, damping, path tolerances, etc.
27-
moveit_pro_controllers_msgs/AdmittanceParameters admittance_parameters
17+
# "Joint Trajectory with Admittance Controller" admittance parameters.
18+
# These include mass, stiffness, damping, selected Cartesian axes, joint damping, force/torque threshold and end
19+
# effector parameters for each tip.
20+
moveit_pro_controllers_msgs/AdmittanceParameters[] admittance_parameters
2821

2922
---
3023
int32 error_code
Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,27 @@
11
# Admittance parameters.
2-
# These are the parameters of a mass-spring-damper model that determines
3-
# the admittance behavior on each of the Cartesian axes.
2+
# These are the parameters of a mass-spring-damper model that determine
3+
# the admittance behavior on each of the Cartesian axes of each tip.
4+
# Each of the individual mass, spring, and damper vectors have 6 elements, one for each Cartesian axis.
5+
# They are given in the order: [X, Y, Z, RX, RY, RZ].
46
# Use carefully. Certain choices may lead to unstable behavior.
5-
float64[] mass
6-
float64[] stiffness
7-
float64[] damping
7+
float64[6] mass
8+
float64[6] stiffness
9+
float64[6] damping
10+
bool[6] selected_axes # Axes in the control frame to control with admittance.
11+
# Joint space damping. If there are multiple tips and corresponding chains in the Admittance problem, and the chains
12+
# share joints, then the joint_damping must match in the AdmittanceParameters that correspond to the overlapping joints.
813
float64 joint_damping
914

10-
geometry_msgs/Pose ee_pose_control # Control frame w.r.t. end-effector frame.
11-
bool[] selected_axes # Axes in the control frame to control with admittance.
15+
# End-effector frame, mass, and center of gravity (CoG) position.
16+
string end_effector_frame
17+
float64 end_effector_mass
18+
float64 end_effector_cog[] # X,Y,Z center of gravity in the end-effector frame. If empty, will default to [0.0, 0.0, 0.0].
19+
geometry_msgs/Pose ee_pose_control # Control frame w.r.t. end-effector frame. If empty, will default to identity pose.
20+
21+
# The absolute force or torque threshold value for each Cartesian axis at which
22+
# the controller will stop executing if exceeded.
23+
# If the absolute value of an axis of the measured FTS wrench exceeds the corresponding
24+
# threshold, the trajectory goal is aborted with 'error_code' set to
25+
# FORCE_TORQUE_THRESHOLD_EXCEEDED.
26+
# If empty, default threshold values from configs will be used.
27+
float64[] absolute_force_torque_threshold

moveit_studio_msgs/moveit_pro_controllers_msgs/msg/TipAdmittanceParameters.msg

Whitespace-only changes.

0 commit comments

Comments
 (0)