Commit graph

4356 commits

Author SHA1 Message Date
jaknapper
15f634a3cb Add longer confirmation messages 2026-02-18 15:21:12 +00:00
Joe Knapper
302e510678 Add recentre and ROM test buttons to stage settings
Only shown if not using a DummyStage, as neither work meaningfully in sim
2026-02-18 15:21:10 +00:00
Julian Stirling
41c9c58f42 Merge branch 'action-modal-w-stream' into 'v3'
CSM modal shows stream

Closes #678

See merge request openflexure/openflexure-microscope-server!483
2026-02-18 15:10:44 +00:00
Joe Knapper
decbbfd14b Apply suggestions from code review of branch dropdown-gui 2026-02-18 14:46:17 +00:00
Julian Stirling
d9deb1a7e7 Typos and clarity fixes from review of jogging branch
Co-authored-by: Joe Knapper <joe.knapper@glasgow.ac.uk>
2026-02-18 14:25:10 +00:00
Joe Knapper
219861cbac Stream progress in UI.py, resize modal 2026-02-18 14:08:18 +00:00
Julian Stirling
752d97314e Fixing some prop types and defaults for dropdowns 2026-02-18 12:50:49 +00:00
Julian Stirling
88c087b8dd Options for server specified property control allow different values and display names 2026-02-18 12:50:49 +00:00
Joe Knapper
5ae0f903d8 Use dropdown separated from dataType in Vue 2026-02-18 12:50:49 +00:00
Joe Knapper
ae81520494 Optional options in UI property control become dropdown 2026-02-18 12:50:49 +00:00
Joe Knapper
89c5ea6886 Merge branch 'eslint-9' into 'v3'
Bump ESLint from unsported version to version 9

See merge request openflexure/openflexure-microscope-server!489
2026-02-18 12:18:14 +00:00
Julian Stirling
f337bda289 Merge branch 'slow-dummy-z' into 'v3'
Reduce the blur for a given z movement in simulation, to improve autofocus.

See merge request openflexure/openflexure-microscope-server!484
2026-02-18 11:04:58 +00:00
Julian Stirling
f4b430071e Bump ESLint from unsported version to version 9 2026-02-18 00:33:26 +00:00
Julian Stirling
bc462d446c Merge branch 'disabled-properties' into 'v3'
Grey out read only properties in webapp

Closes #673

See merge request openflexure/openflexure-microscope-server!475
2026-02-17 18:16:32 +00:00
Joe Knapper
bec422bb85 Grey out read only properties in webapp 2026-02-17 18:16:31 +00:00
Julian Stirling
00a96fec4e Merge branch 'sangaboard-wiki' into 'v3'
Add URL to wiki if Sangaboard firmware out of date

Closes #624

See merge request openflexure/openflexure-microscope-server!486
2026-02-17 17:56:39 +00:00
Julian Stirling
ea3de5f45d Apply suggestions from code review of branch jogging
Co-authored-by: Joe Knapper <joe.knapper@glasgow.ac.uk>
2026-02-17 17:56:26 +00:00
Julian Stirling
a6be550e37 Merge branch 'csm-stream-pos' into 'v3'
Restore CSM stream pos to right of buttons

See merge request openflexure/openflexure-microscope-server!485
2026-02-17 17:41:59 +00:00
Joe Knapper
3329d8f672 Merge branch 'stitching-error-handling' into 'v3'
Manually handle out of storage and JPEG too big errors

Closes #570

See merge request openflexure/openflexure-microscope-server!472
2026-02-17 13:54:55 +00:00
jaknapper
143bbdfea1 Add URL to wiki if firmware out of date 2026-02-17 13:42:11 +00:00
jaknapper
04e5dbb0f3 Restore CSM stream pos to right of buttons 2026-02-17 12:47:12 +00:00
Julian Stirling
56f68db5ca Move all dummy stage movement into a thread 2026-02-17 02:11:01 +00:00
Julian Stirling
752ef3a80c Reduce the blur for a given z movement in simulation, to improve autofocus. 2026-02-17 02:07:06 +00:00
Julian Stirling
0756677671 Test the jogging loop itself 2026-02-16 23:35:13 +00:00
Julian Stirling
22994bdf9b A test for _send_jog_command 2026-02-16 22:56:55 +00:00
Julian Stirling
b4c2a7271a Add tests for jog() action. 2026-02-16 22:17:35 +00:00
Julian Stirling
96ff243239 Remove an method from BaseStage that is not hardware specific 2026-02-16 22:08:28 +00:00
Julian Stirling
8a77c09305 Add some basic tests for base stage implementation 2026-02-16 21:37:05 +00:00
Julian Stirling
10f73cfb76 Read Sangaboard step time from board 2026-02-16 17:47:25 +00:00
jaknapper
3631f76b23 CSM modal shows stream 2026-02-16 17:34:52 +00:00
Julian Stirling
7ed718cbae Estimate move duraction added to each stage class 2026-02-16 17:31:40 +00:00
Julian Stirling
f4d11b3c83 Simplify JogCommand class structure, and remove unneeded event logic 2026-02-16 17:31:39 +00:00
Julian Stirling
eb79905581 Removed the received Event as waiting for forces every jog to be queued and dequeued 2026-02-16 17:31:39 +00:00
Julian Stirling
728880e49d Fix jog queue blocking waiting to put new commands. 2026-02-16 17:31:39 +00:00
Julian Stirling
f1d974c922 Improve some jogging docstrings 2026-02-16 17:31:39 +00:00
Julian Stirling
8478194e30 Better jog comments, use pointer events for robustness 2026-02-16 17:31:39 +00:00
Julian Stirling
d9ba5d906d No jog when right-click on d-pad 2026-02-16 17:31:39 +00:00
Julian Stirling
a1ceb1fc5e Jog buttons in calibration wizard 2026-02-16 17:31:38 +00:00
Julian Stirling
84488b579b Re-implement stage button inversion and update position during move. 2026-02-16 17:31:38 +00:00
Julian Stirling
586d45aed3 Debounce keyboard repeats for smoother movement 2026-02-16 17:17:32 +00:00
Julian Stirling
61666a116b Simulation jog 2026-02-16 17:13:27 +00:00
Julian Stirling
70dd7bd994 Generalise jog 2026-02-16 17:13:27 +00:00
Julian Stirling
2f205a35e9 Fix docstrings 2026-02-16 17:13:27 +00:00
Julian Stirling
5af8ad5192 Split jog dequing from calling commands 2026-02-16 17:13:27 +00:00
Richard Bowman
9ed850cc68 Switch move buttons to use jog
This implements a nicer version of jogging, with a defined interval of 1/3 second. This can be tuned depending on what we think makes sense.

It might be good to re-use this for handling keypresses.
2026-02-16 17:13:27 +00:00
Richard Bowman
abda60adf6 Prevent accidental queueing of jog commands 2026-02-16 17:12:17 +00:00
Richard Bowman
4d445396b2 Update position property during and after jog 2026-02-16 17:12:17 +00:00
Richard Bowman
04e7fa30bd Format fixes 2026-02-16 17:12:17 +00:00
Richard Bowman
d09a5a8ee2 Use jog action for arrow keys.
This now makes the arrow keys work more or less continuously, and stop responsively.

It could do with optimisation so the key rep rate is lower, but the initial wait is shorter. That probably entails adding our own timeout.
2026-02-16 17:12:15 +00:00
Joe Knapper
79e8230ac5 Merge branch 'Extend-autofocus-in-scan' into 'v3'
Increase dz range to 400 to 3000

Closes #675

See merge request openflexure/openflexure-microscope-server!478
2026-02-16 17:11:03 +00:00