diff --git a/clearpath_generator_common/clearpath_generator_common/semantic_description/manipulators.py b/clearpath_generator_common/clearpath_generator_common/semantic_description/manipulators.py index fc627378..4787f7cc 100644 --- a/clearpath_generator_common/clearpath_generator_common/semantic_description/manipulators.py +++ b/clearpath_generator_common/clearpath_generator_common/semantic_description/manipulators.py @@ -30,7 +30,10 @@ # modification, is not permitted without the express permission # of Clearpath Robotics. from clearpath_config.manipulators.types.arms import Franka -from clearpath_config.manipulators.types.grippers import FrankaGripper +from clearpath_config.manipulators.types.grippers import ( + FrankaGripper, + Robotiq2F140 +) from clearpath_config.manipulators.types.manipulator import ( BaseManipulator, ManipulatorPose @@ -88,9 +91,18 @@ def __init__(self, manipulator): super().__init__(manipulator) self.parameters[self.NAME] = f'{manipulator.name}_{manipulator.arm_id}' + class Robotiq2F140SemanticDescription(BaseSemanticDescription): + + def __init__(self, manipulator): + super().__init__(manipulator) + urdf_parameters = dict(manipulator.get_urdf_parameters()) + self.parameters[Robotiq2F140.PADDING] = f"{ + urdf_parameters.get(Robotiq2F140.PADDING, 'true')}" + MODEL = { Franka.MANIPULATOR_MODEL: FrankaSemanticDescription, - FrankaGripper.MANIPULATOR_MODEL: FrankaSemanticDescription + FrankaGripper.MANIPULATOR_MODEL: FrankaSemanticDescription, + Robotiq2F140.MANIPULATOR_MODEL: Robotiq2F140SemanticDescription } def __new__(cls, manipulator: BaseManipulator) -> BaseManipulator: diff --git a/clearpath_manipulators_description/srdf/gripper/robotiq_2f_140.srdf.xacro b/clearpath_manipulators_description/srdf/gripper/robotiq_2f_140.srdf.xacro index 167d747b..077b7c0c 100644 --- a/clearpath_manipulators_description/srdf/gripper/robotiq_2f_140.srdf.xacro +++ b/clearpath_manipulators_description/srdf/gripper/robotiq_2f_140.srdf.xacro @@ -7,7 +7,15 @@ - + + + + + + + + + @@ -26,12 +34,15 @@ + + + diff --git a/clearpath_manipulators_description/urdf/gripper/robotiq_2f_140.urdf.xacro b/clearpath_manipulators_description/urdf/gripper/robotiq_2f_140.urdf.xacro index f8e8a5b7..155e99f6 100644 --- a/clearpath_manipulators_description/urdf/gripper/robotiq_2f_140.urdf.xacro +++ b/clearpath_manipulators_description/urdf/gripper/robotiq_2f_140.urdf.xacro @@ -16,11 +16,18 @@ sim_isaac:=false isaac_joint_commands:=/isaac_joint_commands isaac_joint_states:=/isaac_joint_states - com_port:=/dev/ttyUSB0"> + com_port:=/dev/ttyUSB0 + padding:=true"> + + + + + + @@ -213,7 +220,7 @@ - + @@ -224,7 +231,7 @@ - + @@ -274,14 +281,18 @@ - + + + - + + +