From 3c7ab498d18542ea5b89b64a3fb6dae5bfec691a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Sowi=C5=84ski?= Date: Thu, 1 Sep 2022 14:24:15 +0200 Subject: [PATCH] Added DDS selection for Kasli tester variant MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mikołaj Sowiński --- artiq/gateware/targets/kasli.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/artiq/gateware/targets/kasli.py b/artiq/gateware/targets/kasli.py index 5938fc947..7ed52052b 100755 --- a/artiq/gateware/targets/kasli.py +++ b/artiq/gateware/targets/kasli.py @@ -170,9 +170,11 @@ class Tester(StandaloneBase): """ Configuration for CI tests. Contains the maximum number of different EEMs. """ - def __init__(self, hw_rev=None, **kwargs): + def __init__(self, hw_rev=None, dds=None, **kwargs): if hw_rev is None: hw_rev = "v2.0" + if dds is None: + dds = "ad9910" StandaloneBase.__init__(self, hw_rev=hw_rev, **kwargs) self.config["SI5324_AS_SYNTHESIZER"] = None @@ -186,7 +188,7 @@ class Tester(StandaloneBase): eem.DIO.add_std(self, 5, ttl_serdes_7series.InOut_8X, ttl_serdes_7series.Output_8X, edge_counter_cls=edge_counter.SimpleEdgeCounter) - eem.Urukul.add_std(self, 0, 1, ttl_serdes_7series.Output_8X, + eem.Urukul.add_std(self, 0, 1, ttl_serdes_7series.Output_8X, dds, ttl_simple.ClockGen) eem.Sampler.add_std(self, 3, 2, ttl_serdes_7series.Output_8X) eem.Zotino.add_std(self, 4, ttl_serdes_7series.Output_8X) @@ -686,6 +688,9 @@ def main(): help="variant: {} (default: %(default)s)".format( "/".join(sorted(VARIANTS.keys())))) parser.add_argument("--with-wrpll", default=False, action="store_true") + parser.add_argument("--tester-dds", default=None, + help="Tester variant DDS type: ad9910/ad9912 " + "(default: ad9910)") parser.add_argument("--gateware-identifier-str", default=None, help="Override ROM identifier") args = parser.parse_args() @@ -694,6 +699,7 @@ def main(): if args.with_wrpll: argdict["with_wrpll"] = True argdict["gateware_identifier_str"] = args.gateware_identifier_str + argdict["dds"] = args.tester_dds variant = args.variant.lower() try: