From fa08abfded86f47cb69b990083b6c3e0014fa746 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Sun, 16 Feb 2020 15:52:42 +0000 Subject: [PATCH 1/2] Lookup name on DMR network late entry. --- DMRSlot.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DMRSlot.cpp b/DMRSlot.cpp index 8dd4cd9..e4bf242 100644 --- a/DMRSlot.cpp +++ b/DMRSlot.cpp @@ -1169,11 +1169,11 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) m_netState = RS_NET_AUDIO; setShortLC(m_slotNo, dstId, m_netLC->getFLCO(), ACTIVITY_VOICE); - std::string src = m_lookup->find(srcId); std::string dst = m_lookup->find(dstId); + std::string cn = m_lookup->findWithName(srcId); - m_display->writeDMR(m_slotNo, src, m_netLC->getFLCO() == FLCO_GROUP, dst, "N"); + m_display->writeDMR(m_slotNo, cn, m_netLC->getFLCO() == FLCO_GROUP, dst, "N"); LogMessage("DMR Slot %u, received network late entry from %s to %s%s", m_slotNo, src.c_str(), m_netLC->getFLCO() == FLCO_GROUP ? "TG " : "", dst.c_str()); } From 4450caeddcc3b8c25d76643694e1a9b68e839c40 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Sun, 16 Feb 2020 15:56:31 +0000 Subject: [PATCH 2/2] Update the copyright date. --- DMRSlot.cpp | 2 +- MMDVMHost.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DMRSlot.cpp b/DMRSlot.cpp index e4bf242..a7595fb 100644 --- a/DMRSlot.cpp +++ b/DMRSlot.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015-2019 Jonathan Naylor, G4KLX + * Copyright (C) 2015-2020 Jonathan Naylor, G4KLX * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/MMDVMHost.cpp b/MMDVMHost.cpp index 1c80ab7..53f6d1f 100644 --- a/MMDVMHost.cpp +++ b/MMDVMHost.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015-2019 by Jonathan Naylor G4KLX + * Copyright (C) 2015-2020 by Jonathan Naylor G4KLX * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -59,7 +59,7 @@ static void sigHandler(int signum) const char* HEADER1 = "This software is for use on amateur radio networks only,"; const char* HEADER2 = "it is to be used for educational purposes only. Its use on"; const char* HEADER3 = "commercial networks is strictly prohibited."; -const char* HEADER4 = "Copyright(C) 2015-2018 by Jonathan Naylor, G4KLX and others"; +const char* HEADER4 = "Copyright(C) 2015-2020 by Jonathan Naylor, G4KLX and others"; int main(int argc, char** argv) {