Skip to content

Optics FFP/SFP + zoom, clicks-per-turn turret, tabbed layout - #7

Merged
zxpower merged 2 commits into
mainfrom
improve_optics_setup_and_page
Nov 16, 2026
Merged

zxpower merged 2 commits into
mainfrom
improve_optics_setup_and_page

Conversation

@zxpower

@zxpower zxpower commented Nov 16, 2026 •

Copy link
Copy Markdown
Owner

Optics: FFP / SFP and zoom

  • New settings: focal plane toggle (FFP/SFP) and zoom range.
  • SFP only: "reticle true at" magnification (defaults to max zoom, e.g. 40× on a 10-40×).
  • Shooting magnification can be entered on the Turret, Trajectory and Targets tabs (and in Setup → Optic). It's one shared value, shown only for SFP.
  • For SFP, results show the reticle value to hold over at that zoom: hold = true angle × shooting zoom / true zoom.
    • The Turret tab shows the reticle hold, e.g. reticle hold 0.80 MRAD @ 20× (SFP, true at 40×).
    • Trajectory and target tables get Elev hold / Wind hold columns plus a note naming the zoom.
    • Example: 10-40× true at 40×, shot at 15×, 12 cm drop at 89 m → dial 4.64 MOA, or hold 1.74 MOA on the reticle.
  • Focal plane, zoom range and true zoom are saved in optic profiles. Shooting magnification isn't saved: it's a shooting-time setting.

Turret: clicks per turn and total travel

  • "Marks per full turn" is replaced by clicks per full turn, so turns that end mid-mark now break down correctly. Example: a 100-click 1/8 MOA turret (12.5 marks per turn) dials 113 clicks as 1 turn · mark 1 · + 5 clicks.
  • New optional total elevation clicks: corrections beyond the turret's travel are flagged with ⚠ and a note to hold the rest.
  • Saved state and old optic profiles are migrated automatically (marks × clicks per mark).
  • A hint line shows marks per turn, the angle per turn and total travel.

Layout

  • A sticky tab bar splits the page into Setup (saved gear, rifle, optic, load), Weather, Turret, Trajectory and Targets. The last tab used is remembered.
  • Tighter spacing on phones (3-column grids become 2).

Docs

  • README covers turns ending mid-mark, total travel, the FFP/SFP holds and the new tabs.

Tests

node test.js: 69 passed. New tests cover:

  • mid-mark turn breakdown (113 clicks on a 100-click turret)
  • the travel limit
  • SFP reticle scaling
  • the 10-40× SFP worked example (12 cm drop at 89 m → 4.635 MOA true, 1.738 MOA hold at 15×)

@zxpower zxpower self-assigned this Nov 16, 2026
@zxpower
zxpower merged commit d61b417 into main Nov 16, 2026
2 checks passed
@zxpower
zxpower deleted the improve_optics_setup_and_page branch November 16, 2026 09:29
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.

1 participant