Skip to content

Commit 9798dfd

Browse files
rebeccazhang0707kellyguo11
authored andcommitted
Fixes errors in manipulation envs (isaac-sim#3418)
# Description <!-- Thank you for your interest in sending a pull request. Please make sure to check the contribution guidelines. Link: https://isaac-sim.github.io/IsaacLab/main/source/refs/contributing.html --> The CI tests met asset errors and controller errors for below envs: - "Isaac-Stack-Cube-Instance-Randomize-Franka-IK-Rel-v0", - "Isaac-Stack-Cube-Instance-Randomize-Franka-v0", - "Isaac-Place-Mug-Agibot-Left-Arm-RmpFlow-v0", - "Isaac-Place-Toy2Box-Agibot-Right-Arm-RmpFlow-v0" ## Fixes - Add missing gripper configs in Stack TaskEnvCfgs: self.gripper_joint_names = ["panda_finger_.*"] self.gripper_open_val = 0.04 self.gripper_threshold = 0.005 - Move all object assets in Agibot tasks to S3 bucket. <!-- As a practice, it is recommended to open an issue to have discussions on the proposed pull request. This makes it easier for the community to keep track of what is being developed or added, and if a given feature is demanded by more than one party. --> ## Type of change <!-- As you go through the list, delete the ones that are not applicable. --> - Bug fix (non-breaking change which fixes an issue) <!-- Example: | Before | After | | ------ | ----- | | _gif/png before_ | _gif/png after_ | To upload images to a PR -- simply drag and drop an image while in edit mode and it should upload the image directly. You can then paste that source into the above before/after sections. --> ## Checklist - [x] I have run the [`pre-commit` checks](https://pre-commit.com/) with `./isaaclab.sh --format` - [ ] I have made corresponding changes to the documentation - [ ] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [ ] I have updated the changelog and the corresponding version in the extension's `config/extension.toml` file - [ ] I have added my name to the `CONTRIBUTORS.md` or my name already exists there <!-- As you go through the checklist above, you can mark something as done by putting an x character in it For example, - [x] I have done this task - [ ] I have not done this task --> --------- Co-authored-by: Kelly Guo <[email protected]>
1 parent 63ed317 commit 9798dfd

File tree

5 files changed

+17
-24
lines changed

5 files changed

+17
-24
lines changed

source/isaaclab_tasks/isaaclab_tasks/manager_based/manipulation/place/config/agibot/place_toy2box_rmp_rel_env_cfg.py

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
import os
77
from dataclasses import MISSING
88

9-
from isaaclab_assets import ISAACLAB_ASSETS_DATA_DIR
10-
119
from isaaclab.assets import AssetBaseCfg, RigidObjectCfg
1210
from isaaclab.devices.device_base import DevicesCfg
1311
from isaaclab.devices.keyboard import Se3KeyboardCfg
@@ -24,7 +22,7 @@
2422
from isaaclab.sim.schemas.schemas_cfg import MassPropertiesCfg, RigidBodyPropertiesCfg
2523
from isaaclab.sim.spawners.from_files.from_files_cfg import UsdFileCfg
2624
from isaaclab.utils import configclass
27-
from isaaclab.utils.assets import ISAAC_NUCLEUS_DIR
25+
from isaaclab.utils.assets import ISAAC_NUCLEUS_DIR, ISAACLAB_NUCLEUS_DIR
2826

2927
from isaaclab_tasks.manager_based.manipulation.place import mdp as place_mdp
3028
from isaaclab_tasks.manager_based.manipulation.stack import mdp
@@ -57,7 +55,6 @@ class EventCfgPlaceToy2Box:
5755
"x": (-0.15, 0.20),
5856
"y": (-0.3, -0.15),
5957
"z": (-0.65, -0.65),
60-
"roll": (1.57, 1.57),
6158
"yaw": (-3.14, 3.14),
6259
},
6360
"asset_cfgs": [SceneEntityCfg("toy_truck")],
@@ -71,7 +68,6 @@ class EventCfgPlaceToy2Box:
7168
"x": (0.25, 0.35),
7269
"y": (0.0, 0.10),
7370
"z": (-0.55, -0.55),
74-
"roll": (1.57, 1.57),
7571
"yaw": (-3.14, 3.14),
7672
},
7773
"asset_cfgs": [SceneEntityCfg("box")],
@@ -267,14 +263,7 @@ def __post_init__(self):
267263
disable_gravity=False,
268264
)
269265

270-
box_properties = RigidBodyPropertiesCfg(
271-
solver_position_iteration_count=16,
272-
solver_velocity_iteration_count=1,
273-
max_angular_velocity=1000.0,
274-
max_linear_velocity=1000.0,
275-
max_depenetration_velocity=5.0,
276-
disable_gravity=False,
277-
)
266+
box_properties = toy_truck_properties.copy()
278267

