jonathan/scopething
1
0
Fork 0
mirror of https://github.com/jonathanhogg/scopething synced 2025-07-16 11:46:37 +01:00
Code Issues Releases Wiki Activity

Make time trace optional; more concise code in capture

Browse Source
This commit is contained in:
Jonathan Hogg
2017-03-26 12:51:28 +01:00
parent 425c145ef5
commit ba0af88735
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
scope.py
View File

@ -174,7 +174,9 @@ class Scope(vm.VirtualMachine):
if code != 2: if code != 2:
break break
address = int((await self.read_replies(1))[0], 16) // nsamples_multiplier address = int((await self.read_replies(1))[0], 16) // nsamples_multiplier
traces = DotDict({'t': [t*nsamples_multiplier*self.capture_clock_period for t in range(timestamp-nsamples*ticks, timestamp, ticks)]}) traces = DotDict()
if 't' in channels:
traces.t = [t*self.capture_clock_period for t in range(timestamp-total_samples*ticks, timestamp, ticks*nsamples_multiplier)]
for dump_channel, channel in enumerate(sorted(channels)): for dump_channel, channel in enumerate(sorted(channels)):
async with self.transaction(): async with self.transaction():
await self.set_registers(SampleAddress=(address - nsamples) * nsamples_multiplier % buffer_width, await self.set_registers(SampleAddress=(address - nsamples) * nsamples_multiplier % buffer_width,
@ -183,18 +185,13 @@ class Scope(vm.VirtualMachine):
await self.issue_program_spock_registers() await self.issue_program_spock_registers()
await self.issue_analog_dump_binary() await self.issue_analog_dump_binary()
data = await self._reader.readexactly(nsamples * clock_mode.sample_width) data = await self._reader.readexactly(nsamples * clock_mode.sample_width)
value_multiplier, value_offset = (1, 0) if raw else ((high-low), low+self.analog_offsets[channel])
if clock_mode.sample_width == 2: if clock_mode.sample_width == 2:
data = struct.unpack('>{}h'.format(nsamples), data) data = struct.unpack('>{}h'.format(nsamples), data)
if raw: traces[channel] = [(value/65536+0.5)*value_multiplier + value_offset for value in data]
trace = [(value / 65536 + 0.5) for value in data]
else:
trace = [(value / 65536 + 0.5) * (high - low) + low + self.analog_offsets[channel] for value in data]
else: else:
if raw: traces[channel] = [(value/256)*value_multiplier + value_offset for value in data]
trace = [value / 256 for value in data]
else:
trace = [value / 256 * (high - low) + low + self.analog_offsets[channel] for value in data]
traces[channel] = trace
return traces return traces
async def start_generator(self, frequency, waveform='sine', wavetable=None, ratio=0.5, vpp=None, offset=0, async def start_generator(self, frequency, waveform='sine', wavetable=None, ratio=0.5, vpp=None, offset=0,
@ -314,7 +311,7 @@ INFO:scope:Initialised scope, revision: BS000501
In [2]: generate(2000, 'triangle') In [2]: generate(2000, 'triangle')
Out[2]: 2000.0 Out[2]: 2000.0
In [3]: traces = capture('A', low=0, high=3.3) In [3]: traces = capture('tA', low=0, high=3.3)
In [4]: plot(traces.t, traces.A) In [4]: plot(traces.t, traces.A)
Out[4]: [<matplotlib.lines.Line2D at 0x114009160>] Out[4]: [<matplotlib.lines.Line2D at 0x114009160>]