Docs: focus technique guidance for quick start and troubleshooting (release backport) - #547
Merged
Merged
Conversation
…elease) Backport of the focus guidance from PR #546, adapted to the focus-strip version of the Focus screen documented on this branch: the full focus range is only a few lens turns wide (fair to good is under half a turn), so advise 1/8-1/4 turn adjustments with a pause for vibration to settle, and judge touch-ups by the HFD readout since the camera icon lags a solve behind the lens. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
brickbots
marked this pull request as ready for review
July 24, 2026 17:22
brickbots
added a commit
that referenced
this pull request
Jul 31, 2026
release had accumulated CI work that was never on main (#514, #515, #516, #519, #522, #545), and both branches had independently applied the same focus-technique docs (#546 on main, #547 on release) and the same manifest/PR-builder changes. Merging release in first makes the coming main -> release promotion clean instead of carrying four conflicts into the release cut. Four conflicts, each resolved by taking one side wholesale -- none was a semantic disagreement, only the same work committed twice: .github/scripts/update_manifest.py -> release Strict superset: newest-first entry ordering plus the --migration-url / --migration-sha256-url arguments from #516. main had nothing release lacked. .github/workflows/nixos-pr-build.yml -> release Genuinely divergent designs. main (#493) polls a self-hosted Pi5 first via a native-wait job, falling back to a hosted arm64 runner; release (#495 + #545) was re-architected ARM-primary with the Pi5 as last-resort fallback, drops the polling job, and adds allow-unsafe-pr-checkout for fork PRs under pull_request_target. release's is the newer and hardened design. docs/source/quick_start.rst -> main docs/source/troubleshooting.rst -> main Both branches carry the same small-turn focus technique, but release applied it to the old Focus screen's prose (+/- zoom to 2x/4x). main describes the rebuilt screen from #531 -- magnified star tiles, SQUARE cycling to the Image view, the central HFD -- which is what 2.6.1 actually ships. Net effect: main gains the release-only CI (release.yml, workflow_dispatch only, so nothing fires on merge) and keeps its own newer docs. No source changes. 1100 unit+smoke tests pass. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Docs-only backport of #546 so the published manual (Read the Docs builds from
release) picks up the focus guidance now, adapted to this branch's focus-strip version of the Focus screen:quick_start.rst— Setting Focus & First Solvetroubleshooting.rst— It won't plate solveOpened against
releaseat the maintainer's request (normally changes promote frommain); themaincounterpart is #546.Verification
sphinx-build -b html -n(nitpicky mode) with this branch's pinneddocs/source/requirements.txt— clean, no warnings or errors.🤖 Generated with Claude Code