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
f88a56bb
Commit
f88a56bb
authored
May 04, 2018
by
Tammo Jan Dijkema
Browse files
Improve error handling
parent
f687613b
Changes
2
Hide whitespace changes
Inline
Side-by-side
hpib.py
View file @
f88a56bb
...
...
@@ -39,7 +39,11 @@ class GPIBProtocol(serial.threaded.LineReader):
if
"?"
in
command
:
self
.
write_line
(
"++read eoi"
)
# The command was a query, wait for response
line
=
self
.
responses
.
get
(
timeout
=
timeout
)
try
:
line
=
self
.
responses
.
get
(
timeout
=
timeout
)
except
Empty
:
print
(
"No frequency returned"
)
return
None
return
line
else
:
pass
...
...
setup.py
View file @
f88a56bb
...
...
@@ -12,7 +12,7 @@ meta = dict(name='hpib',
entry_points
=
{
'console_scripts'
:
[
'trackDoppler=trackDoppler:main'
],
},
install_requires
=
[
'pyserial'
,
'astropy>=2.0'
]
install_requires
=
[
'pyserial'
]
#
, 'astropy>=2.0']
)
setup
(
**
meta
)
Write
Preview
Markdown
is supported
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