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

DSD demod: YSF support: reduce FICH status display size

Browse Source
This commit is contained in:
f4exb 2016-09-21 13:42:50 +02:00
parent ae5fcd84de
commit b03ac7ad7d
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
plugins/channel/demoddsd/dsddemodgui.cpp
View File

@ -53,24 +53,24 @@ char DSDDemodGUI::m_dpmrFrameTypes[][3] = {
}; };
const char * DSDDemodGUI::m_ysfChannelTypeText[4] = { const char * DSDDemodGUI::m_ysfChannelTypeText[4] = {
"HC", //!< Header Channel "H", //!< Header Channel
"CC", //!< Communications Channel "C", //!< Communications Channel
"TC", //!< Termination Channel "T", //!< Termination Channel
"TT" //!< Test "S" //!< Test
}; };
const char * DSDDemodGUI::m_ysfDataTypeText[4] = { const char * DSDDemodGUI::m_ysfDataTypeText[4] = {
"VD1", //!< Voice/Data type 1 "V1", //!< Voice/Data type 1
"DFR", //!< Data Full Rate "DF", //!< Data Full Rate
"VD2", //!< Voice/Data type 2 "V2", //!< Voice/Data type 2
"VFR" //!< Voice Full Rate "VF" //!< Voice Full Rate
}; };
const char * DSDDemodGUI::m_ysfCallModeText[4] = { const char * DSDDemodGUI::m_ysfCallModeText[4] = {
"GCQ", //!< Group CQ "GC", //!< Group CQ
"RID", //!< Radio ID "RI", //!< Radio ID
"RES", //!< Reserved "RS", //!< Reserved
"IND" //!< Individual "IN" //!< Individual
}; };
DSDDemodGUI* DSDDemodGUI::create(PluginAPI* pluginAPI, DeviceAPI *deviceAPI) DSDDemodGUI* DSDDemodGUI::create(PluginAPI* pluginAPI, DeviceAPI *deviceAPI)
@ -532,18 +532,18 @@ void DSDDemodGUI::formatStatusText()
m_signalFormat = signalFormatDPMR; m_signalFormat = signalFormatDPMR;
break; break;
case DSDcc::DSDDecoder::DSDSyncYSF: case DSDcc::DSDDecoder::DSDSyncYSF:
// 1 1 2 // 1 1 2 2 3 3 4 4 5 5 6 6 7
// 0....5....0....5....0... // 0....5....0....5....0....5....0....5....0....5....0....5....0....5....0..
// CC VD2 RID B0 F7 WL S000 // C V2 RI 0:7 WL000 ssssssssss>dddddddddd UUUUUUUUUU>DDDDDDDDDD 44444
if (m_dsdDemod->getDecoder().getYSFDecoder().getFICHError() == DSDcc::DSDYSF::FICHNoError) if (m_dsdDemod->getDecoder().getYSFDecoder().getFICHError() == DSDcc::DSDYSF::FICHNoError)
{ {
sprintf(m_formatStatusText, "%s ", m_ysfChannelTypeText[(int) m_dsdDemod->getDecoder().getYSFDecoder().getFICH().getFrameInformation()]); sprintf(m_formatStatusText, "%s ", m_ysfChannelTypeText[(int) m_dsdDemod->getDecoder().getYSFDecoder().getFICH().getFrameInformation()]);
} }
else else
{ {
sprintf(m_formatStatusText, "E%d ", (int) m_dsdDemod->getDecoder().getYSFDecoder().getFICHError()); sprintf(m_formatStatusText, "%d ", (int) m_dsdDemod->getDecoder().getYSFDecoder().getFICHError());
} }
sprintf(&m_formatStatusText[3], "%s %s B%d F%d %c%c ", sprintf(&m_formatStatusText[2], "%s %s %d:%d %c%c",
m_ysfDataTypeText[(int) m_dsdDemod->getDecoder().getYSFDecoder().getFICH().getDataType()], m_ysfDataTypeText[(int) m_dsdDemod->getDecoder().getYSFDecoder().getFICH().getDataType()],
m_ysfCallModeText[(int) m_dsdDemod->getDecoder().getYSFDecoder().getFICH().getCallMode()], m_ysfCallModeText[(int) m_dsdDemod->getDecoder().getYSFDecoder().getFICH().getCallMode()],
m_dsdDemod->getDecoder().getYSFDecoder().getFICH().getBlockTotal(), m_dsdDemod->getDecoder().getYSFDecoder().getFICH().getBlockTotal(),
@ -552,11 +552,11 @@ void DSDDemodGUI::formatStatusText()
(m_dsdDemod->getDecoder().getYSFDecoder().getFICH().isInternetPath() ? 'I' : 'L')); (m_dsdDemod->getDecoder().getYSFDecoder().getFICH().isInternetPath() ? 'I' : 'L'));
if (m_dsdDemod->getDecoder().getYSFDecoder().getFICH().isSquelchCodeEnabled()) if (m_dsdDemod->getDecoder().getYSFDecoder().getFICH().isSquelchCodeEnabled())
{ {
sprintf(&m_formatStatusText[20], "S%03d", m_dsdDemod->getDecoder().getYSFDecoder().getFICH().getSquelchCode()); sprintf(&m_formatStatusText[14], "%03d", m_dsdDemod->getDecoder().getYSFDecoder().getFICH().getSquelchCode());
} }
else else
{ {
strcpy(&m_formatStatusText[20], "S---"); strcpy(&m_formatStatusText[14], "---");
} }
m_signalFormat = signalFormatYSF; m_signalFormat = signalFormatYSF;
break; break;