Skip to content

Allow specifying known devices in the registry. WIP. #378

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

Open
ejeffrey wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Allow specifying known devices in the registry. WIP. #378

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d860e20
Allow specifying known devices in the registry. Completely untested.
Oct 20, 2016
3ff22dc
Actually use the list
Oct 20, 2016
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
23 changes: 22 additions & 1 deletion gpib_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@


KNOWN_DEVICE_TYPES = ('GPIB', 'TCPIP', 'USB')
CONFIG_PATH = ['', 'Servers', 'GPIB Bus']


class GPIBBusServer(LabradServer):
Expand Down Expand Up @@ -98,14 +99,34 @@ def stopServer(self):
self.refresher.stop()
yield self.refresherDone


@inlineCallbacks
def getRegistryDevices(self):
"""Get a list of known devices from the registry.

This is used when a given device won't show up
in the VISA resource manager.

This returns the contents of the registry key named %NODENAME
in the registry path ['', 'Servers', 'GPIB Bus']
"""
keyname = os.environ.get('LABRADNODE', 'default')
p = self.client.registery.packet()
p.cd(CONFIG_PATH, True)
p.get(keyname, True, [])
resp = yield p.send()
return resp['get']

@inlineCallbacks
def refreshDevices(self):
"""Refresh the list of known devices on this bus.

Currently supported are GPIB devices and GPIB over USB.
"""
try:
rm = visa.ResourceManager()
addresses = [str(x) for x in rm.list_resources()]
registry_devices = yield self.getRegistryDevices()
addresses = [str(x) for x in rm.list_resources()] + registry_devices
additions = set(addresses) - set(self.devices.keys())
deletions = set(self.devices.keys()) - set(addresses)
for addr in additions:
Expand Down