279268
# Notes: remember to add Physics/Mass properties to the toy_truck mesh to make grasping successful,
280269
# then you can use below MassPropertiesCfg to set the mass of the toy_truck
@@ -286,8 +275,7 @@ def __post_init__(self):
286275
prim_path="{ENV_REGEX_NS}/ToyTruck",
287276
init_state=RigidObjectCfg.InitialStateCfg(),
288277
spawn=UsdFileCfg(
289-
usd_path=f"{ISAACLAB_ASSETS_DATA_DIR}/Objects/toy_truck_022.usd",
290-
scale=(0.001, 0.001, 0.001),
278+
usd_path=f"{ISAACLAB_NUCLEUS_DIR}/Objects/ToyTruck/toy_truck.usd",
291279
rigid_props=toy_truck_properties,
292280
mass_props=toy_mass_properties,
293281
),
@@ -297,9 +285,7 @@ def __post_init__(self):
297285
prim_path="{ENV_REGEX_NS}/Box",
298286
init_state=RigidObjectCfg.InitialStateCfg(),
299287
spawn=UsdFileCfg(
300-
usd_path=f"{ISAACLAB_ASSETS_DATA_DIR}/Objects/box_167.usd",
301-
activate_contact_sensors=True,
302-
scale=(0.001, 0.001, 0.001),
288+
usd_path=f"{ISAACLAB_NUCLEUS_DIR}/Objects/Box/box.usd",
303289
rigid_props=box_properties,
304290
),
305291
)
@@ -327,10 +313,10 @@ def __post_init__(self):
327313
# add contact force sensor for grasped checking
328314
self.scene.contact_grasp = ContactSensorCfg(
329315
prim_path="{ENV_REGEX_NS}/Robot/right_.*_Pad_Link",
330-
update_period=0.0,
316+
update_period=0.05,
331317
history_length=6,
332318
debug_vis=True,
333-
filter_prim_paths_expr=["{ENV_REGEX_NS}/ToyTruck/Aligned"],
319+
filter_prim_paths_expr=["{ENV_REGEX_NS}/ToyTruck"],
334320
)
335321

336322
self.teleop_devices = DevicesCfg(

source/isaaclab_tasks/isaaclab_tasks/manager_based/manipulation/place/config/agibot/place_upright_mug_rmp_rel_env_cfg.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
import os
77
from dataclasses import MISSING
88

9-
from isaaclab_assets import ISAACLAB_ASSETS_DATA_DIR
10-
119
from isaaclab.assets import AssetBaseCfg, RigidObjectCfg
1210
from isaaclab.devices.device_base import DevicesCfg
1311
from isaaclab.devices.keyboard import Se3KeyboardCfg
@@ -23,7 +21,7 @@
2321
from isaaclab.sim.schemas.schemas_cfg import RigidBodyPropertiesCfg
2422
from isaaclab.sim.spawners.from_files.from_files_cfg import UsdFileCfg
2523
from isaaclab.utils import configclass
26-
from isaaclab.utils.assets import ISAAC_NUCLEUS_DIR
24+
from isaaclab.utils.assets import ISAAC_NUCLEUS_DIR, ISAACLAB_NUCLEUS_DIR
2725

2826
from isaaclab_tasks.manager_based.manipulation.place import mdp as place_mdp
2927
from isaaclab_tasks.manager_based.manipulation.place.config.agibot import place_toy2box_rmp_rel_env_cfg
@@ -229,7 +227,7 @@ def __post_init__(self):
229227
prim_path="{ENV_REGEX_NS}/Mug",
230228
init_state=RigidObjectCfg.InitialStateCfg(),
231229
spawn=UsdFileCfg(
232-
usd_path=f"{ISAACLAB_ASSETS_DATA_DIR}/Objects/mug.usd",
230+
usd_path=f"{ISAACLAB_NUCLEUS_DIR}/Objects/Mug/mug.usd",
233231
scale=(1.0, 1.0, 1.0),
234232
rigid_props=mug_properties,
235233
),

source/isaaclab_tasks/isaaclab_tasks/manager_based/manipulation/stack/config/franka/bin_stack_joint_pos_env_cfg.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,10 @@ def __post_init__(self):
113113
open_command_expr={"panda_finger_.*": 0.04},
114114
close_command_expr={"panda_finger_.*": 0.0},
115115
)
116+
# utilities for gripper status check
117+
self.gripper_joint_names = ["panda_finger_.*"]
118+
self.gripper_open_val = 0.04
119+
self.gripper_threshold = 0.005
116120

117121
# Rigid body properties of each cube
118122
cube_properties = RigidBodyPropertiesCfg(

source/isaaclab_tasks/isaaclab_tasks/manager_based/manipulation/stack/config/franka/stack_joint_pos_env_cfg.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ def __post_init__(self):
8787
open_command_expr={"panda_finger_.*": 0.04},
8888
close_command_expr={"panda_finger_.*": 0.0},
8989
)
90+
# utilities for gripper status check
9091
self.gripper_joint_names = ["panda_finger_.*"]
9192
self.gripper_open_val = 0.04
9293
self.gripper_threshold = 0.005

source/isaaclab_tasks/isaaclab_tasks/manager_based/manipulation/stack/config/franka/stack_joint_pos_instance_randomize_env_cfg.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,10 @@ def __post_init__(self):
8787
open_command_expr={"panda_finger_.*": 0.04},
8888
close_command_expr={"panda_finger_.*": 0.0},
8989
)
90+
# utilities for gripper status check
91+
self.gripper_joint_names = ["panda_finger_.*"]
92+
self.gripper_open_val = 0.04
93+
self.gripper_threshold = 0.005
9094

9195
# Rigid body properties of each cube
9296
cube_properties = RigidBodyPropertiesCfg(

0 commit comments

Comments
 (0)