Skip to content

Commit a8ffb28

Browse files
Merge pull request #165 from robot-descriptions/add/gr1_description
Add Fourier GR-1 URDF description
2 parents d87ef29 + 861544b commit a8ffb28

File tree

6 files changed

+41
-3
lines changed

6 files changed

+41
-3
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ All notable changes to this project will be documented in this file.
77
### Added
88

99
- CLI: Add `pull` command to `robot_description` and cache it (thanks to @haixuantao)
10+
- Description: BamBot (URDF)
1011
- Description: Booster T1 (MJCF)
1112
- Description: Booster T1 (URDF)
12-
- Description: BamBot (URDF)
13+
- Description: Fourier GR-1 (URDF)
1314
- Description: SO ARM 101 (MJCF) (thanks to @haixuantao)
1415
- Description: SO ARM 101 (URDF) (thanks to @haixuantao)
1516

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,7 @@ The DOF column denotes the number of actuated degrees of freedom.
239239
| `ergocub_description` | ergoCub | IIT | URDF | BSD-3-Clause |
240240
| `g1_description` | G1 | UNITREE Robotics | URDF | BSD-3-Clause |
241241
| `g1_mj_description` | G1 | UNITREE Robotics | MJCF | BSD-3-Clause |
242+
| `gr1_description` | GR-1 | Fourier | URDF | [GPL-3.0](https://github.com/FFTAI/Wiki-GRx-Models/blob/351245ac8fa4bf6f4b0c41556e1e6976a438bcef/LICENSE) |
242243
| `h1_description` | H1 | UNITREE Robotics | URDF | BSD-3-Clause |
243244
| `h1_mj_description` | H1 | UNITREE Robotics | MJCF | BSD-3-Clause |
244245
| `icub_description` | iCub | IIT | URDF | CC-BY-SA-4.0 ✖️ |

robot_descriptions/_descriptions.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ def has_urdf(self) -> bool:
128128
"go1_mj_description": Description(Format.MJCF, tags={"quadruped"}),
129129
"go2_description": Description(Format.URDF, tags={"quadruped"}),
130130
"go2_mj_description": Description(Format.MJCF, tags={"quadruped"}),
131+
"gr1_description": Description(Format.URDF, tags={"humanoid"}),
131132
"h1_description": Description(Format.URDF, tags={"humanoid"}),
132133
"h1_mj_description": Description(Format.MJCF, tags={"humanoid"}),
133134
"hyq_description": Description(Format.URDF, tags={"quadruped"}),

robot_descriptions/_repositories.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,12 @@ class Repository:
317317
),
318318
"Wiki-GRx-Models": Repository(
319319
url="https://github.com/FFTAI/Wiki-GRx-Models.git",
320-
commit="f8e683f00d1d99deb882deb9dfce6030095b466a",
320+
commit="351245ac8fa4bf6f4b0c41556e1e6976a438bcef",
321321
cache_path="Wiki-GRx-Models",
322322
),
323+
"Wiki-GRx-Models-FourierN1": Repository(
324+
url="https://github.com/FFTAI/Wiki-GRx-Models.git",
325+
commit="f8e683f00d1d99deb882deb9dfce6030095b466a", # FourierN1 branch
326+
cache_path="Wiki-GRx-Models-FourierN1",
327+
),
323328
}
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
#!/usr/bin/env python3
2+
# -*- coding: utf-8 -*-
3+
4+
"""GR-1 description."""
5+
6+
from os import getenv as _getenv
7+
from os import path as _path
8+
9+
from ._cache import clone_to_cache as _clone_to_cache
10+
11+
REPOSITORY_PATH: str = _clone_to_cache(
12+
"Wiki-GRx-Models",
13+
commit=_getenv("ROBOT_DESCRIPTION_COMMIT", None),
14+
)
15+
16+
PACKAGE_PATH: str = _path.join(REPOSITORY_PATH, "GRX", "GR1", "GR1T1")
17+
18+
URDF_PATH: str = _path.join(PACKAGE_PATH, "urdf", "GR1T1_nohand.urdf")
19+
20+
URDF_PATH_NO_HAND: str = _path.join(PACKAGE_PATH, "urdf", "GR1T1_no_hand.urdf")
21+
22+
URDF_PATH_FOURIER_HAND: str = _path.join(
23+
PACKAGE_PATH, "urdf", "GR1T1_fourier_hand_6dof.urdf"
24+
)
25+
26+
URDF_PATH_INSPIRE_HAND: str = _path.join(
27+
PACKAGE_PATH, "urdf", "GR1T1_inspire_hand.urdf"
28+
)
29+
30+
URDF_PATH_JAW: str = _path.join(PACKAGE_PATH, "GR1T1_jaw.urdf")

robot_descriptions/n1_description.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from ._cache import clone_to_cache as _clone_to_cache
1010

1111
REPOSITORY_PATH: str = _clone_to_cache(
12-
"Wiki-GRx-Models",
12+
"Wiki-GRx-Models-FourierN1",
1313
commit=_getenv("ROBOT_DESCRIPTION_COMMIT", None),
1414
)
1515

0 commit comments

Comments
 (0)