Skip to content

_lowLevelClear*: clear the correct buffers when downsampling is used #215

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

Open
abrasive wants to merge 2 commits into
base: master
Choose a base branch
from
Open

_lowLevelClear*: clear the correct buffers when downsampling is used #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
901bab0
_lowLevelClear*: clear the correct buffers when downsampling is used
Feb 5, 2026
92124c3
ps4000: remove an unused function argument
Feb 5, 2026
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
4 changes: 2 additions & 2 deletions picoscope/picobase.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -728,7 +728,7 @@ def getDataRaw(self, channel='A', numSamples=0, startIndex=0,
segmentIndex)
# necessary or else the next call to getValues will try to fill
# this array unless it is a call trying to read the same channel.
self._lowLevelClearDataBuffer(channel, segmentIndex)
self._lowLevelClearDataBuffer(channel, downSampleMode, segmentIndex)

# overflow is a bitwise mask
overflow = bool(overflow & (1 << channel))
Expand Down Expand Up @@ -797,7 +797,7 @@ def getDataRawBulk(self, channel='A', numSamples=0, fromSegment=0,

# don't leave the API thinking these can be written to later
for i, segment in enumerate(range(fromSegment, toSegment + 1)):
self._lowLevelClearDataBuffer(channel, segment)
self._lowLevelClearDataBuffer(channel, downSampleMode, segment)

return (data, numSamples, overflow)

Expand Down
2 changes: 1 addition & 1 deletion picoscope/ps2000.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ def _lowLevelSetDataBuffer(self, channel, data, downSampleMode,
self.channelBuffersPtr[channel] = dataPtr
self.channelBuffersLen[channel] = numSamples

def _lowLevelClearDataBuffer(self, channel, segmentIndex):
def _lowLevelClearDataBuffer(self, channel, downSampleMode, segmentIndex):
self.channelBuffersPtr[channel] = c_void_p()
self.channelBuffersLen[channel] = 0

Expand Down
5 changes: 3 additions & 2 deletions picoscope/ps2000a.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,11 +379,12 @@ def _lowLevelSetMultipleDataBuffers(self, channel, data, downSampleMode):
downSampleMode, i)
self.checkResult(m)

def _lowLevelClearDataBuffer(self, channel, segmentIndex):
def _lowLevelClearDataBuffer(self, channel, downSampleMode, segmentIndex):
"""Clear the data in the picoscope."""
m = self.lib.ps2000aSetDataBuffer(
c_int16(self.handle), c_enum(channel),
c_void_p(), c_uint32(0), c_uint32(segmentIndex), c_enum(0))
c_void_p(), c_uint32(0),
c_uint32(segmentIndex), c_enum(downSampleMode))
self.checkResult(m)

def _lowLevelGetValues(self, numSamples, startIndex, downSampleRatio,
Expand Down
2 changes: 1 addition & 1 deletion picoscope/ps3000.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ def _lowLevelSetDataBuffer(self, channel, data, downSampleMode,
self.channelBuffersPtr[channel] = dataPtr
self.channelBuffersLen[channel] = numSamples

def _lowLevelClearDataBuffer(self, channel, segmentIndex):
def _lowLevelClearDataBuffer(self, channel, downSampleMode, segmentIndex):
self.channelBuffersPtr[channel] = c_void_p()
self.channelBuffersLen[channel] = 0

Expand Down
4 changes: 2 additions & 2 deletions picoscope/ps3000a.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,12 +406,12 @@ def _lowLevelSetMultipleDataBuffers(self, channel, data, downSampleMode):
downSampleMode, i)
self.checkResult(m)

def _lowLevelClearDataBuffer(self, channel, segmentIndex):
def _lowLevelClearDataBuffer(self, channel, downSampleMode, segmentIndex):
m = self.lib.ps3000aSetDataBuffer(c_int16(self.handle),
c_enum(channel),
c_void_p(), c_uint32(0),
c_uint32(segmentIndex),
c_enum(0))
c_enum(downSampleMode))
self.checkResult(m)

