From 041702ea0b32471ff6ea5789c160a1f664428728 Mon Sep 17 00:00:00 2001
From: Bryan Biedenkapp <gatekeep@gmail.com>
Date: Sun, 2 Oct 2022 23:06:08 -0400
Subject: [PATCH] fix incorrect opcode callback from NXDN RX; code cleanup;

---
 ADF7021.cpp     |  2 +-
 IO.cpp          |  1 -
 nxdn/NXDNRX.cpp | 10 +++++-----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/ADF7021.cpp b/ADF7021.cpp
index 2403632..92019ee 100644
--- a/ADF7021.cpp
+++ b/ADF7021.cpp
@@ -625,7 +625,7 @@ void IO::setDeviations(uint8_t dmrTXLevel, uint8_t p25TXLevel, uint8_t nxdnTXLev
 {
     dmrDev = uint16_t((ADF7021_DEV_DMR * uint16_t(dmrTXLevel)) / 128U);
     p25Dev = uint16_t((ADF7021_DEV_P25 * uint16_t(p25TXLevel)) / 128U);
-    nxdnDev = uint16_t((ADF7021_DEV_NXDN  * uint16_t(nxdnTXLevel)) / 128U);
+    nxdnDev = uint16_t((ADF7021_DEV_NXDN * uint16_t(nxdnTXLevel)) / 128U);
 }
 
 /// <summary>
diff --git a/IO.cpp b/IO.cpp
index e833339..9e5e155 100644
--- a/IO.cpp
+++ b/IO.cpp
@@ -99,7 +99,6 @@ void IO::start()
 void IO::process()
 {
     uint8_t bit;
-    uint32_t scanTime;
     uint8_t control;
 
     m_ledCount++;
diff --git a/nxdn/NXDNRX.cpp b/nxdn/NXDNRX.cpp
index 7176724..3980402 100644
--- a/nxdn/NXDNRX.cpp
+++ b/nxdn/NXDNRX.cpp
@@ -132,21 +132,21 @@ void NXDNRX::processData(bool bit)
         
         // we've not seen a data sync for too long, signal sync lost and change to NXDNRXS_NONE
         if (m_lostCount == 0U) {
-            DEBUG1("NXDNRX: processData(): sync timeout in PDU, lost lock");
+            DEBUG1("NXDNRX: processData(): sync timed out, lost lock");
 
             io.setDecode(false);
 
-            serial.writeP25Lost();
+            serial.writeNXDNLost();
             reset();
         }
         else {
-            DEBUG2("NXDNRX: processData(): sync found in PDU pos", m_dataPtr);
+            DEBUG2("NXDNRX: processData(): sync found pos", m_dataPtr);
 
             uint8_t frame[NXDN_FRAME_LENGTH_BYTES + 1U];
             ::memcpy(frame + 1U, m_buffer, m_endPtr / 8U);
 
             frame[0U] = m_lostCount == (MAX_FSW_FRAMES - 1U) ? 0x01U : 0x00U; // set sync flag
-            serial.writeP25Data(frame, NXDN_FRAME_LENGTH_BYTES + 1U);
+            serial.writeNXDNData(frame, NXDN_FRAME_LENGTH_BYTES + 1U);
         }
     }
 }
@@ -184,7 +184,7 @@ bool NXDNRX::correlateSync()
             m_buffer[i] = sync[i];
 
         // DEBUG1("NXDNRX: m_buffer dump");
-        // DEBUG_DUMP(m_buffer, P25_LDU_FRAME_LENGTH_BYTES);
+        // DEBUG_DUMP(m_buffer, NXDN_FRAME_LENGTH_BYTES);
 
         m_endPtr = m_dataPtr + NXDN_FRAME_LENGTH_BITS - NXDN_FSW_LENGTH_BITS;
         if (m_endPtr >= NXDN_FRAME_LENGTH_BITS)