ShaYmez/MMDVM_CM
1
0
Fork 0
mirror of https://github.com/ShaYmez/MMDVM_CM.git synced 2025-05-29 04:22:26 -04:00
Code Issues Projects Releases Wiki Activity

Fill with silence YSF frames for dropped (and short) YSF transmissions

Browse Source
This commit is contained in:
Andy CA6JAU 2018-07-28 23:08:17 -04:00
parent 3acd89fe9d
commit 788f8f34d0
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
YSF2DMR/YSF2DMR.cpp
View File

@ -261,6 +261,7 @@ int CYSF2DMR::run()
CTimer networkWatchdog(100U, 0U, 1500U); CTimer networkWatchdog(100U, 0U, 1500U);
CTimer pollTimer(1000U, 5U); CTimer pollTimer(1000U, 5U);
CTimer ysfWatchdog(1000U, 0U, 500U);
// CWiresX Control Object // CWiresX Control Object
if (m_enableWiresX) { if (m_enableWiresX) {
@ -289,6 +290,7 @@ int CYSF2DMR::run()
ysfWatch.start(); ysfWatch.start();
dmrWatch.start(); dmrWatch.start();
pollTimer.start(); pollTimer.start();
ysfWatchdog.stop();
unsigned char ysf_cnt = 0; unsigned char ysf_cnt = 0;
unsigned char dmr_cnt = 0; unsigned char dmr_cnt = 0;
@ -527,6 +529,7 @@ int CYSF2DMR::run()
if (fi == YSF_FI_HEADER) { if (fi == YSF_FI_HEADER) {
if (ysfPayload.processHeaderData(buffer + 35U)) { if (ysfPayload.processHeaderData(buffer + 35U)) {
ysfWatchdog.start();
std::string ysfSrc = ysfPayload.getSource(); std::string ysfSrc = ysfPayload.getSource();
std::string ysfDst = ysfPayload.getDest(); std::string ysfDst = ysfPayload.getDest();
LogMessage("Received YSF Header: Src: %s Dst: %s", ysfSrc.c_str(), ysfDst.c_str()); LogMessage("Received YSF Header: Src: %s Dst: %s", ysfSrc.c_str(), ysfDst.c_str());
@ -535,6 +538,7 @@ int CYSF2DMR::run()
m_ysfFrames = 0U; m_ysfFrames = 0U;
} }
} else if (fi == YSF_FI_TERMINATOR) { } else if (fi == YSF_FI_TERMINATOR) {
ysfWatchdog.stop();
int extraFrames = (m_hangTime / 100U) - m_ysfFrames - 2U; int extraFrames = (m_hangTime / 100U) - m_ysfFrames - 2U;
for (int i = 0U; i < extraFrames; i++) for (int i = 0U; i < extraFrames; i++)
m_conv.putDummyYSF(); m_conv.putDummyYSF();
@ -542,6 +546,7 @@ int CYSF2DMR::run()
m_conv.putYSFEOT(); m_conv.putYSFEOT();
m_ysfFrames = 0U; m_ysfFrames = 0U;
} else if (fi == YSF_FI_COMMUNICATIONS) { } else if (fi == YSF_FI_COMMUNICATIONS) {
ysfWatchdog.start();
m_conv.putYSF(buffer + 35U); m_conv.putYSF(buffer + 35U);
m_ysfFrames++; m_ysfFrames++;
} }
@ -1019,6 +1024,14 @@ int CYSF2DMR::run()
pollTimer.start(); pollTimer.start();
} }
ysfWatchdog.clock(ms);
if (ysfWatchdog.isRunning() && ysfWatchdog.hasExpired()) {
int extraFrames = (m_hangTime / 100U) - m_ysfFrames;
for (int i = 0U; i < extraFrames; i++)
m_conv.putDummyYSF();
ysfWatchdog.stop();
}
if (m_xlxReflectors != NULL) if (m_xlxReflectors != NULL)
m_xlxReflectors->clock(ms); m_xlxReflectors->clock(ms);