Unverified Commit 75b67154 authored by rebeccazhang0707's avatar rebeccazhang0707 Committed by GitHub

Fixes errors in manipulation envs (#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: 's avatarKelly Guo <kellyg@nvidia.com>
parent f1f0a8b0
......@@ -6,8 +6,6 @@
import os
from dataclasses import MISSING
from isaaclab_assets import ISAACLAB_ASSETS_DATA_DIR
from isaaclab.assets import AssetBaseCfg, RigidObjectCfg
from isaaclab.devices.device_base import DevicesCfg
from isaaclab.devices.keyboard import Se3KeyboardCfg
......@@ -24,7 +22,7 @@ from isaaclab.sensors.frame_transformer.frame_transformer_cfg import OffsetCfg
from isaaclab.sim.schemas.schemas_cfg import MassPropertiesCfg, RigidBodyPropertiesCfg
from isaaclab.sim.spawners.from_files.from_files_cfg import UsdFileCfg
from isaaclab.utils import configclass
from isaaclab.utils.assets import ISAAC_NUCLEUS_DIR
from isaaclab.utils.assets import ISAAC_NUCLEUS_DIR, ISAACLAB_NUCLEUS_DIR
from isaaclab_tasks.manager_based.manipulation.place import mdp as place_mdp
from isaaclab_tasks.manager_based.manipulation.stack import mdp
......@@ -57,7 +55,6 @@ class EventCfgPlaceToy2Box:
"x": (-0.15, 0.20),
"y": (-0.3, -0.15),
"z": (-0.65, -0.65),
"roll": (1.57, 1.57),
"yaw": (-3.14, 3.14),
},
"asset_cfgs": [SceneEntityCfg("toy_truck")],
......@@ -71,7 +68,6 @@ class EventCfgPlaceToy2Box:
"x": (0.25, 0.35),
"y": (0.0, 0.10),
"z": (-0.55, -0.55),
"roll": (1.57, 1.57),
"yaw": (-3.14, 3.14),
},
"asset_cfgs": [SceneEntityCfg("box")],
......@@ -267,14 +263,7 @@ class RmpFlowAgibotPlaceToy2BoxEnvCfg(PlaceToy2BoxEnvCfg):
disable_gravity=False,
)
box_properties = RigidBodyPropertiesCfg(
solver_position_iteration_count=16,
solver_velocity_iteration_count=1,
max_angular_velocity=1000.0,
max_linear_velocity=1000.0,
max_depenetration_velocity=5.0,
disable_gravity=False,
)
box_properties = toy_truck_properties.copy()
# Notes: remember to add Physics/Mass properties to the toy_truck mesh to make grasping successful,
# then you can use below MassPropertiesCfg to set the mass of the toy_truck
......@@ -286,8 +275,7 @@ class RmpFlowAgibotPlaceToy2BoxEnvCfg(PlaceToy2BoxEnvCfg):
prim_path="{ENV_REGEX_NS}/ToyTruck",
init_state=RigidObjectCfg.InitialStateCfg(),
spawn=UsdFileCfg(
usd_path=f"{ISAACLAB_ASSETS_DATA_DIR}/Objects/toy_truck_022.usd",
scale=(0.001, 0.001, 0.001),
usd_path=f"{ISAACLAB_NUCLEUS_DIR}/Objects/ToyTruck/toy_truck.usd",
rigid_props=toy_truck_properties,
mass_props=toy_mass_properties,
),
......@@ -297,9 +285,7 @@ class RmpFlowAgibotPlaceToy2BoxEnvCfg(PlaceToy2BoxEnvCfg):
prim_path="{ENV_REGEX_NS}/Box",
init_state=RigidObjectCfg.InitialStateCfg(),
spawn=UsdFileCfg(
usd_path=f"{ISAACLAB_ASSETS_DATA_DIR}/Objects/box_167.usd",
activate_contact_sensors=True,
scale=(0.001, 0.001, 0.001),
usd_path=f"{ISAACLAB_NUCLEUS_DIR}/Objects/Box/box.usd",
rigid_props=box_properties,
),
)
......@@ -327,10 +313,10 @@ class RmpFlowAgibotPlaceToy2BoxEnvCfg(PlaceToy2BoxEnvCfg):
# add contact force sensor for grasped checking
self.scene.contact_grasp = ContactSensorCfg(
prim_path="{ENV_REGEX_NS}/Robot/right_.*_Pad_Link",
update_period=0.0,
update_period=0.05,
history_length=6,
debug_vis=True,
filter_prim_paths_expr=["{ENV_REGEX_NS}/ToyTruck/Aligned"],
filter_prim_paths_expr=["{ENV_REGEX_NS}/ToyTruck"],
)
self.teleop_devices = DevicesCfg(
......
......@@ -6,8 +6,6 @@
import os
from dataclasses import MISSING
from isaaclab_assets import ISAACLAB_ASSETS_DATA_DIR
from isaaclab.assets import AssetBaseCfg, RigidObjectCfg
from isaaclab.devices.device_base import DevicesCfg
from isaaclab.devices.keyboard import Se3KeyboardCfg
......@@ -23,7 +21,7 @@ from isaaclab.sensors.frame_transformer.frame_transformer_cfg import OffsetCfg
from isaaclab.sim.schemas.schemas_cfg import RigidBodyPropertiesCfg
from isaaclab.sim.spawners.from_files.from_files_cfg import UsdFileCfg
from isaaclab.utils import configclass
from isaaclab.utils.assets import ISAAC_NUCLEUS_DIR
from isaaclab.utils.assets import ISAAC_NUCLEUS_DIR, ISAACLAB_NUCLEUS_DIR
from isaaclab_tasks.manager_based.manipulation.place import mdp as place_mdp
from isaaclab_tasks.manager_based.manipulation.place.config.agibot import place_toy2box_rmp_rel_env_cfg
......@@ -229,7 +227,7 @@ class RmpFlowAgibotPlaceUprightMugEnvCfg(place_toy2box_rmp_rel_env_cfg.PlaceToy2
prim_path="{ENV_REGEX_NS}/Mug",
init_state=RigidObjectCfg.InitialStateCfg(),
spawn=UsdFileCfg(
usd_path=f"{ISAACLAB_ASSETS_DATA_DIR}/Objects/mug.usd",
usd_path=f"{ISAACLAB_NUCLEUS_DIR}/Objects/Mug/mug.usd",
scale=(1.0, 1.0, 1.0),
rigid_props=mug_properties,
),
......
......@@ -113,6 +113,10 @@ class FrankaBinStackEnvCfg(StackEnvCfg):
open_command_expr={"panda_finger_.*": 0.04},
close_command_expr={"panda_finger_.*": 0.0},
)
# utilities for gripper status check
self.gripper_joint_names = ["panda_finger_.*"]
self.gripper_open_val = 0.04
self.gripper_threshold = 0.005
# Rigid body properties of each cube
cube_properties = RigidBodyPropertiesCfg(
......
......@@ -87,6 +87,7 @@ class FrankaCubeStackEnvCfg(StackEnvCfg):
open_command_expr={"panda_finger_.*": 0.04},
close_command_expr={"panda_finger_.*": 0.0},
)
# utilities for gripper status check
self.gripper_joint_names = ["panda_finger_.*"]
self.gripper_open_val = 0.04
self.gripper_threshold = 0.005
......
......@@ -87,6 +87,10 @@ class FrankaCubeStackInstanceRandomizeEnvCfg(StackInstanceRandomizeEnvCfg):
open_command_expr={"panda_finger_.*": 0.04},
close_command_expr={"panda_finger_.*": 0.0},
)
# utilities for gripper status check
self.gripper_joint_names = ["panda_finger_.*"]
self.gripper_open_val = 0.04
self.gripper_threshold = 0.005
# Rigid body properties of each cube
cube_properties = RigidBodyPropertiesCfg(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment