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

Revert "kasli: force hw_rev for the different targets" 

This reverts commit 17d7d7856a.

Would require filtering it in misoc or better
removing the argparse option.
This commit is contained in:
Robert Jördens 2018-04-28 23:24:41 +02:00
parent 17d7d7856a
commit 5a683ddd1f
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
artiq/gateware/targets/kasli.py
View File

@ -388,7 +388,7 @@ class Opticlock(_StandaloneBase):
Opticlock extension variant configuration Opticlock extension variant configuration
""" """
def __init__(self, **kwargs): 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_AS_SYNTHESIZER"] = None
# self.config["SI5324_EXT_REF"] = None # self.config["SI5324_EXT_REF"] = None
@ -493,7 +493,7 @@ class SUServo(_StandaloneBase):
SUServo (Sampler-Urukul-Servo) extension variant configuration SUServo (Sampler-Urukul-Servo) extension variant configuration
""" """
def __init__(self, **kwargs): 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_AS_SYNTHESIZER"] = None
# self.config["SI5324_EXT_REF"] = None # self.config["SI5324_EXT_REF"] = None
@ -605,7 +605,7 @@ class SUServo(_StandaloneBase):
class SYSU(_StandaloneBase): class SYSU(_StandaloneBase):
def __init__(self, **kwargs): 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_AS_SYNTHESIZER"] = None
self.config["RTIO_FREQUENCY"] = "125.0" self.config["RTIO_FREQUENCY"] = "125.0"
@ -659,8 +659,10 @@ class SYSU(_StandaloneBase):
class MITLL(_StandaloneBase): class MITLL(_StandaloneBase):
def __init__(self, **kwargs): def __init__(self, hw_rev=None, **kwargs):
_StandaloneBase.__init__(self, hw_rev="v1.1", **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["SI5324_AS_SYNTHESIZER"] = None
self.config["RTIO_FREQUENCY"] = "125.0" self.config["RTIO_FREQUENCY"] = "125.0"