From 2bd7f492590f3af41de449d88e5ebf44879659c7 Mon Sep 17 00:00:00 2001 From: f4exb Date: Fri, 19 Aug 2016 05:50:48 +0200 Subject: [PATCH] DSD demod plugin: fixed dPMR frame type display --- plugins/channel/demoddsd/dsddemodgui.cpp | 19 +++++++++---------- plugins/channel/demoddsd/dsddemodgui.h | 2 +- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/plugins/channel/demoddsd/dsddemodgui.cpp b/plugins/channel/demoddsd/dsddemodgui.cpp index 3e332bef0..014850035 100644 --- a/plugins/channel/demoddsd/dsddemodgui.cpp +++ b/plugins/channel/demoddsd/dsddemodgui.cpp @@ -41,16 +41,15 @@ unsigned int DSDDemodBaudRates::m_nb_rates = 2; unsigned int DSDDemodBaudRates::m_defaultRateIndex = 1; // 4800 bauds 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 - "VS", // voice super frame with slow data (SLD) - "VD", // voice and data superframe - "D1", // data type 1 super frame - "D2", // data type 2 super frame - "EN", // end frame + "--", // 0: no frame sync + "XS", // 1: no frame - extensive search of FS2 + "HD", // 2: header frame + "PY", // 3: payload super frame not categorized yet + "VO", // 4: voice super frame + "VD", // 5: voice and data superframe + "D1", // 6: data type 1 super frame + "D2", // 7: data type 2 super frame + "EN", // 8: end frame }; DSDDemodGUI* DSDDemodGUI::create(PluginAPI* pluginAPI, DeviceAPI *deviceAPI) diff --git a/plugins/channel/demoddsd/dsddemodgui.h b/plugins/channel/demoddsd/dsddemodgui.h index 1c7d75979..f0973f892 100644 --- a/plugins/channel/demoddsd/dsddemodgui.h +++ b/plugins/channel/demoddsd/dsddemodgui.h @@ -103,7 +103,7 @@ private: MovingAverage m_channelPowerDbAvg; int m_tickCount; - static char m_dpmrFrameTypes[10][3]; + static char m_dpmrFrameTypes[9][3]; explicit DSDDemodGUI(PluginAPI* pluginAPI, DeviceAPI *deviceAPI, QWidget* parent = NULL); virtual ~DSDDemodGUI();