diff options
| author | Trung Tran <trung.tran@ettus.com> | 2018-10-09 23:26:15 -0700 | 
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2018-10-12 10:59:02 -0700 | 
| commit | 22ec3e4bd6a489d1809760e3fedcd6892798c0e0 (patch) | |
| tree | 45adeaceec7489801c1e7e51779e3ce491d7c6ea /mpm/python/usrp_mpm/dboard_manager | |
| parent | a5b1b401d1d60f2575066e0d76b8ff7055a3eb04 (diff) | |
| download | uhd-22ec3e4bd6a489d1809760e3fedcd6892798c0e0.tar.gz uhd-22ec3e4bd6a489d1809760e3fedcd6892798c0e0.tar.bz2 uhd-22ec3e4bd6a489d1809760e3fedcd6892798c0e0.zip  | |
mpm: dboard_manager: add more args to update_ref_clock_freq
Summary:
This change will allow correct args to pass from mboard to dboards,
that in turn can be useful for dboard manager.
Details:
In N310, the dboard manager needs the  time source to be updated before
calling update_ref_clock_source(), because it will trigger a reinit of
the dboard, for which the time_source is essential to determine correct
clock synchronizer settings.
The special case is the white rabbit time source needs a different
internal ref_clock_frequency for the clock synchronizer than the passed
in ref_clock_freq.
Diffstat (limited to 'mpm/python/usrp_mpm/dboard_manager')
| -rw-r--r-- | mpm/python/usrp_mpm/dboard_manager/base.py | 2 | ||||
| -rw-r--r-- | mpm/python/usrp_mpm/dboard_manager/magnesium.py | 3 | 
2 files changed, 3 insertions, 2 deletions
diff --git a/mpm/python/usrp_mpm/dboard_manager/base.py b/mpm/python/usrp_mpm/dboard_manager/base.py index f7ba918f6..be37a6264 100644 --- a/mpm/python/usrp_mpm/dboard_manager/base.py +++ b/mpm/python/usrp_mpm/dboard_manager/base.py @@ -98,7 +98,7 @@ class DboardManagerBase(object):          """          return self.device_info.get("serial", "") -    def update_ref_clock_freq(self, freq): +    def update_ref_clock_freq(self, freq, **kwargs):          """          Call this function if the frequency of the reference clock changes.          """ diff --git a/mpm/python/usrp_mpm/dboard_manager/magnesium.py b/mpm/python/usrp_mpm/dboard_manager/magnesium.py index c67acdc55..275ee4ce2 100644 --- a/mpm/python/usrp_mpm/dboard_manager/magnesium.py +++ b/mpm/python/usrp_mpm/dboard_manager/magnesium.py @@ -463,7 +463,7 @@ class Magnesium(DboardManagerBase):          " Return master clock rate (== sampling rate) "          return self.master_clock_rate -    def update_ref_clock_freq(self, freq): +    def update_ref_clock_freq(self, freq, **kwargs):          """          Call this function if the frequency of the reference clock changes          (the 10, 20, 25 MHz one). @@ -480,6 +480,7 @@ class Magnesium(DboardManagerBase):          self.log.trace("Changing ref clock frequency to %f MHz", freq/1e6)          self.ref_clock_freq = freq          if self._init_args is not None: +            self._init_args = {**self._init_args, **kwargs}              self._reinit(self.master_clock_rate)  | 
