VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

DSD demod: YSF: support radio ID mode

This commit is contained in:
f4exb 2016-09-21 22:12:02 +02:00
parent a6ba22aeb7
commit fc8a09276b
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -543,6 +543,7 @@ void DSDDemodGUI::formatStatusText()
{
sprintf(m_formatStatusText, "%d ", (int) m_dsdDemod->getDecoder().getYSFDecoder().getFICHError());
}
sprintf(&m_formatStatusText[2], "%s %s %d:%d %c%c",
m_ysfDataTypeText[(int) m_dsdDemod->getDecoder().getYSFDecoder().getFICH().getDataType()],
m_ysfCallModeText[(int) m_dsdDemod->getDecoder().getYSFDecoder().getFICH().getCallMode()],
@ -550,7 +551,8 @@ void DSDDemodGUI::formatStatusText()
m_dsdDemod->getDecoder().getYSFDecoder().getFICH().getFrameTotal(),
(m_dsdDemod->getDecoder().getYSFDecoder().getFICH().isNarrowMode() ? 'N' : 'W'),
(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[14], "%03d", m_dsdDemod->getDecoder().getYSFDecoder().getFICH().getSquelchCode());
}
@ -558,13 +560,28 @@ void DSDDemodGUI::formatStatusText()
{
strcpy(&m_formatStatusText[14], "---");
}
sprintf(&m_formatStatusText[17], "|%-10s>%-10s |%-10s>%-10s|%-5s",
char dest[11];
if ( m_dsdDemod->getDecoder().getYSFDecoder().radioIdMode())
{
sprintf(dest, "%-5s:%-5s",
m_dsdDemod->getDecoder().getYSFDecoder().getDestId(),
m_dsdDemod->getDecoder().getYSFDecoder().getSrcId());
}
else
{
sprintf(dest, "%-10s", m_dsdDemod->getDecoder().getYSFDecoder().getDest());
}
sprintf(&m_formatStatusText[17], "|%-10s>%s|%-10s>%-10s|%-5s",
m_dsdDemod->getDecoder().getYSFDecoder().getSrc(),
m_dsdDemod->getDecoder().getYSFDecoder().getDest(),
dest,
m_dsdDemod->getDecoder().getYSFDecoder().getUplink(),
m_dsdDemod->getDecoder().getYSFDecoder().getDownlink(),
m_dsdDemod->getDecoder().getYSFDecoder().getRem4());
m_signalFormat = signalFormatYSF;
m_signalFormat = signalFormatYSF;
break;
default:
m_signalFormat = signalFormatNone;