Skip to content

Commit 8eb257d

Browse files
committed
Apply isort fixes; resolve previous comments
1 parent f33113b commit 8eb257d

File tree

70 files changed

+116
-20
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+116
-20
lines changed

mujoco_playground/_src/manipulation/__init__.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
from mujoco_playground._src.manipulation.franka_emika_panda_robotiq import push_cube as robotiq_push_cube
2929
from mujoco_playground._src.manipulation.leap_hand import reorient as leap_cube_reorient
3030
from mujoco_playground._src.manipulation.leap_hand import rotate_z as leap_rotate_z
31-
from mujoco_playground._src.manipulation.tetheria_hand import rotate_z as tetheria_hand_rotate_z
31+
from mujoco_playground._src.manipulation.aero_hand import rotate_z as aero_hand_rotate_z
3232

3333
_envs = {
3434
"AlohaHandOver": aloha_handover.HandOver,
@@ -40,7 +40,7 @@
4040
"PandaRobotiqPushCube": robotiq_push_cube.PandaRobotiqPushCube,
4141
"LeapCubeReorient": leap_cube_reorient.CubeReorient,
4242
"LeapCubeRotateZAxis": leap_rotate_z.CubeRotateZAxis,
43-
"TetheriaCubeRotateZAxis": tetheria_hand_rotate_z.CubeRotateZAxis,
43+
"AeroCubeRotateZAxis": aero_hand_rotate_z.CubeRotateZAxis,
4444
}
4545

4646
_cfgs = {
@@ -53,13 +53,13 @@
5353
"PandaRobotiqPushCube": robotiq_push_cube.default_config,
5454
"LeapCubeReorient": leap_cube_reorient.default_config,
5555
"LeapCubeRotateZAxis": leap_rotate_z.default_config,
56-
"TetheriaCubeRotateZAxis": tetheria_hand_rotate_z.default_config,
56+
"AeroCubeRotateZAxis": aero_hand_rotate_z.default_config,
5757
}
5858

5959
_randomizer = {
6060
"LeapCubeRotateZAxis": leap_rotate_z.domain_randomize,
6161
"LeapCubeReorient": leap_cube_reorient.domain_randomize,
62-
"TetheriaCubeRotateZAxis": tetheria_hand_rotate_z.domain_randomize,
62+
"AeroCubeRotateZAxis": aero_hand_rotate_z.domain_randomize,
6363
}
6464

6565

mujoco_playground/_src/manipulation/tetheria_hand/README.md renamed to mujoco_playground/_src/manipulation/aero_hand/README.md

Lines changed: 2 additions & 1 deletion

mujoco_playground/_src/manipulation/tetheria_hand/__init__.py renamed to mujoco_playground/_src/manipulation/aero_hand/__init__.py

