Skip to content

Updated BLACS to use the new labscript-utils device registry. #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dihm merged 2 commits into from
Nov 30, 2021
Merged

Updated BLACS to use the new labscript-utils device registry. #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
741d790
Updated BLACS to use the new labscript-utils device registry.
philipstarkey Jul 16, 2020
ce11661
Merge branch 'master' into break-circular-dependency
dihm Nov 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions blacs/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
# Queue Manager Code
from blacs.experiment_queue import QueueManager, QueueTreeview
# Module containing hardware compatibility:
import labscript_devices
from labscript_utils import device_registry
# Save/restore frontpanel code
from blacs.front_panel_settings import FrontPanelSettings
# Notifications system
Expand Down Expand Up @@ -268,7 +268,7 @@ def __init__(self,application):
self.settings_dict[device_name]["saved_data"] = tab_data[device_name]['data'] if device_name in tab_data else {}
# Instantiate the device
logger.info('instantiating %s'%device_name)
TabClass = labscript_devices.get_BLACS_tab(labscript_device_class_name)
TabClass = device_registry.get_BLACS_tab(labscript_device_class_name)
self.tablist[device_name] = TabClass(self.tab_widgets[0],self.settings_dict[device_name])
except Exception:
self.failed_device_settings[device_name] = {"front_panel": self.settings_dict[device_name]["front_panel_settings"], "save_data": self.settings_dict[device_name]["saved_data"]}
Expand Down
3 changes: 1 addition & 2 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ packages = find:
python_requires = >=3.6
install_requires =
importlib_metadata
labscript_devices>=3.0.0
labscript_utils>=3.0.0
labscript_utils>=3.1.0b1
runmanager>=3.0.0
qtutils>=2.3.2
setuptools_scm>=4.1.0
Expand Down