M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

test_ad9910: default to a useful seed 

Signed-off-by: Robert Jördens <rj@quartiq.de>
This commit is contained in:
Robert Jördens 2018-11-06 17:35:57 +01:00
parent 0b2661a34d
commit 172633c7da
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
artiq/coredevice/ad9910.py
View File

@ -414,7 +414,7 @@ class AD9910:
self.cpld.io_update.pulse(1*us) self.cpld.io_update.pulse(1*us)
@kernel @kernel
def tune_sync_delay(self, sync_delay_seed): def tune_sync_delay(self, sync_delay_seed=8):
"""Find a stable SYNC_IN delay. """Find a stable SYNC_IN delay.
This method first locates the smallest SYNC_IN validity window at This method first locates the smallest SYNC_IN validity window at
@ -439,10 +439,8 @@ class AD9910:
if in_delay & 1: if in_delay & 1:
in_delay = -in_delay in_delay = -in_delay
in_delay = sync_delay_seed + (in_delay >> 1) in_delay = sync_delay_seed + (in_delay >> 1)
if in_delay < 0: if in_delay < 0 or in_delay > 31:
in_delay = 0 continue
elif in_delay > 31:
in_delay = 31
self.set_sync(in_delay, window) self.set_sync(in_delay, window)
self.clear_smp_err() self.clear_smp_err()
# integrate SMP_ERR statistics for a few hundred cycles # integrate SMP_ERR statistics for a few hundred cycles

2
artiq/test/coredevice/test_ad9910.py
View File

@ -81,7 +81,7 @@ class AD9910Exp(EnvExperiment):
self.sync_scan(err, win=i) self.sync_scan(err, win=i)
print(err) print(err)
self.core.break_realtime() self.core.break_realtime()
dly, win = self.dev.tune_sync_delay(self.dev.sync_delay_seed) dly, win = self.dev.tune_sync_delay()
self.sync_scan(err, win=win + 1) # tighten window by 2*75ps self.sync_scan(err, win=win + 1) # tighten window by 2*75ps
self.set_dataset("dly", dly) self.set_dataset("dly", dly)
self.set_dataset("win", win) self.set_dataset("win", win)