Commit graph

119 commits

Author SHA1 Message Date
Joel Collins
6fb61e1e3f Reverted logging style 2020-11-12 15:45:58 +00:00
Joel Collins
9f5252194a Updated all log strings to new format 2020-11-12 15:12:17 +00:00
Joel Collins
6644819352 Formatting 2020-11-12 14:33:08 +00:00
Joel Collins
4c61f0c847 Reduced long-term lock usage 2020-11-06 10:27:22 +00:00
Joel Collins
1f12154876 Fixed thumbnail generation for video_port captures 2020-10-28 16:02:08 +00:00
Joel Collins
f9da19fb7f Merge branch 'geometry-change-bug-fixes' into 'master'
Geometry change bug fixes

See merge request openflexure/openflexure-microscope-server!78
2020-10-27 17:17:58 +00:00
Joel Collins
76094b2cc2 Code formatting 2020-10-27 17:11:41 +00:00
Joel Collins
250fd07e9a Code formatting and linting 2020-10-27 14:14:59 +00:00
Joel Collins
09849ce064 Explicit JPEG thumbnail on capture 2020-10-27 14:04:55 +00:00
samuelmcdermott
b111a4e680 Only save configuration if successfully load new stage type 2020-10-21 18:42:41 +01:00
Joel Collins
994e83dbeb Code cleanup 2020-10-14 14:56:29 +00:00
Joel Collins
2bfb988460 Code formatting 2020-10-13 15:02:19 +01:00
samuelmcdermott
a1f27b0091 Move set_stage into a new function 2020-10-11 00:59:11 +01:00
Joel Collins
647024d861 Removed old debug print 2020-09-21 13:50:40 +01:00
Joel Collins
5ca386bde1 Merge branch 'deltastage' into 'master'
Deltastage

See merge request openflexure/openflexure-microscope-server!69
2020-09-09 15:18:25 +00:00
Samuel McDermott
6dcd6601c4 Include option for delta stage in microscope initialisation 2020-09-06 17:38:57 +01:00
Joel Collins
5139b24ffe Updated to new LabThings structure 2020-09-04 15:48:52 +01:00
Joel Collins
304e620143 Switch microscope ID to URN suffix string 2020-08-14 15:31:44 +01:00
Joel Collins
24398ba7dc Updated tasks nomenclature 2020-07-21 12:54:42 +01:00
Joel Collins
ab3c4b3745 Merge remote-tracking branch 'origin/master' into labthings-070 2020-07-03 18:13:20 +01:00
Joel Collins
489b81f34b Removed some unused gevent imports 2020-07-02 23:41:28 +01:00
Joel Collins
78d0345239 Spawn metadata IO in greenlets 2020-07-01 15:58:18 +01:00
Joel Collins
d9fd00b255 Never cache microscope state 2020-07-01 15:50:31 +01:00
Joel Collins
1cba4205a6 Removed async metadata. Added metadata cache. 2020-07-01 15:35:21 +01:00
Joel Collins
0081ac6649 Removed unused explicit LST handler 2020-06-29 15:35:50 +01:00
Joel Collins
9cecb477cb Flipped to explicit finite lock timeouts 2020-06-29 09:03:27 +01:00
Joel Collins
28ce7fb08b Removed lock timeout for metadata IO 2020-06-25 16:48:30 +01:00
Joel Collins
44ba4b272c Switch to batch-writing metadata 2020-06-15 18:00:33 +01:00
Joel Collins
1c1dcdbe1a Acquire microscope lock for state and settings IO 2020-06-15 16:19:33 +01:00
Joel Collins
871d6f255a Fixed arguments 2020-06-11 12:16:52 +01:00
Joel Collins
6bf37a0985 Threadpool for disk IO, greenlets for metadata 2020-06-11 12:01:19 +01:00
Joel Collins
7c9f42f7f3 Optimised captures by using greenlets for disk IO 2020-06-11 11:42:31 +01:00
Joel Collins
ca051243a1 Catch timeout errors when closing camera stream 2020-05-27 14:24:11 +01:00
Joel Collins
4a553040d3 Fixed logging and split access and root file handlers 2020-05-20 17:46:44 +01:00
Joel Collins
49d677a56b Fix distribution version error in metadata 2020-05-18 15:31:46 +01:00
Joel Collins
79259b3fc9 Revert "Remove CI file from frame branch"
This reverts commit dac3632c28
2020-05-18 09:54:18 +00:00
Joel Collins
a34214b9fb Fixed broken references to capture list 2020-04-28 14:47:22 +01:00
Joel Collins
caf553db7a Moved capture management into separate object 2020-04-28 14:32:56 +01:00
Joel Collins
9646058c37 Code format 2020-04-28 13:20:38 +01:00
Joel Collins
99ef24fb95 Remove unused (and old) import 2020-04-24 17:31:48 +01:00
Richard Bowman
d915625113 Added a kludgy extensions settings dictionary. 2020-03-12 16:43:18 +00:00
Joel Collins
bf4cb24cb3 Fall back to mock stage if Sangastage is missing 2020-03-11 10:48:55 +00:00
Joel Collins
cf66359559 Reimplemented serialising LST 2020-02-06 13:35:05 +00:00
Joel Collins
953a5d7004 Fixed checking if LST exists 2020-01-30 14:21:18 +00:00
Joel Collins
9b4bf4c8fc Moved status routes to instrument/state 2020-01-29 17:43:52 +00:00
Joel Collins
64eb87bf6f Merge branch 'new-semantics-testing' of https://gitlab.com/openflexure/openflexure-microscope-server into new-semantics-testing 2020-01-29 16:17:32 +00:00
Joel Collins
265eed7bfa Fixed picamera setup 2020-01-29 16:16:09 +00:00
Joel Collins
ebdd63f37b Added ndarray type to serialised LST (can be used in custom decoder) 2020-01-29 15:43:29 +00:00
Joel Collins
7458d278d8 Simplified new configuration and metadata 2020-01-29 15:36:57 +00:00
Joel Collins
19af98736d Draft of new semantics 2020-01-29 11:55:39 +00:00