From a92cc91dcbf6bfb5d9eb68a7ffd5d0cdeb2f4b5f Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Thu, 24 Jan 2019 19:37:14 +0800
Subject: [PATCH] kasli_sawgmaster: correctly tune DDS and SAWG

---
 artiq/examples/kasli_sawgmaster/device_db.py          |  3 ++-
 .../kasli_sawgmaster/repository/sines_urukul_sayma.py | 11 +++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/artiq/examples/kasli_sawgmaster/device_db.py b/artiq/examples/kasli_sawgmaster/device_db.py
index b93d777d1..70fa47ab1 100644
--- a/artiq/examples/kasli_sawgmaster/device_db.py
+++ b/artiq/examples/kasli_sawgmaster/device_db.py
@@ -89,7 +89,8 @@ for i in range(4):
         "module": "artiq.coredevice.ad9910",
         "class": "AD9910",
         "arguments": {
-            "pll_n": 26,  # 975MHz sample rate
+            "pll_n": 16,  # 600MHz sample rate
+            "pll_vco": 2,
             "chip_select": 4 + i,
             "cpld_device": "urukul0_cpld",
             "sw_device": "ttl_urukul0_sw" + str(i)
diff --git a/artiq/examples/kasli_sawgmaster/repository/sines_urukul_sayma.py b/artiq/examples/kasli_sawgmaster/repository/sines_urukul_sayma.py
index c23ea99a6..9732b8295 100644
--- a/artiq/examples/kasli_sawgmaster/repository/sines_urukul_sayma.py
+++ b/artiq/examples/kasli_sawgmaster/repository/sines_urukul_sayma.py
@@ -17,6 +17,13 @@ class SinesUrukulSayma(EnvExperiment):
 
     @kernel
     def run(self):
+        f = 9*MHz
+        dds_ftw = self.urukul_chs[0].frequency_to_ftw(f)
+        sawg_ftw = self.sawgs[0].frequency0.to_mu(f)
+        if dds_ftw != sawg_ftw:
+            print("DDS and SAWG FTWs do not match:", dds_ftw, sawg_ftw)
+            return
+
         # Note: when testing sync, do not reboot Urukul, as it is not
         # synchronized to the FPGA (yet).
         self.core.reset()
@@ -24,7 +31,7 @@ class SinesUrukulSayma(EnvExperiment):
         for urukul_ch in self.urukul_chs:
             delay(1*ms)
             urukul_ch.init()
-            urukul_ch.set(9*MHz, amplitude=0.5)
+            urukul_ch.set_mu(dds_ftw, asf=urukul_ch.amplitude_to_asf(0.5))
             urukul_ch.set_att(6.)
             urukul_ch.sw.on()
 
@@ -43,7 +50,7 @@ class SinesUrukulSayma(EnvExperiment):
             for sawg in self.sawgs:
                 delay(1*ms)
                 sawg.amplitude1.set(.4)
-                sawg.frequency0.set(9*MHz)
+                sawg.frequency0.set_mu(sawg_ftw)
 
             while self.drtio_is_up():
                 pass