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

devices/dds_core: fix merging of back-to-back pulses of different frequencies

This commit is contained in:
Sebastien Bourdeauducq 2014-10-13 23:58:32 +08:00
parent 8a06f93eb2
commit a303293e8f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
artiq/devices/dds_core.py
View File

@ -50,9 +50,10 @@ class DDS(AutoContext):
""" """
if self.previous_frequency != frequency: if self.previous_frequency != frequency:
if self.sw.previous_timestamp != time_to_cycles(now()): merge = self.sw.previous_timestamp == time_to_cycles(now())
if not merge:
self.sw.sync() self.sw.sync()
if self.sw.previous_value: if merge or bool(self.sw.previous_value):
# Channel is already on. # Channel is already on.
# Precise timing of frequency change is required. # Precise timing of frequency change is required.
fud_time = time_to_cycles(now()) fud_time = time_to_cycles(now())