From fa29cb00c4482ffb36ae1fe239401330fd19dc7c Mon Sep 17 00:00:00 2001
From: Jonathan Naylor <naylorjs@yahoo.com>
Date: Tue, 10 May 2016 19:24:27 +0100
Subject: [PATCH] Clean up the System Fusion logging.

---
 YSFControl.cpp | 17 ++++++++++-------
 YSFPayload.cpp | 11 -----------
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/YSFControl.cpp b/YSFControl.cpp
index c19e4ab..5a0db75 100644
--- a/YSFControl.cpp
+++ b/YSFControl.cpp
@@ -112,7 +112,7 @@ bool CYSFControl::writeModem(unsigned char *data)
 		fich.encode(data + 2U);
 
 		unsigned int errs = calculateBER(orig, data + 2U, YSF_SYNC_LENGTH_BYTES + YSF_FICH_LENGTH_BYTES);
-		LogDebug("YSF, FI=%u FN=%u FT=%u DT=%u BER=%.1f%%", fi, fn, ft, dt, float(errs) / 2.4F);
+		// LogDebug("YSF, FI=%u FN=%u FT=%u DT=%u BER=%.1f%%", fi, fn, ft, dt, float(errs) / 2.4F);
 
 		m_errs += errs;
 		m_bits += 240U;
@@ -143,7 +143,7 @@ bool CYSFControl::writeModem(unsigned char *data)
 			m_source = m_payload.getSource();
 
 		if (cm == YSF_CM_GROUP) {
-			m_dest = (unsigned char*)"CQCQCQ    ";
+			m_dest = (unsigned char*)"ALL       ";
 		} else {
 			if (valid)
 				m_dest = m_payload.getDest();
@@ -171,7 +171,7 @@ bool CYSFControl::writeModem(unsigned char *data)
 		fich.encode(data + 2U);
 
 		unsigned int errs = calculateBER(orig, data + 2U, YSF_SYNC_LENGTH_BYTES + YSF_FICH_LENGTH_BYTES);
-		LogDebug("YSF, FI=%u FN=%u FT=%u DT=%u BER=%.1f%%", fi, fn, ft, dt, float(errs) / 2.4F);
+		// LogDebug("YSF, FI=%u FN=%u FT=%u DT=%u BER=%.1f%%", fi, fn, ft, dt, float(errs) / 2.4F);
 
 		m_errs += errs;
 		m_bits += 240U;
@@ -217,7 +217,7 @@ bool CYSFControl::writeModem(unsigned char *data)
 		fich.encode(data + 2U);
 
 		unsigned int errs = calculateBER(orig, data + 2U, YSF_SYNC_LENGTH_BYTES + YSF_FICH_LENGTH_BYTES);
-		LogDebug("YSF, FI=%u FN=%u FT=%u DT=%u BER=%.1f%%", fi, fn, ft, dt, float(errs) / 2.4F);
+		// LogDebug("YSF, FI=%u FN=%u FT=%u DT=%u BER=%.1f%%", fi, fn, ft, dt, float(errs) / 2.4F);
 
 		m_errs += errs;
 		m_bits += 240U;
@@ -241,7 +241,7 @@ bool CYSFControl::writeModem(unsigned char *data)
 			valid = m_payload.processDataFRModeData(data + 2U, fn);
 			break;
 
-		default:		// YSF_DT_VOICE_FR_MODE
+		case YSF_DT_VOICE_FR_MODE:
 			if (fn != 0U || ft != 1U) {
 				// The first packet after the header is odd, don't try and regenerate it
 				m_errs += m_payload.processVoiceFRModeAudio(data + 2U);
@@ -249,13 +249,16 @@ bool CYSFControl::writeModem(unsigned char *data)
 			}
 			valid = false;
 			break;
+
+		default:
+			break;
 		}
 
 		bool change = false;
 
 		if (m_dest == NULL) {
 			if (cm == YSF_CM_GROUP) {
-				m_dest = (unsigned char*)"CQCQCQ    ";
+				m_dest = (unsigned char*)"ALL       ";
 				change = true;
 			} else if (valid) {
 				m_dest = m_payload.getDest();
@@ -311,7 +314,7 @@ bool CYSFControl::writeModem(unsigned char *data)
 
 		// Only calculate the BER on the sync word
 		unsigned int errs = calculateBER(orig, data + 2U, YSF_SYNC_LENGTH_BYTES);
-		LogDebug("YSF, invalid FICH, BER=%.1f%%", float(errs) / 0.4F);
+		// LogDebug("YSF, invalid FICH, BER=%.1f%%", float(errs) / 0.4F);
 
 		m_errs += errs;
 		m_bits += 40U;
diff --git a/YSFPayload.cpp b/YSFPayload.cpp
index 9300895..2b0ceaf 100644
--- a/YSFPayload.cpp
+++ b/YSFPayload.cpp
@@ -136,9 +136,6 @@ bool CYSFPayload::processHeaderData(unsigned char* data)
 		for (unsigned int i = 0U; i < 20U; i++)
 			output[i] ^= WHITENING_DATA[i];
 
-		CUtils::dump(1U, "Header, Destination", output + 0U, 10U);
-		CUtils::dump(1U, "Header, Source", output + 10U, 10U);
-
 		if (m_dest == NULL) {
 			m_dest = new unsigned char[10U];
 			::memcpy(m_dest, output + 0U, 10U);
@@ -281,9 +278,6 @@ bool CYSFPayload::processVDMode1Data(unsigned char* data, unsigned char fn)
 
 		switch (fn) {
 		case 0U:
-			CUtils::dump(1U, "V/D Mode 1, Destination", output + 0U, 10U);
-			CUtils::dump(1U, "V/D Mode 1, Source", output + 10U, 10U);
-
 			if (m_dest == NULL) {
 				m_dest = new unsigned char[10U];
 				::memcpy(m_dest, output + 0U, 10U);
@@ -452,14 +446,12 @@ bool CYSFPayload::processVDMode2Data(unsigned char* data, unsigned char fn)
 
 		switch (fn) {
 		case 0U:
-			CUtils::dump(1U, "V/D Mode 2, Destination", output, 10U);
 			if (m_dest == NULL) {
 				m_dest = new unsigned char[10U];
 				::memcpy(m_dest, output, 10U);
 			}
 			break;
 		case 1U:
-			CUtils::dump(1U, "V/D Mode 2, Source", output, 10U);
 			if (m_source == NULL) {
 				m_source = new unsigned char[10U];
 				::memcpy(m_source, output, 10U);
@@ -563,9 +555,6 @@ bool CYSFPayload::processDataFRModeData(unsigned char* data, unsigned char fn)
 
 		switch (fn) {
 		case 0U:
-			CUtils::dump(1U, "Data FR Mode, Destination", output + 0U, 10U);
-			CUtils::dump(1U, "Data FR Mode, Source", output + 10U, 10U);
-
 			if (m_dest == NULL) {
 				m_dest = new unsigned char[10U];
 				::memcpy(m_dest, output + 0U, 10U);