rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
564 commits 1 branch 0 tags 24 MiB
Commit graph

122 commits

Author SHA1 Message Date
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
Richard Bowman
33f719894d Fixed if statement for updating camera config. 2019-04-09 06:27:07 +00:00
Richard Bowman
e6ec800c21 Fixed camera settings 
Since splitting the camera config into a separate YAML file, we've broken
the ability to change the camera's configuration via the API (or at any time
except when the camera is set up, I think).  This (mostly) fixes that, though
I get type errors that I've had to work around (e.g. when setting
shutter_speed), see `pi.py`
 2019-04-08 22:41:12 +01:00
Richard Bowman
1cf1e40c54 Added a lock to stop_preview for good measure 2019-04-08 14:06:14 +01:00
Richard Bowman
ec50d245ab Added a lock to start_preview and caught errors 2019-04-08 14:05:29 +01:00
Richard Bowman
ef3aeb0581 Added fast autofocus 2019-04-07 19:58:08 +01:00
Joel Collins
4602b1da9d Testing not re-saving EXIF on exit 2019-03-28 14:45:51 +00:00
Joel Collins
2cdc20b08e Handle empty or malformed capture list 2019-03-28 14:18:01 +00:00
Joel Collins
b5e6a43caa Spinkled in some sleeps to fix 
#49
 2019-03-21 15:48:22 +00:00
Joel Collins
2fe7722da6 Added subdirectory support for captures 2019-03-06 17:04:04 +00:00
Joel Collins
51ac8a0647 Disabled stream timeout by default 2019-02-26 13:53:33 +00:00
Joel Collins
f54250a638 Catch already-recording error when starting GPU preview 2019-02-25 18:15:16 +00:00
Joel Collins
951cfb6bb0 Fixed exception caused by applying invalid settings to picamera 2019-02-25 11:09:21 +00:00