Skip to content

Commit 60745d5

Browse files
author
neil.hamilton
committed
Merge TSP-127-Support-for-ps6000a-to-discover.py into master
2 parents f05188e + d58075e commit 60745d5

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

picosdk/discover.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
from picosdk.ps4000a import ps4000a
1111
from picosdk.ps5000a import ps5000a
1212
from picosdk.ps6000 import ps6000
13+
from picosdk.ps6000a import ps6000a
1314

1415

1516
# the A drivers are faster to enumerate devices, so search them first.
@@ -18,6 +19,7 @@
1819
ps3000a,
1920
ps4000a,
2021
ps5000a,
22+
ps6000a,
2123
ps6000,
2224
ps2000,
2325
ps3000,
@@ -47,4 +49,4 @@ def find_all_units():
4749
devices.append(device)
4850
if not devices:
4951
raise DeviceNotFoundError("Could not find any devices on any drivers.")
50-
return devices
52+
return devices

0 commit comments

Comments
 (0)