From 788f8f34d0ef960336140118b7e530d068dd2b1f Mon Sep 17 00:00:00 2001
From: Andy CA6JAU <juribeparada@gmail.com>
Date: Sat, 28 Jul 2018 23:08:17 -0400
Subject: [PATCH] Fill with silence YSF frames for dropped (and short) YSF
 transmissions

---
 YSF2DMR/YSF2DMR.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

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