Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Tammo Jan Dijkema
HPIB
Commits
591e46e7
Commit
591e46e7
authored
May 12, 2018
by
Tammo Jan Dijkema
Browse files
Fix address bug, disable return_to_local for now
parent
bfa1c008
Changes
1
Show whitespace changes
Inline
Side-by-side
camrasdevices.py
View file @
591e46e7
...
@@ -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
):
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment