Merge pull request #1695 from srcejon/ils_settings_fix

ILS Demod settings
f4exb · May 22, 2023 · bce8ba7 · bce8ba7
2 parents 11bc050 + 4f997af
commit bce8ba7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/plugins/channelrx/demodils/ilsdemodgui.cpp b/plugins/channelrx/demodils/ilsdemodgui.cpp
@@ -1019,16 +1019,16 @@ ILSDemodGUI::ILSDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban
     setAttribute(Qt::WA_DeleteOnClose, true);
     m_helpURL = "plugins/channelrx/demodils/readme.md";
     RollupContents *rollupContents = getRollupContents();
-	ui->setupUi(rollupContents);
+    ui->setupUi(rollupContents);
     setSizePolicy(rollupContents->sizePolicy());
     rollupContents->arrangeRollups();
-	connect(rollupContents, SIGNAL(widgetRolled(QWidget*,bool)), this, SLOT(onWidgetRolled(QWidget*,bool)));
+    connect(rollupContents, SIGNAL(widgetRolled(QWidget*,bool)), this, SLOT(onWidgetRolled(QWidget*,bool)));
     connect(this, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(onMenuDialogCalled(const QPoint &)));
 
     m_ilsDemod = reinterpret_cast<ILSDemod*>(rxChannel);
     m_ilsDemod->setMessageQueueToGUI(getInputMessageQueue());
     m_spectrumVis = m_ilsDemod->getSpectrumVis();
-	m_spectrumVis->setGLSpectrum(ui->glSpectrum);
+    m_spectrumVis->setGLSpectrum(ui->glSpectrum);
 
     connect(&MainCore::instance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick())); // 50 ms
 
@@ -1124,7 +1124,8 @@ ILSDemodGUI::ILSDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban
     ui->p150Units->setVisible(devMode);
 
     SpectrumSettings spectrumSettings = m_spectrumVis->getSettings();
-    spectrumSettings.m_fftSize = 2048;
+    spectrumSettings.m_fftSize = 256;
+    spectrumSettings.m_fftWindow = FFTWindow::Flattop;  // To match what's used in sink
     spectrumSettings.m_averagingMode = SpectrumSettings::AvgModeMoving;
     spectrumSettings.m_averagingValue = 1;
     spectrumSettings.m_displayWaterfall = true;
@@ -1133,7 +1134,6 @@ ILSDemodGUI::ILSDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban
     spectrumSettings.m_displayHistogram = false;
     spectrumSettings.m_displayCurrent = true;
     spectrumSettings.m_spectrumStyle = SpectrumSettings::Gradient;
-    // FLAT TOP?
     SpectrumVis::MsgConfigureSpectrumVis *msg = SpectrumVis::MsgConfigureSpectrumVis::create(spectrumSettings, false);
     m_spectrumVis->getInputMessageQueue()->push(msg);
 

diff --git a/plugins/channelrx/demodils/ilsdemodsettings.cpp b/plugins/channelrx/demodils/ilsdemodsettings.cpp
@@ -221,9 +221,9 @@ bool ILSDemodSettings::deserialize(const QByteArray& data)
             d.readBlob(52, &bytetmp);
             m_rollupState->deserialize(bytetmp);
         }
-        d.readS32(28, &m_workspaceIndex, 0);
-        d.readBlob(29, &m_geometryBytes);
-        d.readBool(30, &m_hidden, false);
+        d.readS32(53, &m_workspaceIndex, 0);
+        d.readBlob(54, &m_geometryBytes);
+        d.readBool(55, &m_hidden, false);
 
         return true;
     }