Skip to content

Fix: Backport lab_sim burner pushable fix to inlined picknik_accessories#671

Merged
JWhitleyWork merged 1 commit into
mainfrom
fix/inlined-accessories-burner-pushable
May 28, 2026
Merged

Fix: Backport lab_sim burner pushable fix to inlined picknik_accessories#671
JWhitleyWork merged 1 commit into
mainfrom
fix/inlined-accessories-burner-pushable

Conversation

@davetcoleman
Copy link
Copy Markdown
Member

Summary

Backports the burner-pushable fix from picknik_accessories PR #45 into the now-inlined copy of those assets on main.

The v9.3 branch already has this fix via PR #661 (submodule bump aad29fa3b0912d). Main does not, because PR #656 inlined the pre-fix aad29fa snapshot of picknik_accessories shortly after v9.3 was cut, so the picknik_accessories#45 fix never made it across.

What changed

Three surgical changes to the stirrer body in src/picknik_accessories/mujoco_assets/lab_desk/desk.xml:

  1. <freejoint /><joint type="free" damping="1" />, plus an explicit <inertial pos="0 0 0.02" mass="1.5" diaginertia="0.008 0.008 0.012" /> so MuJoCo does not auto-infer ~9.7 kg from the collision-box extents.
  2. mass="0" on the visual geom so it contributes no inertia (the <inertial> element is authoritative).
  3. friction="0.3 0.005 0.0001" + priority="1" on the collision geom so the burner's lower friction overrides the desk's default friction under the MAX-rule combine, allowing the gripper to push it.

The long explanatory comment about the diaginertia choices is preserved from the upstream commit.

Verification

  • picknik_accessories@aad29fa..3b0912d touches only one file (mujoco_assets/lab_desk/desk.xml) across two commits (the fix + its merge), so this is the complete diff — nothing else on main is missing.
  • Diffed the resulting file against picknik_accessories@3b0912d:mujoco_assets/lab_desk/desk.xml — the only remaining differences are cosmetic formatting (multi-line vs single-line attributes), inherited from the pre-commit reformat done in PR Inline picknik_accessories into the workspace #656.
  • Local pre-commit passes on the file.

🤖 Generated with Claude Code

…ccessories

Backports the upstream picknik_accessories#45 burner fix that was
applied on v9.3 via PR #661 (submodule bump aad29fa -> 3b0912d) but
was not carried over to main when picknik_accessories was inlined in
PR #656 (which inlined the pre-fix aad29fa snapshot).

Explicit inertial + friction + priority on the stirrer collision geom
keep the burner light enough and slippery enough relative to the desk
that the gripper can push it. Without this, MuJoCo auto-infers ~9.7 kg
from the collision-box extents, and the desk's default friction pins
the burner under any gripper push.
@davetcoleman davetcoleman added this to the 9.4.0 milestone May 28, 2026
@davetcoleman davetcoleman requested a review from JWhitleyWork May 28, 2026 03:44
@davetcoleman davetcoleman marked this pull request as ready for review May 28, 2026 03:44
@JWhitleyWork JWhitleyWork self-assigned this May 28, 2026
@JWhitleyWork JWhitleyWork merged commit 6bcd252 into main May 28, 2026
5 of 6 checks passed
@JWhitleyWork JWhitleyWork deleted the fix/inlined-accessories-burner-pushable branch May 28, 2026 15:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants