Commit graph

134 commits

Author SHA1 Message Date
jtc42
f2b98807b4 Fixed docstring 2019-11-12 17:14:00 +00:00
Joel Collins
b81cfaf9e7 Converted all configs to JSON 2019-11-12 14:36:39 +00:00
Joel Collins
4e7606aa0c Blackened files 2019-11-06 22:07:16 +00:00
jtc42
625b03fae3 Moved lock submodule into 'common' and updated docs 2019-11-01 18:10:04 +00:00
Joel Collins
7c121cd142 Added timestamp to mock camera stream 2019-10-30 09:43:27 +00:00
Joel Collins
1c67b96895 Added a useful read_config method to BaseCamera 2019-09-20 14:12:49 +01:00
Joel Collins
33af3bf48c Add "board" to all device states 2019-09-19 17:22:04 +01:00
Joel Collins
b0be4fc26a Capture 'temporary' status now stored as tag 2019-09-19 14:23:12 +01:00
Joel Collins
8b9ecbe2c7 Tidied up todos 2019-09-16 17:34:33 +01:00
Joel Collins
4fa70cd7ee Removed redundant YAML representation 2019-09-16 16:36:47 +01:00
Joel Collins
dc794d4df8 Microscope capture objects now just handle on-disk data 2019-09-16 16:35:32 +01:00
Joel Collins
a832dfb2f1 Use get_ident from threading 2019-09-15 14:28:18 +01:00
Joel Collins
5966ce29be Blackened everything 2019-09-15 14:17:52 +01:00
Joel Collins
d9e07f913a Plugin schema are now just plugin forms (requires eV 1.2) 2019-09-14 15:51:51 +01:00
Joel Collins
0d7a5f71e0 Removed noise stream from MockCamera 2019-09-14 15:12:09 +01:00
Joel Collins
3467fe7759 Added extra type checking when applying pi camera config 2019-08-08 10:14:57 +01:00
Joel Collins
a3a63a14e6 Renamed mock.StreamingCamera to MockStreamer 2019-07-16 11:12:44 +01:00
Joel Collins
4715726e9c Renamed pi.StreamingCamera to PiCameraStreamer 2019-07-16 11:12:24 +01:00
jtc42
18f219c8e9 Reduces noise stream resolution 2019-06-28 13:25:53 +01:00
jtc42
4733b250ed Added support for a fully mocked device 2019-06-28 12:52:55 +01:00
Joel Collins
8f2b621ce5 Fixed automatic filename generation 2019-06-25 18:03:26 +01:00
Joel Collins
f31c28fe52 Fixed read and apply config dicts 2019-06-12 17:23:24 +01:00
Joel Collins
ea253f8085 Smarter application of picamera settings 2019-06-05 16:04:14 +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
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
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
90a3a738af Cleaned up camera locks 2019-05-23 14:25:57 +01:00
Joel Collins
e30956d761 Renamed video_resolution to stream_resolution 2019-05-20 10:55:43 +01:00
Joel Collins
1fe8ea18d8 Default capture resolution to MAX_RESOLUTION 2019-05-20 10:06:42 +01:00
Joel Collins
092181348b Load capture objects from files. Remove YAML database. 2019-05-15 16:32:58 +01:00
Joel Collins
2108dea007 Defaut new images to write to file 2019-05-01 14:46:00 +01:00
Joel Collins
638e8245ad Fixed merge conflict artefact 2019-04-26 18:34:49 +01:00
Joel Collins
fface9994e Fixed merge conflicts and simplified new capture creation 2019-04-26 18:32:32 +01:00
Joel Collins
ea44bbefd2 Simplified creation of new capture objects 2019-04-26 18:26:27 +01:00
jtc42
8a564bbdba Fixed default video folder NoneType 2019-04-19 09:06:14 +01:00
jtc42
9b016a76b2 Removed redundant capture initialisation 2019-04-19 09:05:57 +01:00
jtc42
10525c9c8e Rewritten how file names are constructed and restored 2019-04-18 12:17:59 +01:00
Joel Collins
28561433a0 Malformed capture db no longer crashes server 2019-04-15 19:14:31 +01:00
Joel Collins
b7ee18d081 Better handling of GPU preview resizing 2019-04-14 11:31:48 +01:00
Joel Collins
793a3f0b63 Merge branch 'gain-exposure-settings' into 'master'
Fixed camera's read_config method

See merge request openflexure/openflexure-microscope-server!11
2019-04-14 09:04:03 +00:00
Joel Collins
941aadebfe Merge branch 'temporary-scan-captures' into 'master'
Temporary scan captures

See merge request openflexure/openflexure-microscope-server!10
2019-04-14 09:00:21 +00:00
Joel Collins
62b70e5bae clear_tmp now properly removes the tmp capture tree 2019-04-14 09:55:51 +01:00
Richard Bowman
bd5843cec7 Fixed camera's read_config method
read_config was only returning keys already present in the camera's config dictionary, which meant that if the camera settings were reset/deleted, it no longer read the settings from the picamera object.  I've changed it to use CONFIG_KEYS instead, which I believe is the correct behaviour.
2019-04-11 16:45:30 +01:00
Joel Collins
7cf54240be Temp capture folder now handled by camera 2019-04-11 07:13:32 +01:00
Joel Collins
e281b1ecc3 Removed a bit of logging vomit 2019-04-09 15:05:56 +01:00
Joel Collins
61f15d610f Restructured how temporary paths are calculated 2019-04-09 14:52:08 +01:00