diff options
| -rwxr-xr-x | host/lib/ic_reg_maps/gen_adf5355_regs.py | 8 | ||||
| -rw-r--r-- | host/lib/usrp/common/adf5355.cpp | 45 | ||||
| -rw-r--r-- | host/lib/usrp/dboard/twinrx/twinrx_ctrl.cpp | 2 |
3 files changed, 19 insertions, 36 deletions
diff --git a/host/lib/ic_reg_maps/gen_adf5355_regs.py b/host/lib/ic_reg_maps/gen_adf5355_regs.py index 9644f2e53..a69f126cc 100755 --- a/host/lib/ic_reg_maps/gen_adf5355_regs.py +++ b/host/lib/ic_reg_maps/gen_adf5355_regs.py @@ -26,7 +26,7 @@ REGS_TMPL="""\ ######################################################################## int_16_bit 0[4:19] 0 prescaler 0[20] 0 4_5, 8_9 -autocal_en 0[21] 0 disabled, enabled +autocal_en 0[21] 1 disabled, enabled reg0_reserved0 0[22:31] 0x000 ######################################################################## ## address 1 @@ -53,13 +53,13 @@ counter_reset 4[4] 0 disabled, enabled cp_three_state 4[5] 0 disabled, enabled power_down 4[6] 0 disabled, enabled pd_polarity 4[7] 1 negative, positive -mux_logic 4[8] 0 1_8V, 3_3V +mux_logic 4[8] 1 1_8V, 3_3V ref_mode 4[9] 0 single, diff <% current_setting_enums = ', '.join(map(lambda x: '_'.join(("%0.2fma"%(round(x*31.27 + 31.27)/100)).split('.')), range(0,16))) %>\ charge_pump_current 4[10:13] 0 ${current_setting_enums} double_buff_div 4[14] 0 disabled, enabled r_counter_10_bit 4[15:24] 0 -reference_divide_by_2 4[25] 1 disabled, enabled +reference_divide_by_2 4[25] 0 disabled, enabled reference_doubler 4[26] 0 disabled, enabled muxout 4[27:29] 1 3state, dvdd, dgnd, rdiv, ndiv, analog_ld, dld, reserved reg4_reserved0 4[30:31] 0 @@ -91,7 +91,7 @@ frac_n_ld_precision 7[5:6] 0 5ns, 6ns, 8ns, 12ns loss_of_lock_mode 7[7] 0 disabled, enabled ld_cyc_count 7[8:9] 0 1024, 2048, 4096, 8192 reg7_reserved0 7[10:24] 0x0 -le_sync 7[25] 0 disabled, le_synced_to_refin +le_sync 7[25] 1 disabled, le_synced_to_refin reg7_reserved1 7[26:31] 0x4 ######################################################################## ## address 8 diff --git a/host/lib/usrp/common/adf5355.cpp b/host/lib/usrp/common/adf5355.cpp index ee9d1d1d9..e3fd66bc2 100644 --- a/host/lib/usrp/common/adf5355.cpp +++ b/host/lib/usrp/common/adf5355.cpp @@ -62,43 +62,14 @@ public: _pfd_freq(0.0), _fb_after_divider(false) { - _regs.counter_reset = adf5355_regs_t::COUNTER_RESET_DISABLED; - _regs.cp_three_state = adf5355_regs_t::CP_THREE_STATE_DISABLED; - _regs.power_down = adf5355_regs_t::POWER_DOWN_DISABLED; - _regs.pd_polarity = adf5355_regs_t::PD_POLARITY_POSITIVE; - _regs.mux_logic = adf5355_regs_t::MUX_LOGIC_3_3V; - _regs.ref_mode = adf5355_regs_t::REF_MODE_SINGLE; - _regs.muxout = adf5355_regs_t::MUXOUT_DLD; - _regs.double_buff_div = adf5355_regs_t::DOUBLE_BUFF_DIV_DISABLED; - - _regs.rf_out_a_enabled = adf5355_regs_t::RF_OUT_A_ENABLED_ENABLED; - _regs.rf_out_b_enabled = adf5355_regs_t::RF_OUT_B_ENABLED_DISABLED; - _regs.mute_till_lock_detect = adf5355_regs_t::MUTE_TILL_LOCK_DETECT_MUTE_DISABLED; - _regs.ld_mode = adf5355_regs_t::LD_MODE_FRAC_N; - _regs.frac_n_ld_precision = adf5355_regs_t::FRAC_N_LD_PRECISION_5NS; - _regs.ld_cyc_count = adf5355_regs_t::LD_CYC_COUNT_1024; - _regs.le_sync = adf5355_regs_t::LE_SYNC_LE_SYNCED_TO_REFIN; - _regs.phase_resync = adf5355_regs_t::PHASE_RESYNC_DISABLED; - _regs.reference_divide_by_2 = adf5355_regs_t::REFERENCE_DIVIDE_BY_2_DISABLED; - _regs.reference_doubler = adf5355_regs_t::REFERENCE_DOUBLER_DISABLED; - _regs.autocal_en = adf5355_regs_t::AUTOCAL_EN_ENABLED; - _regs.prescaler = adf5355_regs_t::PRESCALER_4_5; + // TODO This is a hardware specific value, but can be made the default in the ic_reg_map _regs.charge_pump_current = adf5355_regs_t::CHARGE_PUMP_CURRENT_0_94MA; - _regs.gated_bleed = adf5355_regs_t::GATED_BLEED_DISABLED; - _regs.negative_bleed = adf5355_regs_t::NEGATIVE_BLEED_ENABLED; - _regs.feedback_select = adf5355_regs_t::FEEDBACK_SELECT_FUNDAMENTAL; - _regs.output_power = adf5355_regs_t::OUTPUT_POWER_5DBM; + // TODO cleanup these magic numbers _regs.cp_bleed_current = 2; _regs.r_counter_10_bit = 8; - - _regs.ld_cyc_count = adf5355_regs_t::LD_CYC_COUNT_1024; - _regs.loss_of_lock_mode = adf5355_regs_t::LOSS_OF_LOCK_MODE_DISABLED; - _regs.frac_n_ld_precision = adf5355_regs_t::FRAC_N_LD_PRECISION_5NS; - _regs.ld_mode = adf5355_regs_t::LD_MODE_FRAC_N; - _regs.vco_band_div = 3; _regs.timeout = 11; _regs.auto_level_timeout = 30; @@ -108,6 +79,14 @@ public: _regs.adc_conversion = adf5355_regs_t::ADC_CONVERSION_ENABLED; _regs.adc_enable = adf5355_regs_t::ADC_ENABLE_ENABLED; + + // TODO Needs to be enabled for phase resync + _regs.phase_resync = adf5355_regs_t::PHASE_RESYNC_DISABLED; + + // TODO Default should be divided, but there seems to be a bug preventing that. Needs rechecking + _regs.feedback_select = adf5355_regs_t::FEEDBACK_SELECT_FUNDAMENTAL; + + // TODO 0 is an invalid value for this field. Setting to 1 seemed to break phase sync, needs retesting. _regs.phase_resync_clk_div = 0; } @@ -193,7 +172,9 @@ public: //----------------------------------------------------------- //Phase resync - _regs.phase_resync = adf5355_regs_t::PHASE_RESYNC_DISABLED; // Disabled during development + // TODO Renable here, in initialization, or through separate set_phase_resync(bool enable) function + _regs.phase_resync = adf5355_regs_t::PHASE_RESYNC_DISABLED; + _regs.phase_adjust = adf5355_regs_t::PHASE_ADJUST_DISABLED; _regs.sd_load_reset = adf5355_regs_t::SD_LOAD_RESET_ON_REG0_UPDATE; _regs.phase_resync_clk_div = static_cast<uint16_t>( diff --git a/host/lib/usrp/dboard/twinrx/twinrx_ctrl.cpp b/host/lib/usrp/dboard/twinrx/twinrx_ctrl.cpp index dfbea9917..346f39589 100644 --- a/host/lib/usrp/dboard/twinrx/twinrx_ctrl.cpp +++ b/host/lib/usrp/dboard/twinrx/twinrx_ctrl.cpp @@ -106,6 +106,8 @@ public: _config_lo2_route(i==0?LO_CONFIG_CH1:LO_CONFIG_CH2); _lo1_iface[i]->set_output_power(adf5355_iface::OUTPUT_POWER_5DBM); _lo1_iface[i]->set_reference_freq(TWINRX_DESIRED_REFERENCE_FREQ); + // Divided feedback did not appear to be correctly implemented during bringup. Necessary for phase resync +// _lo1_iface[i]->set_feedback_select(adf5355_iface::FB_SEL_DIVIDED); _lo1_iface[i]->set_muxout_mode(adf5355_iface::MUXOUT_DLD); _lo1_iface[i]->set_frequency(3e9, 1.0e3); _lo2_iface[i]->set_feedback_select(adf435x_iface::FB_SEL_DIVIDED); |