Skip to content

Fix gpib addressing to remove redundent ::INSTR. #365

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
brooksfoxen merged 3 commits into from
Jul 29, 2016
Merged

Fix gpib addressing to remove redundent ::INSTR. #365

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a087e26
Fix gpib addressing to remove redundent ::INSTR.
brooksfoxen Jul 29, 2016
3f44493
Collapse logic in selecting device addresses.
brooksfoxen Jul 29, 2016
787fd7b
Fix whitespace (2 lines around top lvl defs).
brooksfoxen Jul 29, 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
13 changes: 5 additions & 8 deletions gpib_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@
"""


KNOWN_DEVICE_TYPES = ('GPIB', 'TCPIP', 'USB')


class GPIBBusServer(LabradServer):
Copy link
Contributor

@maffoo maffoo Jul 29, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: two blank lines around top level definitions (https://google.github.io/styleguide/pyguide.html#Blank_Lines)

"""Provides direct access to GPIB-enabled devices."""
name = '%LABRADNODE% GPIB Bus'
Expand Down Expand Up @@ -107,15 +110,9 @@ def refreshDevices(self):
deletions = set(self.devices.keys()) - set(addresses)
for addr in additions:
try:
if addr.startswith('GPIB'):
instName = addr
elif addr.startswith('TCPIP'):
instName = addr
elif addr.startswith('USB'):
instName = addr + '::INSTR'
else:
if not addr.startswith(KNOWN_DEVICE_TYPES):
continue
instr = rm.get_instrument(instName)
instr = rm.get_instrument(addr)
instr.write_termination = ''
instr.clear()
if addr.endswith('SOCKET'):
Expand Down