Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
216 changes: 132 additions & 84 deletions robosuite/models/assets/grippers/robotiq_gripper_140.xml

Large diffs are not rendered by default.

200 changes: 129 additions & 71 deletions robosuite/models/assets/grippers/robotiq_gripper_85.xml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion robosuite/models/grippers/gripper_tester.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from robosuite.models.objects import BoxObject
from robosuite.models.world import MujocoWorldBase
from robosuite.utils import OpenCVRenderer
from robosuite.utils.binding_utils import MjSim
from robosuite.utils.binding_utils import MjRenderContextOffscreen, MjSim
from robosuite.utils.mjcf_utils import array_to_string, new_actuator, new_joint


Expand Down
6 changes: 2 additions & 4 deletions robosuite/models/grippers/robotiq_140_gripper.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def format_action(self, action):

@property
def init_qpos(self):
return np.array([0.012, 0.065, 0.065, -0.012, 0.065, 0.065])
return np.array([0, 0, 0, 0, 0, 0, 0, 0.0])

@property
def _important_geoms(self):
Expand Down Expand Up @@ -63,9 +63,7 @@ def format_action(self, action):
AssertionError: [Invalid action dimension size]
"""
assert len(action) == 1
self.current_action = np.clip(
self.current_action + np.array([1.0, -1.0]) * self.speed * np.sign(action), -1.0, 1.0
)
self.current_action = np.clip(self.current_action + self.speed * np.sign(action), -1.0, 1.0)
return self.current_action

@property
Expand Down
2 changes: 1 addition & 1 deletion robosuite/models/grippers/robotiq_85_gripper.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def format_action(self, action):

@property
def init_qpos(self):
return np.array([-0.026, -0.267, -0.200, -0.026, -0.267, -0.200])
return np.array([0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0])

@property
def _important_geoms(self):
Expand Down
5 changes: 3 additions & 2 deletions tests/test_grippers/test_robotiq_140.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,13 @@ def robotiq_tester(render, total_iters=1, test_y=True):
gripper=gripper,
pos="0 0 0.3",
quat="0 0 1 0",
gripper_low_pos=0.02,
gripper_low_pos=0.03,
gripper_high_pos=0.1,
box_size=[0.025] * 3,
box_size=[0.015] * 3,
render=render,
)
tester.start_simulation()
tester.viewer.set_camera(0)
tester.loop(total_iters=total_iters, test_y=test_y)
tester.close()

Expand Down
4 changes: 2 additions & 2 deletions tests/test_grippers/test_robotiq_85.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ def robotiq_tester(render, total_iters=1, test_y=True):
gripper=gripper,
pos="-0.02 0 0.3",
quat="0 0 1 0",
gripper_low_pos=-0.065,
gripper_high_pos=0.01,
gripper_low_pos=-0.045,
gripper_high_pos=0.02,
box_size=[0.025] * 3,
render=render,
)
Expand Down