mirror
/
sdrangel
kopia lustrzana https://github.com/f4exb/sdrangel
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

NFM modulator: use settings in GUI (2)

pull/85/head
f4exb 2017-10-11 22:27:17 +02:00
rodzic 0ee830f403
commit 4ad10dd250
2 zmienionych plików z 20 dodań i 20 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

32
plugins/channeltx/modnfm/nfmmodgui.cpp
Wyświetl plik

@ -35,18 +35,18 @@
const QString NFMModGUI::m_channelID = "sdrangel.channeltx.modnfm";
const int NFMModGUI::m_rfBW[] = {
3000, 4000, 5000, 6250, 8330, 10000, 12500, 15000, 20000, 25000, 40000
};
const int NFMModGUI::m_nbRfBW = 11;
const float NFMModGUI::m_ctcssTones[] = {
67.0, 71.9, 74.4, 77.0, 79.7, 82.5, 85.4, 88.5, 91.5, 94.8,
97.4, 100.0, 103.5, 107.2, 110.9, 114.8, 118.8, 123.0, 127.3, 131.8,
136.5, 141.3, 146.2, 151.4, 156.7, 162.2, 167.9, 173.8, 179.9, 186.2,
192.8, 203.5
};
const int NFMModGUI::m_nbCTCSSTones = 32;
//const int NFMModGUI::m_rfBW[] = {
// 3000, 4000, 5000, 6250, 8330, 10000, 12500, 15000, 20000, 25000, 40000
//};
//const int NFMModGUI::m_nbRfBW = 11;
//
//const float NFMModGUI::m_ctcssTones[] = {
// 67.0, 71.9, 74.4, 77.0, 79.7, 82.5, 85.4, 88.5, 91.5, 94.8,
// 97.4, 100.0, 103.5, 107.2, 110.9, 114.8, 118.8, 123.0, 127.3, 131.8,
// 136.5, 141.3, 146.2, 151.4, 156.7, 162.2, 167.9, 173.8, 179.9, 186.2,
// 192.8, 203.5
//};
//const int NFMModGUI::m_nbCTCSSTones = 32;
NFMModGUI* NFMModGUI::create(PluginAPI* pluginAPI, DeviceSinkAPI *deviceAPI)
@ -388,8 +388,8 @@ NFMModGUI::NFMModGUI(PluginAPI* pluginAPI, DeviceSinkAPI *deviceAPI, QWidget* pa
blockApplySettings(true);
ui->rfBW->clear();
for (int i = 0; i < m_nbRfBW; i++) {
ui->rfBW->addItem(QString("%1").arg(m_rfBW[i] / 1000.0, 0, 'f', 2));
for (int i = 0; i < NFMModSettings::m_nbRfBW; i++) {
ui->rfBW->addItem(QString("%1").arg(NFMModSettings::getRFBW(i) / 1000.0, 0, 'f', 2));
}
ui->rfBW->setCurrentIndex(6);
blockApplySettings(false);
@ -428,9 +428,9 @@ NFMModGUI::NFMModGUI(PluginAPI* pluginAPI, DeviceSinkAPI *deviceAPI, QWidget* pa
ui->tone->setChecked(false);
ui->mic->setChecked(false);
for (int i=0; i<m_nbCTCSSTones; i++)
for (int i=0; i< NFMModSettings::m_nbCTCSSFreqs; i++)
{
ui->ctcss->addItem(QString("%1").arg((double) m_ctcssTones[i], 0, 'f', 1));
ui->ctcss->addItem(QString("%1").arg((double) NFMModSettings::getCTCSSFreq(i), 0, 'f', 1));
}
ui->cwKeyerGUI->setBuddies(m_nfmMod->getInputMessageQueue(), m_nfmMod->getCWKeyer());

8
plugins/channeltx/modnfm/nfmmodgui.h
Wyświetl plik

@ -109,11 +109,11 @@ private:
NFMMod::NFMModInputAF m_modAFInput;
MessageQueue m_inputMessageQueue;
static const int m_rfBW[];
static const int m_nbRfBW;
// static const int m_rfBW[];
// static const int m_nbRfBW;
static const float m_ctcssTones[];
static const int m_nbCTCSSTones;
// static const float m_ctcssTones[];
// static const int m_nbCTCSSTones;
explicit NFMModGUI(PluginAPI* pluginAPI, DeviceSinkAPI *deviceAPI, QWidget* parent = NULL);
virtual ~NFMModGUI();