From 37ec97eb28e6212ee4d8808e008b49069d4b0916 Mon Sep 17 00:00:00 2001 From: Robert Jordens Date: Wed, 7 Mar 2018 19:00:50 +0000 Subject: [PATCH] ad9910/2: add sw invariant only when passed --- artiq/coredevice/ad9910.py | 3 ++- artiq/coredevice/ad9912.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/artiq/coredevice/ad9910.py b/artiq/coredevice/ad9910.py index 06ddfee67..4be5d8ff7 100644 --- a/artiq/coredevice/ad9910.py +++ b/artiq/coredevice/ad9910.py @@ -49,7 +49,7 @@ class AD9910: :param pll_cp: DDS PLL charge pump setting. :param pll_vco: DDS PLL VCO range selection. """ - kernel_invariants = {"chip_select", "cpld", "core", "bus", "sw", + kernel_invariants = {"chip_select", "cpld", "core", "bus", "ftw_per_hz", "pll_n", "pll_cp", "pll_vco"} def __init__(self, dmgr, chip_select, cpld_device, sw_device=None, @@ -61,6 +61,7 @@ class AD9910: self.chip_select = chip_select if sw_device: self.sw = dmgr.get(sw_device) + self.kernel_invariants.add("sw") assert 12 <= pll_n <= 127 self.pll_n = pll_n assert self.cpld.refclk/4 <= 60e6 diff --git a/artiq/coredevice/ad9912.py b/artiq/coredevice/ad9912.py index fbf116e05..f8b139be8 100644 --- a/artiq/coredevice/ad9912.py +++ b/artiq/coredevice/ad9912.py @@ -24,7 +24,7 @@ class AD9912: f_ref*pll_n where f_ref is the reference frequency (set in the parent Urukul CPLD instance). """ - kernel_invariants = {"chip_select", "cpld", "core", "bus", "sw", + kernel_invariants = {"chip_select", "cpld", "core", "bus", "ftw_per_hz", "sysclk", "pll_n"} def __init__(self, dmgr, chip_select, cpld_device, sw_device=None, @@ -36,6 +36,7 @@ class AD9912: self.chip_select = chip_select if sw_device: self.sw = dmgr.get(sw_device) + self.kernel_invariants.add("sw") self.pll_n = pll_n self.sysclk = self.cpld.refclk*pll_n assert self.sysclk <= 1e9