Commit graph

125 commits

Author SHA1 Message Date
Joel Collins
9b4bf4c8fc Moved status routes to instrument/state 2020-01-29 17:43:52 +00:00
Joel Collins
64eb87bf6f Merge branch 'new-semantics-testing' of https://gitlab.com/openflexure/openflexure-microscope-server into new-semantics-testing 2020-01-29 16:17:32 +00:00
Joel Collins
265eed7bfa Fixed picamera setup 2020-01-29 16:16:09 +00:00
Joel Collins
ebdd63f37b Added ndarray type to serialised LST (can be used in custom decoder) 2020-01-29 15:43:29 +00:00
Joel Collins
7458d278d8 Simplified new configuration and metadata 2020-01-29 15:36:57 +00:00
Joel Collins
19af98736d Draft of new semantics 2020-01-29 11:55:39 +00:00
jtc42
6df7fe9405 Blackened 2020-01-24 15:41:33 +00:00
jtc42
36334ed743 Moved to a LabThings dependency for server 2020-01-17 15:13:32 +00:00
Joel Collins
802f5ba0c2 Started updating documentation 2020-01-15 15:03:58 +00:00
jtc42
70149e9732 Cleaned code structure 2020-01-06 16:45:38 +00:00
Joel Collins
2b90829020 Replace uuid().hex with just uuid() 2019-12-28 18:36:46 +00:00
jtc42
a8a3cafa97 Restructured labthings 2019-12-21 12:10:09 +00:00
Joel Collins
45c8d2b47f Removed old plugin system 2019-12-18 15:04:55 +00:00
Joel Collins
f2af359b8b Added basic thing description to root 2019-12-18 14:30:33 +00:00
Joel Collins
dee77c295a Migrated scan plugin 2019-12-18 11:06:02 +00:00
Joel Collins
c76e3e0ed3 Don't import picamera to build system metadata 2019-11-22 13:42:40 +00:00
Joel Collins
309b34810c Store encoded LST in microscope system metadata 2019-11-22 12:00:33 +00:00
jtc42
76af0891e9 Blackened 2019-11-15 16:52:57 +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
dd82528d78 Blackened 2019-11-06 22:13: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
8b9ecbe2c7 Tidied up todos 2019-09-16 17:34:33 +01:00
Joel Collins
039b4fd3da Removed old clean_keys arg 2019-09-15 14:28:03 +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
8e0cdf3b11 Merge branch 'config-dict-fixes' into 'master'
Fixed read and apply config dicts

See merge request openflexure/openflexure-microscope-server!24
2019-06-12 16:24:08 +00:00
Joel Collins
f31c28fe52 Fixed read and apply config dicts 2019-06-12 17:23:24 +01:00
jtc42
df205cc76d Removed a todo 2019-06-11 10:36:15 +01:00
jtc42
3299934afb Added deprecation warnings to config property 2019-06-11 10:34:02 +01:00
jtc42
b1cd061a00 Actually use config dictionary with version when saving 2019-06-07 16:29:10 +01:00
jtc42
4c67ef2fc2 Inject server_version into saved config 2019-06-07 15:33:31 +01:00
jtc42
235aa984f9 Updated docs 2019-06-07 13:37:20 +01:00
Joel Collins
4aba270365 Added state key for server package version 2019-06-05 17:54:39 +01:00
Joel Collins
9b30d1d38f Completely overhauled config system 2019-06-05 16:03:58 +01:00
Joel Collins
41d9ab51ad Restructured camera attaching 2019-06-04 14:03:46 +01:00
Joel Collins
3b9ef670fe Improved flake8 results 2019-05-24 16:32:20 +01:00
Joel Collins
9fc4dfc628 Moved microscoperc.yaml to microscope_settings.yaml 2019-05-20 10:09:01 +01:00
Joel Collins
ff534e6a51 Initial support for SBv3 and MockStage 2019-05-15 13:25:04 +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
7d9f7278f1 Fixed camera config being overwritten instead of updated 2019-02-20 10:31:02 +00:00
Joel Collins
cc3f7f19df Fixed attaching lock failure 2019-02-19 13:42:17 +00:00
Joel Collins
1bbe234749 Fixed issue #42 2019-02-11 10:00:44 +00:00
Joel Collins
88b946b473 Improved runtime-config docs 2019-02-07 11:19:00 +00:00
Joel Collins
5672b82f5e Added many many debug statements to help debug issue #32 2019-02-05 17:06:05 +00:00
Joel Collins
0948c9308a Went on a PEP-8 rampage 2019-01-31 17:20:46 +00:00
Joel Collins
04bed170a0 Added JSON safety to config reads 2019-01-31 16:47:54 +00:00
Joel Collins
e9d74c07e6 Separated updating/writing from saving config 2019-01-31 13:51:02 +00:00
Joel Collins
5471ffa62b Introduced apply_config and read_config methods 2019-01-31 13:29:07 +00:00