aboutsummaryrefslogtreecommitdiffstats
path: root/mpm
diff options
context:
space:
mode:
authorHumberto Jimenez <humberto.jimenez@ni.com>2018-10-03 16:32:29 -0500
committerBrent Stapleton <bstapleton@g.hmc.edu>2018-10-30 09:57:55 -0700
commit5c9c7b3dd33254f16c19d681a48467686c12d839 (patch)
tree4d3fa55d7785bcc8ef894c7c93e771516150605c /mpm
parenteb4a609ec87a54f189d79b68497e2ee26efae539 (diff)
downloaduhd-5c9c7b3dd33254f16c19d681a48467686c12d839.tar.gz
uhd-5c9c7b3dd33254f16c19d681a48467686c12d839.tar.bz2
uhd-5c9c7b3dd33254f16c19d681a48467686c12d839.zip
rh: Phase DAC configuration clean-up
- Confirmed the Phase DAC to be initialized at mid-scale. - Confirmed the Phase DAC step resolution for fine clock shifting. The clock synchronization algorithm relies on the Phase DAC to fine shift the sampling clocks on each daughterboard. Only a certain number of DAC codes are required for the actual clock adjustment, thus a different range of codes may be chosen by initializing the Phase DAC with a given value. With the selected range, one may measure the Phase DAC's linearity and step resolution, which defines how many steps are required when performing the fine shifting of the clocks. After initializing the 16-bit Phase DAC at 25%, 50% (mid-scale), and 75%; it was found that the clock distribution PLL locks relatively faster when using mid-scale (2^15). By testing the Phase DAC's linearity, it was confirmed that the circuit resolution is 1.11 ps per code.
Diffstat (limited to 'mpm')
-rw-r--r--mpm/python/usrp_mpm/dboard_manager/rh_init.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/mpm/python/usrp_mpm/dboard_manager/rh_init.py b/mpm/python/usrp_mpm/dboard_manager/rh_init.py
index e75b9fa62..20a06d788 100644
--- a/mpm/python/usrp_mpm/dboard_manager/rh_init.py
+++ b/mpm/python/usrp_mpm/dboard_manager/rh_init.py
@@ -23,10 +23,9 @@ class RhodiumInitManager(object):
Helper class: Holds all the logic to initialize an N320/N321 (Rhodium)
daughterboard.
"""
- # After manually probing the PLL1's reference and feedback signal from the LMK
- # using multiple phase dac values close to its midpoint (2^11 = 2048), it was
- # discovered that the PLL1's tightest phase lock is at 2024.
- INIT_PHASE_DAC_WORD = 32768 # TODO: update this number for Rev. B
+ # The Phase DAC is set at midscale, having its flatness validate +/- 1023 codes
+ # from this initial value.
+ INIT_PHASE_DAC_WORD = 32768
PHASE_DAC_SPI_ADDR = 0x3
# External PPS pipeline delay from the PPS captured at the FPGA to TDC input,
# in reference clock ticks
@@ -69,7 +68,6 @@ class RhodiumInitManager(object):
return LMK04828Rh(self.slot_idx, lmk_spi, ref_clk_freq, sampling_clock_rate, self.log)
- # TODO: update phase shift value after testing phase DAC flatness with shields (Rev. B)
def _sync_db_clock(self, dboard_ctrl_regs, ref_clk_freq, master_clock_rate, args):
" Synchronizes the DB clock to the common reference "
reg_offset = 0x200
@@ -85,7 +83,7 @@ class RhodiumInitManager(object):
reg_offset,
master_clock_rate,
ref_clk_freq,
- 1.1E-12, # fine phase shift. TODO don't hardcode. This should live in the EEPROM
+ 1.116E-12, # fine phase shift. TODO don't hardcode. This should live in the EEPROM
self.INIT_PHASE_DAC_WORD,
self.PHASE_DAC_SPI_ADDR,
ext_pps_delay,