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

Infinite timeout when not specified; remove requirement for pandas from test code

Browse Source
This commit is contained in:
Jonathan Hogg
2017-07-03 17:08:56 +01:00
parent 3ec9861cd0
commit 3075dac302
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scope.py
View File

@ -52,8 +52,8 @@ class Scope(vm.VirtualMachine):
self.awg_sample_buffer_size = 1024 self.awg_sample_buffer_size = 1024
self.awg_minimum_clock = 33 self.awg_minimum_clock = 33
self.awg_maximum_voltage = 3.33 self.awg_maximum_voltage = 3.33
self.analog_params = (20.17, -5.247, 299.0, 18.47, 0.4082) self.analog_params = (20.164, -5.2470, 299.00, 18.472, 0.40827)
self.analog_offsets = {'A': -0.0117, 'B': 0.0117} self.analog_offsets = {'A': -0.011924, 'B': 0.011924}
self.analog_min = -5.7 self.analog_min = -5.7
self.analog_max = 8 self.analog_max = 8
self.capture_clock_period = 25e-9 self.capture_clock_period = 25e-9
@ -208,7 +208,7 @@ class Scope(vm.VirtualMachine):
trace_outro = max(0, nsamples-trigger_samples-trigger_outro) trace_outro = max(0, nsamples-trigger_samples-trigger_outro)
trace_intro = max(0, trigger_samples-trigger_intro) trace_intro = max(0, trigger_samples-trigger_intro)
if timeout is None: if timeout is None:
trigger_timeout = int(period*5/self.timeout_clock_period) trigger_timeout = 0
else: else:
trigger_timeout = max(1, int(math.ceil(((trigger_outro+trace_outro)*ticks*clock_scale*self.capture_clock_period trigger_timeout = max(1, int(math.ceil(((trigger_outro+trace_outro)*ticks*clock_scale*self.capture_clock_period
+ timeout)/self.timeout_clock_period))) + timeout)/self.timeout_clock_period)))
@ -405,8 +405,6 @@ Out[7]: <matplotlib.axes._subplots.AxesSubplot at 0x10d05d5f8>
In [8]: In [8]:
""" """
import pandas
async def main(): async def main():
global s global s
parser = argparse.ArgumentParser(description="scopething") parser = argparse.ArgumentParser(description="scopething")
@ -429,6 +427,10 @@ def await(g):
def capture(*args, **kwargs): def capture(*args, **kwargs):
return await(s.capture(*args, **kwargs)) return await(s.capture(*args, **kwargs))
def capturep(*args, **kwargs):
import pandas
return pandas.DataFrame(capture(*args, **kwargs))
def calibrate(*args, **kwargs): def calibrate(*args, **kwargs):
return await(s.calibrate(*args, **kwargs)) return await(s.calibrate(*args, **kwargs))