Skip to content

Commit 9f70e39

Browse files
committed
Revert global abort on preempt — per-arm only
1 parent 3cb56fd commit 9f70e39

1 file changed

Lines changed: 4 additions & 6 deletions

File tree

src/mj_viser/teleop_panel.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -323,15 +323,13 @@ def _activate_teleop(self) -> None:
323323
arm_name = self._arm.config.name
324324

325325
if self._ownership is not None:
326-
# Per-arm preemption: aborts this arm's trajectory runner.
326+
# Per-arm preemption: only aborts THIS arm's trajectory,
327+
# other arms continue unaffected.
327328
from mj_manipulator.ownership import OwnerKind
328329

329330
self._ownership.preempt(arm_name, OwnerKind.TELEOP, self._controller)
330-
331-
# Also fire global abort so the primitive's retry loop stops.
332-
# Per-arm abort gets cleared by _do_activate (runner needs it),
333-
# but global abort stays set until the primitive clears it.
334-
if self._request_abort_fn is not None:
331+
elif self._request_abort_fn is not None:
332+
# Legacy fallback: global abort (aborts all arms)
335333
self._request_abort_fn()
336334

337335
def _do_activate():

0 commit comments

Comments
 (0)