Skip to content

Commit d0dc260

Browse files
Revert iiwa14_description to old drake repository
The commit with obj mesh files for the iiwa description does not come with the corresponding URDF, so this description will stick to the pinned Drake repository for now.
1 parent f59889f commit d0dc260

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

robot_descriptions/_repositories.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,14 @@ class Repository:
7373
),
7474
"drake": Repository(
7575
url="https://github.com/RobotLocomotion/drake.git",
76-
commit="v1.7.0",
76+
commit="7abea0556ede980a5077fe1a8cfbae59b57c7c27",
7777
cache_path="drake",
7878
),
7979
"drake_models": Repository(
8080
url="https://github.com/RobotLocomotion/models.git",
81-
# From 9b274a2570ddefc4140e4b98bcf248003289b870 onward, obj mesh files
82-
# converted to glTF in drake_models don't work with PyBullet ("invalid
83-
# mesh filename extension 'gltf'")
81+
# NB: from 9b274a2570ddefc4140e4b98bcf248003289b870 onward, obj meshes
82+
# for the iiwa14_description are converted to glTF in this repo, which
83+
# PyBullet does not load ("invalid mesh filename extension 'gltf'")
8484
commit="d0fe1a427a6bd39040ff3a77aaf6ddcc4d62a8fe",
8585
cache_path="drake_models",
8686
),

robot_descriptions/iiwa14_description.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,13 @@
1212
from ._cache import clone_to_cache as _clone_to_cache
1313

1414
REPOSITORY_PATH: str = _clone_to_cache(
15-
"drake_models",
15+
"drake",
1616
commit=_getenv("ROBOT_DESCRIPTION_COMMIT", None),
1717
)
1818

19-
PACKAGE_PATH: str = _path.join(REPOSITORY_PATH, "iiwa_description")
19+
PACKAGE_PATH: str = _path.join(
20+
REPOSITORY_PATH, "manipulation", "models", "iiwa_description"
21+
)
2022

2123
URDF_PATH: str = _path.join(
2224
PACKAGE_PATH, "urdf", "iiwa14_primitive_collision.urdf"

0 commit comments

Comments
 (0)