Skip to content

ps6000EnumerateUnits: NULL workaround #160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 6, 2020
Merged

ps6000EnumerateUnits: NULL workaround #160

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions picoscope/ps6000.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
# float is always defined as 32 bits
# double is defined as 64 bits
from ctypes import byref, POINTER, create_string_buffer, c_float, \
c_int16, c_int32, c_uint32, c_uint64, c_void_p
c_int8, c_int16, c_int32, c_uint32, c_uint64, c_void_p
from ctypes import c_int32 as c_enum

from picoscope.picobase import _PicoscopeBase
Expand Down Expand Up @@ -198,7 +198,10 @@ def _lowLevelCloseUnit(self):

def _lowLevelEnumerateUnits(self):
count = c_int16(0)
m = self.lib.ps6000EnumerateUnits(byref(count), None, None)
serials = c_int8(0)
serialLth = c_int16(0)
m = self.lib.ps6000EnumerateUnits(byref(count), byref(serials),
byref(serialLth))
self.checkResult(m)
# a serial number is rouhgly 8 characters
# an extra character for the comma
Expand Down