Unverified Commit 1334f280 authored by Mayank Mittal's avatar Mayank Mittal Committed by GitHub

Renames action term names inside manage-based lift env (#735)

# Description

This MR renames the action term names inside the manager-based
lift-manipulation task. Earlier, they were called
``body_joint_pos`` and ``gripper_joint_pos``. This made it confusing
since they were also being set to IK instead of joint position action
terms. Now, they are called ``arm_action`` and ``gripper_action``.

This makes it consistent with other manipulation tasks. 

## Type of change

- Breaking change (fix or feature that would cause existing
functionality to not work as expected)
- This change requires a documentation update

## Checklist

- [x] I have run the [`pre-commit` checks](https://pre-commit.com/) with
`./isaaclab.sh --format`
- [x] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [x] I have updated the changelog and the corresponding version in the
extension's `config/extension.toml` file
- [x] I have added my name to the `CONTRIBUTORS.md` or my name already
exists there
parent a599cb23
[package] [package]
# Note: Semantic Versioning is used: https://semver.org/ # Note: Semantic Versioning is used: https://semver.org/
version = "0.7.10" version = "0.8.0"
# Description # Description
title = "Isaac Lab Environments" title = "Isaac Lab Environments"
......
Changelog Changelog
--------- ---------
0.8.0 (2024-07-26)
~~~~~~~~~~~~~~~~~~
Removed
^^^^^^^
* Renamed the action term names inside the manager-based lift-manipulation task. Earlier, they were called
``body_joint_pos`` and ``gripper_joint_pos``. Now, they are called ``arm_action`` and ``gripper_action``.
0.7.10 (2024-07-02) 0.7.10 (2024-07-02)
~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~
......
...@@ -134,8 +134,8 @@ class CommandsCfg: ...@@ -134,8 +134,8 @@ class CommandsCfg:
class ActionsCfg: class ActionsCfg:
"""Action specifications for the MDP.""" """Action specifications for the MDP."""
body_joint_pos: mdp.JointPositionActionCfg = MISSING arm_action: mdp.JointPositionActionCfg = MISSING
finger_joint_pos: mdp.BinaryJointPositionActionCfg = MISSING gripper_action: mdp.BinaryJointPositionActionCfg = MISSING
@configclass @configclass
......
...@@ -26,7 +26,7 @@ class FrankaCabinetEnvCfg(joint_pos_env_cfg.FrankaCabinetEnvCfg): ...@@ -26,7 +26,7 @@ class FrankaCabinetEnvCfg(joint_pos_env_cfg.FrankaCabinetEnvCfg):
self.scene.robot = FRANKA_PANDA_HIGH_PD_CFG.replace(prim_path="{ENV_REGEX_NS}/Robot") self.scene.robot = FRANKA_PANDA_HIGH_PD_CFG.replace(prim_path="{ENV_REGEX_NS}/Robot")
# Set actions for the specific robot type (franka) # Set actions for the specific robot type (franka)
self.actions.body_joint_pos = DifferentialInverseKinematicsActionCfg( self.actions.arm_action = DifferentialInverseKinematicsActionCfg(
asset_name="robot", asset_name="robot",
joint_names=["panda_joint.*"], joint_names=["panda_joint.*"],
body_name="panda_hand", body_name="panda_hand",
......
...@@ -26,7 +26,7 @@ class FrankaCabinetEnvCfg(joint_pos_env_cfg.FrankaCabinetEnvCfg): ...@@ -26,7 +26,7 @@ class FrankaCabinetEnvCfg(joint_pos_env_cfg.FrankaCabinetEnvCfg):
self.scene.robot = FRANKA_PANDA_HIGH_PD_CFG.replace(prim_path="{ENV_REGEX_NS}/Robot") self.scene.robot = FRANKA_PANDA_HIGH_PD_CFG.replace(prim_path="{ENV_REGEX_NS}/Robot")
# Set actions for the specific robot type (franka) # Set actions for the specific robot type (franka)
self.actions.body_joint_pos = DifferentialInverseKinematicsActionCfg( self.actions.arm_action = DifferentialInverseKinematicsActionCfg(
asset_name="robot", asset_name="robot",
joint_names=["panda_joint.*"], joint_names=["panda_joint.*"],
body_name="panda_hand", body_name="panda_hand",
......
...@@ -30,13 +30,13 @@ class FrankaCabinetEnvCfg(CabinetEnvCfg): ...@@ -30,13 +30,13 @@ class FrankaCabinetEnvCfg(CabinetEnvCfg):
self.scene.robot = FRANKA_PANDA_CFG.replace(prim_path="{ENV_REGEX_NS}/Robot") self.scene.robot = FRANKA_PANDA_CFG.replace(prim_path="{ENV_REGEX_NS}/Robot")
# Set Actions for the specific robot type (franka) # Set Actions for the specific robot type (franka)
self.actions.body_joint_pos = mdp.JointPositionActionCfg( self.actions.arm_action = mdp.JointPositionActionCfg(
asset_name="robot", asset_name="robot",
joint_names=["panda_joint.*"], joint_names=["panda_joint.*"],
scale=1.0, scale=1.0,
use_default_offset=True, use_default_offset=True,
) )
self.actions.finger_joint_pos = mdp.BinaryJointPositionActionCfg( self.actions.gripper_action = mdp.BinaryJointPositionActionCfg(
asset_name="robot", asset_name="robot",
joint_names=["panda_finger.*"], joint_names=["panda_finger.*"],
open_command_expr={"panda_finger_.*": 0.04}, open_command_expr={"panda_finger_.*": 0.04},
......
...@@ -26,7 +26,7 @@ class FrankaCubeLiftEnvCfg(joint_pos_env_cfg.FrankaCubeLiftEnvCfg): ...@@ -26,7 +26,7 @@ class FrankaCubeLiftEnvCfg(joint_pos_env_cfg.FrankaCubeLiftEnvCfg):
self.scene.robot = FRANKA_PANDA_HIGH_PD_CFG.replace(prim_path="{ENV_REGEX_NS}/Robot") self.scene.robot = FRANKA_PANDA_HIGH_PD_CFG.replace(prim_path="{ENV_REGEX_NS}/Robot")
# Set actions for the specific robot type (franka) # Set actions for the specific robot type (franka)
self.actions.body_joint_pos = DifferentialInverseKinematicsActionCfg( self.actions.arm_action = DifferentialInverseKinematicsActionCfg(
asset_name="robot", asset_name="robot",
joint_names=["panda_joint.*"], joint_names=["panda_joint.*"],
body_name="panda_hand", body_name="panda_hand",
......
...@@ -26,7 +26,7 @@ class FrankaCubeLiftEnvCfg(joint_pos_env_cfg.FrankaCubeLiftEnvCfg): ...@@ -26,7 +26,7 @@ class FrankaCubeLiftEnvCfg(joint_pos_env_cfg.FrankaCubeLiftEnvCfg):
self.scene.robot = FRANKA_PANDA_HIGH_PD_CFG.replace(prim_path="{ENV_REGEX_NS}/Robot") self.scene.robot = FRANKA_PANDA_HIGH_PD_CFG.replace(prim_path="{ENV_REGEX_NS}/Robot")
# Set actions for the specific robot type (franka) # Set actions for the specific robot type (franka)
self.actions.body_joint_pos = DifferentialInverseKinematicsActionCfg( self.actions.arm_action = DifferentialInverseKinematicsActionCfg(
asset_name="robot", asset_name="robot",
joint_names=["panda_joint.*"], joint_names=["panda_joint.*"],
body_name="panda_hand", body_name="panda_hand",
......
...@@ -31,10 +31,10 @@ class FrankaCubeLiftEnvCfg(LiftEnvCfg): ...@@ -31,10 +31,10 @@ class FrankaCubeLiftEnvCfg(LiftEnvCfg):
self.scene.robot = FRANKA_PANDA_CFG.replace(prim_path="{ENV_REGEX_NS}/Robot") self.scene.robot = FRANKA_PANDA_CFG.replace(prim_path="{ENV_REGEX_NS}/Robot")
# Set actions for the specific robot type (franka) # Set actions for the specific robot type (franka)
self.actions.body_joint_pos = mdp.JointPositionActionCfg( self.actions.arm_action = mdp.JointPositionActionCfg(
asset_name="robot", joint_names=["panda_joint.*"], scale=0.5, use_default_offset=True asset_name="robot", joint_names=["panda_joint.*"], scale=0.5, use_default_offset=True
) )
self.actions.finger_joint_pos = mdp.BinaryJointPositionActionCfg( self.actions.gripper_action = mdp.BinaryJointPositionActionCfg(
asset_name="robot", asset_name="robot",
joint_names=["panda_finger.*"], joint_names=["panda_finger.*"],
open_command_expr={"panda_finger_.*": 0.04}, open_command_expr={"panda_finger_.*": 0.04},
......
...@@ -88,8 +88,8 @@ class ActionsCfg: ...@@ -88,8 +88,8 @@ class ActionsCfg:
"""Action specifications for the MDP.""" """Action specifications for the MDP."""
# will be set by agent env cfg # will be set by agent env cfg
body_joint_pos: mdp.JointPositionActionCfg = MISSING arm_action: mdp.JointPositionActionCfg = MISSING
finger_joint_pos: mdp.BinaryJointPositionActionCfg = MISSING gripper_action: mdp.BinaryJointPositionActionCfg = MISSING
@configclass @configclass
......
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