From dcb9dd31a9f3d9abae233fe053ac2f8a4c5be32b Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Thu, 1 Mar 2018 07:34:41 +0000 Subject: [PATCH] Fix reported compilation errors. --- NXDNAudio.cpp | 4 ++-- NXDNControl.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/NXDNAudio.cpp b/NXDNAudio.cpp index 912036e..734085d 100644 --- a/NXDNAudio.cpp +++ b/NXDNAudio.cpp @@ -511,8 +511,8 @@ void CNXDNAudio::decode(const unsigned char* in, unsigned char* out, unsigned in unsigned int aPos = i + 0U; unsigned int bPos = i + 12U; - WRITE_BIT(out, aPos, a & MASK); - WRITE_BIT(out, bPos, b & MASK); + WRITE_BIT(out, aPos, data & MASK); + WRITE_BIT(out, bPos, datb & MASK); MASK >>= 1; } diff --git a/NXDNControl.cpp b/NXDNControl.cpp index 94b97fa..c513f50 100644 --- a/NXDNControl.cpp +++ b/NXDNControl.cpp @@ -770,9 +770,9 @@ void CNXDNControl::writeNetwork() m_netLayer3.setData(netData + 5U + 0U, 10U); unsigned char type = m_netLayer3.getMessageType(); - if (type == NXDN_MESSAGE_TYPE_TX_REL && m_netState == RS_RF_LISTENING) + if (type == NXDN_MESSAGE_TYPE_TX_REL && m_netState == RS_NET_IDLE) return; - if (type == NXDN_MESSAGE_TYPE_VCALL && m_netState != RS_RF_LISTENING) + if (type == NXDN_MESSAGE_TYPE_VCALL && m_netState != RS_NET_IDLE) return; CNXDNSACCH sacch;