VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-02-21 04:58:38 -05:00
Code Issues Projects Releases Wiki Activity

ATV Modulator: change RF filters steps calculation

Browse Source
This commit is contained in:
f4exb 2017-03-21 12:35:27 +01:00
parent 532431939b
commit affc6489c0
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devices/hackrf/devicehackrfvalues.cpp
View File

@ -16,19 +16,21 @@
#include "devicehackrfvalues.h" #include "devicehackrfvalues.h"
const unsigned int HackRFSampleRates::m_nb_rates = 19; const unsigned int HackRFSampleRates::m_nb_rates = 21;
const unsigned int HackRFSampleRates::m_rates[HackRFSampleRates::m_nb_rates] = { const unsigned int HackRFSampleRates::m_rates[HackRFSampleRates::m_nb_rates] = {
2400000, 2400000,
3000000, 3000000,
3024000, // for PAL-M 3150000, // for PAL-M
3200000, 3200000,
3250000, // For PAL-BGIL
4000000, 4000000,
4333333, // for GSM 4333333, // for GSM
4800000, 4800000,
5600000, 5600000,
6000000, 6000000,
6048000, // for PAL-M 6300000, // for PAL-M
6400000, 6400000,
6500000, // For PAL-BGIL
8000000, 8000000,
9600000, 9600000,
12000000, 12000000,

10
plugins/channeltx/modatv/atvmodgui.cpp
View File

@ -230,7 +230,7 @@ void ATVModGUI::channelizerOutputSampleRateChanged()
void ATVModGUI::setRFFiltersSlidersRange(int sampleRate) void ATVModGUI::setRFFiltersSlidersRange(int sampleRate)
{ {
int scaleFactor = (int) std::log10(sampleRate); int scaleFactor = (int) std::log10(sampleRate/2);
m_rfSliderDivisor = std::pow(10.0, scaleFactor-1); m_rfSliderDivisor = std::pow(10.0, scaleFactor-1);
if ((ui->modulation->currentIndex() == (int) ATVMod::ATVModulationLSB) || if ((ui->modulation->currentIndex() == (int) ATVMod::ATVModulationLSB) ||
@ -238,13 +238,13 @@ void ATVModGUI::setRFFiltersSlidersRange(int sampleRate)
(ui->modulation->currentIndex() == (int) ATVMod::ATVModulationVestigialLSB) || (ui->modulation->currentIndex() == (int) ATVMod::ATVModulationVestigialLSB) ||
(ui->modulation->currentIndex() == (int) ATVMod::ATVModulationVestigialUSB)) (ui->modulation->currentIndex() == (int) ATVMod::ATVModulationVestigialUSB))
{ {
ui->rfBW->setMaximum(sampleRate / (2*m_rfSliderDivisor)); ui->rfBW->setMaximum((sampleRate) / (2*m_rfSliderDivisor));
ui->rfOppBW->setMaximum(sampleRate / (2*m_rfSliderDivisor)); ui->rfOppBW->setMaximum((sampleRate) / (2*m_rfSliderDivisor));
} }
else else
{ {
ui->rfBW->setMaximum(sampleRate / m_rfSliderDivisor); ui->rfBW->setMaximum((sampleRate) / m_rfSliderDivisor);
ui->rfOppBW->setMaximum(sampleRate / m_rfSliderDivisor); ui->rfOppBW->setMaximum((sampleRate) / m_rfSliderDivisor);
} }
} }