def _lowLevelGetValues(self, numSamples, startIndex, downSampleRatio,
Expand Down
6 changes: 3 additions & 3 deletions picoscope/ps4000.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,9 +384,9 @@ def _lowLevelSetDataBuffer(self, channel, data, downSampleMode,
dataPtr, c_uint32(numSamples))
self.checkResult(m)

def _lowLevelClearDataBuffer(self, channel, segmentIndex):
def _lowLevelClearDataBuffer(self, channel, downSampleMode, segmentIndex):
m = self.lib.ps4000SetDataBuffer(c_int16(self.handle), c_enum(channel),
c_void_p(), c_uint32(0), c_enum(0))
c_void_p(), c_uint32(0))
self.checkResult(m)

def _lowLevelGetValues(self, numSamples, startIndex, downSampleRatio,
Expand Down Expand Up @@ -542,7 +542,7 @@ def _lowLevelSetDataBuffers(self, channel, bufferMax, bufferMin,
c_uint32(bufferLth))
self.checkResult(m)

def _lowLevelClearDataBuffers(self, channel):
def _lowLevelClearDataBuffers(self, channel, downSampleRatioMode):
m = self.lib.ps4000SetDataBuffers(
c_int16(self.handle),
c_enum(channel),
Expand Down
9 changes: 5 additions & 4 deletions picoscope/ps4000a.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,11 +494,12 @@ def _lowLevelSetDataBuffer(self, channel, data, downSampleMode,
c_uint32(downSampleMode))
self.checkResult(m)

def _lowLevelClearDataBuffer(self, channel, segmentIndex):
def _lowLevelClearDataBuffer(self, channel, downSampleMode, segmentIndex):
m = self.lib.ps4000aSetDataBuffer(c_int16(self.handle),
c_enum(channel),
c_void_p(), c_uint32(0), c_uint32(0),
c_enum(0))
c_void_p(), c_uint32(0),
c_uint32(segmentIndex),
c_enum(downSampleMode))
self.checkResult(m)

def _lowLevelGetValues(self, numSamples, startIndex, downSampleRatio,
Expand Down Expand Up @@ -673,7 +674,7 @@ def _lowLevelSetDataBuffers(self, channel, bufferMax, bufferMin,
c_uint32(bufferLth))
self.checkResult(m)

def _lowLevelClearDataBuffers(self, channel):
def _lowLevelClearDataBuffers(self, channel, downSampleRatioMode):
m = self.lib.ps4000aSetDataBuffers(
c_int16(self.handle),
c_enum(channel),
Expand Down
9 changes: 5 additions & 4 deletions picoscope/ps5000.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,9 +346,10 @@ def _lowLevelSetDataBuffer(self, channel, data, downSampleMode,
c_enum(downSampleMode))
self.checkResult(m)

def _lowLevelClearDataBuffer(self, channel, segmentIndex):
def _lowLevelClearDataBuffer(self, channel, downSampleMode, segmentIndex):
m = self.lib.ps5000SetDataBuffer(c_int16(self.handle), c_enum(channel),
c_void_p(), c_uint32(0), c_enum(0))
c_void_p(), c_uint32(0),
c_enum(downSampleMode))
self.checkResult(m)

def _lowLevelGetValues(self, numSamples, startIndex, downSampleRatio,
Expand Down Expand Up @@ -497,10 +498,10 @@ def _lowLevelSetDataBuffers(self, channel, bufferMax, bufferMin,
c_enum(downSampleRatioMode))
self.checkResult(m)

def _lowLevelClearDataBuffers(self, channel):
def _lowLevelClearDataBuffers(self, channel, downSampleRatioMode):
m = self.lib.ps5000SetDataBuffers(
c_int16(self.handle), c_enum(channel),
c_void_p(), c_void_p(), c_uint32(0), c_enum(0))
c_void_p(), c_void_p(), c_uint32(0), c_enum(downSampleRatioMode))
self.checkResult(m)

# Bulk values.
Expand Down
4 changes: 2 additions & 2 deletions picoscope/ps5000a.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,12 +450,12 @@ def _lowLevelSetDataBufferBulk(self, channel, data, segmentIndex,
downSampleMode,
segmentIndex)

def _lowLevelClearDataBuffer(self, channel, segmentIndex):
def _lowLevelClearDataBuffer(self, channel, downSampleMode, segmentIndex):
m = self.lib.ps5000aSetDataBuffer(c_int16(self.handle),
c_enum(channel),
c_void_p(), c_uint32(0),
c_uint32(segmentIndex),
c_enum(0))
c_enum(downSampleMode))
self.checkResult(m)

def _lowLevelGetValues(self, numSamples, startIndex, downSampleRatio,
Expand Down
9 changes: 5 additions & 4 deletions picoscope/ps6000.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,9 +374,10 @@ def _lowLevelSetDataBuffer(self, channel, data, downSampleMode,
c_enum(downSampleMode))
self.checkResult(m)

def _lowLevelClearDataBuffer(self, channel, segmentIndex):
def _lowLevelClearDataBuffer(self, channel, downSampleMode, segmentIndex):
m = self.lib.ps6000SetDataBuffer(c_int16(self.handle), c_enum(channel),
c_void_p(), c_uint32(0), c_enum(0))
c_void_p(), c_uint32(0),
c_enum(downSampleMode))
self.checkResult(m)

def _lowLevelGetValues(self, numSamples, startIndex, downSampleRatio,
Expand Down Expand Up @@ -499,10 +500,10 @@ def _lowLevelSetDataBuffers(self, channel, bufferMax, bufferMin,
c_enum(downSampleRatioMode))
self.checkResult(m)

def _lowLevelClearDataBuffers(self, channel):
def _lowLevelClearDataBuffers(self, downSampleRatioMode, channel):
m = self.lib.ps6000SetDataBuffers(
c_int16(self.handle), c_enum(channel),
c_void_p(), c_void_p(), c_uint32(0), c_enum(0))
c_void_p(), c_void_p(), c_uint32(0), c_enum(downSampleRatioMode))
self.checkResult(m)

# Bulk values.
Expand Down
10 changes: 5 additions & 5 deletions picoscope/ps6000a.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,8 +543,7 @@ def _lowLevelSetDataBuffer(self, channel, data, downSampleMode,
self.ACTIONS['add'])
self.checkResult(m)

def _lowLevelClearDataBuffer(self, channel, segmentIndex,
downSampleMode=0):
def _lowLevelClearDataBuffer(self, channel, downSampleMode, segmentIndex):
"""Clear the buffer for the chosen channel, segment, downSampleMode."""
if downSampleMode == 0:
downSampleMode = self.RATIO_MODE['raw']
Expand All @@ -558,15 +557,16 @@ def _lowLevelClearDataBuffer(self, channel, segmentIndex,
self.ACTIONS['clear_this'])
self.checkResult(m)

def _lowLevelClearDataBufferAll(self, channel=1, segmentIndex=0):
def _lowLevelClearDataBufferAll(self, channel=1, downSampleMode=0,
segmentIndex=0):
"""Clear all the stored buffers for all channels."""
m = self.lib.ps6000aSetDataBuffer(c_int16(self.handle),
c_enum(channel),
c_void_p(),
c_int32(0),
self.DATA_TYPES['int16'],
c_uint64(segmentIndex),
c_enum(0),
c_enum(downSampleMode),
self.ACTIONS['clear_all'])
self.checkResult(m)

Expand Down Expand Up @@ -743,7 +743,7 @@ def _lowLevelSetDataBuffers(self, channel, bufferMax, bufferMin,
c_enum(downSampleMode))
self.checkResult(m)

def _lowLevelClearDataBuffers(self, channel):
def _lowLevelClearDataBuffers(self, downSampleMode, channel):
raise NotImplementedError()
m = self.lib.ps6000aSetDataBuffers(
c_int16(self.handle), c_enum(channel),
Expand Down