Commit graph

473 commits

Author SHA1 Message Date
Joel Collins
0f8070b64a Smarter server teardown procedure 2019-06-05 16:04:32 +01:00
Joel Collins
ea253f8085 Smarter application of picamera settings 2019-06-05 16:04:14 +01:00
Joel Collins
9b30d1d38f Completely overhauled config system 2019-06-05 16:03:58 +01:00
Joel Collins
cc343e2a8c Overhaul config module to only handle loading/saving 2019-06-05 16:03:42 +01:00
Joel Collins
65a28cc0f4 Default to new camera and stage settings slip 2019-06-05 16:03:17 +01:00
Joel Collins
0d8396b3e4 Fixed Microscope and camera arguments 2019-06-04 14:04:07 +01:00
Joel Collins
41d9ab51ad Restructured camera attaching 2019-06-04 14:03:46 +01:00
Joel Collins
f7ba68b443 Converted base camera into an ABC 2019-06-04 14:03:30 +01:00
Joel Collins
3cf166226b Converted config dict into properties/attributes 2019-06-04 14:03:16 +01:00
Joel Collins
5e6372835e Added extra debug log 2019-06-04 14:02:53 +01:00
Joel Collins
70be245c2a Ensure stream recording at start of fast_up_down_up_autofocus 2019-05-30 10:43:46 +01:00
Joel Collins
5d7fa03cbd Iterated version number 2019-05-29 09:43:27 +01:00
Joel Collins
c107125377 Skip loading invalid captures into array 2019-05-29 09:32:14 +01:00
Joel Collins
2c4fa4aead Return empty dict if capture is corrupt 2019-05-29 09:29:46 +01:00
Joel Collins
9ab1da34ff Handle corrupt captures 2019-05-29 09:28:42 +01:00
Joel Collins
a7fc14d93f Merge branch 'master' of https://gitlab.com/openflexure/openflexure-microscope-server 2019-05-28 13:47:51 +01:00
Joel Collins
c52fb7d854 Updated lockfile 2019-05-28 13:47:42 +01:00
Joel Collins
1f2799d9e1 Merge branch 'joram-fix-test' into 'master'
Joram fixes

See merge request openflexure/openflexure-microscope-server!21
2019-05-28 12:17:29 +00:00
Joel Collins
60c49a8331 Fixed setting Iterable vs Int backlash 2019-05-28 09:28:08 +01:00
Joel Collins
5e34b998dd Fixed plugin calling old focus_rel method 2019-05-28 09:27:47 +01:00
Joel Collins
39e2e0baad Re-implemented scan methods 2019-05-27 13:35:53 +01:00
Joel Collins
5a22d0d308 Re-added timeout parameters (previous commit broke) 2019-05-24 16:47:04 +01:00
Joel Collins
3b9ef670fe Improved flake8 results 2019-05-24 16:32:20 +01:00
Joel Collins
fb606b189d Merge branch 'master' of https://gitlab.com/openflexure/openflexure-microscope-server 2019-05-24 14:55:29 +01:00
Joel Collins
febcc00f07 Updated some dependencies 2019-05-24 14:55:23 +01:00
Joel Collins
36d38bf000 Update CONTRIBUTING.md 2019-05-24 10:47:57 +00:00
Joel Collins
fd4de9540a Merge branch '1.0.1-dev-cleanup' into 'master'
1.0.1 dev cleanup

See merge request openflexure/openflexure-microscope-server!20
2019-05-23 13:26:30 +00:00
Joel Collins
90a3a738af Cleaned up camera locks 2019-05-23 14:25:57 +01:00
Joel Collins
8e35ef2b29 Added locked() method to check lock state 2019-05-23 14:25:26 +01:00
Joel Collins
2d0fe9a032 Iterated version number 2019-05-23 09:45:25 +00:00
Joel Collins
cd216f7990 Update CONTRIBUTING.md 2019-05-23 09:39:44 +00:00
Joel Collins
74f6093245 Merge branch '1.0.1-dev-cleanup' into 'master'
1.0.1 dev - Renamed video_resolution to stream_resolution

See merge request openflexure/openflexure-microscope-server!19
2019-05-20 10:30:44 +00:00
Joel Collins
e30956d761 Renamed video_resolution to stream_resolution 2019-05-20 10:55:43 +01:00
Joel Collins
36ee715fcb Updated dependencies 2019-05-20 10:38:51 +01:00
Joel Collins
805c17b509 Merge branch 'resolution-fix' into 'master'
Default resolution fix

See merge request openflexure/openflexure-microscope-server!18
2019-05-20 09:29:35 +00:00
Joel Collins
8c3cd48f4d Automatically move old config file to new config file 2019-05-20 10:24:50 +01:00
Joel Collins
b0e724a706 Fixed naming of default config placeholder 2019-05-20 10:14:55 +01:00
Joel Collins
9fc4dfc628 Moved microscoperc.yaml to microscope_settings.yaml 2019-05-20 10:09:01 +01:00
Joel Collins
1fe8ea18d8 Default capture resolution to MAX_RESOLUTION 2019-05-20 10:06:42 +01:00
Joel Collins
78882ab4c5 Removed debug print 2019-05-20 10:06:15 +01:00
Joel Collins
bc869794e4 Merge branch 'exif-capture-reload' into 'master'
Load capture objects from files. Remove YAML database.

See merge request openflexure/openflexure-microscope-server!17
2019-05-15 15:33:35 +00:00
Joel Collins
092181348b Load capture objects from files. Remove YAML database. 2019-05-15 16:32:58 +01:00
Joel Collins
f8e647198a Merge branch 'doc-fix' into 'master'
Fixed __init__ imports in stage module

See merge request openflexure/openflexure-microscope-server!16
2019-05-15 14:34:57 +00:00
Joel Collins
31c6c284ab Fixed __init__ imports in stage module 2019-05-15 15:34:31 +01:00
Joel Collins
c5183f79b1 Merge branch 'log-route' into 'master'
Added route to download logfile

See merge request openflexure/openflexure-microscope-server!15
2019-05-15 14:30:59 +00:00
Joel Collins
63c0492022 Added route to download logfile 2019-05-15 15:30:28 +01:00
Joel Collins
d54a35e197 Merge branch 'sangaboard3-support' into 'master'
Initial support for SBv3 and MockStage

See merge request openflexure/openflexure-microscope-server!14
2019-05-15 12:26:50 +00:00
Joel Collins
ff534e6a51 Initial support for SBv3 and MockStage 2019-05-15 13:25:04 +01:00
Joel Collins
068ce9e751 Update CONTRIBUTING.md 2019-05-07 11:06:42 +00:00
Joel Collins
c57d2fb8c8 Add CONTRIBUTING 2019-05-07 10:39:48 +00:00