Skip to content

Commit 2a8f7de

Browse files
committed
fix: replace dep. gym env with own creator and remove delta control
1 parent 088fe09 commit 2a8f7de

1 file changed

Lines changed: 11 additions & 6 deletions

File tree

python/examples/grasp_demo.py

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import gymnasium as gym
55
import mujoco
66
import numpy as np
7+
from rcs.envs.creators import FR3SimplePickUpSimEnvCreator
78
from rcs._core.common import Pose
89
from rcs.envs.base import GripperWrapper, RobotEnv
910

@@ -50,10 +51,10 @@ def plan_linear_motion(self, geom_name: str, delta_up: float, num_waypoints: int
5051
return self.generate_waypoints(end_eff_pose, goal_pose, num_waypoints=num_waypoints)
5152

5253
def execute_motion(self, waypoints: list[Pose], gripper: float = GripperWrapper.BINARY_GRIPPER_OPEN) -> dict:
53-
for i in range(1, len(waypoints)):
54+
for i in range(len(waypoints)):
5455
# calculate delta action
55-
delta_action = waypoints[i] * waypoints[i - 1].inverse()
56-
obs = self.step(self._action(delta_action, gripper))
56+
# delta_action = waypoints[i] * waypoints[i - 1].inverse()
57+
obs = self.step(self._action(waypoints[i], gripper))
5758
return obs
5859

5960
def approach(self, geom_name: str):
@@ -83,10 +84,14 @@ def pickup(self, geom_name: str):
8384

8485
def main():
8586
# compatilbe with rcs/SimplePickUpSimDigitHand-v0 and rcs/SimplePickUpSim-v0
86-
env = gym.make(
87-
"rcs/SimplePickUpSimDigitHand-v0",
87+
# env = gym.make(
88+
# "rcs/SimplePickUpSimDigitHand-v0",
89+
# render_mode="human",
90+
# delta_actions=True,
91+
# )
92+
env = FR3SimplePickUpSimEnvCreator()(
8893
render_mode="human",
89-
delta_actions=True,
94+
delta_actions=False,
9095
)
9196
env.reset()
9297
print(env.unwrapped.robot.get_cartesian_position().translation()) # type: ignore

0 commit comments

Comments
 (0)