|
4 | 4 | import gymnasium as gym |
5 | 5 | import mujoco |
6 | 6 | import numpy as np |
| 7 | +from rcs.envs.creators import FR3SimplePickUpSimEnvCreator |
7 | 8 | from rcs._core.common import Pose |
8 | 9 | from rcs.envs.base import GripperWrapper, RobotEnv |
9 | 10 |
|
@@ -50,10 +51,10 @@ def plan_linear_motion(self, geom_name: str, delta_up: float, num_waypoints: int |
50 | 51 | return self.generate_waypoints(end_eff_pose, goal_pose, num_waypoints=num_waypoints) |
51 | 52 |
|
52 | 53 | 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)): |
54 | 55 | # 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)) |
57 | 58 | return obs |
58 | 59 |
|
59 | 60 | def approach(self, geom_name: str): |
@@ -83,10 +84,14 @@ def pickup(self, geom_name: str): |
83 | 84 |
|
84 | 85 | def main(): |
85 | 86 | # 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()( |
88 | 93 | render_mode="human", |
89 | | - delta_actions=True, |
| 94 | + delta_actions=False, |
90 | 95 | ) |
91 | 96 | env.reset() |
92 | 97 | print(env.unwrapped.robot.get_cartesian_position().translation()) # type: ignore |
|
0 commit comments