From 1474e16bb1c5300f5fb83a9ce8c64c95b5c8261c Mon Sep 17 00:00:00 2001 From: Chipster Date: Fri, 17 Feb 2023 06:22:58 -0600 Subject: [PATCH] Add mode type to APRS string. Make APRS band/offset string a bit more consistent. --- NXDNGateway/APRSWriter.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/NXDNGateway/APRSWriter.cpp b/NXDNGateway/APRSWriter.cpp index bd3d403..1252768 100644 --- a/NXDNGateway/APRSWriter.cpp +++ b/NXDNGateway/APRSWriter.cpp @@ -175,19 +175,19 @@ void CAPRSWriter::sendIdFrameFixed() char desc[200U]; if (m_txFrequency != 0U) { float offset = float(int(m_rxFrequency) - int(m_txFrequency)) / 1000000.0F; - ::sprintf(desc, "MMDVM Voice %.5LfMHz %c%.4lfMHz%s%s", + ::sprintf(desc, "MMDVM Voice (NXDN) %.5LfMHz %c%.4lfMHz%s%s", (long double)(m_txFrequency) / 1000000.0F, offset < 0.0F ? '-' : '+', ::fabs(offset), m_desc.empty() ? "" : ", ", m_desc.c_str()); } else { - ::sprintf(desc, "MMDVM Voice%s%s", m_desc.empty() ? "" : ", ", m_desc.c_str()); + ::sprintf(desc, "MMDVM Voice (NXDN)%s%s", m_desc.empty() ? "" : ", ", m_desc.c_str()); } const char* band = "4m"; if (m_txFrequency >= 1200000000U) - band = "1.2"; + band = "23cm/1.2GHz"; else if (m_txFrequency >= 420000000U) - band = "440"; + band = "70cm"; else if (m_txFrequency >= 144000000U) band = "2m"; else if (m_txFrequency >= 50000000U) @@ -272,19 +272,19 @@ void CAPRSWriter::sendIdFrameMobile() char desc[200U]; if (m_txFrequency != 0U) { float offset = float(int(m_rxFrequency) - int(m_txFrequency)) / 1000000.0F; - ::sprintf(desc, "MMDVM Voice %.5LfMHz %c%.4lfMHz%s%s", + ::sprintf(desc, "MMDVM Voice (NXDN) %.5LfMHz %c%.4lfMHz%s%s", (long double)(m_txFrequency) / 1000000.0F, offset < 0.0F ? '-' : '+', ::fabs(offset), m_desc.empty() ? "" : ", ", m_desc.c_str()); } else { - ::sprintf(desc, "MMDVM Voice%s%s", m_desc.empty() ? "" : ", ", m_desc.c_str()); + ::sprintf(desc, "MMDVM Voice (NXDN)%s%s", m_desc.empty() ? "" : ", ", m_desc.c_str()); } const char* band = "4m"; if (m_txFrequency >= 1200000000U) - band = "1.2"; + band = "23cm/1.2GHz"; else if (m_txFrequency >= 420000000U) - band = "440"; + band = "70cm"; else if (m_txFrequency >= 144000000U) band = "2m"; else if (m_txFrequency >= 50000000U)