VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-12-02 04:55:23 -05:00
Code Issues Projects Releases Wiki Activity

RTLSDR input: make sample rate precision to the sample/s and added 2.167 MS/s for GSM

Browse Source
This commit is contained in:
f4exb 2017-02-18 12:21:17 +01:00
parent 7b9dfb0446
commit e7e83b13be
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
plugins/samplesource/rtlsdr/rtlsdrgui.cpp
View File

@ -44,7 +44,7 @@ RTLSDRGui::RTLSDRGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
for (int i = 0; i < RTLSDRSampleRates::getNbRates(); i++) for (int i = 0; i < RTLSDRSampleRates::getNbRates(); i++)
{ {
ui->sampleRate->addItem(QString::number(RTLSDRSampleRates::getRate(i))); ui->sampleRate->addItem(QString::number(RTLSDRSampleRates::getRate(i)/1000));
} }
connect(&m_updateTimer, SIGNAL(timeout()), this, SLOT(updateHardware())); connect(&m_updateTimer, SIGNAL(timeout()), this, SLOT(updateHardware()));
@ -306,7 +306,7 @@ void RTLSDRGui::on_gain_valueChanged(int value)
void RTLSDRGui::on_sampleRate_currentIndexChanged(int index) void RTLSDRGui::on_sampleRate_currentIndexChanged(int index)
{ {
int newrate = RTLSDRSampleRates::getRate(index); int newrate = RTLSDRSampleRates::getRate(index);
m_settings.m_devSampleRate = newrate * 1000; m_settings.m_devSampleRate = newrate;
sendSettings(); sendSettings();
} }
@ -402,8 +402,21 @@ void RTLSDRGui::on_checkBox_stateChanged(int state)
sendSettings(); sendSettings();
} }
unsigned int RTLSDRSampleRates::m_rates[] = {250, 256, 1000, 1024, 1152, 1200, 1536, 1600, 2000, 2048, 2304, 2400}; const unsigned int RTLSDRSampleRates::m_nb_rates = 13;
unsigned int RTLSDRSampleRates::m_nb_rates = 12; const unsigned int RTLSDRSampleRates::m_rates[] = {
250000,
256000,
1000000,
1024000,
1152000,
1200000,
1536000,
1600000,
2000000,
2048000,
2166667, // for GSM
2304000,
2400000};
unsigned int RTLSDRSampleRates::getRate(unsigned int rate_index) unsigned int RTLSDRSampleRates::getRate(unsigned int rate_index)
{ {
@ -421,7 +434,7 @@ unsigned int RTLSDRSampleRates::getRateIndex(unsigned int rate)
{ {
for (unsigned int i=0; i < m_nb_rates; i++) for (unsigned int i=0; i < m_nb_rates; i++)
{ {
if (rate/1000 == m_rates[i]) if (rate == m_rates[i])
{ {
return i; return i;
} }

4
plugins/samplesource/rtlsdr/rtlsdrgui.h
View File

@ -89,8 +89,8 @@ public:
static unsigned int getRateIndex(unsigned int rate); static unsigned int getRateIndex(unsigned int rate);
static unsigned int getNbRates(); static unsigned int getNbRates();
private: private:
static unsigned int m_rates[12]; static const unsigned int m_nb_rates;
static unsigned int m_nb_rates; static const unsigned int m_rates[];
}; };
#endif // INCLUDE_RTLSDRGUI_H #endif // INCLUDE_RTLSDRGUI_H