From e83aa6142867331d6c98af522a94f8b74ee5cf90 Mon Sep 17 00:00:00 2001
From: Jonathan Naylor <naylorjs@yahoo.com>
Date: Mon, 4 May 2020 13:48:54 +0100
Subject: [PATCH] Tested Kenwood GPS data decoding.

---
 NXDNGateway/GPSHandler.cpp | 28 +---------------------------
 1 file changed, 1 insertion(+), 27 deletions(-)

diff --git a/NXDNGateway/GPSHandler.cpp b/NXDNGateway/GPSHandler.cpp
index 3d04239..e0a511f 100644
--- a/NXDNGateway/GPSHandler.cpp
+++ b/NXDNGateway/GPSHandler.cpp
@@ -60,8 +60,6 @@ void CGPSHandler::processData(const unsigned char* data)
 {
 	assert(data != NULL);
 
-	CUtils::dump(4U, "processData GPS Data", data, 21U);
-
 	::memcpy(m_data + m_length, data + 1U, NXDN_DATA_LENGTH);
 	m_length += NXDN_DATA_LENGTH;
 
@@ -197,25 +195,6 @@ bool CGPSHandler::processKenwood()
 		return true;
 	}
 
-	CUtils::dump("Kenwood GPS Data", m_data, m_length);
-
-	unsigned char UTCss = m_data[3U] & 0x3FU;
-	unsigned char UTCmm = ((m_data[3U] & 0xC0U) >> 6) | ((m_data[4U] & 0x0FU) << 2);
-	unsigned char UTChh = ((m_data[5U] & 0x01U) << 4) | ((m_data[4U] & 0xF0U) >> 4);
-
-	LogMessage("UTC hh:%u mm:%u ss:%u", UTChh, UTCmm, UTCss);
-
-	unsigned char UTCday   = 0x1FU;
-	unsigned char UTCmonth = 0x0FU;
-	unsigned char UTCyear  = 0x7FU;
-	if (type == GPS_FULL) {
-		UTCday   = m_data[17U] & 0x1FU;
-		UTCmonth = ((m_data[17U] & 0xE0U) >> 5) | ((m_data[18U] & 0x01U) << 4);
-		UTCyear  = (m_data[18U] & 0xFEU) >> 1;
-
-		LogMessage("UTC dd:%u mm:%u yy:%u", UTCday, UTCmonth, UTCyear);
-	}
-
 	unsigned char north    = 'N';
 	unsigned int latAfter  = 0x7FFFU;
 	unsigned int latBefore = 0xFFFFU;
@@ -240,9 +219,6 @@ bool CGPSHandler::processKenwood()
 		lonBefore = (m_data[16U] << 8) | m_data[15U];
 	}
 
-	LogMessage("Latitude: %u . %u %c", latBefore, latAfter, north);
-	LogMessage("Longitude: %u . %u %c", lonBefore, lonAfter, east);
-
 	if (latAfter == 0x7FFFU || latBefore == 0xFFFFU || lonAfter == 0x7FFFU || lonBefore == 0xFFFFU)
 		return true;
 
@@ -270,9 +246,7 @@ bool CGPSHandler::processKenwood()
 			source.c_str(), m_callsign.c_str(), latBefore, latAfter / 100U, north, lonBefore, lonAfter / 100U, east);
 	}
 
-	LogMessage("Kenwood APRS message = %s", output);
-
-	// m_writer->write(output);
+	m_writer->write(output);
 
 	return true;
 }