Joel Collins
9cecb477cb
Flipped to explicit finite lock timeouts
2020-06-29 09:03:27 +01:00
Joel Collins
2435842ff6
Changed locks to 1s default
2020-06-25 16:48:17 +01:00
Joel Collins
6b39669546
Removed default timeout from camera lock
2020-06-24 16:04:33 +00:00
Joel Collins
7c1c49eff2
Added 5 second timeout to device locks
2020-06-24 10:39:00 +01:00
Joel Collins
5d70d5f7fe
Remove camera timeout
2020-06-15 16:19:17 +01:00
Joel Collins
89637976e7
Reverted frame thread to patched threading.Thread
2020-06-15 12:09:23 +01:00
Joel Collins
a34214b9fb
Fixed broken references to capture list
2020-04-28 14:47:22 +01:00
Joel Collins
caf553db7a
Moved capture management into separate object
2020-04-28 14:32:56 +01:00
Joel Collins
de5894964e
Explicitally use gevent for camera stream thread
2020-03-27 16:40:06 +00:00
Joel Collins
43c8fea37f
Use LabThings ClientEvent
2020-03-27 15:07:11 +00:00
Joel Collins
697fa87566
Removed debug print
2020-03-17 14:20:07 +00:00
Joel Collins
2bc02b3844
Sync frames using gevent events
2020-03-15 17:06:05 +00:00
Joel Collins
6092e8ab5d
Rearranged for clarity
2020-03-15 16:30:19 +00:00
Joel Collins
a1531e9b14
Fixed capture key types
2020-03-01 18:04:33 +00:00
Joel Collins
60c6ae72f8
Handle captures as an OrderedDict. Fixes file deletion
2020-03-01 17:57:30 +00:00
Joel Collins
0595d3c620
Let camera object handle its own library rebuild
2020-02-18 16:16:06 +00:00
Joel Collins
cf66359559
Reimplemented serialising LST
2020-02-06 13:35:05 +00:00
Joel Collins
9b4bf4c8fc
Moved status routes to instrument/state
2020-01-29 17:43:52 +00:00
Joel Collins
19af98736d
Draft of new semantics
2020-01-29 11:55:39 +00:00
jtc42
36334ed743
Moved to a LabThings dependency for server
2020-01-17 15:13:32 +00:00
Joel Collins
feddcc546b
Changed preferred paths to use PROGRAMDATA, /var, and /etc
2020-01-16 16:31:19 +00:00
Joel Collins
bf9a1e358e
Fixed finding captures by UUID
2020-01-14 15:29:35 +00:00
jtc42
a8a3cafa97
Restructured labthings
2019-12-21 12:10:09 +00:00
Joel Collins
6de315fd48
Drafted ZipBuilder plugin
2019-11-28 16:01:05 +00:00
jtc42
6581612312
Implemented root API v2 routes
2019-11-14 16:33: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
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
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
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
f7ba68b443
Converted base camera into an ABC
2019-06-04 14:03:30 +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
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
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
Joel Collins
28561433a0
Malformed capture db no longer crashes server
2019-04-15 19:14:31 +01: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
7cf54240be
Temp capture folder now handled by camera
2019-04-11 07:13:32 +01: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
Joel Collins
4602b1da9d
Testing not re-saving EXIF on exit
2019-03-28 14:45:51 +00:00