From 243235b75fcaccff7f9b12af2b2eaffb42793ec7 Mon Sep 17 00:00:00 2001 From: f4exb Date: Wed, 14 Mar 2018 19:52:54 +0100 Subject: [PATCH] LimeSDR: GUI cosmetic changea --- .../limesdroutput/limesdroutputgui.cpp | 3 ++- .../limesdroutput/limesdroutputgui.ui | 6 +++--- plugins/samplesink/limesdroutput/readme.md | 4 ++-- .../limesdrinput/limesdrinputgui.cpp | 3 ++- .../limesdrinput/limesdrinputgui.ui | 19 ++++++++++++++++--- plugins/samplesource/limesdrinput/readme.md | 4 ++-- 6 files changed, 27 insertions(+), 12 deletions(-) diff --git a/plugins/samplesink/limesdroutput/limesdroutputgui.cpp b/plugins/samplesink/limesdroutput/limesdroutputgui.cpp index de4515204..9e08cdaa4 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputgui.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutputgui.cpp @@ -328,9 +328,10 @@ void LimeSDROutputGUI::setNCODisplay() false, 8, -ncoHalfRange, - ncoHalfRange); // frequency dial is in kHz + ncoHalfRange); ui->ncoFrequency->blockSignals(true); + ui->ncoFrequency->setToolTip(QString("NCO frequency shift in Hz (Range: +/- %1 kHz)").arg(ncoHalfRange/1000)); ui->ncoFrequency->setValue(m_settings.m_ncoFrequency); ui->ncoFrequency->blockSignals(false); } diff --git a/plugins/samplesink/limesdroutput/limesdroutputgui.ui b/plugins/samplesink/limesdroutput/limesdroutputgui.ui index 247eb4b5a..008191154 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputgui.ui +++ b/plugins/samplesink/limesdroutput/limesdroutputgui.ui @@ -6,7 +6,7 @@ 0 0 - 350 + 360 290 @@ -18,7 +18,7 @@ - 350 + 360 290 @@ -247,7 +247,7 @@ PointingHandCursor - NCO frequency (Hz) + NCO frequency shift in Hz diff --git a/plugins/samplesink/limesdroutput/readme.md b/plugins/samplesink/limesdroutput/readme.md index 3b8d254ef..d21f885db 100644 --- a/plugins/samplesink/limesdroutput/readme.md +++ b/plugins/samplesink/limesdroutput/readme.md @@ -77,9 +77,9 @@ Use this button to activate/deactivate the TSP NCO. The LMS7002M chip has an ind Use this push button to reset the NCO frequency to 0 and thus center on the main passband of the DAC. -

7: NCO frequency

+

7: NCO frequency shift

-This is the NCO frequency. Use the thumbwheels to adjust frequency as done with the LO (1.1). Pressing shift simultanoeusly moves digit by 5 and pressing control moves it by 2. The boundaries are dynamically calculated from the LO center frequency, sample rate and hardware interpolation factor. +This is the frequency shift applied when the NCO is engaged thus the actual LO frequency is the center frequency of transmission minus this value. Use the thumbwheels to adjust frequency as done with the LO (1.1). Pressing shift simultanoeusly moves digit by 5 and pressing control moves it by 2. The boundaries are dynamically calculated from the LO center frequency, sample rate and hardware interpolation factor. ☞ In the LMS7002M TSP block the NCO sits after the interpolator (see Fig.14 of the [datasheet](http://www.limemicro.com/wp-content/uploads/2015/09/LMS7002M-Data-Sheet-v2.8.0.pdf) p.7) so it runs at the actual DAC rate. Hence the NCO limits are calculated as +/- half the device to host sample rate multiplied by the hardware interpolation factor. For example with a 4 MS/s device to host sample rate (10) and a hadrware interpolation of 16 (8) you have +/- 32 MHz span around the LO for the NCO. In this example you can tune all HF frequencies with the center frequency set at its lowest (30 MHz). diff --git a/plugins/samplesource/limesdrinput/limesdrinputgui.cpp b/plugins/samplesource/limesdrinput/limesdrinputgui.cpp index a4bec47d2..26b3b4824 100644 --- a/plugins/samplesource/limesdrinput/limesdrinputgui.cpp +++ b/plugins/samplesource/limesdrinput/limesdrinputgui.cpp @@ -351,9 +351,10 @@ void LimeSDRInputGUI::setNCODisplay() false, 8, -ncoHalfRange, - ncoHalfRange); // frequency dial is in kHz + ncoHalfRange); ui->ncoFrequency->blockSignals(true); + ui->ncoFrequency->setToolTip(QString("NCO frequency shift in Hz (Range: +/- %1 kHz)").arg(ncoHalfRange/1000)); ui->ncoFrequency->setValue(m_settings.m_ncoFrequency); ui->ncoFrequency->blockSignals(false); } diff --git a/plugins/samplesource/limesdrinput/limesdrinputgui.ui b/plugins/samplesource/limesdrinput/limesdrinputgui.ui index 8abb76250..3c493322c 100644 --- a/plugins/samplesource/limesdrinput/limesdrinputgui.ui +++ b/plugins/samplesource/limesdrinput/limesdrinputgui.ui @@ -6,7 +6,7 @@ 0 0 - 374 + 360 290 @@ -18,7 +18,7 @@ - 350 + 360 290 @@ -272,7 +272,7 @@ PointingHandCursor - NCO frequency (Hz) + NCO frequency shift in Hz @@ -585,6 +585,19 @@ + + + + Qt::Horizontal + + + + 40 + 20 + + + + diff --git a/plugins/samplesource/limesdrinput/readme.md b/plugins/samplesource/limesdrinput/readme.md index 60a807a50..3af01b446 100644 --- a/plugins/samplesource/limesdrinput/readme.md +++ b/plugins/samplesource/limesdrinput/readme.md @@ -81,9 +81,9 @@ Use this button to activate/deactivate the TSP NCO. The LMS7002M chip has an ind USe this push button to reset the NCO frequency to 0 and thus center on the main passband of the ADC. -

2.3: Center frequency with NCO engaged

+

2.3: NCO frequency shift

-This is the NCO frequency. Use the thumbwheels to adjust frequency as done with the LO (1.1). Pressing shift simultanoeusly moves digit by 5 and pressing control moves it by 2. The boundaries are dynamically calculated from the LO center frequency, sample rate and hardware decimation factor. +This is the frequency shift applied when the NCO is engaged thus the actual LO frequency is the center frequency of reception minus this value. Use the thumbwheels to adjust frequency as done with the LO (1.1). Pressing shift simultanoeusly moves digit by 5 and pressing control moves it by 2. The boundaries are dynamically calculated from the LO center frequency, sample rate and hardware decimation factor. ☞ In the LMS7002M TSP block the NCO sits before the decimator (see Fig.14 of the [datasheet](http://www.limemicro.com/wp-content/uploads/2015/09/LMS7002M-Data-Sheet-v2.8.0.pdf) p.7) so it runs at the actual ADC rate. Hence the NCO limits are calculated as +/- half the device to host sample rate multiplied by the hardware decimation factor. For example with a 4 MS/s device to host sample rate (5) and a hadrware decimation of 16 (3) you have +/- 32 MHz span around the LO for the NCO. In this example you can tune all HF frequencies with the center frequency set at its lowest (30 MHz).