M-Labs/artiq
2
0
Fork 2
mirror of https://github.com/m-labs/artiq.git synced 2024-12-19 08:26:30 +08:00
Code Issues Projects Releases Wiki Activity

moninj: move _DDSModel constructor

Browse Source 
Signed-off-by: Simon Renblad <srenblad@m-labs.hk>
This commit is contained in:
Simon Renblad 2024-05-07 15:07:37 +08:00 committed by Sébastien Bourdeauducq
parent a8157cd5c9
commit 7dff78e849
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
artiq/dashboard/moninj.py
View File

@ -211,13 +211,14 @@ class _DDSModel:
class _DDSWidget(QtWidgets.QFrame): class _DDSWidget(QtWidgets.QFrame):
def __init__(self, dm, title, bus_channel=0, channel=0, dds_model=None): def __init__(self, dm, title, bus_channel, channel,
dds_type, ref_clk, cpld=None, pll=1, clk_div=0):
self.dm = dm self.dm = dm
self.bus_channel = bus_channel self.bus_channel = bus_channel
self.channel = channel self.channel = channel
self.dds_name = title self.dds_name = title
self.cur_frequency = 0 self.cur_frequency = 0
self.dds_model = dds_model self.dds_model = _DDSModel(dds_type, ref_clk, cpld, pll, clk_div)
QtWidgets.QFrame.__init__(self) QtWidgets.QFrame.__init__(self)
@ -388,9 +389,8 @@ def setup_from_ddb(ddb):
bus_channel = v["arguments"]["bus_channel"] bus_channel = v["arguments"]["bus_channel"]
channel = v["arguments"]["channel"] channel = v["arguments"]["channel"]
dds_sysclk = v["arguments"]["sysclk"] dds_sysclk = v["arguments"]["sysclk"]
model = _DDSModel(v["class"], dds_sysclk)
widget = _WidgetDesc(k, comment, _DDSWidget, widget = _WidgetDesc(k, comment, _DDSWidget,
(k, bus_channel, channel, model)) (k, bus_channel, channel, v["class"], dds_sysclk))
description.add(widget) description.add(widget)
elif (v["module"] == "artiq.coredevice.ad9910" and v["class"] == "AD9910") or \ elif (v["module"] == "artiq.coredevice.ad9910" and v["class"] == "AD9910") or \
(v["module"] == "artiq.coredevice.ad9912" and v["class"] == "AD9912"): (v["module"] == "artiq.coredevice.ad9912" and v["class"] == "AD9912"):
@ -403,9 +403,9 @@ def setup_from_ddb(ddb):
pll = v["arguments"]["pll_n"] pll = v["arguments"]["pll_n"]
refclk = ddb[dds_cpld]["arguments"]["refclk"] refclk = ddb[dds_cpld]["arguments"]["refclk"]
clk_div = v["arguments"].get("clk_div", 0) clk_div = v["arguments"].get("clk_div", 0)
model = _DDSModel(v["class"], refclk, dds_cpld, pll, clk_div)
widget = _WidgetDesc(k, comment, _DDSWidget, widget = _WidgetDesc(k, comment, _DDSWidget,
(k, bus_channel, channel, model)) (k, bus_channel, channel, v["class"],
refclk, dds_cpld, pll, clk_div))
description.add(widget) description.add(widget)
elif (v["module"] == "artiq.coredevice.ad53xx" and v["class"] == "AD53xx") or \ elif (v["module"] == "artiq.coredevice.ad53xx" and v["class"] == "AD53xx") or \
(v["module"] == "artiq.coredevice.zotino" and v["class"] == "Zotino"): (v["module"] == "artiq.coredevice.zotino" and v["class"] == "Zotino"):