mirror of
https://github.com/huggingface/lerobot.git
synced 2026-07-24 18:26:11 +00:00
Feat(robot): add MIT control mode to ReBot (#3778)
* fix(config): update joint limits for RebotB601Follower and RebotArm102Leader * feat(config): add MIT control mode ReBot - Add configurable arm control mode (mit default, pos_vel fallback) with tunable mit_kp / mit_kd - Add optional gripper control mode (force_pos default, mit optional) with gripper_mit_kp / gripper_mit_kd - Update tests for MIT arm routing, gripper mode routing, and revised joint limits * fix(robots): restore joint clipping and wrist_yaw fallback in ReBot B601 send_action * feat(robot): increase gripper velocity and torque for rebot arm
This commit is contained in:
@@ -65,7 +65,13 @@ class BiRebotB601Follower(BimanualMixin, Robot):
|
|||||||
cameras=left_arm_cameras,
|
cameras=left_arm_cameras,
|
||||||
motor_can_ids=config.left_arm_config.motor_can_ids,
|
motor_can_ids=config.left_arm_config.motor_can_ids,
|
||||||
pos_vel_velocity=config.left_arm_config.pos_vel_velocity,
|
pos_vel_velocity=config.left_arm_config.pos_vel_velocity,
|
||||||
|
control_mode=config.left_arm_config.control_mode,
|
||||||
|
mit_kp=config.left_arm_config.mit_kp,
|
||||||
|
mit_kd=config.left_arm_config.mit_kd,
|
||||||
|
gripper_control_mode=config.left_arm_config.gripper_control_mode,
|
||||||
gripper_torque_ratio=config.left_arm_config.gripper_torque_ratio,
|
gripper_torque_ratio=config.left_arm_config.gripper_torque_ratio,
|
||||||
|
gripper_mit_kp=config.left_arm_config.gripper_mit_kp,
|
||||||
|
gripper_mit_kd=config.left_arm_config.gripper_mit_kd,
|
||||||
joint_limits=config.left_arm_config.joint_limits,
|
joint_limits=config.left_arm_config.joint_limits,
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -80,7 +86,13 @@ class BiRebotB601Follower(BimanualMixin, Robot):
|
|||||||
cameras=config.right_arm_config.cameras,
|
cameras=config.right_arm_config.cameras,
|
||||||
motor_can_ids=config.right_arm_config.motor_can_ids,
|
motor_can_ids=config.right_arm_config.motor_can_ids,
|
||||||
pos_vel_velocity=config.right_arm_config.pos_vel_velocity,
|
pos_vel_velocity=config.right_arm_config.pos_vel_velocity,
|
||||||
|
control_mode=config.right_arm_config.control_mode,
|
||||||
|
mit_kp=config.right_arm_config.mit_kp,
|
||||||
|
mit_kd=config.right_arm_config.mit_kd,
|
||||||
|
gripper_control_mode=config.right_arm_config.gripper_control_mode,
|
||||||
gripper_torque_ratio=config.right_arm_config.gripper_torque_ratio,
|
gripper_torque_ratio=config.right_arm_config.gripper_torque_ratio,
|
||||||
|
gripper_mit_kp=config.right_arm_config.gripper_mit_kp,
|
||||||
|
gripper_mit_kd=config.right_arm_config.gripper_mit_kd,
|
||||||
joint_limits=config.right_arm_config.joint_limits,
|
joint_limits=config.right_arm_config.joint_limits,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -65,18 +65,33 @@ class RebotB601FollowerConfig:
|
|||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
# Target velocity for joints running in POS_VEL mode, in degrees/s. A scalar is
|
# Max speed (deg/s) per joint for POS_VEL arms and FORCE_POS gripper (motor order).
|
||||||
# applied to every joint; a list provides one value per joint (in motor order).
|
pos_vel_velocity: float | list[float] = field(
|
||||||
pos_vel_velocity: float | list[float] = field(default_factory=lambda: [150.0] * 7)
|
default_factory=lambda: [150.0, 150.0, 150.0, 150.0, 150.0, 150.0, 900.0]
|
||||||
|
)
|
||||||
|
|
||||||
# Torque/current ratio for the gripper's FORCE_POS mode, in range [0, 1].
|
# Arm control: "mit" or "pos_vel".
|
||||||
gripper_torque_ratio: float = 0.1
|
control_mode: str = "mit"
|
||||||
|
|
||||||
|
# MIT kp/kd per arm joint (motor order). Unused when control_mode="pos_vel".
|
||||||
|
mit_kp: float | list[float] = field(default_factory=lambda: [45.0, 45.0, 45.0, 8.0, 9.0, 8.0, 8.0])
|
||||||
|
mit_kd: float | list[float] = field(default_factory=lambda: [12.0, 12.0, 12.0, 1.0, 1.0, 1.0, 1.0])
|
||||||
|
|
||||||
|
# Gripper control: "force_pos" or "mit".
|
||||||
|
gripper_control_mode: str = "force_pos"
|
||||||
|
|
||||||
|
# FORCE_POS only: max grip force, in [0, 1].
|
||||||
|
gripper_torque_ratio: float = 0.07
|
||||||
|
|
||||||
|
# MIT only.
|
||||||
|
gripper_mit_kp: float = 8.0
|
||||||
|
gripper_mit_kd: float = 0.3
|
||||||
|
|
||||||
# Soft joint limits (degrees). These are clipped against on every action.
|
# Soft joint limits (degrees). These are clipped against on every action.
|
||||||
joint_limits: dict[str, tuple[float, float]] = field(
|
joint_limits: dict[str, tuple[float, float]] = field(
|
||||||
default_factory=lambda: {
|
default_factory=lambda: {
|
||||||
"shoulder_pan": (-145.0, 145.0),
|
"shoulder_pan": (-150.0, 150.0),
|
||||||
"shoulder_lift": (-170.0, 1.0),
|
"shoulder_lift": (-200.0, 1.0),
|
||||||
"elbow_flex": (-200.0, 1.0),
|
"elbow_flex": (-200.0, 1.0),
|
||||||
"wrist_flex": (-80.0, 90.0),
|
"wrist_flex": (-80.0, 90.0),
|
||||||
"wrist_yaw": (-90.0, 90.0),
|
"wrist_yaw": (-90.0, 90.0),
|
||||||
|
|||||||
@@ -174,11 +174,25 @@ class RebotB601Follower(Robot):
|
|||||||
print(f"Calibration saved to {self.calibration_fpath}")
|
print(f"Calibration saved to {self.calibration_fpath}")
|
||||||
|
|
||||||
def configure(self) -> None:
|
def configure(self) -> None:
|
||||||
|
if self.config.control_mode not in ("pos_vel", "mit"):
|
||||||
|
raise ValueError(
|
||||||
|
f"Unsupported control_mode '{self.config.control_mode}'. Use 'pos_vel' or 'mit'."
|
||||||
|
)
|
||||||
|
if self.config.gripper_control_mode not in ("force_pos", "mit"):
|
||||||
|
raise ValueError(
|
||||||
|
f"Unsupported gripper_control_mode '{self.config.gripper_control_mode}'. "
|
||||||
|
"Use 'force_pos' or 'mit'."
|
||||||
|
)
|
||||||
|
use_mit = self.config.control_mode == "mit"
|
||||||
|
gripper_use_mit = self.config.gripper_control_mode == "mit"
|
||||||
self.bus.enable_all()
|
self.bus.enable_all()
|
||||||
for motor_name, motor in self.motors.items():
|
for motor_name, motor in self.motors.items():
|
||||||
target_mode = (
|
if motor_name == GRIPPER_MOTOR:
|
||||||
MotorBridgeMode.FORCE_POS if motor_name == GRIPPER_MOTOR else MotorBridgeMode.POS_VEL
|
target_mode = MotorBridgeMode.MIT if gripper_use_mit else MotorBridgeMode.FORCE_POS
|
||||||
)
|
elif use_mit:
|
||||||
|
target_mode = MotorBridgeMode.MIT
|
||||||
|
else:
|
||||||
|
target_mode = MotorBridgeMode.POS_VEL
|
||||||
for attempt in range(_ENSURE_MODE_RETRIES + 1):
|
for attempt in range(_ENSURE_MODE_RETRIES + 1):
|
||||||
try:
|
try:
|
||||||
motor.ensure_mode(target_mode)
|
motor.ensure_mode(target_mode)
|
||||||
@@ -264,22 +278,34 @@ class RebotB601Follower(Robot):
|
|||||||
goal_present_pos = {key: (g, present_pos.get(key, g)) for key, g in goal_pos.items()}
|
goal_present_pos = {key: (g, present_pos.get(key, g)) for key, g in goal_pos.items()}
|
||||||
goal_pos = ensure_safe_goal_position(goal_present_pos, self.config.max_relative_target)
|
goal_pos = ensure_safe_goal_position(goal_present_pos, self.config.max_relative_target)
|
||||||
|
|
||||||
|
use_mit = self.config.control_mode == "mit"
|
||||||
for motor_name, position_deg in goal_pos.items():
|
for motor_name, position_deg in goal_pos.items():
|
||||||
motor = self.motors.get(motor_name)
|
motor = self.motors.get(motor_name)
|
||||||
if motor is None:
|
if motor is None:
|
||||||
continue
|
continue
|
||||||
idx = self.motor_names.index(motor_name)
|
idx = self.motor_names.index(motor_name)
|
||||||
vel_deg_s = (
|
|
||||||
self.config.pos_vel_velocity[idx]
|
|
||||||
if isinstance(self.config.pos_vel_velocity, list)
|
|
||||||
else self.config.pos_vel_velocity
|
|
||||||
)
|
|
||||||
pos_rad = math.radians(position_deg)
|
pos_rad = math.radians(position_deg)
|
||||||
vel_rad = math.radians(vel_deg_s)
|
|
||||||
if motor_name == GRIPPER_MOTOR:
|
if motor_name == GRIPPER_MOTOR:
|
||||||
motor.send_force_pos(pos_rad, vel_rad, self.config.gripper_torque_ratio)
|
if self.config.gripper_control_mode == "mit":
|
||||||
|
motor.send_mit(pos_rad, 0.0, self.config.gripper_mit_kp, self.config.gripper_mit_kd, 0.0)
|
||||||
|
else:
|
||||||
|
vel_deg_s = (
|
||||||
|
self.config.pos_vel_velocity[idx]
|
||||||
|
if isinstance(self.config.pos_vel_velocity, list)
|
||||||
|
else self.config.pos_vel_velocity
|
||||||
|
)
|
||||||
|
motor.send_force_pos(pos_rad, math.radians(vel_deg_s), self.config.gripper_torque_ratio)
|
||||||
|
elif use_mit:
|
||||||
|
kp = self.config.mit_kp[idx] if isinstance(self.config.mit_kp, list) else self.config.mit_kp
|
||||||
|
kd = self.config.mit_kd[idx] if isinstance(self.config.mit_kd, list) else self.config.mit_kd
|
||||||
|
motor.send_mit(pos_rad, 0.0, kp, kd, 0.0)
|
||||||
else:
|
else:
|
||||||
motor.send_pos_vel(pos_rad, vel_rad)
|
vel_deg_s = (
|
||||||
|
self.config.pos_vel_velocity[idx]
|
||||||
|
if isinstance(self.config.pos_vel_velocity, list)
|
||||||
|
else self.config.pos_vel_velocity
|
||||||
|
)
|
||||||
|
motor.send_pos_vel(pos_rad, math.radians(vel_deg_s))
|
||||||
|
|
||||||
return {f"{motor}.pos": val for motor, val in goal_pos.items()}
|
return {f"{motor}.pos": val for motor, val in goal_pos.items()}
|
||||||
|
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ class RebotArm102LeaderConfig:
|
|||||||
joint_ranges: dict[str, list[int]] = field(
|
joint_ranges: dict[str, list[int]] = field(
|
||||||
default_factory=lambda: {
|
default_factory=lambda: {
|
||||||
"shoulder_pan": [-150, 150],
|
"shoulder_pan": [-150, 150],
|
||||||
"shoulder_lift": [-170, 1],
|
"shoulder_lift": [-200, 1],
|
||||||
"elbow_flex": [-200, 1],
|
"elbow_flex": [-200, 1],
|
||||||
"wrist_flex": [-80, 90],
|
"wrist_flex": [-80, 90],
|
||||||
"wrist_yaw": [-90, 90],
|
"wrist_yaw": [-90, 90],
|
||||||
|
|||||||
@@ -91,10 +91,11 @@ def test_get_observation_converts_to_degrees(follower):
|
|||||||
|
|
||||||
|
|
||||||
def test_send_action_clips_to_joint_limits(follower):
|
def test_send_action_clips_to_joint_limits(follower):
|
||||||
# shoulder_pan limit is (-145, 145); request beyond the upper bound.
|
# shoulder_pan limit is (-150, 150); request beyond the upper bound.
|
||||||
returned = follower.send_action({"shoulder_pan.pos": 999.0})
|
returned = follower.send_action({"shoulder_pan.pos": 999.0})
|
||||||
assert returned["shoulder_pan.pos"] == 145.0
|
assert returned["shoulder_pan.pos"] == 150.0
|
||||||
follower.motors["shoulder_pan"].send_pos_vel.assert_called_once()
|
# Default control_mode is "mit", so arm joints are driven via send_mit.
|
||||||
|
follower.motors["shoulder_pan"].send_mit.assert_called_once()
|
||||||
|
|
||||||
|
|
||||||
def test_send_action_routes_gripper_to_force_pos(follower):
|
def test_send_action_routes_gripper_to_force_pos(follower):
|
||||||
@@ -103,6 +104,22 @@ def test_send_action_routes_gripper_to_force_pos(follower):
|
|||||||
follower.motors["gripper"].send_pos_vel.assert_not_called()
|
follower.motors["gripper"].send_pos_vel.assert_not_called()
|
||||||
|
|
||||||
|
|
||||||
|
def test_gripper_mit_mode_routes_to_send_mit():
|
||||||
|
bus_mock = _make_bus_mock()
|
||||||
|
with (
|
||||||
|
patch(f"{_MODULE}.require_package", lambda *a, **kw: None),
|
||||||
|
patch(f"{_MODULE}.MotorBridgeController") as controller_cls,
|
||||||
|
patch(f"{_MODULE}.MotorBridgeMode", MagicMock()),
|
||||||
|
):
|
||||||
|
controller_cls.from_dm_serial.return_value = bus_mock
|
||||||
|
cfg = RebotB601FollowerRobotConfig(port="/dev/null", gripper_control_mode="mit")
|
||||||
|
robot = RebotB601Follower(cfg)
|
||||||
|
robot.connect(calibrate=False)
|
||||||
|
robot.send_action({"gripper.pos": -10.0})
|
||||||
|
robot.motors["gripper"].send_mit.assert_called_once()
|
||||||
|
robot.motors["gripper"].send_force_pos.assert_not_called()
|
||||||
|
|
||||||
|
|
||||||
def test_bimanual_prefixes_features():
|
def test_bimanual_prefixes_features():
|
||||||
with patch(f"{_MODULE}.require_package", lambda *a, **kw: None):
|
with patch(f"{_MODULE}.require_package", lambda *a, **kw: None):
|
||||||
cfg = BiRebotB601FollowerConfig(
|
cfg = BiRebotB601FollowerConfig(
|
||||||
|
|||||||
Reference in New Issue
Block a user