Public: anyone can read this; the crew can change it.

Migrated from github.com/Trevato/SO-ARM100

The thumb sticks and the reach joystick are gone from every layout, with their code and tests #328

Merged opened this

Check · Review · Land done · Live — Landed; nothing deploys from this branch, so this is the end of its path.

Merged

The thumb sticks and the reach joystick are gone from viewer.html, and src/ui/reach.js and src/ui/reach.test.ts are deleted. I couldn't run the type check here, and one test fails here for a reason unrelated to this change.

Notes

shipped merged

opened this

The thumb sticks and the reach joystick are gone from viewer.html, and src/ui/reach.js and src/ui/reach.test.ts are deleted. I couldn't run the type check here, and one test fails here for a reason unrelated to this change.

bun install fails in this sandbox because the temp directory is read-only, so there is no node_modules. That means tsc had no types to check against. It also means server.test.ts "serves the model, its meshes and the vendored libraries" gets a 404 on /vendor/three/.... The other 564 tests pass. The forge's check will show whether that test passes with dependencies installed.

  • viewer.html:

- Removed the #sticks block (both sticks, the Wrist swap and the Open/Close grip buttons) and the #reach pad with its Up/Down and Open/Close buttons. - Removed all of their CSS and scripts, including the lazy import of reach.js. - Removed the code that put the page into "bare" mode when a turn started on a phone on its side. Without sticks that would have hidden the controls, so the manual Hide/Show button is all that's left. - The gripper is still driven by its joint slider and ±-buttons.

  • browser-modules.ts: it never listed reach.js, so it needed no change.
  • Tests:

- server.test.ts now asserts the served page has none of the stick or reach elements and no reach.js. - It also drops the old .stick and #grips CSS checks and reach.js from the lazy-import list. - relay.test.ts and the 404 check in server.test.ts used reach.js and reach.test.ts as sample files. They now use camera-plan.js and drive.test.ts.

  • README.md: the paragraphs describing the sticks and the joystick are reworded.
  • forge.json: untouched.

🤖 Generated with Claude Code

Closes #278

2 earlier comments · 1 event
commented

The thumb sticks and the reach joystick are gone from viewer.html, and src/ui/reach.js and src/ui/reach.test.ts are deleted. I couldn't run the type check here, and one test fails here for a reason unrelated to this change.

bun install fails in this sandbox because the temp directory is read-only, so there is no node_modules. That means tsc had no types to check against. It also means server.test.ts "serves the model, its meshes and the vendored libraries" gets a 404 on /vendor/three/.... The other 564 tests pass. The forge's check will show whether that test passes with dependencies installed.

  • viewer.html:

- Removed the #sticks block (both sticks, the Wrist swap and the Open/Close grip buttons) and the #reach pad with its Up/Down and Open/Close buttons. - Removed all of their CSS and scripts, including the lazy import of reach.js. - Removed the code that put the page into "bare" mode when a turn started on a phone on its side. Without sticks that would have hidden the controls, so the manual Hide/Show button is all that's left. - The gripper is still driven by its joint slider and ±-buttons.

  • browser-modules.ts: it never listed reach.js, so it needed no change.
  • Tests:

- server.test.ts now asserts the served page has none of the stick or reach elements and no reach.js. - It also drops the old .stick and #grips CSS checks and reach.js from the lazy-import list. - relay.test.ts and the 404 check in server.test.ts used reach.js and reach.test.ts as sample files. They now use camera-plan.js and drive.test.ts.

  • README.md: the paragraphs describing the sticks and the joystick are reworded.
  • forge.json: untouched.

🤖 Generated with Claude Code

commented

I merged main into this branch and pushed it. I haven't seen the forge's check result yet. Locally bun test passed 571 and failed 2. I fixed one of the failures and did not fix the other.

  • Merge conflict: Software/so101/src/viewer.html had two conflicts. I kept main's new sideways STOP placement, the sheet's top padding, and the sideways auto-hide of the sheet when a turn starts (setBare(true)). I dropped main's #reach/#sticks lines, since those controls are removed here.
  • Test fixed: main added a landscape test for the joint sticks in landscape-layout.test.ts. The test was wrong for this branch, so I removed it. I also reworded the title of the test about starting a turn sideways to say "controls" instead of "sticks".
  • Test not fixed: one server.test.ts test still fails. It requests /vendor/three/... and gets a 404, because three isn't installed in this sandbox. I haven't confirmed it fails on main. It doesn't touch what this branch changes.
Changes requested — before the latest push

Two things break the experience, in this order.

  1. The markup is unbalanced. The deletion of the #sticks block also removed the </div> that closed #app. The served preview has 67 <div against 66 </div> before the first script, so #strip, #sheet and everything after nest inside #app. That is the layout every phone and desktop gets, and no test catches it. Restore the </div> after #refusal and add a test that counts opening and closing div tags in the served page.
  1. A phone on its side now starts your turn with the controls hidden. updateTurn still calls setBare(true) when a turn begins sideways, and the sheet is the only thing left to drive with, since the sticks it was hiding the sheet for are gone. The driver sees the picture and nothing to touch until they find Show. Remove that call, because the controls should stay up. The landscape test that pins it ("a turn that starts on its side puts the sheet away, so the controls come up") asserts the wrong thing and should assert the opposite. The pull description says this was removed, but the merge brought it back.

Also dead now: the #shell.driving.bare landscape rules that placed things around the sticks are worth a look, and the README line saying a tablet gets sliders of wider screens reads oddly. Not blocking.

commented

I've fixed both problems on this branch and pushed. landscape-layout.test.ts passes, but I couldn't run the type check here because bun can't write to its temp directory in this sandbox. I also didn't run the full test suite this time.

  • Unbalanced markup: I put the </div> that closes #app back after #refusal in viewer.html. A new test counts <div and </div> in the served page before the first script and requires them to match.
  • Sheet hidden on a sideways turn: I removed the setBare(true) call that the merge brought back, so the sheet stays up when a turn begins sideways. The landscape test that used to require that call now requires its absence.
  • README: the tablet sentence now reads "Wider screens, a tablet held upright included, get the sliders."

I kept the #shell.driving.bare landscape rules. They aren't dead, because a driver can still press Hide. They place the view buttons, the strip and the message around STOP, which doesn't depend on the sticks.

Approved

Approved. The preview serves 200 and has no sticks, reach pad, swap or grips markup; reach.js and its test are gone; no dangling reachState, reachMath or stick references remain in the served script. The sheet stays up on a sideways turn, so a phone on its side is still drivable by touch with the sliders and the ±-buttons. Hide/Show is a real keyboard-reachable button with aria-expanded. The new div-balance test and the not-match test would fail without the change. Next: (1) the onStop loop in viewer.html now iterates a one-element array, so make it a plain lever flash; (2) the landscape-only #shell.driving.bare rules and the sliders still need a thumb check at 360px wide.

Sign in to join this conversation.

↑↓ navigate ↵ open ⌘↵ its app esc close

Keyboard shortcuts

Docs