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

72 commits

Author SHA1 Message Date
Joel Collins
387fdeeb7d Fixed documentation (still needs rewriting) 2020-01-14 17:22:16 +00:00
Joel Collins
dee77c295a Migrated scan plugin 2019-12-18 11:06:02 +00:00
jtc42
76af0891e9 Blackened 2019-11-15 16:52:57 +00:00
jtc42
d79fd55301 Drafted actions routes 2019-11-15 16:40:25 +00:00
jtc42
6581612312 Implemented root API v2 routes 2019-11-14 16:33:00 +00:00
jtc42
b33ab7b22a Moved to a module-level user_settings object 2019-11-12 17:14:30 +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
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
8b9ecbe2c7 Tidied up todos 2019-09-16 17:34:33 +01:00
Joel Collins
dc794d4df8 Microscope capture objects now just handle on-disk data 2019-09-16 16:35:32 +01:00
Joel Collins
5966ce29be Blackened everything 2019-09-15 14:17:52 +01:00
Joel Collins
3467fe7759 Added extra type checking when applying pi camera config 2019-08-08 10:14:57 +01:00
Joel Collins
4715726e9c Renamed pi.StreamingCamera to PiCameraStreamer 2019-07-16 11:12:24 +01:00
jtc42
4733b250ed Added support for a fully mocked device 2019-06-28 12:52:55 +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
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