Commit 591e46e7 authored by Tammo Jan Dijkema's avatar Tammo Jan Dijkema
Browse files

Fix address bug, disable return_to_local for now

parent bfa1c008
...@@ -104,11 +104,11 @@ class CamrasHpibDevice(object): ...@@ -104,11 +104,11 @@ class CamrasHpibDevice(object):
str: output of the command (in case it was a query) str: output of the command (in case it was a query)
""" """
if prepend_address: if prepend_address:
address = self.address address = self.hpib_address
else: else:
address = None address = None
return CamrasHpibDevice.command_thread.protocol.command(command_string, address, return CamrasHpibDevice.command_thread.protocol.command(command_string, address=address,
return_to_local=self.return_to_local) return_to_local=self.return_to_local)
@property @property
...@@ -161,7 +161,7 @@ class LocalOscillator(CamrasHpibDevice): ...@@ -161,7 +161,7 @@ class LocalOscillator(CamrasHpibDevice):
"""Wrapper around HPIB commands for the local oscillator""" """Wrapper around HPIB commands for the local oscillator"""
def __init__(self, **kwargs): def __init__(self, **kwargs):
super(LocalOscillator, self).__init__(28, return_to_local=True) super(LocalOscillator, self).__init__(28)
class ClockGenerator(CamrasHpibDevice): class ClockGenerator(CamrasHpibDevice):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment