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

56 commits

Author SHA1 Message Date
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
3cf166226b Converted config dict into properties/attributes 2019-06-04 14:03:16 +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
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
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
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
b5e6a43caa Spinkled in some sleeps to fix 
#49
 2019-03-21 15:48:22 +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
Joel Collins
366b771b72 Added size and position params to GPU preview route 2019-02-19 11:04:12 +00:00
Joel Collins
d4e7d067a3 Removed fraction conversion 2019-01-31 16:48:39 +00:00
Joel Collins
5471ffa62b Introduced apply_config and read_config methods 2019-01-31 13:29:07 +00:00
Joel Collins
92ac947982 Demoted missing attribute warning to debug 2019-01-30 18:23:40 +00:00
Joel Collins
f2a3261b03 Overhauled config loader to allow split configs 2019-01-30 17:45:11 +00:00
Joel Collins
8292ebf7c7 Implement hardware locks 2019-01-24 12:11:01 +00:00
Joel Collins
646dc24a91 Fixed captures trying to restart recording for a stopped stream 2019-01-17 12:23:54 +00:00
Joel Collins
b0d5426f5b Bayer capture now optional 2019-01-17 10:22:41 +00:00
Joel Collins
226e787cc2 Catch exceptions if pausing an inactive stream 2019-01-16 14:05:47 +00:00
Joel Collins
f70da25c1c Properly implemented zoom method 2019-01-16 11:49:57 +00:00
Joel Collins
3dc160d51f Simplified test suite 2019-01-08 16:29:34 +00:00
Joel Collins
4638071a00 Minor docstring update 2019-01-08 16:01:34 +00:00
Joel Collins
4c5728b182 Updated docstrings and todo 2019-01-08 15:59:47 +00:00
Joel Collins
8137646d5e Removed redundant function arguments 2019-01-08 15:48:31 +00:00
Joel Collins
78ce3a9a11 Explicit output stream must be specified when capturing 2019-01-08 15:46:57 +00:00
Joel Collins
b21040f22e Better fix for RGB capture memory issues 2018-11-30 10:33:39 +00:00
Joel Collins
2cf025088b Calibration now stores to a config file, which can be loaded 2018-11-29 17:58:24 +00:00
Joel Collins
71ea3abda9 Converted config to a getter/setter property 2018-11-29 15:49:59 +00:00
Joel Collins
3925ef8cfe Moved hardware config to a runtime config YAML file in home 2018-11-29 14:41:56 +00:00
Joel Collins
c87878a7dc Tidied up new config load/save. Fixes #6. 2018-11-23 12:17:27 +00:00
Joel Collins
c887f990b5 Split loading, saving, and applying camera config file 2018-11-23 12:14:10 +00:00
Joel Collins
cf96fa0ad2 Better handling of capture path and temporary files 2018-11-22 21:31:21 +00:00
Joel Collins
d3226731d6 Properly clean up temporary capture files at API exit 2018-11-21 10:45:45 +00:00
Joel Collins
69e97ba5a3 Fixed non-clashing basename generation 2018-11-20 13:56:51 +00:00
Joel Collins
ea10cf1ce9 Created initial general documentation 2018-11-16 15:46:19 +00:00
Joel Collins
dd7a3ff2e5 Removed pointless image_recent from microscope state 2018-11-16 12:04:54 +00:00
Joel Collins
4e67d24841 Added capture state endpoint 2018-11-12 12:22:06 +00:00
Joel Collins
5df9b53a9c PEP-8-ified code a bit 2018-11-07 14:22:42 +00:00
Joel Collins
54f906f525 Removed redundant start_workers() calls 2018-11-07 12:04:08 +00:00
Joel Collins
a7598c5e5b Pi camera is now persistent in StreamingCamera 2018-11-07 12:03:09 +00:00
Joel Collins
ffb4dda6a6 Added subclass close() method 2018-11-07 10:58:36 +00:00
Joel Collins
7b23ca4b8a Moved generic camera methods into BaseCamera class 2018-11-07 10:54:39 +00:00