From e75c9f49aa950b2a720f25467493b72767edf892 Mon Sep 17 00:00:00 2001
From: Bryan Biedenkapp <gatekeep@gmail.com>
Date: Thu, 2 Mar 2023 18:42:43 -0500
Subject: [PATCH] minor corrections for messages; fix incorrect variable for
 deep debug; fix incorrect queue size for NXDN;

---
 config.example.yml         | 2 +-
 host/Host.cpp              | 2 +-
 host/calibrate/HostCal.cpp | 2 +-
 modem/Modem.cpp            | 8 ++++----
 nxdn/packet/Voice.cpp      | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/config.example.yml b/config.example.yml
index 98c3132f..50c66890 100644
--- a/config.example.yml
+++ b/config.example.yml
@@ -244,7 +244,7 @@ protocols:
         # BER/Error threshold for silencing voice packets. (0 or 144 disables)
         silenceThreshold: 14
         # Internal data queue size (in NXDN packets).
-        queueSize: 12
+        queueSize: 31
         # Flag indicating whether or not verbose logging is enabled.
         verbose: true
         # Flag indicating whether or not debug logging is enabled.
diff --git a/host/Host.cpp b/host/Host.cpp
index c964d7d2..b944ec60 100644
--- a/host/Host.cpp
+++ b/host/Host.cpp
@@ -1301,7 +1301,7 @@ int Host::run()
                     bool ret = nxdn->processFrame(data, len);
                     if (ret) {
                         m_modeTimer.start();
-                        INTERRUPT_NXDN_CONTROL;
+                        //INTERRUPT_NXDN_CONTROL;
                     }
                 }
                 else if (m_state != HOST_STATE_LOCKOUT) {
diff --git a/host/calibrate/HostCal.cpp b/host/calibrate/HostCal.cpp
index bccfe13c..e1518dec 100644
--- a/host/calibrate/HostCal.cpp
+++ b/host/calibrate/HostCal.cpp
@@ -1603,7 +1603,7 @@ void HostCal::displayHelp()
         LogMessage(LOG_CAL, "    [/]      Inc/Dec P25 +/- 3 Symbol Level");
         LogMessage(LOG_CAL, "    {/}      Inc/Dec P25 +/- 1 Symbol Level");
         LogMessage(LOG_CAL, "    ;/'      Inc/Dec NXDN +/- 3 Symbol Level");
-        LogMessage(LOG_CAL, "    :/\"     Inc/Dec NXDN +/- 1 Symbol Level");
+        LogMessage(LOG_CAL, "    :/\"      Inc/Dec NXDN +/- 1 Symbol Level");
     }
     else {
         LogMessage(LOG_CAL, "    1        Set DMR Disc. Bandwidth Offset");
diff --git a/modem/Modem.cpp b/modem/Modem.cpp
index e1657f3c..f0015cf2 100644
--- a/modem/Modem.cpp
+++ b/modem/Modem.cpp
@@ -1272,7 +1272,7 @@ bool Modem::writeDMRData1(const uint8_t* data, uint32_t length)
         if (m_debug)
             LogDebug(LOG_MODEM, "Modem::writeDMRData1(); immediate write (len %u)", length);
         //if (m_trace)
-        //    Utils::dump(1U, "Immediate TX DMR Data 1", m_buffer, len);
+        //    Utils::dump(1U, "Immediate TX DMR Data 1", buffer, len);
 
         int ret = write(buffer, len);
         if (ret != int(len)) {
@@ -1329,7 +1329,7 @@ bool Modem::writeDMRData2(const uint8_t* data, uint32_t length)
         if (m_debug)
             LogDebug(LOG_MODEM, "Modem::writeDMRData2(); immediate write (len %u)", length);
         //if (m_trace)
-        //    Utils::dump(1U, "Immediate TX DMR Data 2", m_buffer, len);
+        //    Utils::dump(1U, "Immediate TX DMR Data 2", buffer, len);
 
         int ret = write(buffer, len);
         if (ret != int(len)) {
@@ -1386,7 +1386,7 @@ bool Modem::writeP25Data(const uint8_t* data, uint32_t length)
         if (m_debug)
             LogDebug(LOG_MODEM, "Modem::writeP25Data(); immediate write (len %u)", length);
         //if (m_trace)
-        //    Utils::dump(1U, "Immediate TX P25 Data", m_buffer, len);
+        //    Utils::dump(1U, "Immediate TX P25 Data", buffer, len);
 
         int ret = write(buffer, len);
         if (ret != int(len)) {
@@ -1443,7 +1443,7 @@ bool Modem::writeNXDNData(const uint8_t* data, uint32_t length)
         if (m_debug)
             LogDebug(LOG_MODEM, "Modem::writeNXDNData(); immediate write (len %u)", length);
         //if (m_trace)
-        //    Utils::dump(1U, "Immediate TX NXDN Data", m_buffer, len);
+        //    Utils::dump(1U, "Immediate TX NXDN Data", buffer, len);
 
         int ret = write(buffer, len);
         if (ret != int(len)) {
diff --git a/nxdn/packet/Voice.cpp b/nxdn/packet/Voice.cpp
index 29b54427..0a3360ec 100644
--- a/nxdn/packet/Voice.cpp
+++ b/nxdn/packet/Voice.cpp
@@ -525,7 +525,7 @@ bool Voice::process(uint8_t fct, uint8_t option, uint8_t* data, uint32_t len)
             m_rfBits += 188U;
 
             if (m_verbose) {
-                LogMessage(LOG_RF, "NXDN, " NXDN_RTCH_MSG_TYPE_VCALL ", audio, errs = %u/141 (%.1f%%)", errors, float(errors) / 1.88F);
+                LogMessage(LOG_RF, "NXDN, " NXDN_RTCH_MSG_TYPE_VCALL ", audio, errs = %u/188 (%.1f%%)", errors, float(errors) / 1.88F);
             }
         } else if (option == NXDN_LICH_STEAL_FACCH1_1) {
             channel::FACCH1 facch11;