jonathan/scopething
1
0
Fork 0
mirror of https://github.com/jonathanhogg/scopething synced 2025-07-14 03:02:09 +01:00
Code Issues Releases Wiki Activity

Use timestamps starting at 0 and record scope time as capture_start in the series data

Browse Source
This commit is contained in:
Jonathan Hogg
2020-07-01 19:31:18 +01:00
parent ca9011011d
commit 22f7d1a81e
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scope.py
View File

@ -302,7 +302,8 @@ class Scope(vm.VirtualMachine):
address -= address % 2 address -= address % 2
traces = DotDict() traces = DotDict()
timestamps = array.array('d', (t*self.master_clock_period for t in range(0, timestamp, ticks*clock_scale)))
timestamps = array.array('d', (i * sample_period for i in range(nsamples)))
for dump_channel, channel in enumerate(sorted(analog_channels)): for dump_channel, channel in enumerate(sorted(analog_channels)):
asamples = nsamples // len(analog_channels) asamples = nsamples // len(analog_channels)
async with self.transaction(): async with self.transaction():
@ -314,7 +315,7 @@ class Scope(vm.VirtualMachine):
value_multiplier, value_offset = (1, 0) if raw else (high-low, low-analog_params.ab_offset/2*(1 if channel == 'A' else -1)) value_multiplier, value_offset = (1, 0) if raw else (high-low, low-analog_params.ab_offset/2*(1 if channel == 'A' else -1))
data = await self.read_analog_samples(asamples, capture_mode.sample_width) data = await self.read_analog_samples(asamples, capture_mode.sample_width)
series = DotDict({'channel': channel, series = DotDict({'channel': channel,
'start_timestamp': start_timestamp, 'capture_start': start_timestamp * self.master_clock_period,
'timestamps': timestamps[dump_channel::len(analog_channels)] if len(analog_channels) > 1 else timestamps, 'timestamps': timestamps[dump_channel::len(analog_channels)] if len(analog_channels) > 1 else timestamps,
'samples': array.array('f', (value*value_multiplier+value_offset for value in data)), 'samples': array.array('f', (value*value_multiplier+value_offset for value in data)),
'sample_period': sample_period*len(analog_channels), 'sample_period': sample_period*len(analog_channels),
@ -336,7 +337,7 @@ class Scope(vm.VirtualMachine):
mask = 1 << i mask = 1 << i
channel = f'L{i}' channel = f'L{i}'
series = DotDict({'channel': channel, series = DotDict({'channel': channel,
'start_timestamp': start_timestamp, 'capture_start': start_timestamp * self.master_clock_period,
'timestamps': timestamps, 'timestamps': timestamps,
'samples': array.array('B', (1 if value & mask else 0 for value in data)), 'samples': array.array('B', (1 if value & mask else 0 for value in data)),
'sample_period': sample_period, 'sample_period': sample_period,