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

sawg: clear phase accu in reset

This commit is contained in:
Robert Jördens 2017-06-22 13:27:49 +02:00
parent 694f8d784c
commit 53be34a25f
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
artiq/coredevice/sawg.py
View File

@ -311,17 +311,10 @@ class SAWG:
settings. settings.
This method advances the timeline by the time required to perform all This method advances the timeline by the time required to perform all
six writes to the configuration channel. seven writes to the configuration channel.
""" """
self.frequency0.set_mu(0) self.config.set_div(0, 0)
self.frequency1.set_mu(0) delay_mu(self.config._rtio_interval)
self.frequency2.set_mu(0)
self.phase0.set_mu(0)
self.phase1.set_mu(0)
self.phase2.set_mu(0)
self.amplitude1.set_mu(0)
self.amplitude2.set_mu(0)
self.offset.set_mu(0)
self.config.set_clr(1, 1, 1) self.config.set_clr(1, 1, 1)
delay_mu(self.config._rtio_interval) delay_mu(self.config._rtio_interval)
self.config.set_iq_en(1, 0) self.config.set_iq_en(1, 0)
@ -334,3 +327,12 @@ class SAWG:
delay_mu(self.config._rtio_interval) delay_mu(self.config._rtio_interval)
self.config.set_out_max(1.) self.config.set_out_max(1.)
delay_mu(self.config._rtio_interval) delay_mu(self.config._rtio_interval)
self.frequency0.set_mu(0)
self.frequency1.set_mu(0)
self.frequency2.set_mu(0)
self.phase0.set_mu(0)
self.phase1.set_mu(0)
self.phase2.set_mu(0)
self.amplitude1.set_mu(0)
self.amplitude2.set_mu(0)
self.offset.set_mu(0)