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
4a2e6c82
Commit
4a2e6c82
authored
Feb 16, 2018
by
auke.klazema
Browse files
Renamed init parameters
parent
1510fc28
Changes
2
Hide whitespace changes
Inline
Side-by-side
hpib.py
View file @
4a2e6c82
...
...
@@ -19,22 +19,22 @@ class PrologixGpibUsb(PortDevice):
_serialPort
=
None
_hpib_address
=
-
1
def
__init__
(
self
,
port
=
""
,
timeout
=
1
,
port
F
ormat
=
"%d"
,
max
D
evice
N
um
=
9
,
verbose
=
False
,
find
D
evices
=
False
):
def
__init__
(
self
,
port
=
""
,
timeout
=
1
,
port
_f
ormat
=
"%d"
,
max
_d
evice
_n
um
=
9
,
verbose
=
False
,
find
_d
evices
=
False
):
if
port
==
""
:
max
D
evice
N
um
,
port
,
port
F
ormat
=
self
.
_set_default_platform_values
()
max
_d
evice
_n
um
,
port
,
port
_f
ormat
=
self
.
_set_default_platform_values
()
self
.
_validate_port
(
port
)
if
verbose
:
print
"Looking for ports such as %s in range %d on %s"
%
\
(
port
,
max
D
evice
N
um
,
platform
.
system
()
)
(
port
,
max
_d
evice
_n
um
,
platform
.
system
())
self
.
_find_available_port
(
max
D
evice
N
um
,
port
,
port
F
ormat
,
timeout
,
verbose
)
self
.
_find_available_port
(
max
_d
evice
_n
um
,
port
,
port
_f
ormat
,
timeout
,
verbose
)
self
.
_initialize_prologix_gpi
()
if
find
D
evices
:
if
find
_d
evices
:
self
.
_find_devices
()
else
:
self
.
_devices
=
"Not scanned."
...
...
test/test_hpib.py
View file @
4a2e6c82
...
...
@@ -29,7 +29,7 @@ class PrologixGpibUsbTest(unittest.TestCase):
self
.
serial_mock
.
assert_called_with
(
'/dev/ttys000'
,
timeout
=
1
)
def
test_getDevices_returns_not_scanned_when_find_devices_is_false
(
self
):
usb
=
hpib
.
PrologixGpibUsb
(
find
D
evices
=
False
)
usb
=
hpib
.
PrologixGpibUsb
(
find
_d
evices
=
False
)
self
.
assertEqual
(
usb
.
get_devices
(),
'Not scanned.'
)
...
...
@@ -73,14 +73,14 @@ class PrologixGpibUsbTest(unittest.TestCase):
self
.
serial_mock
.
return_value
.
readline
.
return_value
=
""
write_mock
=
self
.
serial_mock
.
return_value
.
write
hpib
.
PrologixGpibUsb
(
find
D
evices
=
True
)
hpib
.
PrologixGpibUsb
(
find
_d
evices
=
True
)
self
.
assertEqual
(
write_mock
.
call_args_list
[
7
],
call
(
"++addr "
+
str
(
0
)
+
chr
(
10
)
+
"*idn?"
+
chr
(
10
)
+
"++read"
+
chr
(
10
)))
def
test_if_find_devices_getDevices_will_return_a_list_of_devices
(
self
):
self
.
serial_mock
.
return_value
.
readline
.
return_value
=
"Device 1"
usb
=
hpib
.
PrologixGpibUsb
(
find
D
evices
=
True
)
usb
=
hpib
.
PrologixGpibUsb
(
find
_d
evices
=
True
)
devices
=
usb
.
get_devices
()
...
...
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