File renamed without changes.
Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
# Copyright 2025 TetherIA Inc.
2+
# Copyright 2023 DeepMind Technologies Limited
3+
#
4+
# Author: Nan Wang (TetherIA Inc.)
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
# ==============================================================================
18+
19+
"""Constants for TetherIA Aero Hand Open."""
20+
21+
from mujoco_playground._src import mjx_env
22+
23+
ROOT_PATH = mjx_env.ROOT_PATH / "manipulation" / "aero_hand"
24+
CUBE_XML = ROOT_PATH / "xmls" / "scene_mjx_cube.xml"
25+
26+
NQ = 16
27+
NV = 16
28+
NU = 7
29+
30+
JOINT_NAMES = [
31+
# index
32+
"right_index_mcp_flex",
33+
"right_index_pip",
34+
"right_index_dip",
35+
# middle
36+
"right_middle_mcp_flex",
37+
"right_middle_pip",
38+
"right_middle_dip",
39+
# ring
40+
"right_ring_mcp_flex",
41+
"right_ring_pip",
42+
"right_ring_dip",
43+
# pinky
44+
"right_pinky_mcp_flex",
45+
"right_pinky_pip",
46+
"right_pinky_dip",
47+
# thumb
48+
"right_thumb_cmc_abd",
49+
"right_thumb_cmc_flex",
50+
"right_thumb_mcp",
51+
"right_thumb_ip",
52+
]
53+
54+
ACTUATOR_NAMES = [
55+
# index
56+
"right_index_A_pip",
57+
# middle
58+
"right_middle_A_pip",
59+
# ring
60+
"right_ring_A_pip",
61+
# pinky
62+
"right_pinky_A_pip",
63+
# thumb
64+
"right_thumb_A_cmc_abd",
65+
"right_th1_A_pip",
66+
"right_th2_A_pip",
67+
]
68+
69+
FINGERTIP_NAMES = [
70+
"if_tip",
71+
"mf_tip",
72+
"rf_tip",
73+
"pf_tip",
74+
"th_tip",
75+
]
76+
77+
78+
SENSOR_TENDON_NAMES = [
79+
"len_if",
80+
"len_mf",
81+
"len_rf",
82+
"len_pf",
83+
"len_th1",
84+
"len_th2",
85+
]
86+
87+
SENSOR_JOINT_NAMES = [
88+
"len_th_abd",
89+
]

mujoco_playground/_src/manipulation/tetheria_hand/base.py renamed to mujoco_playground/_src/manipulation/aero_hand/base.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# limitations under the License.
1717
# ==============================================================================
1818

19-
"""Base classes for tetheria hand."""
19+
"""Base classes for TetherIA Aero Hand Open."""
2020

2121
from typing import Any, Dict, Optional, Union
2222

@@ -28,12 +28,12 @@
2828
from mujoco import mjx
2929

3030
from mujoco_playground._src import mjx_env
31-
from mujoco_playground._src.manipulation.tetheria_hand import tetheria_hand_constants as consts
31+
from mujoco_playground._src.manipulation.aero_hand import aero_hand_constants as consts
3232

3333

3434
def get_assets() -> Dict[str, bytes]:
3535
assets = {}
36-
path = mjx_env.MENAGERIE_PATH / "tetheria_hand"
36+
path = mjx_env.MENAGERIE_PATH / "aero_hand"
3737
mjx_env.update_assets(assets, path / "assets")
3838
mjx_env.update_assets(assets, consts.ROOT_PATH / "xmls", "*.xml")
3939
mjx_env.update_assets(
@@ -43,8 +43,8 @@ def get_assets() -> Dict[str, bytes]:
4343
return assets
4444

4545

46-
class TetheriaHandEnv(mjx_env.MjxEnv):
47-
"""Base class for Tetheria hand environments."""
46+
class AeroHandEnv(mjx_env.MjxEnv):
47+
"""Base class for Aero Hand environments."""
4848

4949
def __init__(
5050
self,

mujoco_playground/_src/manipulation/tetheria_hand/imgs/cube_rotation.gif renamed to mujoco_playground/_src/manipulation/aero_hand/imgs/cube_rotation.gif

File renamed without changes.

mujoco_playground/_src/manipulation/tetheria_hand/imgs/cube_rotation1.gif renamed to mujoco_playground/_src/manipulation/aero_hand/imgs/cube_rotation1.gif

File renamed without changes.

mujoco_playground/_src/manipulation/tetheria_hand/imgs/cube_rotation14.gif renamed to mujoco_playground/_src/manipulation/aero_hand/imgs/cube_rotation14.gif

File renamed without changes.

mujoco_playground/_src/manipulation/tetheria_hand/imgs/index_close_up.png renamed to mujoco_playground/_src/manipulation/aero_hand/imgs/index_close_up.png

File renamed without changes.

mujoco_playground/_src/manipulation/tetheria_hand/imgs/output.gif renamed to mujoco_playground/_src/manipulation/aero_hand/imgs/output.gif

File renamed without changes.

0 commit comments

Comments
 (0)