From 3f7667dffaaf3da1cdc70900138885b1ceb7879a Mon Sep 17 00:00:00 2001 From: f4exb Date: Fri, 12 Aug 2016 02:28:54 +0200 Subject: [PATCH] DSD demod: added extended search frame status --- plugins/channel/demoddsd/dsddemodgui.cpp | 5 +++-- plugins/channel/demoddsd/dsddemodgui.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/channel/demoddsd/dsddemodgui.cpp b/plugins/channel/demoddsd/dsddemodgui.cpp index 4c463945d..802349d3f 100644 --- a/plugins/channel/demoddsd/dsddemodgui.cpp +++ b/plugins/channel/demoddsd/dsddemodgui.cpp @@ -40,8 +40,9 @@ unsigned int DSDDemodBaudRates::m_rates[] = {2400, 4800}; unsigned int DSDDemodBaudRates::m_nb_rates = 2; unsigned int DSDDemodBaudRates::m_defaultRateIndex = 1; // 4800 bauds -char DSDDemodGUI::m_frameTypes[][3] = { +char DSDDemodGUI::m_dpmrFrameTypes[][3] = { "--", // no frame sync + "XS", // no frame - extensive search of FS2 "HD", // header frame "PY", // payload super frame not categorized yet "VO", // voice super frame @@ -450,7 +451,7 @@ void DSDDemodGUI::formatStatusText() break; case DSDcc::DSDDecoder::DSDSyncDPMR: sprintf(m_formatStatusText, "%s CC: %04d", - m_frameTypes[(int) m_dsdDemod->getDecoder().getDPMRDecoder().getFrameType()], + m_dpmrFrameTypes[(int) m_dsdDemod->getDecoder().getDPMRDecoder().getFrameType()], m_dsdDemod->getDecoder().getDPMRDecoder().getColorCode()); m_signalFormat = signalFormatDPMR; break; diff --git a/plugins/channel/demoddsd/dsddemodgui.h b/plugins/channel/demoddsd/dsddemodgui.h index b22d37792..cd50eed0e 100644 --- a/plugins/channel/demoddsd/dsddemodgui.h +++ b/plugins/channel/demoddsd/dsddemodgui.h @@ -101,7 +101,7 @@ private: MovingAverage m_channelPowerDbAvg; int m_tickCount; - static char m_frameTypes[7][3]; + static char m_dpmrFrameTypes[8][3]; explicit DSDDemodGUI(PluginAPI* pluginAPI, DeviceAPI *deviceAPI, QWidget* parent = NULL); virtual ~DSDDemodGUI();