Skip to content

Commit 5652019

Browse files
committed
tmp: make sim teleop work
1 parent 5032dc0 commit 5652019

2 files changed

Lines changed: 16 additions & 14 deletions

File tree

‎python/rcs/envs/creators.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ def __call__( # type: ignore
152152
simulation = sim.Sim(robot_cfg.mjcf_scene_path, sim_cfg)
153153
ik = rcs.common.Pin(
154154
robot_cfg.kinematic_model_path,
155-
robot_cfg.attachment_site,
155+
robot_cfg.attachment_site + "_0",
156156
urdf=robot_cfg.kinematic_model_path.endswith(".urdf"),
157157
)
158158
# ik = rcs_robotics_library._core.rl.RoboticsLibraryIK(robot_cfg.kinematic_model_path)

‎python/rcs/envs/sim.py‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ def __init__(self, env, simulation: sim.Sim, sim_wrapper: Type[SimWrapper] | Non
3939
if sim_wrapper is not None:
4040
env = sim_wrapper(env, simulation)
4141
super().__init__(env)
42-
self.unwrapped: RobotEnv
43-
assert isinstance(self.unwrapped.robot, sim.SimRobot), "Robot must be a sim.SimRobot instance."
44-
self.sim_robot = cast(sim.SimRobot, self.unwrapped.robot)
42+
# self.unwrapped: RobotEnv
43+
# assert isinstance(self.unwrapped.robot, sim.SimRobot), "Robot must be a sim.SimRobot instance."
44+
# self.sim_robot = cast(sim.SimRobot, self.unwrapped.robot)
4545
self.sim = simulation
4646
cfg = self.sim.get_config()
4747
self.frame_rate = SimpleFrameRate(1 / cfg.frequency, "RobotSimWrapper")
@@ -56,18 +56,20 @@ def step(self, action: dict[str, Any]) -> tuple[dict[str, Any], float, bool, boo
5656
self.frame_rate()
5757

5858
else:
59-
self.sim_robot.clear_collision_flag()
59+
# self.sim_robot.clear_collision_flag()
6060
self.sim.step_until_convergence()
61-
state = self.sim_robot.get_state()
62-
if "collision" not in info:
63-
info["collision"] = state.collision
64-
else:
65-
info["collision"] = info["collision"] or state.collision
66-
info["ik_success"] = state.ik_success
61+
# state = self.sim_robot.get_state()
62+
# if "collision" not in info:
63+
# info["collision"] = state.collision
64+
# else:
65+
# info["collision"] = info["collision"] or state.collision
66+
# info["ik_success"] = state.ik_success
6767
info["is_sim_converged"] = self.sim.is_converged()
6868
# truncate episode if collision
69-
obs.update(self.unwrapped.get_obs())
70-
return obs, 0, False, info["collision"] or not state.ik_success, info
69+
# obs.update(self.unwrapped.get_obs())
70+
# return obs, 0, False, info["collision"] or not state.ik_success, info
71+
return obs, 0, False, False, info
72+
7173

7274
def reset(
7375
self, *, seed: int | None = None, options: dict[str, Any] | None = None
@@ -76,7 +78,7 @@ def reset(
7678
obs, info = super().reset(seed=seed, options=options)
7779
self.sim.step(1)
7880
# todo: an obs method that is recursive over wrappers would be needed
79-
obs.update(self.unwrapped.get_obs())
81+
# obs.update(self.unwrapped.get_obs())
8082
return obs, info
8183

8284

0 commit comments

Comments
 (0)