Update AdmittanceParameters for multi-tip

* Pass in a list of AdmittanceParameters to the
  FollowJointTrajectoryWithAdmittance action, one per tip.
* Break out tip specific fields (absolute_force_torque_threshold) into
  the AdmittanceParameters msg and pull up non-tip specific fields
  (joint_damping) into the FollowJointTrajectoryWithAdmittance action

Author: dyackzan

moveit_studio_msgs/moveit_pro_controllers_msgs/action/FollowJointTrajectoryWithAdmittance.action

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

moveit_studio_msgs/moveit_pro_controllers_msgs/msg/AdmittanceParameters.msg

@@ -1,39 +1,24 @@
 # Admittance parameters.
-# These are the parameters of a mass-spring-damper model that determines
+# These are the parameters of a mass-spring-damper model that determine
 # the admittance behavior on each of the Cartesian axes of each tip.
-# Each of the individual axis mass, spring, and damper vectors should be the same size as the end_effector_frames vector.
+# Each of the individual mass, spring, and damper vectors have 6 elements, one for each Cartesian axis.
+# They are given in the order: [X, Y, Z, RX, RY, RZ].
 # Use carefully. Certain choices may lead to unstable behavior.
-float64[] mass_x
-float64[] mass_y
-float64[] mass_z
-float64[] mass_rx
-float64[] mass_ry
-float64[] mass_rz
-float64[] stiffness_x
-float64[] stiffness_y
-float64[] stiffness_z
-float64[] stiffness_rx
-float64[] stiffness_ry
-float64[] stiffness_rz
-float64[] damping_x
-float64[] damping_y
-float64[] damping_z
-float64[] damping_rx
-float64[] damping_ry
-float64[] damping_rz
-float64 joint_damping
+float64[6] mass
+float64[6] stiffness
+float64[6] damping
+bool[6] selected_axes  # Axes in the control frame to control with admittance.
 
-# End-effector frames, masses, and center of gravity (CoG) positions.
-string[] end_effector_frames
-float64[] end_effector_masses
-float64[] end_effector_cogs_x
-float64[] end_effector_cogs_y
-float64[] end_effector_cogs_z
-geometry_msgs/Pose[] ee_poses_control     # Control frames w.r.t. end-effector frames.
-# Specify which axes of the control frames to control with admittance for each tip.
-bool[] x_on
-bool[] y_on
-bool[] z_on
-bool[] rx_on
-bool[] ry_on
-bool[] rz_on
+# End-effector frame, mass, and center of gravity (CoG) position.
+string end_effector_frame
+float64 end_effector_mass
+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].
+geometry_msgs/Pose ee_pose_control  # Control frame w.r.t. end-effector frame. If empty, will default to identity pose.
+
+# The absolute force or torque threshold value for each Cartesian axis at which
+# the controller will stop executing if exceeded.
+# If the absolute value of an axis of the measured FTS wrench exceeds the corresponding
+# threshold, the trajectory goal is aborted with 'error_code' set to
+# FORCE_TORQUE_THRESHOLD_EXCEEDED.
+# If empty, default threshold values from configs will be used.
+float64[] absolute_force_torque_threshold