diff --git a/devices/hackrf/devicehackrfvalues.cpp b/devices/hackrf/devicehackrfvalues.cpp index 3edef3153..e118f11f8 100644 --- a/devices/hackrf/devicehackrfvalues.cpp +++ b/devices/hackrf/devicehackrfvalues.cpp @@ -16,19 +16,21 @@ #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] = { 2400000, 3000000, - 3024000, // for PAL-M + 3150000, // for PAL-M 3200000, + 3250000, // For PAL-BGIL 4000000, 4333333, // for GSM 4800000, 5600000, 6000000, - 6048000, // for PAL-M + 6300000, // for PAL-M 6400000, + 6500000, // For PAL-BGIL 8000000, 9600000, 12000000, diff --git a/plugins/channeltx/modatv/atvmodgui.cpp b/plugins/channeltx/modatv/atvmodgui.cpp index 906449e15..615966d27 100644 --- a/plugins/channeltx/modatv/atvmodgui.cpp +++ b/plugins/channeltx/modatv/atvmodgui.cpp @@ -230,7 +230,7 @@ void ATVModGUI::channelizerOutputSampleRateChanged() 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); 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::ATVModulationVestigialUSB)) { - ui->rfBW->setMaximum(sampleRate / (2*m_rfSliderDivisor)); - ui->rfOppBW->setMaximum(sampleRate / (2*m_rfSliderDivisor)); + ui->rfBW->setMaximum((sampleRate) / (2*m_rfSliderDivisor)); + ui->rfOppBW->setMaximum((sampleRate) / (2*m_rfSliderDivisor)); } else { - ui->rfBW->setMaximum(sampleRate / m_rfSliderDivisor); - ui->rfOppBW->setMaximum(sampleRate / m_rfSliderDivisor); + ui->rfBW->setMaximum((sampleRate) / m_rfSliderDivisor); + ui->rfOppBW->setMaximum((sampleRate) / m_rfSliderDivisor); } }