Enable global locking.

This commit:
* switches to the LabThings branch
* enables locking when config files are loaded
* Updates jogging so jog moves aren't subject to the lock, but the jog loop is.
This commit is contained in:
Richard Bowman 2026-04-28 12:11:06 +01:00 committed by Julian Stirling
parent eff66eb667
commit 608f4ec0d5
2 changed files with 9 additions and 2 deletions

View file

@ -190,4 +190,11 @@ def _full_config_from_args(args: Namespace) -> ThingServerConfig:
)
patched_config = load_patched_config(args.config)
if "enable_global_lock" not in patched_config:
patched_config["enable_global_lock"] = True
if patched_config["enable_global_lock"] is not True:
raise ValueError(
"OpenFlexure Microscope Server requires `enable_global_lock` to be `true`, "
"and it was set to another value in the configuration file."
)
return ThingServerConfig(**patched_config)