diff options
| author | Trung N Tran <trung.tran@ettus.com> | 2018-02-12 14:06:59 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2018-02-14 01:25:24 +0100 |
| commit | 8c4894534ecec3f0d51b9fff9e0605b40ba2ab6c (patch) | |
| tree | 57c9ab4c4c6bcfd02db7642d79523563302e0768 /host | |
| parent | ca2c2f4f0bfb0b39194d76e4543829e39fde8ce8 (diff) | |
| download | uhd-8c4894534ecec3f0d51b9fff9e0605b40ba2ab6c.tar.gz uhd-8c4894534ecec3f0d51b9fff9e0605b40ba2ab6c.tar.bz2 uhd-8c4894534ecec3f0d51b9fff9e0605b40ba2ab6c.zip | |
mg: turn on tx power amplifiers when idle
Without turning on tx power amplifer when being idle, the TX settling time is
100ms. Turning these power amplifiers on "all time" results in tx settling time
around 140us.
Diffstat (limited to 'host')
| -rw-r--r-- | host/lib/ic_reg_maps/gen_mgcpld_regs.py | 16 | ||||
| -rw-r--r-- | host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_cpld.cpp | 5 |
2 files changed, 11 insertions, 10 deletions
diff --git a/host/lib/ic_reg_maps/gen_mgcpld_regs.py b/host/lib/ic_reg_maps/gen_mgcpld_regs.py index c42e1a5a3..e8827a1a4 100644 --- a/host/lib/ic_reg_maps/gen_mgcpld_regs.py +++ b/host/lib/ic_reg_maps/gen_mgcpld_regs.py @@ -20,8 +20,8 @@ ch1_idle_tx_sw2 0x0050[2:5] 1 ToTxFilterLp3400MHz=1,ToTxFilterLp1700 ch1_idle_tx_sw3 0x0050[6] 0 ToTxFilterBanks,BypassPathToTrxSw ch1_idle_tx_lowband_mixer_path_select 0x0050[7] 0 bypass,enable ch1_idle_tx_mixer_en 0x0050[8] 0 -ch1_idle_tx_amp_en 0x0050[9] 0 -ch1_idle_tx_pa_en 0x0050[10] 0 +ch1_idle_tx_amp_en 0x0050[9] 1 +ch1_idle_tx_pa_en 0x0050[10] 1 ch1_idle_sw_trx 0x0050[11:12] 0 FromLowerFilterBankTxSw1,FromTxUpperFilterBankLp6400MHz,RxChannelPath,BypassPathToTxSw3 ch1_idle_tx_led 0x0050[13] 0 ch1_idle_tx_myk_en 0x0050[14] 0 @@ -44,8 +44,8 @@ ch1_on_tx_sw2 0x0053[2:5] 1 ToTxFilterLp3400MHz=1,ToTxFilterLp1700 ch1_on_tx_sw3 0x0053[6] 0 ToTxFilterBanks,BypassPathToTrxSw 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 +ch1_on_tx_amp_en 0x0053[9] 1 +ch1_on_tx_pa_en 0x0053[10] 1 ch1_on_sw_trx 0x0053[11:12] 0 FromLowerFilterBankTxSw1,FromTxUpperFilterBankLp6400MHz,RxChannelPath,BypassPathToTxSw3 ch1_on_tx_led 0x0053[13] 0 ch1_on_tx_myk_en 0x0053[14] 0 @@ -68,8 +68,8 @@ ch2_idle_tx_sw2 0x0060[2:5] 1 ToTxFilterLp3400MHz=1,ToTxFilterLp1700 ch2_idle_tx_sw3 0x0060[6] 0 ToTxFilterBanks,BypassPathToTrxSw ch2_idle_tx_lowband_mixer_path_select 0x0060[7] 0 bypass,enable ch2_idle_tx_mixer_en 0x0060[8] 0 -ch2_idle_tx_amp_en 0x0060[9] 0 -ch2_idle_tx_pa_en 0x0060[10] 0 +ch2_idle_tx_amp_en 0x0060[9] 1 +ch2_idle_tx_pa_en 0x0060[10] 1 ch2_idle_sw_trx 0x0060[11:12] 0 FromLowerFilterBankTxSw1,FromTxUpperFilterBankLp6400MHz,RxChannelPath,BypassPathToTxSw3 ch2_idle_tx_led 0x0060[13] 0 ch2_idle_tx_myk_en 0x0060[14] 0 @@ -92,8 +92,8 @@ ch2_on_tx_sw2 0x0063[2:5] 1 ToTxFilterLp3400MHz=1,ToTxFilterLp1700 ch2_on_tx_sw3 0x0063[6] 0 ToTxFilterBanks,BypassPathToTrxSw 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 +ch2_on_tx_amp_en 0x0063[9] 1 +ch2_on_tx_pa_en 0x0063[10] 1 ch2_on_sw_trx 0x0063[11:12] 0 FromLowerFilterBankTxSw1,FromTxUpperFilterBankLp6400MHz,RxChannelPath,BypassPathToTxSw3 ch2_on_tx_led 0x0063[13] 0 ch2_on_tx_myk_en 0x0063[14] 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 183b87dcb..2bd2b2341 100644 --- a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_cpld.cpp +++ b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_cpld.cpp @@ -117,12 +117,13 @@ void magnesium_radio_ctrl_impl::_update_atr_switches( true, /* Myk on */ true /* defer commit */ ); + // Leaving PA on since we want shorter tx settling time. _cpld->set_tx_atr_bits( chan, magnesium_cpld_ctrl::IDLE, false, /* LED off */ - false, /* PA off */ - false, /* AMP off */ + true, /* PA on */ + true, /* AMP on */ true, /* Myk on */ false /* don't defer commit */ ); |