Skip to content

Fix capture cancellation, shutter verification and native-error detection - #3

Merged
shurkanTwo merged 2 commits into
masterfrom
t3/aeb61805
Oct 17, 2026
Merged

shurkanTwo merged 2 commits into
masterfrom
t3/aeb61805

Conversation

@shurkanTwo

@shurkanTwo shurkanTwo commented Oct 17, 2026 •

Copy link
Copy Markdown
Owner

Summary

All work from this PR is included in the combined 1.0.0.5 release. Original commits and contributor credits are preserved. Current installation instructions.

Correct four findings in the initial integration at 413290f; the corrective source is preserved at 0341e8f.

start -> register pending request -> preflight -> reject if aborted -> native start
shutter -> select nearest learned step -> retry mismatch, including old Bulb -> verify
native error -> classify operation/property -> third consecutive error -> disconnect and stop

Retain the original upstream commit history and credits. Restore the repeated-failure guard adapted from @totoantibes's PR dougforpres#13 with restart-only recovery. Update installation instructions and record the corrections in docs/CORRECTIVE-REVIEW.md.

Evidence

  • Before: abort during blocked preflight returned, then a native exposure started and its wait succeeded.
    After: regression cases with native cancel on/off prevent that start; busy rejection also preserves the preceding capture's cancellation.
  • Before: requests of 0.011439s and 0.88s accepted stale 1/100s and 1s settings; a valid previous Bulb reading failed immediately.
    After: production-wrapper tests retry until 1/80s, 0.8s and 0.5s respectively, then start once.
  • Before: ten returned native failures left IsOpen true.
    After: three qualifying errors hide the camera and block further native calls; unsupported/never-working properties are excluded and success resets the count.
  • Local validation: 84 capture/simulator/native-policy tests and 24 temperature tests pass. Windows-targeted release cross-build succeeds with existing legacy-package NU1701 warnings. Windows CI passed all 123 tests (84 capture/native-policy, 24 temperature, 15 full-plugin integration) and successfully built and packaged the plugin: https://github.com/shurkanTwo/NINASonyCameraPlugin/actions/runs/39034710092. Independent GPT-6 Astra xhigh review of 68d635b found no remaining concrete P1/P2 findings after the additional candidate-rounding fix.

Merge Danger

Door: two-way

Install a backed-up earlier DLL to roll back; no plugin identifier or profile migration changes.

Blast Radius: imaging

Capture cancellation, shutter application and native failure handling affect physical camera/lens operations. Three qualifying consecutive native failures now require restarting NINA and power-cycling the camera; no native cleanup or automatic reconnect follows the guard. Physical camera/USB operation is unverified, and updates are installed manually. The current release includes these corrections and the subsequent session-review fixes.

shurkanTwo and others added 2 commits October 17, 2026 14:57
Preserve aborts through blocked start preflight, verify the nearest learned
shutter step, retry unchanged Bulb mode, and stop native access after three
qualifying consecutive device errors. Exercise the production native wrappers
in portable regression tests and update manual installation and review notes.

Restore Robert Hasson's repeated-failure protection from upstream PR dougforpres#13
with restart-only recovery and exclusions for unsupported properties.

Co-authored-by: Robert Hasson <robert_hasson@yahoo.com>
@shurkanTwo
shurkanTwo merged commit 0341e8f into master Oct 17, 2026
1 check passed
@shurkanTwo shurkanTwo changed the title Fix capture cancellation and shutter verification for preview 1.0.0.6 Fix capture cancellation, shutter verification and native-error detection Oct 18, 2026
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