diff options
| author | Trung N Tran <trung.tran@ettus.com> | 2017-11-29 17:47:10 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2017-12-22 15:05:57 -0800 |
| commit | de7ed3081b6b9746c320669d87d318e82e4af7f4 (patch) | |
| tree | 26c926af167b62e8d66c764ffd1cee0eafd5fb49 | |
| parent | 8bccbf85643feb7e88b768e41f29cc5aa66e2aa2 (diff) | |
| download | uhd-de7ed3081b6b9746c320669d87d318e82e4af7f4.tar.gz uhd-de7ed3081b6b9746c320669d87d318e82e4af7f4.tar.bz2 uhd-de7ed3081b6b9746c320669d87d318e82e4af7f4.zip | |
mg: Fix TX power issues
- Fixed incorrect register address for channel 1 lowband mixer select
- Fixed enabling of bypass path
| -rw-r--r-- | host/lib/ic_reg_maps/gen_mgcpld_regs.py | 4 | ||||
| -rw-r--r-- | host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_cpld.cpp | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/host/lib/ic_reg_maps/gen_mgcpld_regs.py b/host/lib/ic_reg_maps/gen_mgcpld_regs.py index fd3d9673f..c42e1a5a3 100644 --- a/host/lib/ic_reg_maps/gen_mgcpld_regs.py +++ b/host/lib/ic_reg_maps/gen_mgcpld_regs.py @@ -42,7 +42,7 @@ ch1_idle_rx_myk_en 0x0052[10] 0 ch1_on_tx_sw1 0x0053[0:1] 0 ShutdownTxSw1,FromTxFilterLp1700MHz,FromTxFilterLp3400MHz,FromTxFilterLp0800MHz ch1_on_tx_sw2 0x0053[2:5] 1 ToTxFilterLp3400MHz=1,ToTxFilterLp1700MHz=2,ToTxFilterLp0800MHz=4,ToTxFilterLp6400MHz=8 ch1_on_tx_sw3 0x0053[6] 0 ToTxFilterBanks,BypassPathToTrxSw -ch1_on_tx_lowband_mixer_path_select 0x0050[7] 0 bypass,enable +ch1_on_tx_lowband_mixer_path_select 0x0053[7] 0 bypass,enable ch1_on_tx_mixer_en 0x0053[8] 0 ch1_on_tx_amp_en 0x0053[9] 0 ch1_on_tx_pa_en 0x0053[10] 0 @@ -90,7 +90,7 @@ ch2_idle_rx_myk_en 0x0062[10] 0 ch2_on_tx_sw1 0x0063[0:1] 0 ShutdownTxSw1,FromTxFilterLp1700MHz,FromTxFilterLp3400MHz,FromTxFilterLp0800MHz ch2_on_tx_sw2 0x0063[2:5] 1 ToTxFilterLp3400MHz=1,ToTxFilterLp1700MHz=2,ToTxFilterLp0800MHz=4,ToTxFilterLp6400MHz=8 ch2_on_tx_sw3 0x0063[6] 0 ToTxFilterBanks,BypassPathToTrxSw -ch2_on_tx_lowband_mixer_path_select 0x0050[7] 0 bypass,enable +ch2_on_tx_lowband_mixer_path_select 0x0063[7] 0 bypass,enable ch2_on_tx_mixer_en 0x0063[8] 0 ch2_on_tx_amp_en 0x0063[9] 0 ch2_on_tx_pa_en 0x0063[10] 0 diff --git a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_cpld.cpp b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_cpld.cpp index c7163052b..28bc7ec35 100644 --- a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_cpld.cpp +++ b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_cpld.cpp @@ -240,7 +240,9 @@ void magnesium_radio_ctrl_impl::_update_tx_freq_switches( magnesium_cpld_ctrl::LOWBAND_MIXER_PATH_SEL_BYPASS; const bool enable_lowband_mixer = (freq <= MAGNESIUM_LOWBAND_FREQ); // Defaults are fine for bypassing the amp stage - if (not bypass_amp) { + if (bypass_amp) { + _sw_trx[chan_sel] = magnesium_cpld_ctrl::SW_TRX_BYPASSPATHTOTXSW3; + } else { // Set filters based on frequency if (freq < MAGNESIUM_TX_BAND1_MIN_FREQ) { _sw_trx[chan_sel] = |