Skip to content

Commit 8563365

Browse files
committed
update dataset and fix workflows
1 parent 69e8707 commit 8563365

File tree

4 files changed

+5
-7
lines changed

4 files changed

+5
-7
lines changed

isaaclab_arena/embodiments/g1/g1.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -781,7 +781,7 @@ def get_object_poses(self, env_ids: Sequence[int] | None = None):
781781
pelvis_pose_w = wp.to_torch(self.scene["robot"].data.body_link_state_w)[
782782
:, self.scene["robot"].data.body_names.index("pelvis"), :
783783
]
784-
pelvis_position_w = pelvis_pose_w[:, :3] - wp.to_torch(self.scene.env_origins)
784+
pelvis_position_w = pelvis_pose_w[:, :3] - self.scene.env_origins
785785
pelvis_rot_mat_w = PoseUtils.matrix_from_quat(pelvis_pose_w[:, 3:7])
786786
pelvis_pose_mat_w = PoseUtils.make_pose(pelvis_position_w, pelvis_rot_mat_w)
787787
pelvis_pose_inv = PoseUtils.pose_inv(pelvis_pose_mat_w)

isaaclab_arena_environments/galileo_g1_locomanip_pick_and_place_environment.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
# SPDX-License-Identifier: Apache-2.0
55

66
import argparse
7+
import math
78

89
from isaaclab_arena_environments.example_environment_base import ExampleEnvironmentBase
910

@@ -33,8 +34,8 @@ def get_env(self, args_cli: argparse.Namespace):
3334
PoseRange(
3435
position_xyz_min=(0.5785 - XY_RANGE_M, 0.18 - XY_RANGE_M, 0.0707),
3536
position_xyz_max=(0.5785 + XY_RANGE_M, 0.18 + XY_RANGE_M, 0.0707),
36-
rpy_min=(0.0, 0.0, 0.0),
37-
rpy_max=(0.0, 0.0, 0.0),
37+
rpy_min=(math.pi, 0.0, math.pi),
38+
rpy_max=(math.pi, 0.0, math.pi),
3839
)
3940
)
4041

isaaclab_arena_environments/gr1_put_and_close_door_environment.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ def __post_init__(self):
154154
pickup_object = self.asset_registry.get_asset_by_name(args_cli.object)()
155155

156156
pickup_object.add_relation(On(kitchen_counter_top))
157-
# pickup_object.add_relation(AtPosition(x=4.05, y=-0.58))
157+
pickup_object.add_relation(AtPosition(x=4.05, y=-0.58))
158158
# Consider changing to other values for different objects, below is for ranch dressing bottle.
159159
yaw_rad = math.radians(-111.55)
160160
pickup_object.add_relation(RotateAroundSolution(yaw_rad=yaw_rad))

isaaclab_arena_g1/g1_env/mdp/actions/g1_decoupled_wbc_pink_action.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -220,9 +220,6 @@ def process_actions(self, actions: torch.Tensor):
220220
right_arm_quat = actions_clone[:, RIGHT_WRIST_QUAT_START_IDX:RIGHT_WRIST_QUAT_END_IDX].squeeze(0).cpu()
221221

222222
# Convert from pos/quat to 4x4 transform matrix
223-
# Scipy requires quat xyzw, IsaacLab uses wxyz so a conversion is needed
224-
left_arm_quat = np.roll(left_arm_quat, -1)
225-
right_arm_quat = np.roll(right_arm_quat, -1)
226223
left_rotmat = R.from_quat(left_arm_quat).as_matrix()
227224
right_rotmat = R.from_quat(right_arm_quat).as_matrix()
228225

0 commit comments

Comments
 (0)