Joel Collins
5c8d38b0e1
Move pynpm to dev dependencies
2020-05-18 14:55:41 +01:00
Joel Collins
ec4c8ef02e
Merge branch 'frame' into 'master'
...
eV submodule & new distribution system
See merge request openflexure/openflexure-microscope-server!59
2020-05-18 09:54:18 +00:00
Joel Collins
79259b3fc9
Revert "Remove CI file from frame branch"
...
This reverts commit dac3632c28
2020-05-18 09:54:18 +00:00
Joel Collins
e91b9bf356
Removed content for master branch CI
2020-05-15 16:51:08 +00:00
Joel Collins
e32baa9baa
Explicit submodules
2020-05-15 17:28:18 +01:00
Joel Collins
87a7f91402
Fix poetry path
2020-05-15 17:19:58 +01:00
Joel Collins
4652e0e5f8
Test CI for 'frame' branch
2020-05-15 17:17:53 +01:00
Joel Collins
5f7d7be59f
Removed old example extensions
2020-05-15 10:01:10 +01:00
Joel Collins
ffafd93838
Updated to LabThings 061
2020-05-15 09:37:43 +01:00
Joel Collins
3a4975a070
Merge branch 'labthings-fixes' into 'master'
...
Labthings 0.6.0 fixes
See merge request openflexure/openflexure-microscope-server!58
2020-05-12 15:04:57 +00:00
Joel Collins
f068bffec0
Pinned to LabThings 0.6.0
2020-05-12 16:01:45 +01:00
Joel Collins
3a16a48d54
Fixed LST calibration endpoints
2020-05-12 14:29:11 +01:00
Joel Collins
eaf4cf09f5
Updated to new Action tasks
2020-05-12 11:29:53 +01:00
Joel Collins
28e555ad9b
Added explicit endpoints
2020-05-10 16:35:16 +01:00
Joel Collins
93d29fbc8d
Added full logger
2020-05-10 16:35:08 +01:00
Joel Collins
d884680daa
Merge branch 'capture-manager' into 'master'
...
Capture manager
See merge request openflexure/openflexure-microscope-server!57
2020-05-04 09:30:51 +00:00
Joel Collins
6d9314e0c9
Merge branch 'master' into 'capture-manager'
...
# Conflicts:
# poetry.lock
# pyproject.toml
2020-05-04 09:30:03 +00:00
Joel Collins
ef6f428a84
Updated dependencies
2020-04-30 17:46:59 +01:00
Richard Bowman
484734df95
Revert "add FFT tracking and "leapfrog" support"
...
This reverts commit e46e06d840
2020-04-29 12:07:43 +01:00
Richard Bowman
e46e06d840
add FFT tracking and "leapfrog" support
2020-04-29 12:00:13 +01:00
Joel Collins
a34214b9fb
Fixed broken references to capture list
2020-04-28 14:47:22 +01:00
Joel Collins
45ee112e6f
Fixed broken references
2020-04-28 14:40:09 +01:00
Joel Collins
caf553db7a
Moved capture management into separate object
2020-04-28 14:32:56 +01:00
Joel Collins
1a6088a816
Code formatting
2020-04-28 13:42:26 +01:00
Joel Collins
9ff24e8e37
Added updated opencv-python-headless for Py38 installations
2020-04-28 13:36:53 +01:00
Joel Collins
d4dbafcb52
Explicit __all__ in devel submodule
2020-04-28 13:20:48 +01:00
Joel Collins
9646058c37
Code format
2020-04-28 13:20:38 +01:00
Joel Collins
ed8057ce04
Upgrade to labthings 0.5.2
2020-04-27 13:10:34 +01:00
Joel Collins
43e35501e1
Fixed updated dependencies
2020-04-24 17:48:06 +01:00
Joel Collins
99ef24fb95
Remove unused (and old) import
2020-04-24 17:31:48 +01:00
Joel Collins
ef5b3393f9
Merge branch 'csm-calibration-file' into 'master'
...
Added calibration data download view
See merge request openflexure/openflexure-microscope-server!56
2020-04-24 16:30:46 +00:00
Joel Collins
a1f3dd1624
Added calibration data download view
2020-04-24 16:42:35 +01:00
Joel Collins
6fcd8caf91
Merge branch 'autofocus-error-messages' into 'master'
...
Autofocus error messages
See merge request openflexure/openflexure-microscope-server!54
2020-04-24 15:14:37 +00:00
Joel Collins
216bf70dde
Merge branch 'json-encoder-fix' into 'master'
...
Json encoder fix
See merge request openflexure/openflexure-microscope-server!55
2020-04-24 15:14:25 +00:00
Joel Collins
cda5cdbb44
Switched away from using JSONify
2020-04-24 16:05:01 +01:00
Joel Collins
4fffa1fcba
Update deps
2020-04-24 16:04:46 +01:00
Joel Collins
abd291f1e0
Base OFM JSON encoder on LabThings encoder
2020-04-23 14:25:19 +01:00
Richard Bowman
be85d07210
Attempt to start the stream if it's stopped.
2020-04-23 11:22:14 +01:00
Richard Bowman
5a4aae8ed1
Added helpful errors if the stream has stopped
2020-04-23 11:15:10 +01:00
Richard Bowman
161c17812e
Removed vestigial global statement
...
There was a global declaration for the modules
np and logging, probably left over from running
this code in the dodgy console plugin. I've
removed it as it's ugly, dodgy, and no longer
needed.
2020-04-23 11:10:36 +01:00
Joel Collins
3c27b5a6e6
Merge branch 'enable-ipv6' into 'master'
...
Enable ipv6
See merge request openflexure/openflexure-microscope-server!53
2020-04-23 09:45:25 +00:00
Richard Bowman
6213620031
Enable ipv6
...
Setting the listen address to :: puts flask into ipv6 mode.
This makes it compatible with ipv6 and, thanks
to the system automatically translating ipv4
into ipv6, it is completely compatible with ipv4
as well.
2020-04-23 10:42:49 +01:00
Joel Collins
bcd6f426cc
Merge branch 'actions-aint-actions' into 'master'
...
The "actions" endpoint shouldn't be tagged
See merge request openflexure/openflexure-microscope-server!52
2020-04-23 08:42:48 +00:00
Richard Bowman
102264c4be
The "actions" endpoint shouldn't be tagged
...
The actions endpoint (responds only to GET, lists the actions)
is not itself an action.
The ``@tag("actions")`` causes LabThings to try to include
it as an action, which fails.
Removing the tag makes the server run again -
but maybe I've broken something else here?
2020-04-23 08:09:21 +01:00
Joel Collins
3c2f4d1eec
Merge branch 'stage-calibration' into 'master'
...
Stage calibration
See merge request openflexure/openflexure-microscope-server!43
2020-04-14 10:36:45 +00:00
Richard Bowman
70d4c7e950
Merge branch 'master' into stage-calibration
2020-04-10 15:16:25 +01:00
Joel Collins
4a62d9c7c0
Merge branch '2.0.X-hotfix-b' into 'master'
...
Documentation fix
See merge request openflexure/openflexure-microscope-server!51
2020-04-07 11:03:26 +00:00
Joel Collins
f292ff3e43
Revert "Added sleeps to check for blank capture fix"
...
This reverts commit 32ddcd5d13
2020-04-07 11:03:26 +00:00
Joel Collins
13d18b4101
Removed medscan extension (now in separate repo)
2020-04-01 11:39:09 +01:00
Joel Collins
a5d5b6cda2
Removed example component from default extensions
2020-04-01 10:31:50 +01:00
