From 5a683ddd1f1e9604c3ea06cb9a6bb0bacaab0794 Mon Sep 17 00:00:00 2001 From: Robert Jordens Date: Sat, 28 Apr 2018 23:24:41 +0200 Subject: [PATCH] Revert "kasli: force hw_rev for the different targets" This reverts commit 17d7d7856a833f3c07dbff88a67143bc0f3a3d19. Would require filtering it in misoc or better removing the argparse option. --- artiq/gateware/targets/kasli.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/artiq/gateware/targets/kasli.py b/artiq/gateware/targets/kasli.py index faba6e128..ab7541858 100755 --- a/artiq/gateware/targets/kasli.py +++ b/artiq/gateware/targets/kasli.py @@ -388,7 +388,7 @@ class Opticlock(_StandaloneBase): Opticlock extension variant configuration """ def __init__(self, **kwargs): - _StandaloneBase.__init__(self, hw_rev="v1.0", **kwargs) + _StandaloneBase.__init__(self, **kwargs) self.config["SI5324_AS_SYNTHESIZER"] = None # self.config["SI5324_EXT_REF"] = None @@ -493,7 +493,7 @@ class SUServo(_StandaloneBase): SUServo (Sampler-Urukul-Servo) extension variant configuration """ def __init__(self, **kwargs): - _StandaloneBase.__init__(self, hw_rev="v1.1", **kwargs) + _StandaloneBase.__init__(self, **kwargs) self.config["SI5324_AS_SYNTHESIZER"] = None # self.config["SI5324_EXT_REF"] = None @@ -605,7 +605,7 @@ class SUServo(_StandaloneBase): class SYSU(_StandaloneBase): def __init__(self, **kwargs): - _StandaloneBase.__init__(self, hw_rev="v1.1", **kwargs) + _StandaloneBase.__init__(self, **kwargs) self.config["SI5324_AS_SYNTHESIZER"] = None self.config["RTIO_FREQUENCY"] = "125.0" @@ -659,8 +659,10 @@ class SYSU(_StandaloneBase): class MITLL(_StandaloneBase): - def __init__(self, **kwargs): - _StandaloneBase.__init__(self, hw_rev="v1.1", **kwargs) + def __init__(self, hw_rev=None, **kwargs): + if hw_rev is None: + hw_rev = "v1.1" + _StandaloneBase.__init__(self, hw_rev=hw_rev, **kwargs) self.config["SI5324_AS_SYNTHESIZER"] = None self.config["RTIO_FREQUENCY"] = "125.0"