From 78fc96b0a59557da704a0c4a746d88b1c44a7a10 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Wed, 12 Mar 2025 12:55:25 +0000 Subject: [PATCH 1/3] Add new processing for D-Star Fast Data which doesn't clobber normal D-Star audio. --- Conf.cpp | 9 +- Conf.h | 2 + DMRControl.cpp | 4 +- DMRControl.h | 2 +- DMRSlot.cpp | 33 ++++++-- DMRSlot.h | 3 +- DStarControl.cpp | 210 +++++++++++++++++++++++++++++++++------------- DStarDefines.h | 16 ++-- DStarSlowData.cpp | 65 +++++++++----- DStarSlowData.h | 20 ++--- MMDVMHost.cpp | 6 +- Version.h | 2 +- 12 files changed, 259 insertions(+), 113 deletions(-) diff --git a/Conf.cpp b/Conf.cpp index 03e881a..6091f78 100644 --- a/Conf.cpp +++ b/Conf.cpp @@ -161,6 +161,7 @@ m_dmrCallHang(10U), m_dmrTXHang(4U), m_dmrModeHang(10U), m_dmrOVCM(DMR_OVCM_OFF), +m_dmrProtect(false), m_fusionEnabled(false), m_fusionLowDeviation(false), m_fusionRemoteGateway(false), @@ -753,7 +754,8 @@ bool CConf::read() m_dmrOVCM = DMR_OVCM_OFF; break; } - } + } else if (::strcmp(key, "Protect") == 0) + m_dmrProtect = ::atoi(value) == 1; } else if (section == SECTION_FUSION) { if (::strcmp(key, "Enable") == 0) m_fusionEnabled = ::atoi(value) == 1; @@ -1643,6 +1645,11 @@ DMR_OVCM_TYPES CConf::getDMROVCM() const return m_dmrOVCM; } +bool CConf::getDMRProtect() const +{ + return m_dmrProtect; +} + bool CConf::getFusionEnabled() const { return m_fusionEnabled; diff --git a/Conf.h b/Conf.h index e3d9d1e..6f210a5 100644 --- a/Conf.h +++ b/Conf.h @@ -144,6 +144,7 @@ public: unsigned int getDMRTXHang() const; unsigned int getDMRModeHang() const; DMR_OVCM_TYPES getDMROVCM() const; + bool getDMRProtect() const; // The System Fusion section bool getFusionEnabled() const; @@ -481,6 +482,7 @@ private: unsigned int m_dmrTXHang; unsigned int m_dmrModeHang; DMR_OVCM_TYPES m_dmrOVCM; + bool m_dmrProtect; bool m_fusionEnabled; bool m_fusionLowDeviation; diff --git a/DMRControl.cpp b/DMRControl.cpp index 5761080..3cedb5a 100644 --- a/DMRControl.cpp +++ b/DMRControl.cpp @@ -21,7 +21,7 @@ #include #include -CDMRControl::CDMRControl(unsigned int id, unsigned int colorCode, unsigned int callHang, bool selfOnly, bool embeddedLCOnly, bool dumpTAData, const std::vector& prefixes, const std::vector& blacklist, const std::vector& whitelist, const std::vector& slot1TGWhitelist, const std::vector& slot2TGWhitelist, unsigned int timeout, CModem* modem, IDMRNetwork* network, CDisplay* display, bool duplex, CDMRLookup* lookup, CRSSIInterpolator* rssi, unsigned int jitter, DMR_OVCM_TYPES ovcm) : +CDMRControl::CDMRControl(unsigned int id, unsigned int colorCode, unsigned int callHang, bool selfOnly, bool embeddedLCOnly, bool dumpTAData, const std::vector& prefixes, const std::vector& blacklist, const std::vector& whitelist, const std::vector& slot1TGWhitelist, const std::vector& slot2TGWhitelist, unsigned int timeout, CModem* modem, IDMRNetwork* network, CDisplay* display, bool duplex, CDMRLookup* lookup, CRSSIInterpolator* rssi, unsigned int jitter, DMR_OVCM_TYPES ovcm, bool protect) : m_colorCode(colorCode), m_modem(modem), m_network(network), @@ -38,7 +38,7 @@ m_lookup(lookup) // Load black and white lists to DMRAccessControl CDMRAccessControl::init(blacklist, whitelist, slot1TGWhitelist, slot2TGWhitelist, selfOnly, prefixes, id); - CDMRSlot::init(colorCode, embeddedLCOnly, dumpTAData, callHang, modem, network, display, duplex, m_lookup, rssi, jitter, ovcm); + CDMRSlot::init(colorCode, embeddedLCOnly, dumpTAData, callHang, modem, network, display, duplex, m_lookup, rssi, jitter, ovcm, protect); } CDMRControl::~CDMRControl() diff --git a/DMRControl.h b/DMRControl.h index 9144194..30cccdf 100644 --- a/DMRControl.h +++ b/DMRControl.h @@ -31,7 +31,7 @@ class CDMRControl { public: - CDMRControl(unsigned int id, unsigned int colorCode, unsigned int callHang, bool selfOnly, bool embeddedLCOnly, bool dumpTAData, const std::vector& prefixes, const std::vector& blacklist, const std::vector& whitelist, const std::vector& slot1TGWhitelist, const std::vector& slot2TGWhitelist, unsigned int timeout, CModem* modem, IDMRNetwork* network, CDisplay* display, bool duplex, CDMRLookup* lookup, CRSSIInterpolator* rssi, unsigned int jitter, DMR_OVCM_TYPES ovcm); + CDMRControl(unsigned int id, unsigned int colorCode, unsigned int callHang, bool selfOnly, bool embeddedLCOnly, bool dumpTAData, const std::vector& prefixes, const std::vector& blacklist, const std::vector& whitelist, const std::vector& slot1TGWhitelist, const std::vector& slot2TGWhitelist, unsigned int timeout, CModem* modem, IDMRNetwork* network, CDisplay* display, bool duplex, CDMRLookup* lookup, CRSSIInterpolator* rssi, unsigned int jitter, DMR_OVCM_TYPES ovcm, bool protect); ~CDMRControl(); bool processWakeup(const unsigned char* data); diff --git a/DMRSlot.cpp b/DMRSlot.cpp index e66e11c..7720b0a 100644 --- a/DMRSlot.cpp +++ b/DMRSlot.cpp @@ -44,6 +44,7 @@ bool CDMRSlot::m_duplex = true; CDMRLookup* CDMRSlot::m_lookup = NULL; unsigned int CDMRSlot::m_hangCount = 3U * 17U; DMR_OVCM_TYPES CDMRSlot::m_ovcm = DMR_OVCM_OFF; +bool CDMRSlot::m_protect = false; CRSSIInterpolator* CDMRSlot::m_rssiMapper = NULL; @@ -222,6 +223,15 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len) unsigned int dstId = lc->getDstId(); FLCO flco = lc->getFLCO(); + if (!m_protect) { + if (lc->getPF()) { + LogMessage("DMR Slot %u, RF user %u rejected", m_slotNo, srcId); + delete lc; + m_rfState = RS_RF_LISTENING; + return false; + } + } + if (!CDMRAccessControl::validateSrcId(srcId)) { LogMessage("DMR Slot %u, RF user %u rejected", m_slotNo, srcId); delete lc; @@ -320,10 +330,12 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len) data[0U] = TAG_DATA; data[1U] = 0x00U; - if (m_duplex) - writeQueueRF(data); + if (m_protect) { + if (m_duplex) + writeQueueRF(data); - writeNetworkRF(data, DT_VOICE_PI_HEADER); + writeNetworkRF(data, DT_VOICE_PI_HEADER); + } return true; } else if (dataType == DT_TERMINATOR_WITH_LC) { @@ -810,6 +822,15 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len) unsigned int dstId = lc->getDstId(); FLCO flco = lc->getFLCO(); + if (!m_protect) { + if (lc->getPF()) { + LogMessage("DMR Slot %u, RF user %u rejected", m_slotNo, srcId); + delete lc; + m_rfState = RS_RF_LISTENING; + return false; + } + } + if (!CDMRAccessControl::validateSrcId(srcId)) { LogMessage("DMR Slot %u, RF user %u rejected", m_slotNo, srcId); delete lc; @@ -1246,7 +1267,8 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) data[0U] = TAG_DATA; data[1U] = 0x00U; - writeQueueNet(data); + if (m_protect) + writeQueueNet(data); #if defined(DUMP_DMR) writeFile(data); @@ -1957,7 +1979,7 @@ void CDMRSlot::writeQueueNet(const unsigned char *data) m_queue.addData(data, len); } -void CDMRSlot::init(unsigned int colorCode, bool embeddedLCOnly, bool dumpTAData, unsigned int callHang, CModem* modem, IDMRNetwork* network, CDisplay* display, bool duplex, CDMRLookup* lookup, CRSSIInterpolator* rssiMapper, unsigned int jitter, DMR_OVCM_TYPES ovcm) +void CDMRSlot::init(unsigned int colorCode, bool embeddedLCOnly, bool dumpTAData, unsigned int callHang, CModem* modem, IDMRNetwork* network, CDisplay* display, bool duplex, CDMRLookup* lookup, CRSSIInterpolator* rssiMapper, unsigned int jitter, DMR_OVCM_TYPES ovcm, bool protect) { assert(modem != NULL); assert(display != NULL); @@ -1974,6 +1996,7 @@ void CDMRSlot::init(unsigned int colorCode, bool embeddedLCOnly, bool dumpTAData m_lookup = lookup; m_hangCount = callHang * 17U; m_ovcm = ovcm; + m_protect = protect; m_rssiMapper = rssiMapper; diff --git a/DMRSlot.h b/DMRSlot.h index d3d58a2..11756a4 100644 --- a/DMRSlot.h +++ b/DMRSlot.h @@ -62,7 +62,7 @@ public: void enable(bool enabled); - static void init(unsigned int colorCode, bool embeddedLCOnly, bool dumpTAData, unsigned int callHang, CModem* modem, IDMRNetwork* network, CDisplay* display, bool duplex, CDMRLookup* lookup, CRSSIInterpolator* rssiMapper, unsigned int jitter, DMR_OVCM_TYPES ovcm); + static void init(unsigned int colorCode, bool embeddedLCOnly, bool dumpTAData, unsigned int callHang, CModem* modem, IDMRNetwork* network, CDisplay* display, bool duplex, CDMRLookup* lookup, CRSSIInterpolator* rssiMapper, unsigned int jitter, DMR_OVCM_TYPES ovcm, bool protect); private: unsigned int m_slotNo; @@ -125,6 +125,7 @@ private: static CDMRLookup* m_lookup; static unsigned int m_hangCount; static DMR_OVCM_TYPES m_ovcm; + static bool m_protect; static CRSSIInterpolator* m_rssiMapper; diff --git a/DStarControl.cpp b/DStarControl.cpp index d6a42ac..c7ba73b 100644 --- a/DStarControl.cpp +++ b/DStarControl.cpp @@ -129,7 +129,7 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len) unsigned char type = data[0U]; - if (type == TAG_LOST && m_rfState == RS_RF_AUDIO) { + if (type == TAG_LOST && ((m_rfState == RS_RF_AUDIO) || (m_rfState == RS_RF_DATA))) { unsigned char my1[DSTAR_LONG_CALLSIGN_LENGTH]; unsigned char my2[DSTAR_SHORT_CALLSIGN_LENGTH]; unsigned char your[DSTAR_LONG_CALLSIGN_LENGTH]; @@ -320,7 +320,7 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len) } return false; - } else if (m_rfState == RS_RF_AUDIO) { + } else if ((m_rfState == RS_RF_AUDIO) || (m_rfState == RS_RF_DATA)) { if (m_net) writeNetworkDataRF(DSTAR_END_PATTERN_BYTES, 0U, true); @@ -354,37 +354,75 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len) // The sync is regenerated by the modem so can do exact match if (::memcmp(data + 1U + DSTAR_VOICE_FRAME_LENGTH_BYTES, DSTAR_SYNC_BYTES, DSTAR_DATA_FRAME_LENGTH_BYTES) == 0) { m_rfSlowData.start(); + m_rfN = 0U; m_rfState = RS_RF_LATE_ENTRY; } return false; } - if (m_rfState == RS_RF_AUDIO) { + if ((m_rfState == RS_RF_AUDIO) || (m_rfState == RS_RF_DATA)) { // The sync is regenerated by the modem so can do exact match if (::memcmp(data + 1U + DSTAR_VOICE_FRAME_LENGTH_BYTES, DSTAR_SYNC_BYTES, DSTAR_DATA_FRAME_LENGTH_BYTES) == 0) { m_rfSlowData.start(); m_rfN = 0U; } + } - // Regenerate the sync and send the RSSI data to the display - if (m_rfN == 0U) { - CSync::addDStarSync(data + 1U); - m_display->writeDStarRSSI(m_rssi); - } + if (m_rfState == RS_RF_AUDIO) { + m_rfSlowData.peakSlowData(data + 1U, m_rfN); + unsigned char type = m_rfSlowData.getType(); - unsigned int errors = 0U; - if (!m_rfHeader.isDataPacket()) { - errors = m_fec.regenerateDStar(data + 1U); - m_display->writeDStarBER(float(errors) / 0.48F); - m_rfErrs += errors; + if (type == DSTAR_SLOW_DATA_TYPE_FASTDATA_BEGIN) { + LogMessage("D-Star, starting fast data mode"); + m_rfState = RS_RF_DATA; } + } + + if (m_rfState == RS_RF_DATA) { + LogDebug("D-Star, fast data sequence no. %u", m_rfN); m_rfBits += 48U; m_rfFrames++; + if (m_net) + writeNetworkDataRF(data, 0U, false); + + if (m_duplex) + writeQueueDataRF(data); + + m_rfSlowData.peakSlowData(data + 1U, m_rfN); + bool complete = m_rfSlowData.isComplete(); + + if (complete) { + unsigned char type = m_rfSlowData.getType(); + if (type == DSTAR_SLOW_DATA_TYPE_FASTDATA_END) { + LogMessage("D-Star, leaving fast data mode"); + m_rfState = RS_RF_AUDIO; + } + } + + m_rfN = (m_rfN + 1U) % 21U; + } else if (m_rfState == RS_RF_AUDIO) { + // Send the RSSI data to the display + if (m_rfN == 0U) + m_display->writeDStarRSSI(m_rssi); + + unsigned int errors = 0U; + if (::memcmp(data + 1U, DSTAR_NULL_AMBE_DATA_BYTES_SCRAMBLED, DSTAR_VOICE_FRAME_LENGTH_BYTES) == 0) { + LogDebug("D-Star, audio sequence no. %u, null audio", m_rfN); + } else { + errors = m_fec.regenerateDStar(data + 1U); + LogDebug("D-Star, audio sequence no. %u, errs: %u/48 (%.1f%%)", m_rfN, errors, float(errors) / 0.48F); + m_display->writeDStarBER(float(errors) / 0.48F); + } + + m_rfErrs += errors; + m_rfBits += 48U; + m_rfFrames++; + if (m_rfN != 0U) { - const unsigned char* text = m_rfSlowData.addText(data + 1U); + const unsigned char* text = m_rfSlowData.addText(data + 1U, m_rfN); if (text != NULL) LogMessage("D-Star, RF slow data text = \"%s\"", text); } @@ -398,15 +436,20 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len) } m_rfN = (m_rfN + 1U) % 21U; - } else if (m_rfState == RS_RF_LATE_ENTRY) { + } + + if (m_rfState == RS_RF_LATE_ENTRY) { // The sync is regenerated by the modem so can do exact match if (::memcmp(data + 1U + DSTAR_VOICE_FRAME_LENGTH_BYTES, DSTAR_SYNC_BYTES, DSTAR_DATA_FRAME_LENGTH_BYTES) == 0) { m_rfSlowData.reset(); + m_rfN = 0U; return false; } else { - CDStarHeader* header = m_rfSlowData.addHeader(data + 1U); - if (header == NULL) + CDStarHeader* header = m_rfSlowData.addHeader(data + 1U, m_rfN); + if (header == NULL) { + m_rfN = (m_rfN + 1U) % 21U; return false; + } m_rfHeader = *header; delete header; @@ -503,12 +546,14 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len) } unsigned int errors = 0U; - if (!m_rfHeader.isDataPacket()) { + if (::memcmp(data + 1U, DSTAR_NULL_AMBE_DATA_BYTES_SCRAMBLED, DSTAR_VOICE_FRAME_LENGTH_BYTES) == 0) { + LogDebug("D-Star, audio sequence no. %u, null audio", m_rfN); + } else { errors = m_fec.regenerateDStar(data + 1U); LogDebug("D-Star, audio sequence no. %u, errs: %u/48 (%.1f%%)", m_rfN, errors, float(errors) / 0.48F); - m_rfErrs += errors; } + m_rfErrs += errors; m_rfBits += 48U; if (m_net) @@ -521,8 +566,6 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len) m_rfState = RS_RF_AUDIO; - m_rfN = (m_rfN + 1U) % 21U; - if (m_netState == RS_NET_IDLE) { m_display->writeDStar((char*)my1, (char*)my2, (char*)your, "R", " "); m_display->writeDStarRSSI(m_rssi); @@ -530,6 +573,8 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len) } LogMessage("D-Star, received RF late entry from %8.8s/%4.4s to %8.8s", my1, my2, your); + + m_rfN = (m_rfN + 1U) % 21U; } } else { CUtils::dump("D-Star, unknown data from modem", data, DSTAR_FRAME_LENGTH_BYTES + 1U); @@ -601,7 +646,7 @@ void CDStarControl::writeNetwork() if (!m_enabled) return; - if (m_rfState == RS_RF_AUDIO && m_netState == RS_NET_IDLE) + if (((m_rfState == RS_RF_AUDIO) || (m_rfState == RS_RF_DATA)) && (m_netState == RS_NET_IDLE)) return; m_networkWatchdog.start(); @@ -666,12 +711,9 @@ void CDStarControl::writeNetwork() LogMessage("D-Star, received network header from %8.8s/%4.4s to %8.8s", my1, my2, your); } - // Something just above here introduces a large delay forcing erroneous(?) insertion of silence packets. - // Starting the elapsed timer here instead of the commented out position above solves that. m_elapsed.start(); - } else if (type == TAG_EOT) { - if (m_netState != RS_NET_AUDIO) + if ((m_netState != RS_NET_AUDIO) && (m_netState != RS_NET_DATA)) return; writeQueueEOTNet(); @@ -695,48 +737,96 @@ void CDStarControl::writeNetwork() writeEndNet(); } else if (type == TAG_DATA) { - if (m_netState != RS_NET_AUDIO) - return; + if ((m_netState == RS_NET_AUDIO) || (m_netState == RS_NET_DATA)) { + unsigned char n = data[1U]; - unsigned int errors = 0U; - unsigned char n = data[1U]; + // The sync is regenerated by the modem so can do exact match + if (::memcmp(data + 1U + DSTAR_VOICE_FRAME_LENGTH_BYTES, DSTAR_SYNC_BYTES, DSTAR_DATA_FRAME_LENGTH_BYTES) == 0) { + m_netSlowData.start(); + } else { + m_netSlowData.peakSlowData(data + 1U, n); - if (!m_netHeader.isDataPacket()) - errors = m_fec.regenerateDStar(data + 2U); - - blankDTMF(data + 2U); - - data[1U] = TAG_DATA; - - // Insert silence and reject if in the past - bool ret = insertSilence(data + 1U, n); - if (!ret) - return; - - m_netErrs += errors; - m_netBits += 48U; - - m_netN = n; - - // Regenerate the sync - if (n == 0U) { - CSync::addDStarSync(data + 2U); - m_netSlowData.start(); + if (m_netState == RS_NET_AUDIO) { + unsigned char type = m_netSlowData.getType(); + if (type == DSTAR_SLOW_DATA_TYPE_FASTDATA_BEGIN) { + LogMessage("D-Star, starting fast data mode"); + m_netState = RS_NET_DATA; + } + } + } } - if (n != 0U) { - const unsigned char* text = m_netSlowData.addText(data + 2U); - if (text != NULL) - LogMessage("D-Star, network slow data text = \"%s\"", text); - } + if (m_netState == RS_NET_AUDIO) { + unsigned char n = data[1U]; - m_packetTimer.start(); - m_netFrames++; + unsigned int errors = 0U; + if (::memcmp(data + 2U, DSTAR_NULL_AMBE_DATA_BYTES_SCRAMBLED, DSTAR_VOICE_FRAME_LENGTH_BYTES) != 0) { + errors = m_fec.regenerateDStar(data + 2U); + blankDTMF(data + 2U); + } + + data[1U] = TAG_DATA; + + // Insert silence and reject if in the past + bool ret = insertSilence(data + 1U, n); + if (!ret) + return; + + m_netErrs += errors; + m_netBits += 48U; + + m_netN = n; + + // Regenerate the sync + if (m_netN == 0U) { + CSync::addDStarSync(data + 2U); + m_netSlowData.start(); + } else { + const unsigned char* text = m_netSlowData.addText(data + 2U, m_netN); + if (text != NULL) + LogMessage("D-Star, network slow data text = \"%s\"", text); + } + + m_packetTimer.start(); + m_netFrames++; #if defined(DUMP_DSTAR) - writeFile(data + 1U, length - 1U); + writeFile(data + 1U, length - 1U); #endif - writeQueueDataNet(data + 1U); + writeQueueDataNet(data + 1U); + } + + if (m_netState == RS_NET_DATA) { + m_netN = data[1U]; + + data[1U] = TAG_DATA; + + m_netBits += 48U; + + // Regenerate the sync + if (m_netN == 0U) { + CSync::addDStarSync(data + 2U); + m_netSlowData.start(); + } else { + m_netSlowData.peakSlowData(data + 2U, m_netN); + bool complete = m_netSlowData.isComplete(); + if (complete) { + unsigned char type = m_netSlowData.getType(); + if (type == DSTAR_SLOW_DATA_TYPE_FASTDATA_END) { + LogMessage("D-Star, leaving fast data mode"); + m_netState = RS_NET_AUDIO; + } + } + } + + m_packetTimer.start(); + m_netFrames++; + +#if defined(DUMP_DSTAR) + writeFile(data + 1U, length - 1U); +#endif + writeQueueDataNet(data + 1U); + } } else { CUtils::dump("D-Star, unknown data from network", data, DSTAR_FRAME_LENGTH_BYTES + 1U); } diff --git a/DStarDefines.h b/DStarDefines.h index 6ac7f06..d7caeb0 100644 --- a/DStarDefines.h +++ b/DStarDefines.h @@ -44,14 +44,14 @@ const unsigned int DSTAR_DATA_FRAME_LENGTH_BYTES = 3U; const unsigned int DSTAR_LONG_CALLSIGN_LENGTH = 8U; const unsigned int DSTAR_SHORT_CALLSIGN_LENGTH = 4U; -const unsigned char DSTAR_SLOW_DATA_TYPE_MASK = 0xF0U; -const unsigned char DSTAR_SLOW_DATA_TYPE_GPSDATA = 0x30U; -const unsigned char DSTAR_SLOW_DATA_TYPE_TEXT = 0x40U; -const unsigned char DSTAR_SLOW_DATA_TYPE_HEADER = 0x50U; -const unsigned char DSTAR_SLOW_DATA_TYPE_FASTDATA01 = 0x80U; -const unsigned char DSTAR_SLOW_DATA_TYPE_FASTDATA16 = 0x90U; -const unsigned char DSTAR_SLOW_DATA_TYPE_SQUELCH = 0xC0U; -const unsigned char DSTAR_SLOW_DATA_LENGTH_MASK = 0x0FU; +const unsigned char DSTAR_SLOW_DATA_TYPE_MASK = 0xF0U; +const unsigned char DSTAR_SLOW_DATA_TYPE_GPSDATA = 0x30U; +const unsigned char DSTAR_SLOW_DATA_TYPE_TEXT = 0x40U; +const unsigned char DSTAR_SLOW_DATA_TYPE_HEADER = 0x50U; +const unsigned char DSTAR_SLOW_DATA_TYPE_FASTDATA_END = 0x80U; +const unsigned char DSTAR_SLOW_DATA_TYPE_FASTDATA_BEGIN = 0x90U; +const unsigned char DSTAR_SLOW_DATA_TYPE_SQUELCH = 0xC0U; +const unsigned char DSTAR_SLOW_DATA_LENGTH_MASK = 0x0FU; // Data Frames are always scrambled using the first three bytes of // DSTAR_SCRAMBLER_BYTES, and Voice Frames are scrambled with all nine diff --git a/DStarSlowData.cpp b/DStarSlowData.cpp index 5f11b70..9aec2e6 100644 --- a/DStarSlowData.cpp +++ b/DStarSlowData.cpp @@ -1,5 +1,5 @@ /* -* Copyright (C) 2016,2023 by Jonathan Naylor G4KLX +* Copyright (C) 2016,2023,2025 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 @@ -33,7 +33,8 @@ m_buffer(NULL), m_text(NULL), m_textPtr(0U), m_textBits(0x00U), -m_state(SDD_FIRST) +m_type(0x00U), +m_complete(false) { m_header = new unsigned char[50U]; // DSTAR_HEADER_LENGTH_BYTES m_buffer = new unsigned char[DSTAR_DATA_FRAME_LENGTH_BYTES * 2U]; @@ -47,24 +48,33 @@ CDStarSlowData::~CDStarSlowData() delete[] m_text; } -CDStarHeader* CDStarSlowData::addHeader(const unsigned char* data) +void CDStarSlowData::peakSlowData(const unsigned char* data, unsigned int n) { assert(data != NULL); - switch (m_state) { - case SDD_FIRST: + if ((n % 2U) == 0U) { + m_type = data[9U] ^ DSTAR_SCRAMBLER_BYTES[0U]; + m_complete = false; + } else { + m_complete = true; + } +} + +CDStarHeader* CDStarSlowData::addHeader(const unsigned char* data, unsigned int n) +{ + assert(data != NULL); + + if ((n % 2U) == 0U) { + m_type = data[9U] ^ DSTAR_SCRAMBLER_BYTES[0U]; m_buffer[0U] = data[9U] ^ DSTAR_SCRAMBLER_BYTES[0U]; m_buffer[1U] = data[10U] ^ DSTAR_SCRAMBLER_BYTES[1U]; m_buffer[2U] = data[11U] ^ DSTAR_SCRAMBLER_BYTES[2U]; - m_state = SDD_SECOND; - return NULL; - - case SDD_SECOND: + m_complete = false; + } else { m_buffer[3U] = data[9U] ^ DSTAR_SCRAMBLER_BYTES[0U]; m_buffer[4U] = data[10U] ^ DSTAR_SCRAMBLER_BYTES[1U]; m_buffer[5U] = data[11U] ^ DSTAR_SCRAMBLER_BYTES[2U]; - m_state = SDD_FIRST; - break; + m_complete = true; } if ((m_buffer[0U] & DSTAR_SLOW_DATA_TYPE_MASK) != DSTAR_SLOW_DATA_TYPE_HEADER) @@ -95,24 +105,21 @@ CDStarHeader* CDStarSlowData::addHeader(const unsigned char* data) return new CDStarHeader(m_header); } -const unsigned char* CDStarSlowData::addText(const unsigned char* data) +const unsigned char* CDStarSlowData::addText(const unsigned char* data, unsigned int n) { assert(data != NULL); - switch (m_state) { - case SDD_FIRST: + if ((n % 2U) == 0U) { + m_type = data[9U] ^ DSTAR_SCRAMBLER_BYTES[0U]; m_buffer[0U] = data[9U] ^ DSTAR_SCRAMBLER_BYTES[0U]; m_buffer[1U] = data[10U] ^ DSTAR_SCRAMBLER_BYTES[1U]; m_buffer[2U] = data[11U] ^ DSTAR_SCRAMBLER_BYTES[2U]; - m_state = SDD_SECOND; - return NULL; - - case SDD_SECOND: + m_complete = false; + } else { m_buffer[3U] = data[9U] ^ DSTAR_SCRAMBLER_BYTES[0U]; m_buffer[4U] = data[10U] ^ DSTAR_SCRAMBLER_BYTES[1U]; m_buffer[5U] = data[11U] ^ DSTAR_SCRAMBLER_BYTES[2U]; - m_state = SDD_FIRST; - break; + m_complete = true; } switch (m_buffer[0U]) { @@ -160,7 +167,7 @@ const unsigned char* CDStarSlowData::addText(const unsigned char* data) if (m_textBits != 0x0FU) return NULL; - CUtils::dump(1U, "D-STar slow data text", m_text, 20U); + CUtils::dump(1U, "D-Star slow data text", m_text, 20U); m_textBits = 0x00U; @@ -172,14 +179,16 @@ void CDStarSlowData::start() ::memset(m_header, 0x00U, DSTAR_HEADER_LENGTH_BYTES); m_ptr = 0U; - m_state = SDD_FIRST; + m_type = 0x00U; + m_complete = false; m_textBits = 0x00U; } void CDStarSlowData::reset() { m_ptr = 0U; - m_state = SDD_FIRST; + m_type = 0x00U; + m_complete = false; m_textBits = 0x00U; } @@ -233,3 +242,13 @@ void CDStarSlowData::getSlowData(unsigned char* data) data[2U] = 'f' ^ DSTAR_SCRAMBLER_BYTES[2U]; } } + +unsigned char CDStarSlowData::getType() const +{ + return m_type & DSTAR_SLOW_DATA_TYPE_MASK; +} + +bool CDStarSlowData::isComplete() const +{ + return m_complete; +} diff --git a/DStarSlowData.h b/DStarSlowData.h index eaedf45..ee529d5 100644 --- a/DStarSlowData.h +++ b/DStarSlowData.h @@ -1,5 +1,5 @@ /* -* Copyright (C) 2016,2023 by Jonathan Naylor G4KLX +* Copyright (C) 2016,2023,2025 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 @@ -26,9 +26,14 @@ public: CDStarSlowData(); ~CDStarSlowData(); - CDStarHeader* addHeader(const unsigned char* data); + void peakSlowData(const unsigned char* data, unsigned int n); - const unsigned char* addText(const unsigned char* data); + CDStarHeader* addHeader(const unsigned char* data, unsigned int n); + + const unsigned char* addText(const unsigned char* data, unsigned int n); + + unsigned char getType() const; + bool isComplete() const; void start(); void reset(); @@ -43,13 +48,8 @@ private: unsigned char* m_text; unsigned int m_textPtr; unsigned char m_textBits; - - enum SDD_STATE { - SDD_FIRST, - SDD_SECOND - }; - - SDD_STATE m_state; + unsigned char m_type; + bool m_complete; }; #endif diff --git a/MMDVMHost.cpp b/MMDVMHost.cpp index 7501213..f420281 100644 --- a/MMDVMHost.cpp +++ b/MMDVMHost.cpp @@ -541,6 +541,7 @@ int CMMDVMHost::run() m_dmrRFModeHang = m_conf.getDMRModeHang(); dmrBeacons = m_conf.getDMRBeacons(); DMR_OVCM_TYPES ovcm = m_conf.getDMROVCM(); + bool protect = m_conf.getDMRProtect(); if (txHang > m_dmrRFModeHang) txHang = m_dmrRFModeHang; @@ -584,6 +585,9 @@ int CMMDVMHost::run() else if (ovcm == DMR_OVCM_FORCE_OFF) LogInfo(" OVCM: off (forced)"); + if (protect) + LogInfo(" Protect: yes"); + switch (dmrBeacons) { case DMR_BEACONS_NETWORK: { unsigned int dmrBeaconDuration = m_conf.getDMRBeaconDuration(); @@ -613,7 +617,7 @@ int CMMDVMHost::run() break; } - m_dmr = new CDMRControl(id, colorCode, callHang, selfOnly, embeddedLCOnly, dumpTAData, prefixes, blackList, whiteList, slot1TGWhiteList, slot2TGWhiteList, m_timeout, m_modem, m_dmrNetwork, m_display, m_duplex, m_dmrLookup, rssi, jitter, ovcm); + m_dmr = new CDMRControl(id, colorCode, callHang, selfOnly, embeddedLCOnly, dumpTAData, prefixes, blackList, whiteList, slot1TGWhiteList, slot2TGWhiteList, m_timeout, m_modem, m_dmrNetwork, m_display, m_duplex, m_dmrLookup, rssi, jitter, ovcm, protect); m_dmrTXTimer.setTimeout(txHang); } diff --git a/Version.h b/Version.h index 7fac374..bb8d3e3 100644 --- a/Version.h +++ b/Version.h @@ -19,6 +19,6 @@ #if !defined(VERSION_H) #define VERSION_H -const char* VERSION = "20250227"; +const char* VERSION = "20250312"; #endif From 43f8b2f6f0203db4a20e4f8c1095c0c82d8bfd6d Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Thu, 13 Mar 2025 18:16:33 +0000 Subject: [PATCH 2/3] Change all of the enums to the modern format. --- Conf.cpp | 238 +++++++++++++++---------------- Conf.h | 10 +- DMRCSBK.cpp | 24 ++-- DMRCSBK.h | 26 ++-- DMRControl.cpp | 6 +- DMRControl.h | 4 +- DMRData.cpp | 4 +- DMRDefines.h | 18 +-- DMRDirectNetwork.cpp | 84 +++++------ DMRDirectNetwork.h | 4 +- DMREmbeddedData.cpp | 24 ++-- DMREmbeddedData.h | 12 +- DMRGatewayNetwork.cpp | 36 ++--- DMRLC.cpp | 8 +- DMRSlot.cpp | 316 ++++++++++++++++++++--------------------- DMRSlot.h | 20 +-- DStarControl.cpp | 148 +++++++++---------- DStarControl.h | 4 +- DStarDefines.h | 30 ++-- DStarNetwork.cpp | 6 +- Defines.h | 82 +++++------ FMNetwork.cpp | 30 ++-- FMNetwork.h | 8 +- LCDproc.cpp | 16 ++- LCDproc.h | 11 +- Log.cpp | 4 +- M17Control.cpp | 70 ++++----- MMDVMHost.cpp | 102 ++++++------- Modem.cpp | 136 +++++++++--------- Modem.h | 22 +-- NXDNControl.cpp | 88 ++++++------ NXDNDefines.h | 4 +- NXDNIcomNetwork.cpp | 14 +- NXDNKenwoodNetwork.cpp | 18 +-- NXDNNetwork.h | 16 +-- NetworkInfo.cpp | 3 +- P25Control.cpp | 82 +++++------ P25Defines.h | 4 +- P25Utils.cpp | 22 +-- POCSAGControl.cpp | 26 ++-- POCSAGControl.h | 12 +- RemoteCommand.cpp | 4 +- RemoteControl.cpp | 126 ++++++++-------- RemoteControl.h | 72 +++++----- SHA256.h | 8 +- TFTSurenoo.cpp | 43 +++--- UDPSocket.cpp | 6 +- UDPSocket.h | 10 +- Version.h | 2 +- YSFControl.cpp | 86 +++++------ 50 files changed, 1085 insertions(+), 1064 deletions(-) diff --git a/Conf.cpp b/Conf.cpp index 6091f78..fe6f1b5 100644 --- a/Conf.cpp +++ b/Conf.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015-2023 by Jonathan Naylor G4KLX + * Copyright (C) 2015-2023,2025 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 @@ -27,41 +27,41 @@ const int BUFFER_SIZE = 500; -enum SECTION { - SECTION_NONE, - SECTION_GENERAL, - SECTION_INFO, - SECTION_LOG, - SECTION_CWID, - SECTION_DMRID_LOOKUP, - SECTION_NXDNID_LOOKUP, - SECTION_MODEM, - SECTION_TRANSPARENT, - SECTION_DSTAR, - SECTION_DMR, - SECTION_FUSION, - SECTION_P25, - SECTION_NXDN, - SECTION_M17, - SECTION_POCSAG, - SECTION_FM, - SECTION_AX25, - SECTION_DSTAR_NETWORK, - SECTION_DMR_NETWORK, - SECTION_FUSION_NETWORK, - SECTION_P25_NETWORK, - SECTION_NXDN_NETWORK, - SECTION_M17_NETWORK, - SECTION_POCSAG_NETWORK, - SECTION_FM_NETWORK, - SECTION_AX25_NETWORK, - SECTION_TFTSERIAL, - SECTION_HD44780, - SECTION_NEXTION, - SECTION_OLED, - SECTION_LCDPROC, - SECTION_LOCK_FILE, - SECTION_REMOTE_CONTROL +enum class SECTION { + NONE, + GENERAL, + INFO, + LOG, + CWID, + DMRID_LOOKUP, + NXDNID_LOOKUP, + MODEM, + TRANSPARENT, + DSTAR, + DMR, + FUSION, + P25, + NXDN, + M17, + POCSAG, + FM, + AX25, + DSTAR_NETWORK, + DMR_NETWORK, + FUSION_NETWORK, + P25_NETWORK, + NXDN_NETWORK, + M17_NETWORK, + POCSAG_NETWORK, + FM_NETWORK, + AX25_NETWORK, + TFTSERIAL, + HD44780, + NEXTION, + OLED, + LCDPROC, + LOCK_FILE, + REMOTE_CONTROL }; CConf::CConf(const std::string& file) : @@ -139,12 +139,12 @@ m_dstarBlackList(), m_dstarWhiteList(), m_dstarAckReply(true), m_dstarAckTime(750U), -m_dstarAckMessage(DSTAR_ACK_BER), +m_dstarAckMessage(DSTAR_ACK::BER), m_dstarErrorReply(true), m_dstarRemoteGateway(false), m_dstarModeHang(10U), m_dmrEnabled(false), -m_dmrBeacons(DMR_BEACONS_OFF), +m_dmrBeacons(DMR_BEACONS::OFF), m_dmrBeaconInterval(60U), m_dmrBeaconDuration(3U), m_dmrId(0U), @@ -160,7 +160,7 @@ m_dmrSlot2TGWhiteList(), m_dmrCallHang(10U), m_dmrTXHang(4U), m_dmrModeHang(10U), -m_dmrOVCM(DMR_OVCM_OFF), +m_dmrOVCM(DMR_OVCM::OFF), m_dmrProtect(false), m_fusionEnabled(false), m_fusionLowDeviation(false), @@ -361,7 +361,7 @@ bool CConf::read() return false; } - SECTION section = SECTION_NONE; + SECTION section = SECTION::NONE; char buffer[BUFFER_SIZE]; while (::fgets(buffer, BUFFER_SIZE, fp) != NULL) { @@ -370,73 +370,73 @@ bool CConf::read() if (buffer[0U] == '[') { if (::strncmp(buffer, "[General]", 9U) == 0) - section = SECTION_GENERAL; + section = SECTION::GENERAL; else if (::strncmp(buffer, "[Info]", 6U) == 0) - section = SECTION_INFO; + section = SECTION::INFO; else if (::strncmp(buffer, "[Log]", 5U) == 0) - section = SECTION_LOG; + section = SECTION::LOG; else if (::strncmp(buffer, "[CW Id]", 7U) == 0) - section = SECTION_CWID; + section = SECTION::CWID; else if (::strncmp(buffer, "[DMR Id Lookup]", 15U) == 0) - section = SECTION_DMRID_LOOKUP; + section = SECTION::DMRID_LOOKUP; else if (::strncmp(buffer, "[NXDN Id Lookup]", 16U) == 0) - section = SECTION_NXDNID_LOOKUP; + section = SECTION::NXDNID_LOOKUP; else if (::strncmp(buffer, "[Modem]", 7U) == 0) - section = SECTION_MODEM; + section = SECTION::MODEM; else if (::strncmp(buffer, "[Transparent Data]", 18U) == 0) - section = SECTION_TRANSPARENT; + section = SECTION::TRANSPARENT; else if (::strncmp(buffer, "[D-Star]", 8U) == 0) - section = SECTION_DSTAR; + section = SECTION::DSTAR; else if (::strncmp(buffer, "[DMR]", 5U) == 0) - section = SECTION_DMR; + section = SECTION::DMR; else if (::strncmp(buffer, "[System Fusion]", 15U) == 0) - section = SECTION_FUSION; + section = SECTION::FUSION; else if (::strncmp(buffer, "[P25]", 5U) == 0) - section = SECTION_P25; + section = SECTION::P25; else if (::strncmp(buffer, "[NXDN]", 6U) == 0) - section = SECTION_NXDN; + section = SECTION::NXDN; else if (::strncmp(buffer, "[M17]", 5U) == 0) - section = SECTION_M17; + section = SECTION::M17; else if (::strncmp(buffer, "[POCSAG]", 8U) == 0) - section = SECTION_POCSAG; + section = SECTION::POCSAG; else if (::strncmp(buffer, "[FM]", 4U) == 0) - section = SECTION_FM; + section = SECTION::FM; else if (::strncmp(buffer, "[AX.25]", 7U) == 0) - section = SECTION_AX25; + section = SECTION::AX25; else if (::strncmp(buffer, "[D-Star Network]", 16U) == 0) - section = SECTION_DSTAR_NETWORK; + section = SECTION::DSTAR_NETWORK; else if (::strncmp(buffer, "[DMR Network]", 13U) == 0) - section = SECTION_DMR_NETWORK; + section = SECTION::DMR_NETWORK; else if (::strncmp(buffer, "[System Fusion Network]", 23U) == 0) - section = SECTION_FUSION_NETWORK; + section = SECTION::FUSION_NETWORK; else if (::strncmp(buffer, "[P25 Network]", 13U) == 0) - section = SECTION_P25_NETWORK; + section = SECTION::P25_NETWORK; else if (::strncmp(buffer, "[NXDN Network]", 14U) == 0) - section = SECTION_NXDN_NETWORK; + section = SECTION::NXDN_NETWORK; else if (::strncmp(buffer, "[M17 Network]", 13U) == 0) - section = SECTION_M17_NETWORK; + section = SECTION::M17_NETWORK; else if (::strncmp(buffer, "[POCSAG Network]", 16U) == 0) - section = SECTION_POCSAG_NETWORK; + section = SECTION::POCSAG_NETWORK; else if (::strncmp(buffer, "[FM Network]", 12U) == 0) - section = SECTION_FM_NETWORK; + section = SECTION::FM_NETWORK; else if (::strncmp(buffer, "[AX.25 Network]", 15U) == 0) - section = SECTION_AX25_NETWORK; + section = SECTION::AX25_NETWORK; else if (::strncmp(buffer, "[TFT Serial]", 12U) == 0) - section = SECTION_TFTSERIAL; + section = SECTION::TFTSERIAL; else if (::strncmp(buffer, "[HD44780]", 9U) == 0) - section = SECTION_HD44780; + section = SECTION::HD44780; else if (::strncmp(buffer, "[Nextion]", 9U) == 0) - section = SECTION_NEXTION; + section = SECTION::NEXTION; else if (::strncmp(buffer, "[OLED]", 6U) == 0) - section = SECTION_OLED; + section = SECTION::OLED; else if (::strncmp(buffer, "[LCDproc]", 9U) == 0) - section = SECTION_LCDPROC; + section = SECTION::LCDPROC; else if (::strncmp(buffer, "[Lock File]", 11U) == 0) - section = SECTION_LOCK_FILE; + section = SECTION::LOCK_FILE; else if (::strncmp(buffer, "[Remote Control]", 16U) == 0) - section = SECTION_REMOTE_CONTROL; + section = SECTION::REMOTE_CONTROL; else - section = SECTION_NONE; + section = SECTION::NONE; continue; } @@ -466,7 +466,7 @@ bool CConf::read() *p = '\0'; } - if (section == SECTION_GENERAL) { + if (section == SECTION::GENERAL) { if (::strcmp(key, "Callsign") == 0) { // Convert the callsign to upper case for (unsigned int i = 0U; value[i] != 0; i++) @@ -489,7 +489,7 @@ bool CConf::read() m_display = value; else if (::strcmp(key, "Daemon") == 0) m_daemon = ::atoi(value) == 1; - } else if (section == SECTION_INFO) { + } else if (section == SECTION::INFO) { if (::strcmp(key, "TXFrequency") == 0) m_pocsagFrequency = m_txFrequency = (unsigned int)::atoi(value); else if (::strcmp(key, "RXFrequency") == 0) @@ -508,7 +508,7 @@ bool CConf::read() m_description = value; else if (::strcmp(key, "URL") == 0) m_url = value; - } else if (section == SECTION_LOG) { + } else if (section == SECTION::LOG) { if (::strcmp(key, "FilePath") == 0) m_logFilePath = value; else if (::strcmp(key, "FileRoot") == 0) @@ -519,7 +519,7 @@ bool CConf::read() m_logDisplayLevel = (unsigned int)::atoi(value); else if (::strcmp(key, "FileRotate") == 0) m_logFileRotate = ::atoi(value) == 1; - } else if (section == SECTION_CWID) { + } else if (section == SECTION::CWID) { if (::strcmp(key, "Enable") == 0) m_cwIdEnabled = ::atoi(value) == 1; else if (::strcmp(key, "Time") == 0) @@ -530,17 +530,17 @@ bool CConf::read() value[i] = ::toupper(value[i]); m_cwIdCallsign = value; } - } else if (section == SECTION_DMRID_LOOKUP) { + } else if (section == SECTION::DMRID_LOOKUP) { if (::strcmp(key, "File") == 0) m_dmrIdLookupFile = value; else if (::strcmp(key, "Time") == 0) m_dmrIdLookupTime = (unsigned int)::atoi(value); - } else if (section == SECTION_NXDNID_LOOKUP) { + } else if (section == SECTION::NXDNID_LOOKUP) { if (::strcmp(key, "File") == 0) m_nxdnIdLookupFile = value; else if (::strcmp(key, "Time") == 0) m_nxdnIdLookupTime = (unsigned int)::atoi(value); - } else if (section == SECTION_MODEM) { + } else if (section == SECTION::MODEM) { if (::strcmp(key, "Protocol") == 0) m_modemProtocol = value; else if (::strcmp(key, "UARTPort") == 0) @@ -611,7 +611,7 @@ bool CConf::read() m_modemTrace = ::atoi(value) == 1; else if (::strcmp(key, "Debug") == 0) m_modemDebug = ::atoi(value) == 1; - } else if (section == SECTION_TRANSPARENT) { + } else if (section == SECTION::TRANSPARENT) { if (::strcmp(key, "Enable") == 0) m_transparentEnabled = ::atoi(value) == 1; else if (::strcmp(key, "RemoteAddress") == 0) @@ -622,7 +622,7 @@ bool CConf::read() m_transparentLocalPort = (unsigned short)::atoi(value); else if (::strcmp(key, "SendFrameType") == 0) m_transparentSendFrameType = (unsigned int)::atoi(value); - } else if (section == SECTION_DSTAR) { + } else if (section == SECTION::DSTAR) { if (::strcmp(key, "Enable") == 0) m_dstarEnabled = ::atoi(value) == 1; else if (::strcmp(key, "Module") == 0) { @@ -661,22 +661,22 @@ bool CConf::read() else if (::strcmp(key, "AckTime") == 0) m_dstarAckTime = (unsigned int)::atoi(value); else if (::strcmp(key, "AckMessage") == 0) { - m_dstarAckMessage = (DSTAR_ACK_MESSAGE)::atoi(value); - if (m_dstarAckMessage != DSTAR_ACK_BER && m_dstarAckMessage != DSTAR_ACK_RSSI && m_dstarAckMessage != DSTAR_ACK_SMETER) - m_dstarAckMessage = DSTAR_ACK_BER; + m_dstarAckMessage = DSTAR_ACK(::atoi(value)); + if ((m_dstarAckMessage != DSTAR_ACK::BER) && (m_dstarAckMessage != DSTAR_ACK::RSSI) && (m_dstarAckMessage != DSTAR_ACK::SMETER)) + m_dstarAckMessage = DSTAR_ACK::BER; } else if (::strcmp(key, "ErrorReply") == 0) m_dstarErrorReply = ::atoi(value) == 1; else if (::strcmp(key, "RemoteGateway") == 0) m_dstarRemoteGateway = ::atoi(value) == 1; else if (::strcmp(key, "ModeHang") == 0) m_dstarModeHang = (unsigned int)::atoi(value); - } else if (section == SECTION_DMR) { + } else if (section == SECTION::DMR) { if (::strcmp(key, "Enable") == 0) m_dmrEnabled = ::atoi(value) == 1; else if (::strcmp(key, "Beacons") == 0) - m_dmrBeacons = ::atoi(value) == 1 ? DMR_BEACONS_NETWORK : DMR_BEACONS_OFF; + m_dmrBeacons = ::atoi(value) == 1 ? DMR_BEACONS::NETWORK : DMR_BEACONS::OFF; else if (::strcmp(key, "BeaconInterval") == 0) { - m_dmrBeacons = m_dmrBeacons != DMR_BEACONS_OFF ? DMR_BEACONS_TIMED : DMR_BEACONS_OFF; + m_dmrBeacons = m_dmrBeacons != DMR_BEACONS::OFF ? DMR_BEACONS::TIMED : DMR_BEACONS::OFF; m_dmrBeaconInterval = (unsigned int)::atoi(value); } else if (::strcmp(key, "BeaconDuration") == 0) m_dmrBeaconDuration = (unsigned int)::atoi(value); @@ -739,24 +739,24 @@ bool CConf::read() else if (::strcmp(key, "OVCM") == 0) { switch (::atoi(value)) { case 1: - m_dmrOVCM = DMR_OVCM_RX_ON; + m_dmrOVCM = DMR_OVCM::RX_ON; break; case 2: - m_dmrOVCM = DMR_OVCM_TX_ON; + m_dmrOVCM = DMR_OVCM::TX_ON; break; case 3: - m_dmrOVCM = DMR_OVCM_ON; + m_dmrOVCM = DMR_OVCM::ON; break; case 4: - m_dmrOVCM = DMR_OVCM_FORCE_OFF; + m_dmrOVCM = DMR_OVCM::FORCE_OFF; break; default: - m_dmrOVCM = DMR_OVCM_OFF; + m_dmrOVCM = DMR_OVCM::OFF; break; } } else if (::strcmp(key, "Protect") == 0) m_dmrProtect = ::atoi(value) == 1; - } else if (section == SECTION_FUSION) { + } else if (section == SECTION::FUSION) { if (::strcmp(key, "Enable") == 0) m_fusionEnabled = ::atoi(value) == 1; else if (::strcmp(key, "LowDeviation") == 0) @@ -769,7 +769,7 @@ bool CConf::read() m_fusionTXHang = (unsigned int)::atoi(value); else if (::strcmp(key, "ModeHang") == 0) m_fusionModeHang = (unsigned int)::atoi(value); - } else if (section == SECTION_P25) { + } else if (section == SECTION::P25) { if (::strcmp(key, "Enable") == 0) m_p25Enabled = ::atoi(value) == 1; else if (::strcmp(key, "Id") == 0) @@ -786,7 +786,7 @@ bool CConf::read() m_p25TXHang = (unsigned int)::atoi(value); else if (::strcmp(key, "ModeHang") == 0) m_p25ModeHang = (unsigned int)::atoi(value); - } else if (section == SECTION_NXDN) { + } else if (section == SECTION::NXDN) { if (::strcmp(key, "Enable") == 0) m_nxdnEnabled = ::atoi(value) == 1; else if (::strcmp(key, "Id") == 0) @@ -801,7 +801,7 @@ bool CConf::read() m_nxdnTXHang = (unsigned int)::atoi(value); else if (::strcmp(key, "ModeHang") == 0) m_nxdnModeHang = (unsigned int)::atoi(value); - } else if (section == SECTION_M17) { + } else if (section == SECTION::M17) { if (::strcmp(key, "Enable") == 0) m_m17Enabled = ::atoi(value) == 1; else if (::strcmp(key, "CAN") == 0) @@ -814,12 +814,12 @@ bool CConf::read() m_m17TXHang = (unsigned int)::atoi(value); else if (::strcmp(key, "ModeHang") == 0) m_m17ModeHang = (unsigned int)::atoi(value); - } else if (section == SECTION_POCSAG) { + } else if (section == SECTION::POCSAG) { if (::strcmp(key, "Enable") == 0) m_pocsagEnabled = ::atoi(value) == 1; else if (::strcmp(key, "Frequency") == 0) m_pocsagFrequency = (unsigned int)::atoi(value); - } else if (section == SECTION_FM) { + } else if (section == SECTION::FM) { if (::strcmp(key, "Enable") == 0) m_fmEnabled = ::atoi(value) == 1; else if (::strcmp(key, "Callsign") == 0) { @@ -905,7 +905,7 @@ bool CConf::read() m_fmExtAudioBoost = (unsigned int)::atoi(value); else if (::strcmp(key, "ModeHang") == 0) m_fmModeHang = (unsigned int)::atoi(value); - } else if (section == SECTION_AX25) { + } else if (section == SECTION::AX25) { if (::strcmp(key, "Enable") == 0) m_ax25Enabled = ::atoi(value) == 1; else if (::strcmp(key, "TXDelay") == 0) @@ -918,7 +918,7 @@ bool CConf::read() m_ax25PPersist = (unsigned int)::atoi(value); else if (::strcmp(key, "Trace") == 0) m_ax25Trace = ::atoi(value) == 1; - } else if (section == SECTION_DSTAR_NETWORK) { + } else if (section == SECTION::DSTAR_NETWORK) { if (::strcmp(key, "Enable") == 0) m_dstarNetworkEnabled = ::atoi(value) == 1; else if (::strcmp(key, "GatewayAddress") == 0) @@ -933,7 +933,7 @@ bool CConf::read() m_dstarNetworkModeHang = (unsigned int)::atoi(value); else if (::strcmp(key, "Debug") == 0) m_dstarNetworkDebug = ::atoi(value) == 1; - } else if (section == SECTION_DMR_NETWORK) { + } else if (section == SECTION::DMR_NETWORK) { if (::strcmp(key, "Enable") == 0) m_dmrNetworkEnabled = ::atoi(value) == 1; else if (::strcmp(key, "Type") == 0) @@ -960,7 +960,7 @@ bool CConf::read() m_dmrNetworkSlot2 = ::atoi(value) == 1; else if (::strcmp(key, "ModeHang") == 0) m_dmrNetworkModeHang = (unsigned int)::atoi(value); - } else if (section == SECTION_FUSION_NETWORK) { + } else if (section == SECTION::FUSION_NETWORK) { if (::strcmp(key, "Enable") == 0) m_fusionNetworkEnabled = ::atoi(value) == 1; else if (::strcmp(key, "LocalAddress") == 0) @@ -975,7 +975,7 @@ bool CConf::read() m_fusionNetworkModeHang = (unsigned int)::atoi(value); else if (::strcmp(key, "Debug") == 0) m_fusionNetworkDebug = ::atoi(value) == 1; - } else if (section == SECTION_P25_NETWORK) { + } else if (section == SECTION::P25_NETWORK) { if (::strcmp(key, "Enable") == 0) m_p25NetworkEnabled = ::atoi(value) == 1; else if (::strcmp(key, "GatewayAddress") == 0) @@ -990,7 +990,7 @@ bool CConf::read() m_p25NetworkModeHang = (unsigned int)::atoi(value); else if (::strcmp(key, "Debug") == 0) m_p25NetworkDebug = ::atoi(value) == 1; - } else if (section == SECTION_NXDN_NETWORK) { + } else if (section == SECTION::NXDN_NETWORK) { if (::strcmp(key, "Enable") == 0) m_nxdnNetworkEnabled = ::atoi(value) == 1; else if (::strcmp(key, "LocalAddress") == 0) @@ -1005,7 +1005,7 @@ bool CConf::read() m_nxdnNetworkModeHang = (unsigned int)::atoi(value); else if (::strcmp(key, "Debug") == 0) m_nxdnNetworkDebug = ::atoi(value) == 1; - } else if (section == SECTION_M17_NETWORK) { + } else if (section == SECTION::M17_NETWORK) { if (::strcmp(key, "Enable") == 0) m_m17NetworkEnabled = ::atoi(value) == 1; else if (::strcmp(key, "LocalAddress") == 0) @@ -1020,7 +1020,7 @@ bool CConf::read() m_m17NetworkModeHang = (unsigned int)::atoi(value); else if (::strcmp(key, "Debug") == 0) m_m17NetworkDebug = ::atoi(value) == 1; - } else if (section == SECTION_POCSAG_NETWORK) { + } else if (section == SECTION::POCSAG_NETWORK) { if (::strcmp(key, "Enable") == 0) m_pocsagNetworkEnabled = ::atoi(value) == 1; else if (::strcmp(key, "LocalAddress") == 0) @@ -1035,7 +1035,7 @@ bool CConf::read() m_pocsagNetworkModeHang = (unsigned int)::atoi(value); else if (::strcmp(key, "Debug") == 0) m_pocsagNetworkDebug = ::atoi(value) == 1; - } else if (section == SECTION_FM_NETWORK) { + } else if (section == SECTION::FM_NETWORK) { if (::strcmp(key, "Enable") == 0) m_fmNetworkEnabled = ::atoi(value) == 1; else if (::strcmp(key, "Protocol") == 0) @@ -1064,7 +1064,7 @@ bool CConf::read() m_fmNetworkModeHang = (unsigned int)::atoi(value); else if (::strcmp(key, "Debug") == 0) m_fmNetworkDebug = ::atoi(value) == 1; - } else if (section == SECTION_AX25_NETWORK) { + } else if (section == SECTION::AX25_NETWORK) { if (::strcmp(key, "Enable") == 0) m_ax25NetworkEnabled = ::atoi(value) == 1; else if (::strcmp(key, "Port") == 0) @@ -1073,14 +1073,14 @@ bool CConf::read() m_ax25NetworkSpeed = (unsigned int)::atoi(value); else if (::strcmp(key, "Debug") == 0) m_ax25NetworkDebug = ::atoi(value) == 1; - } else if (section == SECTION_TFTSERIAL) { + } else if (section == SECTION::TFTSERIAL) { if (::strcmp(key, "Port") == 0) m_tftSerialPort = value; else if (::strcmp(key, "Brightness") == 0) m_tftSerialBrightness = (unsigned int)::atoi(value); else if (::strcmp(key, "ScreenLayout") == 0) m_tftSerialScreenLayout = (unsigned int)::atoi(value); - } else if (section == SECTION_HD44780) { + } else if (section == SECTION::HD44780) { if (::strcmp(key, "Rows") == 0) m_hd44780Rows = (unsigned int)::atoi(value); else if (::strcmp(key, "Columns") == 0) @@ -1107,7 +1107,7 @@ bool CConf::read() p = ::strtok(NULL, ",\r\n"); } } - } else if (section == SECTION_NEXTION) { + } else if (section == SECTION::NEXTION) { if (::strcmp(key, "Port") == 0) m_nextionPort = value; else if (::strcmp(key, "Brightness") == 0) @@ -1126,7 +1126,7 @@ bool CConf::read() m_nextionOutput = ::atoi(value) == 1; else if (::strcmp(key, "NextionUDPPort") == 0) m_nextionUDPPort = (unsigned short)::atoi(value); - } else if (section == SECTION_OLED) { + } else if (section == SECTION::OLED) { if (::strcmp(key, "Type") == 0) m_oledType = (unsigned char)::atoi(value); else if (::strcmp(key, "Brightness") == 0) @@ -1139,7 +1139,7 @@ bool CConf::read() m_oledRotate = ::atoi(value) == 1; else if (::strcmp(key, "LogoScreensaver") == 0) m_oledLogoScreensaver = ::atoi(value) == 1; - } else if (section == SECTION_LCDPROC) { + } else if (section == SECTION::LCDPROC) { if (::strcmp(key, "Address") == 0) m_lcdprocAddress = value; else if (::strcmp(key, "Port") == 0) @@ -1152,12 +1152,12 @@ bool CConf::read() m_lcdprocUTC = ::atoi(value) == 1; else if (::strcmp(key, "DimOnIdle") == 0) m_lcdprocDimOnIdle = ::atoi(value) == 1; - } else if (section == SECTION_LOCK_FILE) { + } else if (section == SECTION::LOCK_FILE) { if (::strcmp(key, "Enable") == 0) m_lockFileEnabled = ::atoi(value) == 1; else if (::strcmp(key, "File") == 0) m_lockFileName = value; - } else if (section == SECTION_REMOTE_CONTROL) { + } else if (section == SECTION::REMOTE_CONTROL) { if (::strcmp(key, "Enable") == 0) m_remoteControlEnabled = ::atoi(value) == 1; else if (::strcmp(key, "Port") == 0) @@ -1535,7 +1535,7 @@ unsigned int CConf::getDStarAckTime() const return m_dstarAckTime; } -DSTAR_ACK_MESSAGE CConf::getDStarAckMessage() const +DSTAR_ACK CConf::getDStarAckMessage() const { return m_dstarAckMessage; } @@ -1640,7 +1640,7 @@ unsigned int CConf::getDMRModeHang() const return m_dmrModeHang; } -DMR_OVCM_TYPES CConf::getDMROVCM() const +DMR_OVCM CConf::getDMROVCM() const { return m_dmrOVCM; } diff --git a/Conf.h b/Conf.h index 6f210a5..d2689fd 100644 --- a/Conf.h +++ b/Conf.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015-2023 by Jonathan Naylor G4KLX + * Copyright (C) 2015-2023,2025 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 @@ -120,7 +120,7 @@ public: std::vector getDStarWhiteList() const; bool getDStarAckReply() const; unsigned int getDStarAckTime() const; - DSTAR_ACK_MESSAGE getDStarAckMessage() const; + DSTAR_ACK getDStarAckMessage() const; bool getDStarErrorReply() const; bool getDStarRemoteGateway() const; unsigned int getDStarModeHang() const; @@ -143,7 +143,7 @@ public: unsigned int getDMRCallHang() const; unsigned int getDMRTXHang() const; unsigned int getDMRModeHang() const; - DMR_OVCM_TYPES getDMROVCM() const; + DMR_OVCM getDMROVCM() const; bool getDMRProtect() const; // The System Fusion section @@ -459,7 +459,7 @@ private: std::vector m_dstarWhiteList; bool m_dstarAckReply; unsigned int m_dstarAckTime; - DSTAR_ACK_MESSAGE m_dstarAckMessage; + DSTAR_ACK m_dstarAckMessage; bool m_dstarErrorReply; bool m_dstarRemoteGateway; unsigned int m_dstarModeHang; @@ -481,7 +481,7 @@ private: unsigned int m_dmrCallHang; unsigned int m_dmrTXHang; unsigned int m_dmrModeHang; - DMR_OVCM_TYPES m_dmrOVCM; + DMR_OVCM m_dmrOVCM; bool m_dmrProtect; bool m_fusionEnabled; diff --git a/DMRCSBK.cpp b/DMRCSBK.cpp index ad02b0b..c30e8e7 100644 --- a/DMRCSBK.cpp +++ b/DMRCSBK.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015,2016,2020,2021,2022 by Jonathan Naylor G4KLX + * Copyright (C) 2015,2016,2020,2021,2022,2025 by Jonathan Naylor G4KLX * Copyright (C) 2019 by Patrick Maier DK5MP * * This program is free software; you can redistribute it and/or modify @@ -27,7 +27,7 @@ CDMRCSBK::CDMRCSBK() : m_data(NULL), -m_CSBKO(CSBKO_NONE), +m_CSBKO(CSBKO::NONE), m_FID(0x00U), m_GI(false), m_bsId(0U), @@ -67,7 +67,7 @@ bool CDMRCSBK::put(const unsigned char* bytes) m_FID = m_data[1U]; switch (m_CSBKO) { - case CSBKO_BSDWNACT: + case CSBKO::BSDWNACT: m_GI = false; m_bsId = m_data[4U] << 16 | m_data[5U] << 8 | m_data[6U]; m_srcId = m_data[7U] << 16 | m_data[8U] << 8 | m_data[9U]; @@ -76,7 +76,7 @@ bool CDMRCSBK::put(const unsigned char* bytes) CUtils::dump(1U, "Downlink Activate CSBK", m_data, 12U); break; - case CSBKO_UUVREQ: + case CSBKO::UUVREQ: m_GI = false; m_dstId = m_data[4U] << 16 | m_data[5U] << 8 | m_data[6U]; m_srcId = m_data[7U] << 16 | m_data[8U] << 8 | m_data[9U]; @@ -86,7 +86,7 @@ bool CDMRCSBK::put(const unsigned char* bytes) CUtils::dump(1U, "Unit to Unit Service Request CSBK", m_data, 12U); break; - case CSBKO_UUANSRSP: + case CSBKO::UUANSRSP: m_GI = false; m_dstId = m_data[4U] << 16 | m_data[5U] << 8 | m_data[6U]; m_srcId = m_data[7U] << 16 | m_data[8U] << 8 | m_data[9U]; @@ -96,7 +96,7 @@ bool CDMRCSBK::put(const unsigned char* bytes) CUtils::dump(1U, "Unit to Unit Service Answer Response CSBK", m_data, 12U); break; - case CSBKO_PRECCSBK: + case CSBKO::PRECCSBK: m_GI = (m_data[2U] & 0x40U) == 0x40U; m_dstId = m_data[4U] << 16 | m_data[5U] << 8 | m_data[6U]; m_srcId = m_data[7U] << 16 | m_data[8U] << 8 | m_data[9U]; @@ -105,7 +105,7 @@ bool CDMRCSBK::put(const unsigned char* bytes) CUtils::dump(1U, "Preamble CSBK", m_data, 12U); break; - case CSBKO_NACKRSP: + case CSBKO::NACKRSP: m_GI = false; m_srcId = m_data[4U] << 16 | m_data[5U] << 8 | m_data[6U]; m_dstId = m_data[7U] << 16 | m_data[8U] << 8 | m_data[9U]; @@ -114,7 +114,7 @@ bool CDMRCSBK::put(const unsigned char* bytes) CUtils::dump(1U, "Negative Acknowledge Response CSBK", m_data, 12U); break; - case CSBKO_CALL_ALERT: + case CSBKO::CALL_ALERT: m_GI = false; m_dstId = m_data[4U] << 16 | m_data[5U] << 8 | m_data[6U]; m_srcId = m_data[7U] << 16 | m_data[8U] << 8 | m_data[9U]; @@ -123,7 +123,7 @@ bool CDMRCSBK::put(const unsigned char* bytes) CUtils::dump(1U, "Call Alert CSBK", m_data, 12U); break; - case CSBKO_CALL_ALERT_ACK: + case CSBKO::CALL_ALERT_ACK: m_GI = false; m_dstId = m_data[4U] << 16 | m_data[5U] << 8 | m_data[6U]; m_srcId = m_data[7U] << 16 | m_data[8U] << 8 | m_data[9U]; @@ -132,7 +132,7 @@ bool CDMRCSBK::put(const unsigned char* bytes) CUtils::dump(1U, "Call Alert Ack CSBK", m_data, 12U); break; - case CSBKO_RADIO_CHECK: + case CSBKO::RADIO_CHECK: m_GI = false; if (m_data[3U] == 0x80) { m_dstId = m_data[4U] << 16 | m_data[5U] << 8 | m_data[6U]; @@ -147,7 +147,7 @@ bool CDMRCSBK::put(const unsigned char* bytes) m_CBF = 0U; break; - case CSBKO_CALL_EMERGENCY: + case CSBKO::CALL_EMERGENCY: m_GI = true; m_dstId = m_data[4U] << 16 | m_data[5U] << 8 | m_data[6U]; m_srcId = m_data[7U] << 16 | m_data[8U] << 8 | m_data[9U]; @@ -202,7 +202,7 @@ bool CDMRCSBK::getOVCM() const void CDMRCSBK::setOVCM(bool ovcm) { - if (m_CSBKO == CSBKO_UUVREQ || m_CSBKO == CSBKO_UUANSRSP) { + if ((m_CSBKO == CSBKO::UUVREQ) || (m_CSBKO == CSBKO::UUANSRSP)) { m_OVCM = ovcm; if (ovcm) diff --git a/DMRCSBK.h b/DMRCSBK.h index 52f16d2..42b871d 100644 --- a/DMRCSBK.h +++ b/DMRCSBK.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015,2016,2020,2021,2022 by Jonathan Naylor G4KLX + * Copyright (C) 2015,2016,2020,2021,2022,2025 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 @@ -21,18 +21,18 @@ #include "DMRDefines.h" -enum CSBKO { - CSBKO_NONE = 0x00, - CSBKO_UUVREQ = 0x04, - CSBKO_UUANSRSP = 0x05, - CSBKO_CTCSBK = 0x07, - CSBKO_CALL_ALERT = 0x1F, - CSBKO_CALL_ALERT_ACK = 0x20, - CSBKO_RADIO_CHECK = 0x24, - CSBKO_NACKRSP = 0x26, - CSBKO_CALL_EMERGENCY = 0x27, - CSBKO_BSDWNACT = 0x38, - CSBKO_PRECCSBK = 0x3D +enum class CSBKO { + NONE = 0x00, + UUVREQ = 0x04, + UUANSRSP = 0x05, + CTCSBK = 0x07, + CALL_ALERT = 0x1F, + CALL_ALERT_ACK = 0x20, + RADIO_CHECK = 0x24, + NACKRSP = 0x26, + CALL_EMERGENCY = 0x27, + BSDWNACT = 0x38, + PRECCSBK = 0x3D }; class CDMRCSBK diff --git a/DMRControl.cpp b/DMRControl.cpp index 3cedb5a..20fd49b 100644 --- a/DMRControl.cpp +++ b/DMRControl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015-2021 Jonathan Naylor, G4KLX + * Copyright (C) 2015-2021,2025 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 @@ -21,7 +21,7 @@ #include #include -CDMRControl::CDMRControl(unsigned int id, unsigned int colorCode, unsigned int callHang, bool selfOnly, bool embeddedLCOnly, bool dumpTAData, const std::vector& prefixes, const std::vector& blacklist, const std::vector& whitelist, const std::vector& slot1TGWhitelist, const std::vector& slot2TGWhitelist, unsigned int timeout, CModem* modem, IDMRNetwork* network, CDisplay* display, bool duplex, CDMRLookup* lookup, CRSSIInterpolator* rssi, unsigned int jitter, DMR_OVCM_TYPES ovcm, bool protect) : +CDMRControl::CDMRControl(unsigned int id, unsigned int colorCode, unsigned int callHang, bool selfOnly, bool embeddedLCOnly, bool dumpTAData, const std::vector& prefixes, const std::vector& blacklist, const std::vector& whitelist, const std::vector& slot1TGWhitelist, const std::vector& slot2TGWhitelist, unsigned int timeout, CModem* modem, IDMRNetwork* network, CDisplay* display, bool duplex, CDMRLookup* lookup, CRSSIInterpolator* rssi, unsigned int jitter, DMR_OVCM ovcm, bool protect) : m_colorCode(colorCode), m_modem(modem), m_network(network), @@ -59,7 +59,7 @@ bool CDMRControl::processWakeup(const unsigned char* data) return false; CSBKO csbko = csbk.getCSBKO(); - if (csbko != CSBKO_BSDWNACT) + if (csbko != CSBKO::BSDWNACT) return false; unsigned int srcId = csbk.getSrcId(); diff --git a/DMRControl.h b/DMRControl.h index 30cccdf..7ed14de 100644 --- a/DMRControl.h +++ b/DMRControl.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015-2021 by Jonathan Naylor G4KLX + * Copyright (C) 2015-2021,2025 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 @@ -31,7 +31,7 @@ class CDMRControl { public: - CDMRControl(unsigned int id, unsigned int colorCode, unsigned int callHang, bool selfOnly, bool embeddedLCOnly, bool dumpTAData, const std::vector& prefixes, const std::vector& blacklist, const std::vector& whitelist, const std::vector& slot1TGWhitelist, const std::vector& slot2TGWhitelist, unsigned int timeout, CModem* modem, IDMRNetwork* network, CDisplay* display, bool duplex, CDMRLookup* lookup, CRSSIInterpolator* rssi, unsigned int jitter, DMR_OVCM_TYPES ovcm, bool protect); + CDMRControl(unsigned int id, unsigned int colorCode, unsigned int callHang, bool selfOnly, bool embeddedLCOnly, bool dumpTAData, const std::vector& prefixes, const std::vector& blacklist, const std::vector& whitelist, const std::vector& slot1TGWhitelist, const std::vector& slot2TGWhitelist, unsigned int timeout, CModem* modem, IDMRNetwork* network, CDisplay* display, bool duplex, CDMRLookup* lookup, CRSSIInterpolator* rssi, unsigned int jitter, DMR_OVCM ovcm, bool protect); ~CDMRControl(); bool processWakeup(const unsigned char* data); diff --git a/DMRData.cpp b/DMRData.cpp index 25dea58..39830d8 100644 --- a/DMRData.cpp +++ b/DMRData.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015,2016,2017 Jonathan Naylor, G4KLX + * Copyright (C) 2015,2016,2017,2025 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 @@ -42,7 +42,7 @@ m_slotNo(1U), m_data(NULL), m_srcId(0U), m_dstId(0U), -m_flco(FLCO_GROUP), +m_flco(FLCO::GROUP), m_dataType(0U), m_seqNo(0U), m_n(0U), diff --git a/DMRDefines.h b/DMRDefines.h index 839f764..2f38874 100644 --- a/DMRDefines.h +++ b/DMRDefines.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015,2016,2021 by Jonathan Naylor G4KLX + * Copyright (C) 2015,2016,2021,2025 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 @@ -110,14 +110,14 @@ const unsigned char DPF_PROPRIETARY = 0x0FU; const unsigned char FID_ETSI = 0U; const unsigned char FID_DMRA = 16U; -enum FLCO { - FLCO_GROUP = 0, - FLCO_USER_USER = 3, - FLCO_TALKER_ALIAS_HEADER = 4, - FLCO_TALKER_ALIAS_BLOCK1 = 5, - FLCO_TALKER_ALIAS_BLOCK2 = 6, - FLCO_TALKER_ALIAS_BLOCK3 = 7, - FLCO_GPS_INFO = 8 +enum class FLCO { + GROUP = 0, + USER_USER = 3, + TALKER_ALIAS_HEADER = 4, + TALKER_ALIAS_BLOCK1 = 5, + TALKER_ALIAS_BLOCK2 = 6, + TALKER_ALIAS_BLOCK3 = 7, + GINFO = 8 }; #endif diff --git a/DMRDirectNetwork.cpp b/DMRDirectNetwork.cpp index d8c34fe..d231972 100644 --- a/DMRDirectNetwork.cpp +++ b/DMRDirectNetwork.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015,2016,2017,2018,2020,2021,2024 by Jonathan Naylor G4KLX + * Copyright (C) 2015,2016,2017,2018,2020,2021,2024,2025 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 @@ -45,7 +45,7 @@ m_enabled(false), m_slot1(slot1), m_slot2(slot2), m_hwType(hwType), -m_status(WAITING_CONNECT), +m_status(STATUS::WAITING_CONNECT), m_retryTimer(1000U, 10U), m_timeoutTimer(1000U, 60U), m_buffer(NULL), @@ -131,7 +131,7 @@ bool CDMRDirectNetwork::open() LogMessage("DMR, Opening DMR Network"); - m_status = WAITING_CONNECT; + m_status = STATUS::WAITING_CONNECT; m_timeoutTimer.stop(); m_retryTimer.start(); @@ -148,7 +148,7 @@ void CDMRDirectNetwork::enable(bool enabled) bool CDMRDirectNetwork::read(CDMRData& data) { - if (m_status != RUNNING) + if (m_status != STATUS::RUNNING) return false; if (m_rxData.isEmpty()) @@ -180,7 +180,7 @@ bool CDMRDirectNetwork::read(CDMRData& data) if (slotNo == 2U && !m_slot2) return false; - FLCO flco = (m_buffer[15U] & 0x40U) == 0x40U ? FLCO_USER_USER : FLCO_GROUP; + FLCO flco = (m_buffer[15U] & 0x40U) == 0x40U ? FLCO::USER_USER : FLCO::GROUP; data.setSeqNo(seqNo); data.setSlotNo(slotNo); @@ -212,7 +212,7 @@ bool CDMRDirectNetwork::read(CDMRData& data) bool CDMRDirectNetwork::write(const CDMRData& data) { - if (m_status != RUNNING) + if (m_status != STATUS::RUNNING) return false; unsigned char buffer[HOMEBREW_DATA_PACKET_LENGTH]; @@ -246,7 +246,7 @@ bool CDMRDirectNetwork::write(const CDMRData& data) buffer[15U] = slotNo == 1U ? 0x00U : 0x80U; FLCO flco = data.getFLCO(); - buffer[15U] |= flco == FLCO_GROUP ? 0x00U : 0x40U; + buffer[15U] |= flco == FLCO::GROUP ? 0x00U : 0x40U; unsigned int slotIndex = slotNo - 1U; @@ -283,7 +283,7 @@ bool CDMRDirectNetwork::write(const CDMRData& data) bool CDMRDirectNetwork::writeRadioPosition(unsigned int id, const unsigned char* data) { - if (m_status != RUNNING) + if (m_status != STATUS::RUNNING) return false; unsigned char buffer[20U]; @@ -301,7 +301,7 @@ bool CDMRDirectNetwork::writeRadioPosition(unsigned int id, const unsigned char* bool CDMRDirectNetwork::writeTalkerAlias(unsigned int id, unsigned char type, const unsigned char* data) { - if (m_status != RUNNING) + if (m_status != STATUS::RUNNING) return false; unsigned char buffer[20U]; @@ -321,14 +321,14 @@ bool CDMRDirectNetwork::writeTalkerAlias(unsigned int id, unsigned char type, co bool CDMRDirectNetwork::isConnected() const { - return (m_status == RUNNING); + return (m_status == STATUS::RUNNING); } void CDMRDirectNetwork::close(bool sayGoodbye) { LogMessage("DMR, Closing DMR Network"); - if (sayGoodbye && (m_status == RUNNING)) { + if (sayGoodbye && (m_status == STATUS::RUNNING)) { unsigned char buffer[9U]; ::memcpy(buffer + 0U, "RPTCL", 5U); ::memcpy(buffer + 5U, m_id, 4U); @@ -346,23 +346,23 @@ void CDMRDirectNetwork::clock(unsigned int ms) m_retryTimer.clock(ms); if (m_retryTimer.isRunning() && m_retryTimer.hasExpired()) { switch (m_status) { - case WAITING_CONNECT: + case STATUS::WAITING_CONNECT: writeLogin(); - m_status = WAITING_LOGIN; + m_status = STATUS::WAITING_LOGIN; break; - case WAITING_LOGIN: + case STATUS::WAITING_LOGIN: writeLogin(); break; - case WAITING_AUTHORISATION: + case STATUS::WAITING_AUTHORISATION: writeAuthorisation(); break; - case WAITING_OPTIONS: + case STATUS::WAITING_OPTIONS: writeOptions(); break; - case WAITING_CONFIG: + case STATUS::WAITING_CONFIG: writeConfig(); break; - case RUNNING: + case STATUS::RUNNING: writePing(); break; default: @@ -398,9 +398,9 @@ void CDMRDirectNetwork::clock(unsigned int ms) m_rxData.addData(m_buffer, len); } } else if (::memcmp(m_buffer, "MSTNAK", 6U) == 0) { - if (m_status == RUNNING) { + if (m_status == STATUS::RUNNING) { LogWarning("DMR, Login to the master has failed, retrying login ..."); - m_status = WAITING_LOGIN; + m_status = STATUS::WAITING_LOGIN; m_timeoutTimer.start(); m_retryTimer.start(); } else { @@ -414,36 +414,36 @@ void CDMRDirectNetwork::clock(unsigned int ms) } } else if (::memcmp(m_buffer, "RPTACK", 6U) == 0) { switch (m_status) { - case WAITING_LOGIN: + case STATUS::WAITING_LOGIN: LogDebug("DMR, Sending authorisation"); ::memcpy(m_salt, m_buffer + 6U, sizeof(uint32_t)); writeAuthorisation(); - m_status = WAITING_AUTHORISATION; + m_status = STATUS::WAITING_AUTHORISATION; m_timeoutTimer.start(); m_retryTimer.start(); break; - case WAITING_AUTHORISATION: + case STATUS::WAITING_AUTHORISATION: LogDebug("DMR, Sending configuration"); writeConfig(); - m_status = WAITING_CONFIG; + m_status = STATUS::WAITING_CONFIG; m_timeoutTimer.start(); m_retryTimer.start(); break; - case WAITING_CONFIG: + case STATUS::WAITING_CONFIG: if (m_options.empty()) { LogMessage("DMR, Logged into the master successfully"); - m_status = RUNNING; + m_status = STATUS::RUNNING; } else { LogDebug("DMR, Sending options"); writeOptions(); - m_status = WAITING_OPTIONS; + m_status = STATUS::WAITING_OPTIONS; } m_timeoutTimer.start(); m_retryTimer.start(); break; - case WAITING_OPTIONS: + case STATUS::WAITING_OPTIONS: LogMessage("DMR, Logged into the master successfully"); - m_status = RUNNING; + m_status = STATUS::RUNNING; m_timeoutTimer.start(); m_retryTimer.start(); break; @@ -526,16 +526,16 @@ bool CDMRDirectNetwork::writeConfig() slots = '2'; switch (m_hwType) { - case HWT_MMDVM: + case HW_TYPE::MMDVM: software = "MMDVM"; break; - case HWT_MMDVM_HS: + case HW_TYPE::MMDVM_HS: software = "MMDVM_MMDVM_HS"; break; - case HWT_MMDVM_HS_DUAL_HAT: + case HW_TYPE::MMDVM_HS_DUAL_HAT: software = "MMDVM_MMDVM_HS_Dual_Hat"; break; - case HWT_NANO_HOTSPOT: + case HW_TYPE::NANO_HOTSPOT: software = "MMDVM_Nano_hotSPOT"; break; default: @@ -546,31 +546,31 @@ bool CDMRDirectNetwork::writeConfig() slots = '4'; switch (m_hwType) { - case HWT_MMDVM: + case HW_TYPE::MMDVM: software = "MMDVM_DMO"; break; - case HWT_DVMEGA: + case HW_TYPE::DVMEGA: software = "MMDVM_DVMega"; break; - case HWT_MMDVM_ZUMSPOT: + case HW_TYPE::MMDVM_ZUMSPOT: software = "MMDVM_ZUMspot"; break; - case HWT_MMDVM_HS_HAT: + case HW_TYPE::MMDVM_HS_HAT: software = "MMDVM_MMDVM_HS_Hat"; break; - case HWT_MMDVM_HS_DUAL_HAT: + case HW_TYPE::MMDVM_HS_DUAL_HAT: software = "MMDVM_MMDVM_HS_Dual_Hat"; break; - case HWT_NANO_HOTSPOT: + case HW_TYPE::NANO_HOTSPOT: software = "MMDVM_Nano_hotSPOT"; break; - case HWT_NANO_DV: + case HW_TYPE::NANO_DV: software = "MMDVM_Nano_DV"; break; - case HWT_D2RG_MMDVM_HS: + case HW_TYPE::D2RG_MMDVM_HS: software = "MMDVM_D2RG_MMDVM_HS"; break; - case HWT_MMDVM_HS: + case HW_TYPE::MMDVM_HS: software = "MMDVM_MMDVM_HS"; break; default: diff --git a/DMRDirectNetwork.h b/DMRDirectNetwork.h index 5d6a959..ed8c4c6 100644 --- a/DMRDirectNetwork.h +++ b/DMRDirectNetwork.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015,2016,2017,2018,2020,2021 by Jonathan Naylor G4KLX + * Copyright (C) 2015,2016,2017,2018,2020,2021,2025 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 @@ -75,7 +75,7 @@ private: bool m_slot2; HW_TYPE m_hwType; - enum STATUS { + enum class STATUS { WAITING_CONNECT, WAITING_LOGIN, WAITING_AUTHORISATION, diff --git a/DMREmbeddedData.cpp b/DMREmbeddedData.cpp index a5a3e42..f2fb365 100644 --- a/DMREmbeddedData.cpp +++ b/DMREmbeddedData.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015,2016,2017 by Jonathan Naylor G4KLX + * Copyright (C) 2015,2016,2017,2025 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 @@ -28,9 +28,9 @@ CDMREmbeddedData::CDMREmbeddedData() : m_raw(NULL), -m_state(LCS_NONE), +m_state(LC_STATE::NONE), m_data(NULL), -m_FLCO(FLCO_GROUP), +m_FLCO(FLCO::GROUP), m_valid(false) { m_raw = new bool[128U]; @@ -61,41 +61,41 @@ bool CDMREmbeddedData::addData(const unsigned char* data, unsigned char lcss) m_raw[a] = rawData[a + 4U]; // Show we are ready for the next LC block - m_state = LCS_FIRST; + m_state = LC_STATE::FIRST; m_valid = false; return false; } // Is this the 2nd block of a 4 block embedded LC ? - if (lcss == 3U && m_state == LCS_FIRST) { + if ((lcss == 3U) && (m_state == LC_STATE::FIRST)) { for (unsigned int a = 0U; a < 32U; a++) m_raw[a + 32U] = rawData[a + 4U]; // Show we are ready for the next LC block - m_state = LCS_SECOND; + m_state = LC_STATE::SECOND; return false; } // Is this the 3rd block of a 4 block embedded LC ? - if (lcss == 3U && m_state == LCS_SECOND) { + if ((lcss == 3U) && (m_state == LC_STATE::SECOND)) { for (unsigned int a = 0U; a < 32U; a++) m_raw[a + 64U] = rawData[a + 4U]; // Show we are ready for the final LC block - m_state = LCS_THIRD; + m_state = LC_STATE::THIRD; return false; } // Is this the final block of a 4 block embedded LC ? - if (lcss == 2U && m_state == LCS_THIRD) { + if ((lcss == 2U) && (m_state == LC_STATE::THIRD)) { for (unsigned int a = 0U; a < 32U; a++) m_raw[a + 96U] = rawData[a + 4U]; // Show that we're not ready for any more data - m_state = LCS_NONE; + m_state = LC_STATE::NONE; // Process the complete data block decodeEmbeddedData(); @@ -279,7 +279,7 @@ CDMRLC* CDMREmbeddedData::getLC() const if (!m_valid) return NULL; - if (m_FLCO != FLCO_GROUP && m_FLCO != FLCO_USER_USER) + if ((m_FLCO != FLCO::GROUP) && (m_FLCO != FLCO::USER_USER)) return NULL; return new CDMRLC(m_data); @@ -297,7 +297,7 @@ FLCO CDMREmbeddedData::getFLCO() const void CDMREmbeddedData::reset() { - m_state = LCS_NONE; + m_state = LC_STATE::NONE; m_valid = false; } diff --git a/DMREmbeddedData.h b/DMREmbeddedData.h index 7222dcd..dbadec8 100644 --- a/DMREmbeddedData.h +++ b/DMREmbeddedData.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015,2016,2017 by Jonathan Naylor G4KLX + * Copyright (C) 2015,2016,2017,2025 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 @@ -22,11 +22,11 @@ #include "DMRDefines.h" #include "DMRLC.h" -enum LC_STATE { - LCS_NONE, - LCS_FIRST, - LCS_SECOND, - LCS_THIRD +enum class LC_STATE { + NONE, + FIRST, + SECOND, + THIRD }; class CDMREmbeddedData diff --git a/DMRGatewayNetwork.cpp b/DMRGatewayNetwork.cpp index 1eb7e63..0bb3e66 100644 --- a/DMRGatewayNetwork.cpp +++ b/DMRGatewayNetwork.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015-2021 by Jonathan Naylor G4KLX + * Copyright (C) 2015-2021,2025 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 @@ -157,7 +157,7 @@ bool CDMRGatewayNetwork::read(CDMRData& data) if (slotNo == 2U && !m_slot2) return false; - FLCO flco = (m_buffer[15U] & 0x40U) == 0x40U ? FLCO_USER_USER : FLCO_GROUP; + FLCO flco = (m_buffer[15U] & 0x40U) == 0x40U ? FLCO::USER_USER : FLCO::GROUP; data.setSeqNo(seqNo); data.setSlotNo(slotNo); @@ -220,7 +220,7 @@ bool CDMRGatewayNetwork::write(const CDMRData& data) buffer[15U] = slotNo == 1U ? 0x00U : 0x80U; FLCO flco = data.getFLCO(); - buffer[15U] |= flco == FLCO_GROUP ? 0x00U : 0x40U; + buffer[15U] |= flco == FLCO::GROUP ? 0x00U : 0x40U; unsigned int slotIndex = slotNo - 1U; @@ -349,16 +349,16 @@ bool CDMRGatewayNetwork::writeConfig() slots = '2'; switch (m_hwType) { - case HWT_MMDVM: + case HW_TYPE::MMDVM: software = "MMDVM"; break; - case HWT_MMDVM_HS: + case HW_TYPE::MMDVM_HS: software = "MMDVM_MMDVM_HS"; break; - case HWT_MMDVM_HS_DUAL_HAT: + case HW_TYPE::MMDVM_HS_DUAL_HAT: software = "MMDVM_MMDVM_HS_Dual_Hat"; break; - case HWT_NANO_HOTSPOT: + case HW_TYPE::NANO_HOTSPOT: software = "MMDVM_Nano_hotSPOT"; break; default: @@ -369,37 +369,37 @@ bool CDMRGatewayNetwork::writeConfig() slots = '4'; switch (m_hwType) { - case HWT_MMDVM: + case HW_TYPE::MMDVM: software = "MMDVM_DMO"; break; - case HWT_DVMEGA: + case HW_TYPE::DVMEGA: software = "MMDVM_DVMega"; break; - case HWT_MMDVM_ZUMSPOT: + case HW_TYPE::MMDVM_ZUMSPOT: software = "MMDVM_ZUMspot"; break; - case HWT_MMDVM_HS_HAT: + case HW_TYPE::MMDVM_HS_HAT: software = "MMDVM_MMDVM_HS_Hat"; break; - case HWT_MMDVM_HS_DUAL_HAT: + case HW_TYPE::MMDVM_HS_DUAL_HAT: software = "MMDVM_MMDVM_HS_Dual_Hat"; break; - case HWT_NANO_HOTSPOT: + case HW_TYPE::NANO_HOTSPOT: software = "MMDVM_Nano_hotSPOT"; break; - case HWT_NANO_DV: + case HW_TYPE::NANO_DV: software = "MMDVM_Nano_DV"; break; - case HWT_D2RG_MMDVM_HS: + case HW_TYPE::D2RG_MMDVM_HS: software = "MMDVM_D2RG_MMDVM_HS"; break; - case HWT_MMDVM_HS: + case HW_TYPE::MMDVM_HS: software = "MMDVM_MMDVM_HS"; break; - case HWT_OPENGD77_HS: + case HW_TYPE::OPENGD77_HS: software = "MMDVM_OpenGD77_HS"; break; - case HWT_SKYBRIDGE: + case HW_TYPE::SKYBRIDGE: software = "MMDVM_SkyBridge"; break; default: diff --git a/DMRLC.cpp b/DMRLC.cpp index 6433647..36c0cfa 100644 --- a/DMRLC.cpp +++ b/DMRLC.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015,2016,2019,2021,2022 by Jonathan Naylor G4KLX + * Copyright (C) 2015,2016,2019,2021,2022,2025 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 @@ -37,7 +37,7 @@ m_dstId(dstId) CDMRLC::CDMRLC(const unsigned char* bytes) : m_PF(false), m_R(false), -m_FLCO(FLCO_GROUP), +m_FLCO(FLCO::GROUP), m_FID(0U), m_options(0U), m_srcId(0U), @@ -61,7 +61,7 @@ m_dstId(0U) CDMRLC::CDMRLC(const bool* bits) : m_PF(false), m_R(false), -m_FLCO(FLCO_GROUP), +m_FLCO(FLCO::GROUP), m_FID(0U), m_options(0U), m_srcId(0U), @@ -99,7 +99,7 @@ m_dstId(0U) CDMRLC::CDMRLC() : m_PF(false), m_R(false), -m_FLCO(FLCO_GROUP), +m_FLCO(FLCO::GROUP), m_FID(0U), m_options(0U), m_srcId(0U), diff --git a/DMRSlot.cpp b/DMRSlot.cpp index 7720b0a..0ae4fa8 100644 --- a/DMRSlot.cpp +++ b/DMRSlot.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015-2021,2023 Jonathan Naylor, G4KLX + * Copyright (C) 2015-2021,2023,2025 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 @@ -43,7 +43,7 @@ CDisplay* CDMRSlot::m_display = NULL; bool CDMRSlot::m_duplex = true; CDMRLookup* CDMRSlot::m_lookup = NULL; unsigned int CDMRSlot::m_hangCount = 3U * 17U; -DMR_OVCM_TYPES CDMRSlot::m_ovcm = DMR_OVCM_OFF; +DMR_OVCM CDMRSlot::m_ovcm = DMR_OVCM::OFF; bool CDMRSlot::m_protect = false; CRSSIInterpolator* CDMRSlot::m_rssiMapper = NULL; @@ -55,10 +55,10 @@ unsigned char* CDMRSlot::m_idle = NULL; FLCO CDMRSlot::m_flco1; unsigned char CDMRSlot::m_id1 = 0U; -ACTIVITY_TYPE CDMRSlot::m_activity1 = ACTIVITY_NONE; +ACTIVITY_TYPE CDMRSlot::m_activity1 = ACTIVITY_TYPE::NONE; FLCO CDMRSlot::m_flco2; unsigned char CDMRSlot::m_id2 = 0U; -ACTIVITY_TYPE CDMRSlot::m_activity2 = ACTIVITY_NONE; +ACTIVITY_TYPE CDMRSlot::m_activity2 = ACTIVITY_TYPE::NONE; const unsigned char TALKER_ID_NONE = 0x00U; const unsigned char TALKER_ID_HEADER = 0x01U; @@ -75,8 +75,8 @@ const unsigned int NO_PREAMBLE_CSBK = 15U; CDMRSlot::CDMRSlot(unsigned int slotNo, unsigned int timeout) : m_slotNo(slotNo), m_queue(5000U, "DMR Slot"), -m_rfState(RS_RF_LISTENING), -m_netState(RS_NET_IDLE), +m_rfState(RPT_RF_STATE::LISTENING), +m_netState(RPT_NET_STATE::IDLE), m_rfEmbeddedLC(), m_rfEmbeddedData(NULL), m_rfEmbeddedReadN(0U), @@ -143,15 +143,15 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len) if (!m_enabled) return false; - if (data[0U] == TAG_LOST && m_rfState == RS_RF_AUDIO) { + if ((data[0U] == TAG_LOST) && (m_rfState == RPT_RF_STATE::AUDIO)) { std::string src = m_lookup->find(m_rfLC->getSrcId()); std::string dst = m_lookup->find(m_rfLC->getDstId()); FLCO flco = m_rfLC->getFLCO(); if (m_rssi != 0U) - LogMessage("DMR Slot %u, RF voice transmission lost from %s to %s%s, %.1f seconds, BER: %.1f%%, RSSI: -%u/-%u/-%u dBm", m_slotNo, src.c_str(), flco == FLCO_GROUP ? "TG " : "", dst.c_str(), float(m_rfFrames) / 16.667F, float(m_rfErrs * 100U) / float(m_rfBits), m_minRSSI, m_maxRSSI, m_aveRSSI / m_rssiCount); + LogMessage("DMR Slot %u, RF voice transmission lost from %s to %s%s, %.1f seconds, BER: %.1f%%, RSSI: -%u/-%u/-%u dBm", m_slotNo, src.c_str(), flco == FLCO::GROUP ? "TG " : "", dst.c_str(), float(m_rfFrames) / 16.667F, float(m_rfErrs * 100U) / float(m_rfBits), m_minRSSI, m_maxRSSI, m_aveRSSI / m_rssiCount); else - LogMessage("DMR Slot %u, RF voice transmission lost from %s to %s%s, %.1f seconds, BER: %.1f%%", m_slotNo, src.c_str(), flco == FLCO_GROUP ? "TG " : "", dst.c_str(), float(m_rfFrames) / 16.667F, float(m_rfErrs * 100U) / float(m_rfBits)); + LogMessage("DMR Slot %u, RF voice transmission lost from %s to %s%s, %.1f seconds, BER: %.1f%%", m_slotNo, src.c_str(), flco == FLCO::GROUP ? "TG " : "", dst.c_str(), float(m_rfFrames) / 16.667F, float(m_rfErrs * 100U) / float(m_rfBits)); if (m_rfTimeout) { writeEndRF(); return false; @@ -161,18 +161,18 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len) } } - if (data[0U] == TAG_LOST && m_rfState == RS_RF_DATA) { + if ((data[0U] == TAG_LOST) && (m_rfState == RPT_RF_STATE::DATA)) { std::string src = m_lookup->find(m_rfLC->getSrcId()); std::string dst = m_lookup->find(m_rfLC->getDstId()); FLCO flco = m_rfLC->getFLCO(); - LogMessage("DMR Slot %u, RF data transmission lost from %s to %s%s", m_slotNo, src.c_str(), flco == FLCO_GROUP ? "TG " : "", dst.c_str()); + LogMessage("DMR Slot %u, RF data transmission lost from %s to %s%s", m_slotNo, src.c_str(), flco == FLCO::GROUP ? "TG " : "", dst.c_str()); writeEndRF(); return false; } if (data[0U] == TAG_LOST) { - m_rfState = RS_RF_LISTENING; + m_rfState = RPT_RF_STATE::LISTENING; return false; } @@ -211,7 +211,7 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len) slotType.setDataType(dataType); if (dataType == DT_VOICE_LC_HEADER) { - if (m_rfState == RS_RF_AUDIO) + if (m_rfState == RPT_RF_STATE::AUDIO) return true; CDMRFullLC fullLC; @@ -227,7 +227,7 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len) if (lc->getPF()) { LogMessage("DMR Slot %u, RF user %u rejected", m_slotNo, srcId); delete lc; - m_rfState = RS_RF_LISTENING; + m_rfState = RPT_RF_STATE::LISTENING; return false; } } @@ -235,20 +235,20 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len) if (!CDMRAccessControl::validateSrcId(srcId)) { LogMessage("DMR Slot %u, RF user %u rejected", m_slotNo, srcId); delete lc; - m_rfState = RS_RF_LISTENING; + m_rfState = RPT_RF_STATE::LISTENING; return false; } - if (!CDMRAccessControl::validateTGId(m_slotNo, flco == FLCO_GROUP, dstId)) { + if (!CDMRAccessControl::validateTGId(m_slotNo, flco == FLCO::GROUP, dstId)) { LogMessage("DMR Slot %u, RF user %u rejected for using TG %u", m_slotNo, srcId, dstId); delete lc; - m_rfState = RS_RF_LISTENING; + m_rfState = RPT_RF_STATE::LISTENING; return false; } - if (m_ovcm == DMR_OVCM_TX_ON || m_ovcm == DMR_OVCM_ON) + if ((m_ovcm == DMR_OVCM::TX_ON) || (m_ovcm == DMR_OVCM::ON)) lc->setOVCM(true); - else if (m_ovcm == DMR_OVCM_FORCE_OFF) + else if (m_ovcm == DMR_OVCM::FORCE_OFF) lc->setOVCM(false); m_rfLC = lc; @@ -297,22 +297,22 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len) writeNetworkRF(data, DT_VOICE_LC_HEADER); - m_rfState = RS_RF_AUDIO; + m_rfState = RPT_RF_STATE::AUDIO; std::string src = m_lookup->find(srcId); std::string dst = m_lookup->find(dstId); - if (m_netState == RS_NET_IDLE) { - setShortLC(m_slotNo, dstId, flco, ACTIVITY_VOICE); - m_display->writeDMR(m_slotNo, src, flco == FLCO_GROUP, dst, "R"); + if (m_netState == RPT_NET_STATE::IDLE) { + setShortLC(m_slotNo, dstId, flco, ACTIVITY_TYPE::VOICE); + m_display->writeDMR(m_slotNo, src, flco == FLCO::GROUP, dst, "R"); m_display->writeDMRRSSI(m_slotNo, m_rssi); } - LogMessage("DMR Slot %u, received RF voice header from %s to %s%s", m_slotNo, src.c_str(), flco == FLCO_GROUP ? "TG " : "", dst.c_str()); + LogMessage("DMR Slot %u, received RF voice header from %s to %s%s", m_slotNo, src.c_str(), flco == FLCO::GROUP ? "TG " : "", dst.c_str()); return true; } else if (dataType == DT_VOICE_PI_HEADER) { - if (m_rfState != RS_RF_AUDIO) + if (m_rfState != RPT_RF_STATE::AUDIO) return false; // Regenerate the Slot Type @@ -339,7 +339,7 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len) return true; } else if (dataType == DT_TERMINATOR_WITH_LC) { - if (m_rfState != RS_RF_AUDIO) + if (m_rfState != RPT_RF_STATE::AUDIO) return false; // Regenerate the LC data @@ -369,9 +369,9 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len) FLCO flco = m_rfLC->getFLCO(); if (m_rssi != 0U) - LogMessage("DMR Slot %u, received RF end of voice transmission from %s to %s%s, %.1f seconds, BER: %.1f%%, RSSI: -%u/-%u/-%u dBm", m_slotNo, src.c_str(), flco == FLCO_GROUP ? "TG " : "", dst.c_str(), float(m_rfFrames) / 16.667F, float(m_rfErrs * 100U) / float(m_rfBits), m_minRSSI, m_maxRSSI, m_aveRSSI / m_rssiCount); + LogMessage("DMR Slot %u, received RF end of voice transmission from %s to %s%s, %.1f seconds, BER: %.1f%%, RSSI: -%u/-%u/-%u dBm", m_slotNo, src.c_str(), flco == FLCO::GROUP ? "TG " : "", dst.c_str(), float(m_rfFrames) / 16.667F, float(m_rfErrs * 100U) / float(m_rfBits), m_minRSSI, m_maxRSSI, m_aveRSSI / m_rssiCount); else - LogMessage("DMR Slot %u, received RF end of voice transmission from %s to %s%s, %.1f seconds, BER: %.1f%%", m_slotNo, src.c_str(), flco == FLCO_GROUP ? "TG " : "", dst.c_str(), float(m_rfFrames) / 16.667F, float(m_rfErrs * 100U) / float(m_rfBits)); + LogMessage("DMR Slot %u, received RF end of voice transmission from %s to %s%s, %.1f seconds, BER: %.1f%%", m_slotNo, src.c_str(), flco == FLCO::GROUP ? "TG " : "", dst.c_str(), float(m_rfFrames) / 16.667F, float(m_rfErrs * 100U) / float(m_rfBits)); m_display->writeDMRTA(m_slotNo, NULL, " "); @@ -383,7 +383,7 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len) return true; } } else if (dataType == DT_DATA_HEADER) { - if (m_rfState == RS_RF_DATA) + if (m_rfState == RPT_RF_STATE::DATA) return true; CDMRDataHeader dataHeader; @@ -397,19 +397,19 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len) if (!CDMRAccessControl::validateSrcId(srcId)) { LogMessage("DMR Slot %u, RF user %u rejected", m_slotNo, srcId); - m_rfState = RS_RF_LISTENING; + m_rfState = RPT_RF_STATE::LISTENING; return false; } if (!CDMRAccessControl::validateTGId(m_slotNo, gi, dstId)) { LogMessage("DMR Slot %u, RF user %u rejected for using TG %u", m_slotNo, srcId, dstId); - m_rfState = RS_RF_LISTENING; + m_rfState = RPT_RF_STATE::LISTENING; return false; } m_rfFrames = dataHeader.getBlocks(); - m_rfLC = new CDMRLC(gi ? FLCO_GROUP : FLCO_USER_USER, srcId, dstId); + m_rfLC = new CDMRLC(gi ? FLCO::GROUP : FLCO::USER_USER, srcId, dstId); // Regenerate the data header dataHeader.get(data + 2U); @@ -428,13 +428,13 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len) writeNetworkRF(data, DT_DATA_HEADER); - m_rfState = RS_RF_DATA; + m_rfState = RPT_RF_STATE::DATA; std::string src = m_lookup->find(srcId); std::string dst = m_lookup->find(dstId); - if (m_netState == RS_NET_IDLE) { - setShortLC(m_slotNo, dstId, gi ? FLCO_GROUP : FLCO_USER_USER, ACTIVITY_DATA); + if (m_netState == RPT_NET_STATE::IDLE) { + setShortLC(m_slotNo, dstId, gi ? FLCO::GROUP : FLCO::USER_USER, ACTIVITY_TYPE::DATA); m_display->writeDMR(m_slotNo, src, gi, dst, "R"); m_display->writeDMRRSSI(m_slotNo, m_rssi); } @@ -454,13 +454,13 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len) return false; CSBKO csbko = csbk.getCSBKO(); - if (csbko == CSBKO_BSDWNACT) + if (csbko == CSBKO::BSDWNACT) return false; // set the OVCM bit for the supported csbk - if (m_ovcm == DMR_OVCM_TX_ON || m_ovcm == DMR_OVCM_ON) + if ((m_ovcm == DMR_OVCM::TX_ON) || (m_ovcm == DMR_OVCM::ON)) csbk.setOVCM(true); - else if (m_ovcm == DMR_OVCM_FORCE_OFF) + else if (m_ovcm == DMR_OVCM::FORCE_OFF) csbk.setOVCM(false); bool gi = csbk.getGI(); @@ -470,13 +470,13 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len) if (srcId != 0U || dstId != 0U) { if (!CDMRAccessControl::validateSrcId(srcId)) { LogMessage("DMR Slot %u, RF user %u rejected", m_slotNo, srcId); - m_rfState = RS_RF_LISTENING; + m_rfState = RPT_RF_STATE::LISTENING; return false; } if (!CDMRAccessControl::validateTGId(m_slotNo, gi, dstId)) { LogMessage("DMR Slot %u, RF user %u rejected for using TG %u", m_slotNo, srcId, dstId); - m_rfState = RS_RF_LISTENING; + m_rfState = RPT_RF_STATE::LISTENING; return false; } } @@ -496,34 +496,34 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len) if (m_duplex) writeQueueRF(data); - writeNetworkRF(data, DT_CSBK, gi ? FLCO_GROUP : FLCO_USER_USER, srcId, dstId); + writeNetworkRF(data, DT_CSBK, gi ? FLCO::GROUP : FLCO::USER_USER, srcId, dstId); std::string src = m_lookup->find(srcId); std::string dst = m_lookup->find(dstId); switch (csbko) { - case CSBKO_UUVREQ: + case CSBKO::UUVREQ: LogMessage("DMR Slot %u, received RF Unit to Unit Voice Service Request CSBK from %s to %s%s", m_slotNo, src.c_str(), gi ? "TG ": "", dst.c_str()); break; - case CSBKO_UUANSRSP: + case CSBKO::UUANSRSP: LogMessage("DMR Slot %u, received RF Unit to Unit Voice Service Answer Response CSBK from %s to %s%s", m_slotNo, src.c_str(), gi ? "TG ": "", dst.c_str()); break; - case CSBKO_NACKRSP: + case CSBKO::NACKRSP: LogMessage("DMR Slot %u, received RF Negative Acknowledgment Response CSBK from %s to %s%s", m_slotNo, src.c_str(), gi ? "TG ": "", dst.c_str()); break; - case CSBKO_PRECCSBK: + case CSBKO::PRECCSBK: LogMessage("DMR Slot %u, received RF %s Preamble CSBK (%u to follow) from %s to %s%s", m_slotNo, csbk.getDataContent() ? "Data" : "CSBK", csbk.getCBF(), src.c_str(), gi ? "TG ": "", dst.c_str()); break; - case CSBKO_CALL_ALERT: + case CSBKO::CALL_ALERT: LogMessage("DMR Slot %u, received RF Call Alert CSBK from %s to %s%s", m_slotNo, src.c_str(), gi ? "TG " : "", dst.c_str()); break; - case CSBKO_CALL_ALERT_ACK: + case CSBKO::CALL_ALERT_ACK: LogMessage("DMR Slot %u, received RF Call Alert Ack CSBK from %s to %s%s", m_slotNo, src.c_str(), gi ? "TG " : "", dst.c_str()); break; - case CSBKO_RADIO_CHECK: + case CSBKO::RADIO_CHECK: LogMessage("DMR Slot %u, received RF Radio Check %s CSBK from %s to %s%s", m_slotNo, /* TBD */ 1 ? "Req" : "Ack", src.c_str(), gi ? "TG " : "", dst.c_str()); break; - case CSBKO_CALL_EMERGENCY: + case CSBKO::CALL_EMERGENCY: LogMessage("DMR Slot %u, received RF Call Emergency CSBK from %s to %s%s", m_slotNo, src.c_str(), gi ? "TG " : "", dst.c_str()); break; default: @@ -532,15 +532,15 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len) } // If data preamble, signal its existence - if (m_netState == RS_NET_IDLE && csbko == CSBKO_PRECCSBK && csbk.getDataContent()) { - setShortLC(m_slotNo, dstId, gi ? FLCO_GROUP : FLCO_USER_USER, ACTIVITY_DATA); + if ((m_netState == RPT_NET_STATE::IDLE) && (csbko == CSBKO::PRECCSBK) && csbk.getDataContent()) { + setShortLC(m_slotNo, dstId, gi ? FLCO::GROUP : FLCO::USER_USER, ACTIVITY_TYPE::DATA); m_display->writeDMR(m_slotNo, src, gi, dst, "R"); m_display->writeDMRRSSI(m_slotNo, m_rssi); } return true; - } else if (dataType == DT_RATE_12_DATA || dataType == DT_RATE_34_DATA || dataType == DT_RATE_1_DATA) { - if (m_rfState != RS_RF_DATA || m_rfFrames == 0U) + } else if ((dataType == DT_RATE_12_DATA) || (dataType == DT_RATE_34_DATA) || (dataType == DT_RATE_1_DATA)) { + if ((m_rfState != RPT_RF_STATE::DATA) || (m_rfFrames == 0U)) return false; char title[80U]; @@ -593,7 +593,7 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len) return true; } } else if (audioSync) { - if (m_rfState == RS_RF_AUDIO) { + if (m_rfState == RPT_RF_STATE::AUDIO) { m_lastrfN = 0; // Convert the Audio Sync to be from the BS or MS as needed CSync::addDMRAudioSync(data + 2U, m_duplex); @@ -630,13 +630,13 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len) } return false; - } else if (m_rfState == RS_RF_LISTENING) { + } else if (m_rfState == RPT_RF_STATE::LISTENING) { m_rfEmbeddedLC.reset(); - m_rfState = RS_RF_LATE_ENTRY; + m_rfState = RPT_RF_STATE::LATE_ENTRY; return false; } } else { - if (m_rfState == RS_RF_AUDIO) { + if (m_rfState == RPT_RF_STATE::AUDIO) { m_rfN = data[1U] & 0x0FU; if (m_rfN > 5U) return false; @@ -673,13 +673,13 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len) char text[80U]; switch (flco) { - case FLCO_GROUP: - case FLCO_USER_USER: + case FLCO::GROUP: + case FLCO::USER_USER: // ::sprintf(text, "DMR Slot %u, Embedded LC", m_slotNo); // CUtils::dump(1U, text, data, 9U); break; - case FLCO_GPS_INFO: + case FLCO::GINFO: if (m_dumpTAData) { ::sprintf(text, "DMR Slot %u, Embedded GPS Info", m_slotNo); CUtils::dump(1U, text, data, 9U); @@ -689,7 +689,7 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len) m_network->writeRadioPosition(m_rfLC->getSrcId(), data); break; - case FLCO_TALKER_ALIAS_HEADER: + case FLCO::TALKER_ALIAS_HEADER: if (m_network != NULL) m_network->writeTalkerAlias(m_rfLC->getSrcId(), 0U, data); @@ -708,7 +708,7 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len) } break; - case FLCO_TALKER_ALIAS_BLOCK1: + case FLCO::TALKER_ALIAS_BLOCK1: if (m_network != NULL) m_network->writeTalkerAlias(m_rfLC->getSrcId(), 1U, data); @@ -727,7 +727,7 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len) } break; - case FLCO_TALKER_ALIAS_BLOCK2: + case FLCO::TALKER_ALIAS_BLOCK2: if (m_network != NULL) m_network->writeTalkerAlias(m_rfLC->getSrcId(), 2U, data); @@ -746,7 +746,7 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len) } break; - case FLCO_TALKER_ALIAS_BLOCK3: + case FLCO::TALKER_ALIAS_BLOCK3: if (m_network != NULL) m_network->writeTalkerAlias(m_rfLC->getSrcId(), 3U, data); @@ -806,7 +806,7 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len) } return false; - } else if (m_rfState == RS_RF_LATE_ENTRY) { + } else if (m_rfState == RPT_RF_STATE::LATE_ENTRY) { CDMREMB emb; emb.putData(data + 2U); @@ -826,7 +826,7 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len) if (lc->getPF()) { LogMessage("DMR Slot %u, RF user %u rejected", m_slotNo, srcId); delete lc; - m_rfState = RS_RF_LISTENING; + m_rfState = RPT_RF_STATE::LISTENING; return false; } } @@ -834,20 +834,20 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len) if (!CDMRAccessControl::validateSrcId(srcId)) { LogMessage("DMR Slot %u, RF user %u rejected", m_slotNo, srcId); delete lc; - m_rfState = RS_RF_LISTENING; + m_rfState = RPT_RF_STATE::LISTENING; return false; } - if (!CDMRAccessControl::validateTGId(m_slotNo, flco == FLCO_GROUP, dstId)) { + if (!CDMRAccessControl::validateTGId(m_slotNo, flco == FLCO::GROUP, dstId)) { LogMessage("DMR Slot %u, RF user %u rejected for using TG %u", m_slotNo, srcId, dstId); delete lc; - m_rfState = RS_RF_LISTENING; + m_rfState = RPT_RF_STATE::LISTENING; return false; } - if (m_ovcm == DMR_OVCM_TX_ON || m_ovcm == DMR_OVCM_ON) + if ((m_ovcm == DMR_OVCM::TX_ON) || (m_ovcm == DMR_OVCM::ON)) lc->setOVCM(true); - else if (m_ovcm == DMR_OVCM_FORCE_OFF) + else if (m_ovcm == DMR_OVCM::FORCE_OFF) lc->setOVCM(false); m_rfLC = lc; @@ -930,19 +930,19 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len) writeNetworkRF(data, DT_VOICE, errors); - m_rfState = RS_RF_AUDIO; + m_rfState = RPT_RF_STATE::AUDIO; std::string src = m_lookup->find(srcId); std::string dst = m_lookup->find(dstId); - if (m_netState == RS_NET_IDLE) { - setShortLC(m_slotNo, dstId, flco, ACTIVITY_VOICE); - m_display->writeDMR(m_slotNo, src, flco == FLCO_GROUP, dst, "R"); + if (m_netState == RPT_NET_STATE::IDLE) { + setShortLC(m_slotNo, dstId, flco, ACTIVITY_TYPE::VOICE); + m_display->writeDMR(m_slotNo, src, flco == FLCO::GROUP, dst, "R"); m_display->writeDMRRSSI(m_slotNo, m_rssi); m_display->writeDMRBER(m_slotNo, float(errors) / 1.41F); } - LogMessage("DMR Slot %u, received RF late entry from %s to %s%s", m_slotNo, src.c_str(), flco == FLCO_GROUP ? "TG " : "", dst.c_str()); + LogMessage("DMR Slot %u, received RF late entry from %s to %s%s", m_slotNo, src.c_str(), flco == FLCO::GROUP ? "TG " : "", dst.c_str()); return true; } @@ -969,15 +969,15 @@ unsigned int CDMRSlot::readModem(unsigned char* data) void CDMRSlot::writeEndRF(bool writeEnd) { - m_rfState = RS_RF_LISTENING; + m_rfState = RPT_RF_STATE::LISTENING; - if (m_netState == RS_NET_IDLE) { + if (m_netState == RPT_NET_STATE::IDLE) { setShortLC(m_slotNo, 0U); m_display->clearDMR(m_slotNo); } if (writeEnd) { - if (m_netState == RS_NET_IDLE && m_duplex && !m_rfTimeout) { + if ((m_netState == RPT_NET_STATE::IDLE) && m_duplex && !m_rfTimeout) { // Create a dummy start end frame unsigned char data[DMR_FRAME_LENGTH_BYTES + 2U]; @@ -1015,7 +1015,7 @@ void CDMRSlot::writeEndRF(bool writeEnd) void CDMRSlot::writeEndNet(bool writeEnd) { - m_netState = RS_NET_IDLE; + m_netState = RPT_NET_STATE::IDLE; setShortLC(m_slotNo, 0U); @@ -1075,7 +1075,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) if (!m_enabled) return; - if (m_rfState != RS_RF_LISTENING && m_netState == RS_NET_IDLE) + if ((m_rfState != RPT_RF_STATE::LISTENING) && (m_netState == RPT_NET_STATE::IDLE)) return; m_networkWatchdog.start(); @@ -1086,7 +1086,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) dmrData.getData(data + 2U); if (dataType == DT_VOICE_LC_HEADER) { - if (m_netState == RS_NET_AUDIO) + if (m_netState == RPT_NET_STATE::AUDIO) return; CDMRFullLC fullLC; @@ -1102,12 +1102,12 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) if (dstId != dmrData.getDstId() || srcId != dmrData.getSrcId() || flco != dmrData.getFLCO()) LogWarning("DMR Slot %u, DMRD header doesn't match the DMR RF header: %u->%s%u %u->%s%u", m_slotNo, - dmrData.getSrcId(), dmrData.getFLCO() == FLCO_GROUP ? "TG" : "", dmrData.getDstId(), - srcId, flco == FLCO_GROUP ? "TG" : "", dstId); + dmrData.getSrcId(), dmrData.getFLCO() == FLCO::GROUP ? "TG" : "", dmrData.getDstId(), + srcId, flco == FLCO::GROUP ? "TG" : "", dstId); - if (m_ovcm == DMR_OVCM_RX_ON || m_ovcm == DMR_OVCM_ON) + if ((m_ovcm == DMR_OVCM::RX_ON) || (m_ovcm == DMR_OVCM::ON)) lc->setOVCM(true); - else if (m_ovcm == DMR_OVCM_FORCE_OFF) + else if (m_ovcm == DMR_OVCM::FORCE_OFF) lc->setOVCM(false); m_netLC = lc; @@ -1162,31 +1162,31 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) writeQueueNet(data); } - m_netState = RS_NET_AUDIO; + m_netState = RPT_NET_STATE::AUDIO; - setShortLC(m_slotNo, dstId, flco, ACTIVITY_VOICE); + setShortLC(m_slotNo, dstId, flco, ACTIVITY_TYPE::VOICE); std::string src = m_lookup->find(srcId); std::string dst = m_lookup->find(dstId); class CUserDBentry cn; m_lookup->findWithName(srcId, &cn); - m_display->writeDMR(m_slotNo, cn, flco == FLCO_GROUP, dst, "N"); + m_display->writeDMR(m_slotNo, cn, flco == FLCO::GROUP, dst, "N"); #if defined(DUMP_DMR) openFile(); writeFile(data); #endif - LogMessage("DMR Slot %u, received network voice header from %s to %s%s", m_slotNo, src.c_str(), flco == FLCO_GROUP ? "TG " : "", dst.c_str()); + LogMessage("DMR Slot %u, received network voice header from %s to %s%s", m_slotNo, src.c_str(), flco == FLCO::GROUP ? "TG " : "", dst.c_str()); } else if (dataType == DT_VOICE_PI_HEADER) { - if (m_netState != RS_NET_AUDIO) { + if (m_netState != RPT_NET_STATE::AUDIO) { CDMRLC* lc = new CDMRLC(dmrData.getFLCO(), dmrData.getSrcId(), dmrData.getDstId()); unsigned int dstId = lc->getDstId(); unsigned int srcId = lc->getSrcId(); - if (m_ovcm == DMR_OVCM_RX_ON || m_ovcm == DMR_OVCM_ON) + if ((m_ovcm == DMR_OVCM::RX_ON) || (m_ovcm == DMR_OVCM::ON)) lc->setOVCM(true); - else if (m_ovcm == DMR_OVCM_FORCE_OFF) + else if (m_ovcm == DMR_OVCM::FORCE_OFF) lc->setOVCM(false); m_netLC = lc; @@ -1236,17 +1236,17 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) m_netBits = 1U; m_netErrs = 0U; - m_netState = RS_NET_AUDIO; + m_netState = RPT_NET_STATE::AUDIO; - setShortLC(m_slotNo, dstId, m_netLC->getFLCO(), ACTIVITY_VOICE); + setShortLC(m_slotNo, dstId, m_netLC->getFLCO(), ACTIVITY_TYPE::VOICE); std::string src = m_lookup->find(srcId); std::string dst = m_lookup->find(dstId); class CUserDBentry cn; m_lookup->findWithName(srcId, &cn); - m_display->writeDMR(m_slotNo, cn, 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()); + 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()); } // Regenerate the Slot Type @@ -1274,7 +1274,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) writeFile(data); #endif } else if (dataType == DT_TERMINATOR_WITH_LC) { - if (m_netState != RS_NET_AUDIO) + if (m_netState != RPT_NET_STATE::AUDIO) return; // Regenerate the LC data @@ -1313,11 +1313,11 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) // We've received the voice header and terminator haven't we? m_netFrames += 2U; - LogMessage("DMR Slot %u, received network end of voice transmission from %s to %s%s, %.1f seconds, %u%% packet loss, BER: %.1f%%", m_slotNo, src.c_str(), flco == FLCO_GROUP ? "TG " : "", dst.c_str(), float(m_netFrames) / 16.667F, (m_netLost * 100U) / m_netFrames, float(m_netErrs * 100U) / float(m_netBits)); + LogMessage("DMR Slot %u, received network end of voice transmission from %s to %s%s, %.1f seconds, %u%% packet loss, BER: %.1f%%", m_slotNo, src.c_str(), flco == FLCO::GROUP ? "TG " : "", dst.c_str(), float(m_netFrames) / 16.667F, (m_netLost * 100U) / m_netFrames, float(m_netErrs * 100U) / float(m_netBits)); m_display->writeDMRTA(m_slotNo, NULL, " "); writeEndNet(); } else if (dataType == DT_DATA_HEADER) { - if (m_netState == RS_NET_DATA) + if (m_netState == RPT_NET_STATE::DATA) return; CDMRDataHeader dataHeader; @@ -1354,9 +1354,9 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) writeQueueNet(data); - m_netState = RS_NET_DATA; + m_netState = RPT_NET_STATE::DATA; - setShortLC(m_slotNo, dstId, gi ? FLCO_GROUP : FLCO_USER_USER, ACTIVITY_DATA); + setShortLC(m_slotNo, dstId, gi ? FLCO::GROUP : FLCO::USER_USER, ACTIVITY_TYPE::DATA); std::string src = m_lookup->find(srcId); std::string dst = m_lookup->find(dstId); @@ -1370,15 +1370,15 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) writeEndNet(); } } else if (dataType == DT_VOICE_SYNC) { - if (m_netState == RS_NET_IDLE) { + if (m_netState == RPT_NET_STATE::IDLE) { CDMRLC* lc = new CDMRLC(dmrData.getFLCO(), dmrData.getSrcId(), dmrData.getDstId()); unsigned int dstId = lc->getDstId(); unsigned int srcId = lc->getSrcId(); - if (m_ovcm == DMR_OVCM_RX_ON || m_ovcm == DMR_OVCM_ON) + if ((m_ovcm == DMR_OVCM::RX_ON) || (m_ovcm == DMR_OVCM::ON)) lc->setOVCM(true); - else if (m_ovcm == DMR_OVCM_FORCE_OFF) + else if (m_ovcm == DMR_OVCM::FORCE_OFF) lc->setOVCM(false); m_netLC = lc; @@ -1437,21 +1437,21 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) m_netEmbeddedWriteN = 1U; m_netTalkerId = TALKER_ID_NONE; - m_netState = RS_NET_AUDIO; + m_netState = RPT_NET_STATE::AUDIO; - setShortLC(m_slotNo, dstId, m_netLC->getFLCO(), ACTIVITY_VOICE); + setShortLC(m_slotNo, dstId, m_netLC->getFLCO(), ACTIVITY_TYPE::VOICE); std::string src = m_lookup->find(srcId); std::string dst = m_lookup->find(dstId); class CUserDBentry cn; m_lookup->findWithName(srcId, &cn); - m_display->writeDMR(m_slotNo, cn, 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()); + 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()); } - if (m_netState == RS_NET_AUDIO) { + if (m_netState == RPT_NET_STATE::AUDIO) { unsigned char fid = m_netLC->getFID(); if (fid == FID_ETSI || fid == FID_DMRA) m_netErrs += m_fec.regenerateDMR(data + 2U); @@ -1494,7 +1494,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) #endif } } else if (dataType == DT_VOICE) { - if (m_netState != RS_NET_AUDIO) + if (m_netState != RPT_NET_STATE::AUDIO) return; unsigned char fid = m_netLC->getFID(); @@ -1517,19 +1517,19 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) char text[80U]; switch (flco) { - case FLCO_GROUP: - case FLCO_USER_USER: + case FLCO::GROUP: + case FLCO::USER_USER: // ::sprintf(text, "DMR Slot %u, Embedded LC", m_slotNo); // CUtils::dump(1U, text, data, 9U); break; - case FLCO_GPS_INFO: + case FLCO::GINFO: if (m_dumpTAData) { ::sprintf(text, "DMR Slot %u, Embedded GPS Info", m_slotNo); CUtils::dump(1U, text, data, 9U); logGPSPosition(data); } break; - case FLCO_TALKER_ALIAS_HEADER: + case FLCO::TALKER_ALIAS_HEADER: if (!(m_netTalkerId & TALKER_ID_HEADER)) { if (!m_netTalkerId) m_netTalkerAlias.reset(); @@ -1544,7 +1544,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) m_netTalkerId |= TALKER_ID_HEADER; } break; - case FLCO_TALKER_ALIAS_BLOCK1: + case FLCO::TALKER_ALIAS_BLOCK1: if (!(m_netTalkerId & TALKER_ID_BLOCK1)) { if (!m_netTalkerId) m_netTalkerAlias.reset(); @@ -1559,7 +1559,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) m_netTalkerId |= TALKER_ID_BLOCK1; } break; - case FLCO_TALKER_ALIAS_BLOCK2: + case FLCO::TALKER_ALIAS_BLOCK2: if (!(m_netTalkerId & TALKER_ID_BLOCK2)) { if (!m_netTalkerId) m_netTalkerAlias.reset(); @@ -1574,7 +1574,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) m_netTalkerId |= TALKER_ID_BLOCK2; } break; - case FLCO_TALKER_ALIAS_BLOCK3: + case FLCO::TALKER_ALIAS_BLOCK3: if (!(m_netTalkerId & TALKER_ID_BLOCK3)) { if (!m_netTalkerId) m_netTalkerAlias.reset(); @@ -1648,13 +1648,13 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) } CSBKO csbko = csbk.getCSBKO(); - if (csbko == CSBKO_BSDWNACT) + if (csbko == CSBKO::BSDWNACT) return; // set the OVCM bit for the supported csbk - if (m_ovcm == DMR_OVCM_RX_ON || m_ovcm == DMR_OVCM_ON) + if ((m_ovcm == DMR_OVCM::RX_ON) || (m_ovcm == DMR_OVCM::ON)) csbk.setOVCM(true); - else if (m_ovcm == DMR_OVCM_FORCE_OFF) + else if (m_ovcm == DMR_OVCM::FORCE_OFF) csbk.setOVCM(false); bool gi = csbk.getGI(); @@ -1676,7 +1676,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) data[0U] = TAG_DATA; data[1U] = 0x00U; - if (csbko == CSBKO_PRECCSBK && csbk.getDataContent()) { + if ((csbko == CSBKO::PRECCSBK) && csbk.getDataContent()) { unsigned int cbf = NO_PREAMBLE_CSBK + csbk.getCBF() - 1U; for (unsigned int i = 0U; i < NO_PREAMBLE_CSBK; i++, cbf--) { // Change blocks to follow @@ -1709,25 +1709,25 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) std::string dst = m_lookup->find(dstId); switch (csbko) { - case CSBKO_UUVREQ: + case CSBKO::UUVREQ: LogMessage("DMR Slot %u, received network Unit to Unit Voice Service Request CSBK from %s to %s%s", m_slotNo, src.c_str(), gi ? "TG ": "", dst.c_str()); break; - case CSBKO_UUANSRSP: + case CSBKO::UUANSRSP: LogMessage("DMR Slot %u, received network Unit to Unit Voice Service Answer Response CSBK from %s to %s%s", m_slotNo, src.c_str(), gi ? "TG ": "", dst.c_str()); break; - case CSBKO_NACKRSP: + case CSBKO::NACKRSP: LogMessage("DMR Slot %u, received network Negative Acknowledgment Response CSBK from %s to %s%s", m_slotNo, src.c_str(), gi ? "TG ": "", dst.c_str()); break; - case CSBKO_PRECCSBK: + case CSBKO::PRECCSBK: LogMessage("DMR Slot %u, received network %s Preamble CSBK (%u to follow) from %s to %s%s", m_slotNo, csbk.getDataContent() ? "Data" : "CSBK", csbk.getCBF(), src.c_str(), gi ? "TG " : "", dst.c_str()); break; - case CSBKO_CALL_ALERT: + case CSBKO::CALL_ALERT: LogMessage("DMR Slot %u, received network Call Alert CSBK from %s to %s%s", m_slotNo, src.c_str(), gi ? "TG " : "", dst.c_str()); break; - case CSBKO_CALL_ALERT_ACK: + case CSBKO::CALL_ALERT_ACK: LogMessage("DMR Slot %u, received network Call Alert Ack CSBK from %s to %s%s", m_slotNo, src.c_str(), gi ? "TG " : "", dst.c_str()); break; - case CSBKO_RADIO_CHECK: + case CSBKO::RADIO_CHECK: LogMessage("DMR Slot %u, received network Radio Check %s CSBK from %s to %s%s", m_slotNo, /* TBD */ 1 ? "Req" : "Ack", src.c_str(), gi ? "TG " : "", dst.c_str()); break; default: @@ -1736,12 +1736,12 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) } // If data preamble, signal its existence - if (csbko == CSBKO_PRECCSBK && csbk.getDataContent()) { - setShortLC(m_slotNo, dstId, gi ? FLCO_GROUP : FLCO_USER_USER, ACTIVITY_DATA); + if ((csbko == CSBKO::PRECCSBK) && csbk.getDataContent()) { + setShortLC(m_slotNo, dstId, gi ? FLCO::GROUP : FLCO::USER_USER, ACTIVITY_TYPE::DATA); m_display->writeDMR(m_slotNo, src, gi, dst, "N"); } - } else if (dataType == DT_RATE_12_DATA || dataType == DT_RATE_34_DATA || dataType == DT_RATE_1_DATA) { - if (m_netState != RS_NET_DATA || m_netFrames == 0U) { + } else if ((dataType == DT_RATE_12_DATA) || (dataType == DT_RATE_34_DATA) || (dataType == DT_RATE_1_DATA)) { + if ((m_netState != RPT_NET_STATE::DATA) || (m_netFrames == 0U)) { writeEndNet(); return; } @@ -1870,11 +1870,11 @@ void CDMRSlot::clock() } } - if (m_netState == RS_NET_AUDIO || m_netState == RS_NET_DATA) { + if ((m_netState == RPT_NET_STATE::AUDIO) || (m_netState == RPT_NET_STATE::DATA)) { m_networkWatchdog.clock(ms); if (m_networkWatchdog.hasExpired()) { - if (m_netState == RS_NET_AUDIO) { + if (m_netState == RPT_NET_STATE::AUDIO) { // We've received the voice header haven't we? m_netFrames += 1U; LogMessage("DMR Slot %u, network watchdog has expired, %.1f seconds, %u%% packet loss, BER: %.1f%%", m_slotNo, float(m_netFrames) / 16.667F, (m_netLost * 100U) / m_netFrames, float(m_netErrs * 100U) / float(m_netBits)); @@ -1892,7 +1892,7 @@ void CDMRSlot::clock() } } - if (m_netState == RS_NET_AUDIO) { + if (m_netState == RPT_NET_STATE::AUDIO) { m_packetTimer.clock(ms); if (m_packetTimer.isRunning() && m_packetTimer.hasExpired()) { @@ -1912,7 +1912,7 @@ void CDMRSlot::writeQueueRF(const unsigned char *data) { assert(data != NULL); - if (m_netState != RS_NET_IDLE) + if (m_netState != RPT_NET_STATE::IDLE) return; unsigned char len = DMR_FRAME_LENGTH_BYTES + 2U; @@ -1931,7 +1931,7 @@ void CDMRSlot::writeNetworkRF(const unsigned char* data, unsigned char dataType, { assert(data != NULL); - if (m_netState != RS_NET_IDLE) + if (m_netState != RPT_NET_STATE::IDLE) return; if (m_network == NULL) @@ -1979,7 +1979,7 @@ void CDMRSlot::writeQueueNet(const unsigned char *data) m_queue.addData(data, len); } -void CDMRSlot::init(unsigned int colorCode, bool embeddedLCOnly, bool dumpTAData, unsigned int callHang, CModem* modem, IDMRNetwork* network, CDisplay* display, bool duplex, CDMRLookup* lookup, CRSSIInterpolator* rssiMapper, unsigned int jitter, DMR_OVCM_TYPES ovcm, bool protect) +void CDMRSlot::init(unsigned int colorCode, bool embeddedLCOnly, bool dumpTAData, unsigned int callHang, CModem* modem, IDMRNetwork* network, CDisplay* display, bool duplex, CDMRLookup* lookup, CRSSIInterpolator* rssiMapper, unsigned int jitter, DMR_OVCM ovcm, bool protect) { assert(modem != NULL); assert(display != NULL); @@ -2061,41 +2061,41 @@ void CDMRSlot::setShortLC(unsigned int slotNo, unsigned int id, FLCO flco, ACTIV if (m_id1 != 0U) { lc[2U] = m_id1; - if (m_activity1 == ACTIVITY_VOICE && m_flco1 == FLCO_GROUP) + if ((m_activity1 == ACTIVITY_TYPE::VOICE) && (m_flco1 == FLCO::GROUP)) lc[1U] |= 0x08U; - else if (m_activity1 == ACTIVITY_VOICE && m_flco1 == FLCO_USER_USER) + else if ((m_activity1 == ACTIVITY_TYPE::VOICE) && (m_flco1 == FLCO::USER_USER)) lc[1U] |= 0x09U; - else if (m_activity1 == ACTIVITY_DATA && m_flco1 == FLCO_GROUP) + else if ((m_activity1 == ACTIVITY_TYPE::DATA) && (m_flco1 == FLCO::GROUP)) lc[1U] |= 0x0BU; - else if (m_activity1 == ACTIVITY_DATA && m_flco1 == FLCO_USER_USER) + else if ((m_activity1 == ACTIVITY_TYPE::DATA) && (m_flco1 == FLCO::USER_USER)) lc[1U] |= 0x0AU; - else if (m_activity1 == ACTIVITY_CSBK && m_flco1 == FLCO_GROUP) + else if ((m_activity1 == ACTIVITY_TYPE::CSBK) && (m_flco1 == FLCO::GROUP)) lc[1U] |= 0x02U; - else if (m_activity1 == ACTIVITY_CSBK && m_flco1 == FLCO_USER_USER) + else if ((m_activity1 == ACTIVITY_TYPE::CSBK) && (m_flco1 == FLCO::USER_USER)) lc[1U] |= 0x03U; - else if (m_activity1 == ACTIVITY_EMERG && m_flco1 == FLCO_GROUP) + else if ((m_activity1 == ACTIVITY_TYPE::EMERG) && (m_flco1 == FLCO::GROUP)) lc[1U] |= 0x0CU; - else if (m_activity1 == ACTIVITY_EMERG && m_flco1 == FLCO_USER_USER) + else if ((m_activity1 == ACTIVITY_TYPE::EMERG) && (m_flco1 == FLCO::USER_USER)) lc[1U] |= 0x0DU; } if (m_id2 != 0U) { lc[3U] = m_id2; - if (m_activity2 == ACTIVITY_VOICE && m_flco2 == FLCO_GROUP) + if ((m_activity2 == ACTIVITY_TYPE::VOICE) && (m_flco2 == FLCO::GROUP)) lc[1U] |= 0x80U; - else if (m_activity2 == ACTIVITY_VOICE && m_flco2 == FLCO_USER_USER) + else if ((m_activity2 == ACTIVITY_TYPE::VOICE) && (m_flco2 == FLCO::USER_USER)) lc[1U] |= 0x90U; - else if (m_activity2 == ACTIVITY_DATA && m_flco2 == FLCO_GROUP) + else if ((m_activity2 == ACTIVITY_TYPE::DATA) && (m_flco2 == FLCO::GROUP)) lc[1U] |= 0xB0U; - else if (m_activity2 == ACTIVITY_DATA && m_flco2 == FLCO_USER_USER) + else if ((m_activity2 == ACTIVITY_TYPE::DATA) && (m_flco2 == FLCO::USER_USER)) lc[1U] |= 0xA0U; - else if (m_activity2 == ACTIVITY_CSBK && m_flco2 == FLCO_GROUP) + else if ((m_activity2 == ACTIVITY_TYPE::CSBK) && (m_flco2 == FLCO::GROUP)) lc[1U] |= 0x20U; - else if (m_activity2 == ACTIVITY_CSBK && m_flco2 == FLCO_USER_USER) + else if ((m_activity2 == ACTIVITY_TYPE::CSBK) && (m_flco2 == FLCO::USER_USER)) lc[1U] |= 0x30U; - else if (m_activity2 == ACTIVITY_EMERG && m_flco2 == FLCO_GROUP) + else if ((m_activity2 == ACTIVITY_TYPE::EMERG) && (m_flco2 == FLCO::GROUP)) lc[1U] |= 0xC0U; - else if (m_activity2 == ACTIVITY_EMERG && m_flco2 == FLCO_USER_USER) + else if ((m_activity2 == ACTIVITY_TYPE::EMERG) && (m_flco2 == FLCO::USER_USER)) lc[1U] |= 0xD0U; } @@ -2229,7 +2229,7 @@ void CDMRSlot::insertSilence(unsigned int count) bool CDMRSlot::isBusy() const { - return m_rfState != RS_RF_LISTENING || m_netState != RS_NET_IDLE; + return (m_rfState != RPT_RF_STATE::LISTENING) || (m_netState != RPT_NET_STATE::IDLE); } void CDMRSlot::enable(bool enabled) @@ -2238,7 +2238,7 @@ void CDMRSlot::enable(bool enabled) m_queue.clear(); // Reset the RF section - m_rfState = RS_RF_LISTENING; + m_rfState = RPT_RF_STATE::LISTENING; m_rfTimeoutTimer.stop(); m_rfTimeout = false; @@ -2254,7 +2254,7 @@ void CDMRSlot::enable(bool enabled) m_rfLC = NULL; // Reset the networking section - m_netState = RS_NET_IDLE; + m_netState = RPT_NET_STATE::IDLE; m_lastFrameValid = false; diff --git a/DMRSlot.h b/DMRSlot.h index 11756a4..a998a44 100644 --- a/DMRSlot.h +++ b/DMRSlot.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015-2021,2023 by Jonathan Naylor G4KLX + * Copyright (C) 2015-2021,2023,2025 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 @@ -37,12 +37,12 @@ #include -enum ACTIVITY_TYPE { - ACTIVITY_NONE, - ACTIVITY_VOICE, - ACTIVITY_DATA, - ACTIVITY_CSBK, - ACTIVITY_EMERG +enum class ACTIVITY_TYPE { + NONE, + VOICE, + DATA, + CSBK, + EMERG }; class CDMRSlot { @@ -62,7 +62,7 @@ public: void enable(bool enabled); - static void init(unsigned int colorCode, bool embeddedLCOnly, bool dumpTAData, unsigned int callHang, CModem* modem, IDMRNetwork* network, CDisplay* display, bool duplex, CDMRLookup* lookup, CRSSIInterpolator* rssiMapper, unsigned int jitter, DMR_OVCM_TYPES ovcm, bool protect); + static void init(unsigned int colorCode, bool embeddedLCOnly, bool dumpTAData, unsigned int callHang, CModem* modem, IDMRNetwork* network, CDisplay* display, bool duplex, CDMRLookup* lookup, CRSSIInterpolator* rssiMapper, unsigned int jitter, DMR_OVCM ovcm, bool protect); private: unsigned int m_slotNo; @@ -124,7 +124,7 @@ private: static bool m_duplex; static CDMRLookup* m_lookup; static unsigned int m_hangCount; - static DMR_OVCM_TYPES m_ovcm; + static DMR_OVCM m_ovcm; static bool m_protect; static CRSSIInterpolator* m_rssiMapper; @@ -158,7 +158,7 @@ private: bool insertSilence(const unsigned char* data, unsigned char seqNo); void insertSilence(unsigned int count); - static void setShortLC(unsigned int slotNo, unsigned int id, FLCO flco = FLCO_GROUP, ACTIVITY_TYPE type = ACTIVITY_NONE); + static void setShortLC(unsigned int slotNo, unsigned int id, FLCO flco = FLCO::GROUP, ACTIVITY_TYPE type = ACTIVITY_TYPE::NONE); }; #endif diff --git a/DStarControl.cpp b/DStarControl.cpp index c7ba73b..240a75e 100644 --- a/DStarControl.cpp +++ b/DStarControl.cpp @@ -37,7 +37,7 @@ bool CallsignCompare(const std::string& arg, const unsigned char* my) // #define DUMP_DSTAR -CDStarControl::CDStarControl(const std::string& callsign, const std::string& module, bool selfOnly, bool ackReply, unsigned int ackTime, DSTAR_ACK_MESSAGE ackMessage, bool errorReply, const std::vector& blackList, const std::vector& whiteList, CDStarNetwork* network, CDisplay* display, unsigned int timeout, bool duplex, bool remoteGateway, CRSSIInterpolator* rssiMapper) : +CDStarControl::CDStarControl(const std::string& callsign, const std::string& module, bool selfOnly, bool ackReply, unsigned int ackTime, DSTAR_ACK ackMessage, bool errorReply, const std::vector& blackList, const std::vector& whiteList, CDStarNetwork* network, CDisplay* display, unsigned int timeout, bool duplex, bool remoteGateway, CRSSIInterpolator* rssiMapper) : m_callsign(NULL), m_gateway(NULL), m_selfOnly(selfOnly), @@ -53,8 +53,8 @@ m_duplex(duplex), m_queue(5000U, "D-Star Control"), m_rfHeader(), m_netHeader(), -m_rfState(RS_RF_LISTENING), -m_netState(RS_NET_IDLE), +m_rfState(RPT_RF_STATE::LISTENING), +m_netState(RPT_NET_STATE::IDLE), m_net(false), m_rfSlowData(), m_netSlowData(), @@ -129,7 +129,7 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len) unsigned char type = data[0U]; - if (type == TAG_LOST && ((m_rfState == RS_RF_AUDIO) || (m_rfState == RS_RF_DATA))) { + if (type == TAG_LOST && ((m_rfState == RPT_RF_STATE::AUDIO) || (m_rfState == RPT_RF_STATE::DATA))) { unsigned char my1[DSTAR_LONG_CALLSIGN_LENGTH]; unsigned char my2[DSTAR_SHORT_CALLSIGN_LENGTH]; unsigned char your[DSTAR_LONG_CALLSIGN_LENGTH]; @@ -145,10 +145,10 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len) return false; } - if (type == TAG_LOST && m_rfState == RS_RF_INVALID) { - m_rfState = RS_RF_LISTENING; + if ((type == TAG_LOST) && (m_rfState == RPT_RF_STATE::INVALID)) { + m_rfState = RPT_RF_STATE::LISTENING; - if (m_netState == RS_NET_IDLE) { + if (m_netState == RPT_NET_STATE::IDLE) { if (m_errorReply) m_errTimer.start(); @@ -160,7 +160,7 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len) } if (type == TAG_LOST) { - m_rfState = RS_RF_LISTENING; + m_rfState = RPT_RF_STATE::LISTENING; return false; } @@ -220,7 +220,7 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len) // Is this a transmission destined for a repeater? if (!header.isRepeater()) { LogMessage("D-Star, non repeater RF header received from %8.8s", my1); - m_rfState = RS_RF_INVALID; + m_rfState = RPT_RF_STATE::INVALID; return true; } @@ -230,19 +230,19 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len) // Is it for us? if (::memcmp(callsign, m_callsign, DSTAR_LONG_CALLSIGN_LENGTH) != 0) { LogMessage("D-Star, received RF header for wrong repeater (%8.8s) from %8.8s", callsign, my1); - m_rfState = RS_RF_INVALID; + m_rfState = RPT_RF_STATE::INVALID; return true; } if (m_selfOnly && ::memcmp(my1, m_callsign, DSTAR_LONG_CALLSIGN_LENGTH - 1U) != 0 && !(std::find_if(m_whiteList.begin(), m_whiteList.end(), std::bind(CallsignCompare, std::placeholders::_1, my1)) != m_whiteList.end())) { LogMessage("D-Star, invalid access attempt from %8.8s", my1); - m_rfState = RS_RF_REJECTED; + m_rfState = RPT_RF_STATE::REJECTED; return true; } if (!m_selfOnly && std::find_if(m_blackList.begin(), m_blackList.end(), std::bind(CallsignCompare, std::placeholders::_1, my1)) != m_blackList.end()) { LogMessage("D-Star, invalid access attempt from %8.8s", my1); - m_rfState = RS_RF_REJECTED; + m_rfState = RPT_RF_STATE::REJECTED; return true; } @@ -297,21 +297,21 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len) writeNetworkHeaderRF(data); } - m_rfState = RS_RF_AUDIO; + m_rfState = RPT_RF_STATE::AUDIO; - if (m_netState == RS_NET_IDLE) { + if (m_netState == RPT_NET_STATE::IDLE) { m_display->writeDStar((char*)my1, (char*)my2, (char*)your, "R", " "); m_display->writeDStarRSSI(m_rssi); } LogMessage("D-Star, received RF header from %8.8s/%4.4s to %8.8s", my1, my2, your); } else if (type == TAG_EOT) { - if (m_rfState == RS_RF_REJECTED) { - m_rfState = RS_RF_LISTENING; - } else if (m_rfState == RS_RF_INVALID) { - m_rfState = RS_RF_LISTENING; + if (m_rfState == RPT_RF_STATE::REJECTED) { + m_rfState = RPT_RF_STATE::LISTENING; + } else if (m_rfState == RPT_RF_STATE::INVALID) { + m_rfState = RPT_RF_STATE::LISTENING; - if (m_netState == RS_NET_IDLE) { + if (m_netState == RPT_NET_STATE::IDLE) { if (m_errorReply) m_errTimer.start(); @@ -320,7 +320,7 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len) } return false; - } else if ((m_rfState == RS_RF_AUDIO) || (m_rfState == RS_RF_DATA)) { + } else if ((m_rfState == RPT_RF_STATE::AUDIO) || (m_rfState == RPT_RF_STATE::DATA)) { if (m_net) writeNetworkDataRF(DSTAR_END_PATTERN_BYTES, 0U, true); @@ -344,24 +344,24 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len) return false; } else if (type == TAG_DATA) { - if (m_rfState == RS_RF_REJECTED) + if (m_rfState == RPT_RF_STATE::REJECTED) return true; - if (m_rfState == RS_RF_INVALID) + if (m_rfState == RPT_RF_STATE::INVALID) return true; - if (m_rfState == RS_RF_LISTENING) { + if (m_rfState == RPT_RF_STATE::LISTENING) { // The sync is regenerated by the modem so can do exact match if (::memcmp(data + 1U + DSTAR_VOICE_FRAME_LENGTH_BYTES, DSTAR_SYNC_BYTES, DSTAR_DATA_FRAME_LENGTH_BYTES) == 0) { m_rfSlowData.start(); m_rfN = 0U; - m_rfState = RS_RF_LATE_ENTRY; + m_rfState = RPT_RF_STATE::LATE_ENTRY; } return false; } - if ((m_rfState == RS_RF_AUDIO) || (m_rfState == RS_RF_DATA)) { + if ((m_rfState == RPT_RF_STATE::AUDIO) || (m_rfState == RPT_RF_STATE::DATA)) { // The sync is regenerated by the modem so can do exact match if (::memcmp(data + 1U + DSTAR_VOICE_FRAME_LENGTH_BYTES, DSTAR_SYNC_BYTES, DSTAR_DATA_FRAME_LENGTH_BYTES) == 0) { m_rfSlowData.start(); @@ -369,17 +369,17 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len) } } - if (m_rfState == RS_RF_AUDIO) { + if (m_rfState == RPT_RF_STATE::AUDIO) { m_rfSlowData.peakSlowData(data + 1U, m_rfN); unsigned char type = m_rfSlowData.getType(); if (type == DSTAR_SLOW_DATA_TYPE_FASTDATA_BEGIN) { LogMessage("D-Star, starting fast data mode"); - m_rfState = RS_RF_DATA; + m_rfState = RPT_RF_STATE::DATA; } } - if (m_rfState == RS_RF_DATA) { + if (m_rfState == RPT_RF_STATE::DATA) { LogDebug("D-Star, fast data sequence no. %u", m_rfN); m_rfBits += 48U; @@ -398,12 +398,12 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len) unsigned char type = m_rfSlowData.getType(); if (type == DSTAR_SLOW_DATA_TYPE_FASTDATA_END) { LogMessage("D-Star, leaving fast data mode"); - m_rfState = RS_RF_AUDIO; + m_rfState = RPT_RF_STATE::AUDIO; } } m_rfN = (m_rfN + 1U) % 21U; - } else if (m_rfState == RS_RF_AUDIO) { + } else if (m_rfState == RPT_RF_STATE::AUDIO) { // Send the RSSI data to the display if (m_rfN == 0U) m_display->writeDStarRSSI(m_rssi); @@ -438,7 +438,7 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len) m_rfN = (m_rfN + 1U) % 21U; } - if (m_rfState == RS_RF_LATE_ENTRY) { + if (m_rfState == RPT_RF_STATE::LATE_ENTRY) { // The sync is regenerated by the modem so can do exact match if (::memcmp(data + 1U + DSTAR_VOICE_FRAME_LENGTH_BYTES, DSTAR_SYNC_BYTES, DSTAR_DATA_FRAME_LENGTH_BYTES) == 0) { m_rfSlowData.reset(); @@ -461,7 +461,7 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len) // Is this a transmission destined for a repeater? if (!m_rfHeader.isRepeater()) { LogMessage("D-Star, non repeater RF header received from %8.8s", my1); - m_rfState = RS_RF_INVALID; + m_rfState = RPT_RF_STATE::INVALID; return true; } @@ -471,19 +471,19 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len) // Is it for us? if (::memcmp(callsign, m_callsign, DSTAR_LONG_CALLSIGN_LENGTH) != 0) { LogMessage("D-Star, received RF header for wrong repeater (%8.8s) from %8.8s", callsign, my1); - m_rfState = RS_RF_INVALID; + m_rfState = RPT_RF_STATE::INVALID; return true; } if (m_selfOnly && ::memcmp(my1, m_callsign, DSTAR_LONG_CALLSIGN_LENGTH - 1U) != 0 && !(std::find_if(m_whiteList.begin(), m_whiteList.end(), std::bind(CallsignCompare, std::placeholders::_1, my1)) != m_whiteList.end())) { LogMessage("D-Star, invalid access attempt from %8.8s", my1); - m_rfState = RS_RF_REJECTED; + m_rfState = RPT_RF_STATE::REJECTED; return true; } if (!m_selfOnly && std::find_if(m_blackList.begin(), m_blackList.end(), std::bind(CallsignCompare, std::placeholders::_1, my1)) != m_blackList.end()) { LogMessage("D-Star, invalid access attempt from %8.8s", my1); - m_rfState = RS_RF_REJECTED; + m_rfState = RPT_RF_STATE::REJECTED; return true; } @@ -564,9 +564,9 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len) writeQueueDataRF(data); } - m_rfState = RS_RF_AUDIO; + m_rfState = RPT_RF_STATE::AUDIO; - if (m_netState == RS_NET_IDLE) { + if (m_netState == RPT_NET_STATE::IDLE) { m_display->writeDStar((char*)my1, (char*)my2, (char*)your, "R", " "); m_display->writeDStarRSSI(m_rssi); m_display->writeDStarBER(float(errors) / 0.48F); @@ -600,11 +600,11 @@ unsigned int CDStarControl::readModem(unsigned char* data) void CDStarControl::writeEndRF() { - m_rfState = RS_RF_LISTENING; + m_rfState = RPT_RF_STATE::LISTENING; m_rfTimeoutTimer.stop(); - if (m_netState == RS_NET_IDLE) { + if (m_netState == RPT_NET_STATE::IDLE) { m_display->clearDStar(); m_ackTimer.start(); @@ -616,7 +616,7 @@ void CDStarControl::writeEndRF() void CDStarControl::writeEndNet() { - m_netState = RS_NET_IDLE; + m_netState = RPT_NET_STATE::IDLE; m_lastFrameValid = false; @@ -646,7 +646,7 @@ void CDStarControl::writeNetwork() if (!m_enabled) return; - if (((m_rfState == RS_RF_AUDIO) || (m_rfState == RS_RF_DATA)) && (m_netState == RS_NET_IDLE)) + if (((m_rfState == RPT_RF_STATE::AUDIO) || (m_rfState == RPT_RF_STATE::DATA)) && (m_netState == RPT_NET_STATE::IDLE)) return; m_networkWatchdog.start(); @@ -654,7 +654,7 @@ void CDStarControl::writeNetwork() unsigned char type = data[0U]; if (type == TAG_HEADER) { - if (m_netState != RS_NET_IDLE) + if (m_netState != RPT_NET_STATE::IDLE) return; CDStarHeader header(data + 1U); @@ -698,12 +698,12 @@ void CDStarControl::writeNetwork() openFile(); writeFile(data + 1U, length - 1U); #endif - m_netState = RS_NET_AUDIO; + m_netState = RPT_NET_STATE::AUDIO; - LINK_STATUS status = LS_NONE; + LINK_STATUS status = LINK_STATUS::NONE; unsigned char reflector[DSTAR_LONG_CALLSIGN_LENGTH]; m_network->getStatus(status, reflector); - if (status == LS_LINKED_DEXTRA || status == LS_LINKED_DPLUS || status == LS_LINKED_DCS || status == LS_LINKED_CCS || status == LS_LINKED_LOOPBACK) { + if ((status == LINK_STATUS::LINKED_DEXTRA) || (status == LINK_STATUS::LINKED_DPLUS) || (status == LINK_STATUS::LINKED_DCS) || (status == LINK_STATUS::LINKED_CCS) || (status == LINK_STATUS::LINKED_LOOPBACK)) { m_display->writeDStar((char*)my1, (char*)my2, (char*)your, "N", (char*) reflector); LogMessage("D-Star, received network header from %8.8s/%4.4s to %8.8s via %8.8s", my1, my2, your, reflector); } else { @@ -713,7 +713,7 @@ void CDStarControl::writeNetwork() m_elapsed.start(); } else if (type == TAG_EOT) { - if ((m_netState != RS_NET_AUDIO) && (m_netState != RS_NET_DATA)) + if ((m_netState != RPT_NET_STATE::AUDIO) && (m_netState != RPT_NET_STATE::DATA)) return; writeQueueEOTNet(); @@ -737,7 +737,7 @@ void CDStarControl::writeNetwork() writeEndNet(); } else if (type == TAG_DATA) { - if ((m_netState == RS_NET_AUDIO) || (m_netState == RS_NET_DATA)) { + if ((m_netState == RPT_NET_STATE::AUDIO) || (m_netState == RPT_NET_STATE::DATA)) { unsigned char n = data[1U]; // The sync is regenerated by the modem so can do exact match @@ -746,17 +746,17 @@ void CDStarControl::writeNetwork() } else { m_netSlowData.peakSlowData(data + 1U, n); - if (m_netState == RS_NET_AUDIO) { + if (m_netState == RPT_NET_STATE::AUDIO) { unsigned char type = m_netSlowData.getType(); if (type == DSTAR_SLOW_DATA_TYPE_FASTDATA_BEGIN) { LogMessage("D-Star, starting fast data mode"); - m_netState = RS_NET_DATA; + m_netState = RPT_NET_STATE::DATA; } } } } - if (m_netState == RS_NET_AUDIO) { + if (m_netState == RPT_NET_STATE::AUDIO) { unsigned char n = data[1U]; unsigned int errors = 0U; @@ -796,7 +796,7 @@ void CDStarControl::writeNetwork() writeQueueDataNet(data + 1U); } - if (m_netState == RS_NET_DATA) { + if (m_netState == RPT_NET_STATE::DATA) { m_netN = data[1U]; data[1U] = TAG_DATA; @@ -814,7 +814,7 @@ void CDStarControl::writeNetwork() unsigned char type = m_netSlowData.getType(); if (type == DSTAR_SLOW_DATA_TYPE_FASTDATA_END) { LogMessage("D-Star, leaving fast data mode"); - m_netState = RS_NET_AUDIO; + m_netState = RPT_NET_STATE::AUDIO; } } } @@ -855,7 +855,7 @@ void CDStarControl::clock() m_rfTimeoutTimer.clock(ms); m_netTimeoutTimer.clock(ms); - if (m_netState == RS_NET_AUDIO) { + if (m_netState == RPT_NET_STATE::AUDIO) { m_networkWatchdog.clock(ms); if (m_networkWatchdog.hasExpired()) { @@ -870,7 +870,7 @@ void CDStarControl::clock() } // Only insert silence on audio data - if (m_netState == RS_NET_AUDIO) { + if (m_netState == RPT_NET_STATE::AUDIO) { m_packetTimer.clock(ms); if (m_packetTimer.isRunning() && m_packetTimer.hasExpired()) { @@ -894,7 +894,7 @@ void CDStarControl::writeQueueHeaderRF(const unsigned char *data) { assert(data != NULL); - if (m_netState != RS_NET_IDLE) + if (m_netState != RPT_NET_STATE::IDLE) return; if (m_rfTimeoutTimer.isRunning() && m_rfTimeoutTimer.hasExpired()) @@ -917,7 +917,7 @@ void CDStarControl::writeQueueDataRF(const unsigned char *data) { assert(data != NULL); - if (m_netState != RS_NET_IDLE) + if (m_netState != RPT_NET_STATE::IDLE) return; if (m_rfTimeoutTimer.isRunning() && m_rfTimeoutTimer.hasExpired()) @@ -938,7 +938,7 @@ void CDStarControl::writeQueueDataRF(const unsigned char *data) void CDStarControl::writeQueueEOTRF() { - if (m_netState != RS_NET_IDLE) + if (m_netState != RPT_NET_STATE::IDLE) return; if (m_rfTimeoutTimer.isRunning() && m_rfTimeoutTimer.hasExpired()) @@ -1028,7 +1028,7 @@ void CDStarControl::writeNetworkHeaderRF(const unsigned char* data) if (m_rfTimeoutTimer.isRunning() && m_rfTimeoutTimer.hasExpired()) return; - m_network->writeHeader(data + 1U, DSTAR_HEADER_LENGTH_BYTES, m_netState != RS_NET_IDLE); + m_network->writeHeader(data + 1U, DSTAR_HEADER_LENGTH_BYTES, m_netState != RPT_NET_STATE::IDLE); } void CDStarControl::writeNetworkDataRF(const unsigned char* data, unsigned int errors, bool end) @@ -1042,7 +1042,7 @@ void CDStarControl::writeNetworkDataRF(const unsigned char* data, unsigned int e if (m_rfTimeoutTimer.isRunning() && m_rfTimeoutTimer.hasExpired()) return; - m_network->writeData(data + 1U, DSTAR_FRAME_LENGTH_BYTES, errors, end, m_netState != RS_NET_IDLE); + m_network->writeData(data + 1U, DSTAR_FRAME_LENGTH_BYTES, errors, end, m_netState != RPT_NET_STATE::IDLE); } bool CDStarControl::openFile() @@ -1184,20 +1184,20 @@ void CDStarControl::sendAck() writeQueueDataRF(DSTAR_NULL_FRAME_SYNC_BYTES); - LINK_STATUS status = LS_NONE; + LINK_STATUS status = LINK_STATUS::NONE; unsigned char reflector[DSTAR_LONG_CALLSIGN_LENGTH]; if (m_network != NULL) m_network->getStatus(status, reflector); char text[40U]; - if (m_ackMessage == DSTAR_ACK_RSSI && m_rssi != 0) { - if (status == LS_LINKED_DEXTRA || status == LS_LINKED_DPLUS || status == LS_LINKED_DCS || status == LS_LINKED_CCS || status == LS_LINKED_LOOPBACK) { + if ((m_ackMessage == DSTAR_ACK::RSSI) && (m_rssi != 0U)) { + if ((status == LINK_STATUS::LINKED_DEXTRA) || (status == LINK_STATUS::LINKED_DPLUS) || (status == LINK_STATUS::LINKED_DCS) || (status == LINK_STATUS::LINKED_CCS) || (status == LINK_STATUS::LINKED_LOOPBACK)) { CUtils::removeChar(reflector, ' ');//remove space from reflector so all nicely fits onto 20 chars in case rssi < 99dBm ::sprintf(text, "%-8.8s %.1f%% -%udBm ", reflector, float(m_rfErrs * 100U) / float(m_rfBits), m_aveRSSI / m_rssiCount); } else { ::sprintf(text, "BER:%.1f%% -%udBm ", float(m_rfErrs * 100U) / float(m_rfBits), m_aveRSSI / m_rssiCount); } - } else if (m_ackMessage == DSTAR_ACK_SMETER && m_rssi != 0) { + } else if ((m_ackMessage == DSTAR_ACK::SMETER) && (m_rssi != 0U)) { unsigned int signal, plus; char signalText[15U]; CSMeter::getSignal(m_aveRSSI / m_rssiCount, signal, plus); @@ -1206,12 +1206,12 @@ void CDStarControl::sendAck() else ::sprintf(signalText, "S%u", signal); - if (status == LS_LINKED_DEXTRA || status == LS_LINKED_DPLUS || status == LS_LINKED_DCS || status == LS_LINKED_CCS || status == LS_LINKED_LOOPBACK) + if ((status == LINK_STATUS::LINKED_DEXTRA) || (status == LINK_STATUS::LINKED_DPLUS) || (status == LINK_STATUS::LINKED_DCS) || (status == LINK_STATUS::LINKED_CCS) || (status == LINK_STATUS::LINKED_LOOPBACK)) ::sprintf(text, "%-8.8s %.1f%% %s ", reflector, float(m_rfErrs * 100U) / float(m_rfBits), signalText); else ::sprintf(text, "BER:%.1f%% %s ", float(m_rfErrs * 100U) / float(m_rfBits), signalText); } else { - if (status == LS_LINKED_DEXTRA || status == LS_LINKED_DPLUS || status == LS_LINKED_DCS || status == LS_LINKED_CCS || status == LS_LINKED_LOOPBACK) + if ((status == LINK_STATUS::LINKED_DEXTRA) || (status == LINK_STATUS::LINKED_DPLUS) || (status == LINK_STATUS::LINKED_DCS) || (status == LINK_STATUS::LINKED_CCS) || (status == LINK_STATUS::LINKED_LOOPBACK)) ::sprintf(text, "%-8.8s BER: %.1f%% ", reflector, float(m_rfErrs * 100U) / float(m_rfBits)); else ::sprintf(text, "BER: %.1f%% ", float(m_rfErrs * 100U) / float(m_rfBits)); @@ -1249,20 +1249,20 @@ void CDStarControl::sendError() writeQueueDataRF(DSTAR_NULL_FRAME_SYNC_BYTES); - LINK_STATUS status = LS_NONE; + LINK_STATUS status = LINK_STATUS::NONE; unsigned char reflector[DSTAR_LONG_CALLSIGN_LENGTH]; if (m_network != NULL) m_network->getStatus(status, reflector); char text[40U]; - if (m_ackMessage == DSTAR_ACK_RSSI && m_rssi != 0) { - if (status == LS_LINKED_DEXTRA || status == LS_LINKED_DPLUS || status == LS_LINKED_DCS || status == LS_LINKED_CCS || status == LS_LINKED_LOOPBACK) { + if ((m_ackMessage == DSTAR_ACK::RSSI) && (m_rssi != 0U)) { + if ((status == LINK_STATUS::LINKED_DEXTRA) || (status == LINK_STATUS::LINKED_DPLUS) || (status == LINK_STATUS::LINKED_DCS) || (status == LINK_STATUS::LINKED_CCS) || (status == LINK_STATUS::LINKED_LOOPBACK)) { CUtils::removeChar(reflector, ' ');//remove space from reflector so all nicely fits onto 20 chars in case rssi < 99dBm ::sprintf(text, "%-8.8s %.1f%% -%udBm ", reflector, float(m_rfErrs * 100U) / float(m_rfBits), m_aveRSSI / m_rssiCount); } else { ::sprintf(text, "BER:%.1f%% -%udBm ", float(m_rfErrs * 100U) / float(m_rfBits), m_aveRSSI / m_rssiCount); } - } else if (m_ackMessage == DSTAR_ACK_SMETER && m_rssi != 0) { + } else if ((m_ackMessage == DSTAR_ACK::SMETER) && (m_rssi != 0U)) { unsigned int signal, plus; char signalText[15U]; CSMeter::getSignal(m_aveRSSI / m_rssiCount, signal, plus); @@ -1271,12 +1271,12 @@ void CDStarControl::sendError() else ::sprintf(signalText, "S%u", signal); - if (status == LS_LINKED_DEXTRA || status == LS_LINKED_DPLUS || status == LS_LINKED_DCS || status == LS_LINKED_CCS || status == LS_LINKED_LOOPBACK) + if ((status == LINK_STATUS::LINKED_DEXTRA) || (status == LINK_STATUS::LINKED_DPLUS) || (status == LINK_STATUS::LINKED_DCS) || (status == LINK_STATUS::LINKED_CCS) || (status == LINK_STATUS::LINKED_LOOPBACK)) ::sprintf(text, "%-8.8s %.1f%% %s ", reflector, float(m_rfErrs * 100U) / float(m_rfBits), signalText); else ::sprintf(text, "BER:%.1f%% %s ", float(m_rfErrs * 100U) / float(m_rfBits), signalText); } else { - if (status == LS_LINKED_DEXTRA || status == LS_LINKED_DPLUS || status == LS_LINKED_DCS || status == LS_LINKED_CCS || status == LS_LINKED_LOOPBACK) + if ((status == LINK_STATUS::LINKED_DEXTRA) || (status == LINK_STATUS::LINKED_DPLUS) || (status == LINK_STATUS::LINKED_DCS) || (status == LINK_STATUS::LINKED_CCS) || (status == LINK_STATUS::LINKED_LOOPBACK)) ::sprintf(text, "%-8.8s BER: %.1f%% ", reflector, float(m_rfErrs * 100U) / float(m_rfBits)); else ::sprintf(text, "BER: %.1f%% ", float(m_rfErrs * 100U) / float(m_rfBits)); @@ -1296,7 +1296,7 @@ void CDStarControl::sendError() bool CDStarControl::isBusy() const { - return m_rfState != RS_RF_LISTENING || m_netState != RS_NET_IDLE; + return (m_rfState != RPT_RF_STATE::LISTENING) || (m_netState != RPT_NET_STATE::IDLE); } void CDStarControl::enable(bool enabled) @@ -1305,12 +1305,12 @@ void CDStarControl::enable(bool enabled) m_queue.clear(); // Reset the RF section - m_rfState = RS_RF_LISTENING; + m_rfState = RPT_RF_STATE::LISTENING; m_rfTimeoutTimer.stop(); // Reset the networking section - m_netState = RS_NET_IDLE; + m_netState = RPT_NET_STATE::IDLE; m_lastFrameValid = false; diff --git a/DStarControl.h b/DStarControl.h index 35dbcda..1916e75 100644 --- a/DStarControl.h +++ b/DStarControl.h @@ -37,7 +37,7 @@ class CDStarControl { public: - CDStarControl(const std::string& callsign, const std::string& module, bool selfOnly, bool ackReply, unsigned int ackTime, DSTAR_ACK_MESSAGE ackMessage, bool errorReply, const std::vector& blackList, const std::vector& whiteList, CDStarNetwork* network, CDisplay* display, unsigned int timeout, bool duplex, bool remoteGateway, CRSSIInterpolator* rssiMapper); + CDStarControl(const std::string& callsign, const std::string& module, bool selfOnly, bool ackReply, unsigned int ackTime, DSTAR_ACK ackMessage, bool errorReply, const std::vector& blackList, const std::vector& whiteList, CDStarNetwork* network, CDisplay* display, unsigned int timeout, bool duplex, bool remoteGateway, CRSSIInterpolator* rssiMapper); ~CDStarControl(); bool writeModem(unsigned char* data, unsigned int len); @@ -55,7 +55,7 @@ private: unsigned char* m_gateway; bool m_selfOnly; bool m_ackReply; - DSTAR_ACK_MESSAGE m_ackMessage; + DSTAR_ACK m_ackMessage; bool m_errorReply; bool m_remoteGateway; std::vector m_blackList; diff --git a/DStarDefines.h b/DStarDefines.h index d7caeb0..0098f9e 100644 --- a/DStarDefines.h +++ b/DStarDefines.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015,2016,2018,2019,2021 by Jonathan Naylor G4KLX + * Copyright (C) 2015,2016,2018,2019,2021,2025 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 @@ -66,7 +66,7 @@ const unsigned char DSTAR_URGENT_MASK = 0x08U; const unsigned char DSTAR_REPEATER_CONTROL = 0x07U; const unsigned char DSTAR_AUTO_REPLY = 0x06U; const unsigned char DSTAR_RESEND_REQUESTED = 0x04U; -const unsigned char DSTAR_ACK_FLAG = 0x03U; +const unsigned char FLAG = 0x03U; const unsigned char DSTAR_NO_RESPONSE = 0x02U; const unsigned char DSTAR_RELAY_UNAVAILABLE = 0x01U; @@ -77,19 +77,19 @@ const unsigned char DSTAR_DTMF_SIG[] = { 0x82U, 0x08U, 0x20U, 0x82U, 0x00U, 0x0 const unsigned int DSTAR_FRAME_TIME = 20U; -enum LINK_STATUS { - LS_NONE, - LS_PENDING_IRCDDB, - LS_LINKING_LOOPBACK, - LS_LINKING_DEXTRA, - LS_LINKING_DPLUS, - LS_LINKING_DCS, - LS_LINKING_CCS, - LS_LINKED_LOOPBACK, - LS_LINKED_DEXTRA, - LS_LINKED_DPLUS, - LS_LINKED_DCS, - LS_LINKED_CCS +enum class LINK_STATUS { + NONE, + PENDING_IRCDDB, + LINKING_LOOPBACK, + LINKING_DEXTRA, + LINKING_DPLUS, + LINKING_DCS, + LINKING_CCS, + LINKED_LOOPBACK, + LINKED_DEXTRA, + LINKED_DPLUS, + LINKED_DCS, + LINKED_CCS }; #endif diff --git a/DStarNetwork.cpp b/DStarNetwork.cpp index 67099d6..eb8d914 100644 --- a/DStarNetwork.cpp +++ b/DStarNetwork.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2014,2016,2019,2020,2021,2024 by Jonathan Naylor G4KLX + * Copyright (C) 2009-2014,2016,2019,2020,2021,2024,2025 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 @@ -43,7 +43,7 @@ m_outSeq(0U), m_inId(0U), m_buffer(1000U, "D-Star Network"), m_pollTimer(1000U, 60U), -m_linkStatus(LS_NONE), +m_linkStatus(LINK_STATUS::NONE), m_linkReflector(NULL), m_random() { @@ -166,7 +166,7 @@ bool CDStarNetwork::writePoll(const char* text) buffer[4] = 0x0AU; // Poll with text - unsigned int length = ::strlen(text); + unsigned int length = (unsigned int)::strlen(text); // Include the nul at the end also ::memcpy(buffer + 5U, text, length + 1U); diff --git a/Defines.h b/Defines.h index a7075b9..ebd2f2b 100644 --- a/Defines.h +++ b/Defines.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015,2016,2017,2018,2020,2021 by Jonathan Naylor G4KLX + * Copyright (C) 2015,2016,2017,2018,2020,2021,2025 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 @@ -42,56 +42,56 @@ const unsigned char TAG_EOT = 0x03U; const unsigned int DSTAR_MODEM_DATA_LEN = 220U; -enum HW_TYPE { - HWT_MMDVM, - HWT_DVMEGA, - HWT_MMDVM_ZUMSPOT, - HWT_MMDVM_HS_HAT, - HWT_MMDVM_HS_DUAL_HAT, - HWT_NANO_HOTSPOT, - HWT_NANO_DV, - HWT_D2RG_MMDVM_HS, - HWT_MMDVM_HS, - HWT_OPENGD77_HS, - HWT_SKYBRIDGE, - HWT_UNKNOWN +enum class HW_TYPE { + MMDVM, + DVMEGA, + MMDVM_ZUMSPOT, + MMDVM_HS_HAT, + MMDVM_HS_DUAL_HAT, + NANO_HOTSPOT, + NANO_DV, + D2RG_MMDVM_HS, + MMDVM_HS, + OPENGD77_HS, + SKYBRIDGE, + UNKNOWN }; -enum RPT_RF_STATE { - RS_RF_LISTENING, - RS_RF_LATE_ENTRY, - RS_RF_AUDIO, - RS_RF_DATA_AUDIO, - RS_RF_DATA, - RS_RF_REJECTED, - RS_RF_INVALID +enum class RPT_RF_STATE { + LISTENING, + LATE_ENTRY, + AUDIO, + DATA_AUDIO, + DATA, + REJECTED, + INVALID }; -enum RPT_NET_STATE { - RS_NET_IDLE, - RS_NET_AUDIO, - RS_NET_DATA_AUDIO, - RS_NET_DATA +enum class RPT_NET_STATE { + IDLE, + AUDIO, + DATA_AUDIO, + DATA }; -enum DMR_BEACONS { - DMR_BEACONS_OFF, - DMR_BEACONS_NETWORK, - DMR_BEACONS_TIMED +enum class DMR_BEACONS { + OFF, + NETWORK, + TIMED }; -enum DMR_OVCM_TYPES { - DMR_OVCM_OFF, - DMR_OVCM_RX_ON, - DMR_OVCM_TX_ON, - DMR_OVCM_ON, - DMR_OVCM_FORCE_OFF +enum class DMR_OVCM { + OFF, + RX_ON, + TX_ON, + ON, + FORCE_OFF }; -enum DSTAR_ACK_MESSAGE { - DSTAR_ACK_BER, - DSTAR_ACK_RSSI, - DSTAR_ACK_SMETER +enum class DSTAR_ACK { + BER, + RSSI, + SMETER }; #endif diff --git a/FMNetwork.cpp b/FMNetwork.cpp index f649368..bd634ed 100644 --- a/FMNetwork.cpp +++ b/FMNetwork.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020,2021,2023,2024 by Jonathan Naylor G4KLX + * Copyright (C) 2020,2021,2023,2024,2025 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 @@ -35,7 +35,7 @@ const unsigned int BUFFER_LENGTH = 1500U; CFMNetwork::CFMNetwork(const std::string& callsign, const std::string& protocol, const std::string& localAddress, unsigned short localPort, const std::string& gatewayAddress, unsigned short gatewayPort, unsigned int sampleRate, const std::string& squelchFile, bool debug) : m_callsign(callsign), -m_protocol(FMNP_USRP), +m_protocol(FM_NETWORK_PROTOCOL::USRP), m_socket(localAddress, localPort), m_addr(), m_addrLen(0U), @@ -65,9 +65,9 @@ m_fp(NULL) m_callsign = callsign.substr(0U, pos); if (protocol == "RAW") - m_protocol = FMNP_RAW; + m_protocol = FM_NETWORK_PROTOCOL::RAW; else - m_protocol = FMNP_USRP; + m_protocol = FM_NETWORK_PROTOCOL::USRP; #if defined(HAS_SRC) m_resampler = ::src_new(SRC_SINC_FASTEST, 1, &m_error); @@ -90,7 +90,7 @@ bool CFMNetwork::open() LogMessage("Opening FM network connection"); - if (m_protocol == FMNP_RAW) { + if (m_protocol == FM_NETWORK_PROTOCOL::RAW) { if (!m_squelchFile.empty()) { m_fp = ::fopen(m_squelchFile.c_str(), "wb"); if (m_fp == NULL) { @@ -105,7 +105,7 @@ bool CFMNetwork::open() } #if !defined(HAS_SRC) - if ((m_protocol == FMNP_RAW) && (m_sampleRate != MMDVM_SAMPLERATE)) { + if ((m_protocol == FM_NETWORK_PROTOCOL::RAW) && (m_sampleRate != MMDVM_SAMPLERATE)) { LogError("The resampler needed for non-native sample rates has not been included"); return false; } @@ -119,9 +119,9 @@ bool CFMNetwork::writeData(const float* data, unsigned int nSamples) assert(data != NULL); assert(nSamples > 0U); - if (m_protocol == FMNP_USRP) + if (m_protocol == FM_NETWORK_PROTOCOL::USRP) return writeUSRPData(data, nSamples); - else if (m_protocol == FMNP_RAW) + else if (m_protocol == FM_NETWORK_PROTOCOL::RAW) return writeRawData(data, nSamples); else return false; @@ -264,7 +264,7 @@ bool CFMNetwork::writeRawData(const float* in, unsigned int nIn) bool CFMNetwork::writeEnd() { - if (m_protocol == FMNP_USRP) + if (m_protocol == FM_NETWORK_PROTOCOL::USRP) return writeUSRPEnd(); else return writeRawEnd(); @@ -366,13 +366,13 @@ void CFMNetwork::clock(unsigned int ms) return; // Check if the data is for us - if (m_protocol == FMNP_USRP) { - if (!CUDPSocket::match(addr, m_addr, IMT_ADDRESS_AND_PORT)) { + if (m_protocol == FM_NETWORK_PROTOCOL::USRP) { + if (!CUDPSocket::match(addr, m_addr, IPMATCHTYPE::IMT_ADDREAND_PORT)) { LogMessage("FM packet received from an invalid source"); return; } } else { - if (!CUDPSocket::match(addr, m_addr, IMT_ADDRESS_ONLY)) { + if (!CUDPSocket::match(addr, m_addr, IPMATCHTYPE::IMT_ADDREONLY)) { LogMessage("FM packet received from an invalid source"); return; } @@ -384,7 +384,7 @@ void CFMNetwork::clock(unsigned int ms) if (m_debug) CUtils::dump(1U, "FM Network Data Received", buffer, length); - if (m_protocol == FMNP_USRP) { + if (m_protocol == FM_NETWORK_PROTOCOL::USRP) { // Invalid packet type? if (::memcmp(buffer, "USRP", 4U) != 0) return; @@ -400,7 +400,7 @@ void CFMNetwork::clock(unsigned int ms) if (type == 0U) m_buffer.addData(buffer + 32U, length - 32U); - } else if (m_protocol == FMNP_RAW) { + } else if (m_protocol == FM_NETWORK_PROTOCOL::RAW) { m_buffer.addData(buffer, length); } } @@ -415,7 +415,7 @@ unsigned int CFMNetwork::readData(float* out, unsigned int nOut) return 0U; #if defined(HAS_SRC) - if ((m_protocol == FMNP_RAW) && (m_sampleRate != MMDVM_SAMPLERATE)) { + if ((m_protocol == RAW) && (m_sampleRate != MMDVM_SAMPLERATE)) { unsigned int nIn = (nOut * m_sampleRate) / MMDVM_SAMPLERATE; if (bytes < nIn) { diff --git a/FMNetwork.h b/FMNetwork.h index 60042cf..cd2cc4e 100644 --- a/FMNetwork.h +++ b/FMNetwork.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020,2021,2023,2024 by Jonathan Naylor G4KLX + * Copyright (C) 2020,2021,2023,2024,2025 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 @@ -29,9 +29,9 @@ #include #include -enum FM_NETWORK_PROTOCOL { - FMNP_USRP, - FMNP_RAW +enum class FM_NETWORK_PROTOCOL { + USRP, + RAW }; class CFMNetwork { diff --git a/LCDproc.cpp b/LCDproc.cpp index 7167eed..f9a336b 100644 --- a/LCDproc.cpp +++ b/LCDproc.cpp @@ -1,6 +1,6 @@ /* * Copyright (C) 2016,2017,2018 by Tony Corbett G0WFV - * Copyright (C) 2018,2020,2024 by Jonathan Naylor G4KLX + * Copyright (C) 2018,2020,2024,2025 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 @@ -78,7 +78,11 @@ #define BUFFER_MAX_LEN 128 +#if defined(_WIN32) || defined(_WIN64) +SOCKET m_socketfd; +#else int m_socketfd; +#endif char m_buffer[BUFFER_MAX_LEN]; fd_set m_readfds, m_writefds; struct timeval m_timeout; @@ -141,7 +145,7 @@ bool CLCDproc::open() LogError("LCDproc, cannot lookup server"); return false; } - memcpy(&serverAddress, res->ai_addr, addrlen = res->ai_addrlen); + memcpy(&serverAddress, res->ai_addr, addrlen = (unsigned int)res->ai_addrlen); freeaddrinfo(res); /* Lookup the client address (random port - need to specify manual port from ini file) */ @@ -671,7 +675,7 @@ void CLCDproc::clockInt(unsigned int ms) * exceptfds = we are not waiting for exception fds */ - if (select(m_socketfd + 1, &m_readfds, NULL, NULL, &m_timeout) == -1) { + if (select(int(m_socketfd) + 1, &m_readfds, NULL, NULL, &m_timeout) == -1) { LogError("LCDproc, error on select"); return; } @@ -767,7 +771,11 @@ void CLCDproc::close() { } +#if defined(_WIN32) || defined(_WIN64) +int CLCDproc::socketPrintf(SOCKET fd, const char* format, ...) +#else int CLCDproc::socketPrintf(int fd, const char *format, ...) +#endif { char buf[BUFFER_MAX_LEN]; va_list ap; @@ -790,7 +798,7 @@ int CLCDproc::socketPrintf(int fd, const char *format, ...) m_timeout.tv_sec = 0; m_timeout.tv_usec = 0; - if (select(m_socketfd + 1, NULL, &m_writefds, NULL, &m_timeout) == -1) + if (select(int(m_socketfd) + 1, NULL, &m_writefds, NULL, &m_timeout) == -1) LogError("LCDproc, error on select"); if (FD_ISSET(m_socketfd, &m_writefds)) { diff --git a/LCDproc.h b/LCDproc.h index b702493..38fb369 100644 --- a/LCDproc.h +++ b/LCDproc.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2016,2017 by Tony Corbett G0WFV - * Copyright (C) 2018,2020 by Jonathan Naylor G4KLX + * Copyright (C) 2018,2020,2025 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 @@ -25,6 +25,11 @@ #include +#if defined(_WIN32) || defined(_WIN64) +#include +#include +#endif + class CLCDproc : public CDisplay { public: @@ -89,7 +94,11 @@ private: unsigned int m_rssiCount1; unsigned int m_rssiCount2; +#if defined(_WIN32) || defined(_WIN64) + int socketPrintf(SOCKET fd, const char* format, ...); +#else int socketPrintf(int fd, const char *format, ...); +#endif void defineScreens(); }; diff --git a/Log.cpp b/Log.cpp index 752601e..6a444d7 100644 --- a/Log.cpp +++ b/Log.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015,2016,2020 by Jonathan Naylor G4KLX + * Copyright (C) 2015,2016,2020,2025 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 @@ -167,7 +167,7 @@ void Log(unsigned int level, const char* fmt, ...) va_list vl; va_start(vl, fmt); - ::vsnprintf(buffer + ::strlen(buffer), 500, fmt, vl); + ::vsnprintf(buffer + ::strlen(buffer), 500 - ::strlen(buffer), fmt, vl); va_end(vl); diff --git a/M17Control.cpp b/M17Control.cpp index 070f5ba..5b86f1c 100644 --- a/M17Control.cpp +++ b/M17Control.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020,2021,2023 Jonathan Naylor, G4KLX + * Copyright (C) 2020,2021,2023,2025 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 @@ -68,8 +68,8 @@ m_duplex(duplex), m_queue(5000U, "M17 Control"), m_source(), m_dest(), -m_rfState(RS_RF_LISTENING), -m_netState(RS_NET_IDLE), +m_rfState(RPT_RF_STATE::LISTENING), +m_netState(RPT_NET_STATE::IDLE), m_rfTimeoutTimer(1000U, timeout), m_netTimeoutTimer(1000U, timeout), m_networkWatchdog(1000U, 0U, 1500U), @@ -121,7 +121,7 @@ bool CM17Control::writeModem(unsigned char* data, unsigned int len) unsigned char type = data[0U]; - if (type == TAG_LOST && (m_rfState == RS_RF_AUDIO || m_rfState == RS_RF_DATA_AUDIO)) { + if (type == TAG_LOST && (m_rfState == RPT_RF_STATE::AUDIO || m_rfState == RPT_RF_STATE::DATA_AUDIO)) { if (m_rssi != 0U) LogMessage("M17, transmission lost from %s to %s, %.1f seconds, BER: %.1f%%, RSSI: -%u/-%u/-%u dBm", m_source.c_str(), m_dest.c_str(), float(m_rfFrames) / 25.0F, float(m_rfErrs * 100U) / float(m_rfBits), m_minRSSI, m_maxRSSI, m_aveRSSI / m_rssiCount); else @@ -130,18 +130,18 @@ bool CM17Control::writeModem(unsigned char* data, unsigned int len) return false; } - if (type == TAG_LOST && m_rfState == RS_RF_DATA) { + if ((type == TAG_LOST) && (m_rfState == RPT_RF_STATE::DATA)) { writeEndRF(); return false; } - if (type == TAG_LOST && m_rfState == RS_RF_REJECTED) { + if ((type == TAG_LOST) && (m_rfState == RPT_RF_STATE::REJECTED)) { writeEndRF(); return false; } if (type == TAG_LOST) { - m_rfState = RS_RF_LISTENING; + m_rfState = RPT_RF_STATE::LISTENING; return false; } @@ -172,7 +172,7 @@ bool CM17Control::writeModem(unsigned char* data, unsigned int len) decorrelator(data + 2U, temp); interleaver(temp, data + 2U); - if (m_rfState == RS_RF_LISTENING && data[0U] == TAG_HEADER) { + if ((m_rfState == RPT_RF_STATE::LISTENING) && (data[0U] == TAG_HEADER)) { m_rfCurrentRFLSF.reset(); m_rfCurrentNetLSF.reset(); @@ -212,18 +212,18 @@ bool CM17Control::writeModem(unsigned char* data, unsigned int len) #endif return true; } else { - m_rfState = RS_RF_LATE_ENTRY; + m_rfState = RPT_RF_STATE::LATE_ENTRY; return false; } } - if (m_rfState == RS_RF_LISTENING && data[0U] == TAG_DATA) { - m_rfState = RS_RF_LATE_ENTRY; + if ((m_rfState == RPT_RF_STATE::LISTENING) && (data[0U] == TAG_DATA)) { + m_rfState = RPT_RF_STATE::LATE_ENTRY; m_rfCurrentRFLSF.reset(); m_rfCurrentNetLSF.reset(); } - if (m_rfState == RS_RF_LATE_ENTRY && data[0U] == TAG_DATA) { + if ((m_rfState == RPT_RF_STATE::LATE_ENTRY) && (data[0U] == TAG_DATA)) { unsigned int lich1, lich2, lich3, lich4; bool valid1 = CGolay24128::decode24128(data + 2U + M17_SYNC_LENGTH_BYTES + 0U, lich1); bool valid2 = CGolay24128::decode24128(data + 2U + M17_SYNC_LENGTH_BYTES + 3U, lich2); @@ -270,7 +270,7 @@ bool CM17Control::writeModem(unsigned char* data, unsigned int len) } } - if ((m_rfState == RS_RF_AUDIO || m_rfState == RS_RF_DATA_AUDIO) && data[0U] == TAG_DATA) { + if (((m_rfState == RPT_RF_STATE::AUDIO) || (m_rfState == RPT_RF_STATE::DATA_AUDIO)) && (data[0U] == TAG_DATA)) { #if defined(DUMP_M17) writeFile(data + 2U); #endif @@ -419,7 +419,7 @@ bool CM17Control::writeModem(unsigned char* data, unsigned int len) return true; } - if ((m_rfState == RS_RF_AUDIO || m_rfState == RS_RF_DATA_AUDIO) && data[0U] == TAG_EOT) { + if (((m_rfState == RPT_RF_STATE::AUDIO) || (m_rfState == RPT_RF_STATE::DATA_AUDIO)) && (data[0U] == TAG_EOT)) { #if defined(DUMP_M17) writeFile(data + 2U); #endif @@ -445,10 +445,10 @@ bool CM17Control::writeModem(unsigned char* data, unsigned int len) netData[M17_LSF_LENGTH_BYTES - M17_CRC_LENGTH_BYTES + 0U] = 0x80U; netData[M17_LSF_LENGTH_BYTES - M17_CRC_LENGTH_BYTES + 1U] = 0x00U; - if (m_rfState == RS_RF_AUDIO) { + if (m_rfState == RPT_RF_STATE::AUDIO) { ::memcpy(netData + M17_LSF_LENGTH_BYTES - M17_CRC_LENGTH_BYTES + M17_FN_LENGTH_BYTES + 0U, M17_3200_SILENCE, 8U); ::memcpy(netData + M17_LSF_LENGTH_BYTES - M17_CRC_LENGTH_BYTES + M17_FN_LENGTH_BYTES + 8U, M17_3200_SILENCE, 8U); - } else if (m_rfState == RS_RF_DATA_AUDIO) { + } else if (m_rfState == RPT_RF_STATE::DATA_AUDIO) { ::memcpy(netData + M17_LSF_LENGTH_BYTES - M17_CRC_LENGTH_BYTES + M17_FN_LENGTH_BYTES + 0U, M17_1600_SILENCE, 8U); ::memset(netData + M17_LSF_LENGTH_BYTES - M17_CRC_LENGTH_BYTES + M17_FN_LENGTH_BYTES + 8U, 0x00U, 8U); } else { @@ -490,7 +490,7 @@ unsigned int CM17Control::readModem(unsigned char* data) void CM17Control::writeEndRF() { - m_rfState = RS_RF_LISTENING; + m_rfState = RPT_RF_STATE::LISTENING; m_rfTimeoutTimer.stop(); @@ -502,7 +502,7 @@ void CM17Control::writeEndRF() m_rfCollectingLSF.reset(); m_rfCollectedLSF.reset(); - if (m_netState == RS_NET_IDLE) { + if (m_netState == RPT_NET_STATE::IDLE) { m_display->clearM17(); if (m_network != NULL) @@ -516,7 +516,7 @@ void CM17Control::writeEndRF() void CM17Control::writeEndNet() { - m_netState = RS_NET_IDLE; + m_netState = RPT_NET_STATE::IDLE; m_netTimeoutTimer.stop(); m_networkWatchdog.stop(); @@ -542,7 +542,7 @@ void CM17Control::writeNetwork() if (!m_enabled) return; - if (m_rfState != RS_RF_LISTENING && m_rfState != RS_RF_LATE_ENTRY && m_netState == RS_NET_IDLE) { + if ((m_rfState != RPT_RF_STATE::LISTENING) && (m_rfState != RPT_RF_STATE::LATE_ENTRY) && (m_netState == RPT_NET_STATE::IDLE)) { m_network->reset(); return; } @@ -560,7 +560,7 @@ void CM17Control::writeNetwork() } } - if (m_netState == RS_NET_IDLE) { + if (m_netState == RPT_NET_STATE::IDLE) { m_netLSF.setNetwork(netData); m_source = m_netLSF.getSource(); @@ -573,15 +573,15 @@ void CM17Control::writeNetwork() switch (dataType) { case M17_DATA_TYPE_DATA: LogMessage("M17, received network data transmission from %s to %s", m_source.c_str(), m_dest.c_str()); - m_netState = RS_NET_DATA; + m_netState = RPT_NET_STATE::DATA; break; case M17_DATA_TYPE_VOICE: LogMessage("M17, received network voice transmission from %s to %s", m_source.c_str(), m_dest.c_str()); - m_netState = RS_NET_AUDIO; + m_netState = RPT_NET_STATE::AUDIO; break; case M17_DATA_TYPE_VOICE_DATA: LogMessage("M17, received network voice + data transmission from %s to %s", m_source.c_str(), m_dest.c_str()); - m_netState = RS_NET_DATA_AUDIO; + m_netState = RPT_NET_STATE::DATA_AUDIO; break; default: LogMessage("M17, received network unknown transmission from %s to %s", m_source.c_str(), m_dest.c_str()); @@ -621,7 +621,7 @@ void CM17Control::writeNetwork() writeQueueNet(start); } - if (m_netState == RS_NET_AUDIO || m_netState == RS_NET_DATA_AUDIO) { + if ((m_netState == RPT_NET_STATE::AUDIO) || (m_netState == RPT_NET_STATE::DATA_AUDIO)) { // Refresh the LSF every six frames in case the META field changes if (m_netLSFn == 0U) { m_netLSF.setNetwork(netData); @@ -751,7 +751,7 @@ bool CM17Control::processRFHeader(bool lateEntry) unsigned char type = m_rfCurrentNetLSF.getEncryptionType(); if (type != M17_ENCRYPTION_TYPE_NONE) { LogMessage("M17, access attempt with encryption from %s to %s", m_source.c_str(), m_dest.c_str()); - m_rfState = RS_RF_REJECTED; + m_rfState = RPT_RF_STATE::REJECTED; return true; } } @@ -760,7 +760,7 @@ bool CM17Control::processRFHeader(bool lateEntry) bool ret = checkCallsign(m_source); if (!ret) { LogMessage("M17, invalid access attempt from %s to %s", m_source.c_str(), m_dest.c_str()); - m_rfState = RS_RF_REJECTED; + m_rfState = RPT_RF_STATE::REJECTED; return true; } } @@ -769,15 +769,15 @@ bool CM17Control::processRFHeader(bool lateEntry) switch (dataType) { case M17_DATA_TYPE_DATA: LogMessage("M17, received RF%sdata transmission from %s to %s", lateEntry ? " late entry " : " ", m_source.c_str(), m_dest.c_str()); - m_rfState = RS_RF_DATA; + m_rfState = RPT_RF_STATE::DATA; break; case M17_DATA_TYPE_VOICE: LogMessage("M17, received RF%svoice transmission from %s to %s", lateEntry ? " late entry " : " ", m_source.c_str(), m_dest.c_str()); - m_rfState = RS_RF_AUDIO; + m_rfState = RPT_RF_STATE::AUDIO; break; case M17_DATA_TYPE_VOICE_DATA: LogMessage("M17, received RF%svoice + data transmission from %s to %s", lateEntry ? " late entry " : " ", m_source.c_str(), m_dest.c_str()); - m_rfState = RS_RF_DATA_AUDIO; + m_rfState = RPT_RF_STATE::DATA_AUDIO; break; default: return false; @@ -841,7 +841,7 @@ void CM17Control::clock(unsigned int ms) m_rfTimeoutTimer.clock(ms); m_netTimeoutTimer.clock(ms); - if (m_netState == RS_NET_AUDIO || m_netState == RS_NET_DATA_AUDIO) { + if ((m_netState == RPT_NET_STATE::AUDIO) || (m_netState == RPT_NET_STATE::DATA_AUDIO)) { m_networkWatchdog.clock(ms); if (m_networkWatchdog.hasExpired()) { @@ -855,7 +855,7 @@ void CM17Control::writeQueueRF(const unsigned char *data) { assert(data != NULL); - if (m_netState != RS_NET_IDLE) + if (m_netState != RPT_NET_STATE::IDLE) return; if (m_rfTimeoutTimer.isRunning() && m_rfTimeoutTimer.hasExpired()) @@ -966,7 +966,7 @@ void CM17Control::closeFile() bool CM17Control::isBusy() const { - return m_rfState != RS_RF_LISTENING || m_netState != RS_NET_IDLE; + return (m_rfState != RPT_RF_STATE::LISTENING) || (m_netState != RPT_NET_STATE::IDLE); } void CM17Control::enable(bool enabled) @@ -975,12 +975,12 @@ void CM17Control::enable(bool enabled) m_queue.clear(); // Reset the RF section - m_rfState = RS_RF_LISTENING; + m_rfState = RPT_RF_STATE::LISTENING; m_rfTimeoutTimer.stop(); // Reset the networking section - m_netState = RS_NET_IDLE; + m_netState = RPT_NET_STATE::IDLE; m_netTimeoutTimer.stop(); m_networkWatchdog.stop(); diff --git a/MMDVMHost.cpp b/MMDVMHost.cpp index f420281..a952cfc 100644 --- a/MMDVMHost.cpp +++ b/MMDVMHost.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015-2021,2023,2024 by Jonathan Naylor G4KLX + * Copyright (C) 2015-2021,2023,2024,2025 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 @@ -70,7 +70,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-2024 by Jonathan Naylor, G4KLX and others"; +const char* HEADER4 = "Copyright(C) 2015-2025 by Jonathan Naylor, G4KLX and others"; int main(int argc, char** argv) { @@ -497,7 +497,7 @@ int CMMDVMHost::run() std::vector whiteList = m_conf.getDStarWhiteList(); bool ackReply = m_conf.getDStarAckReply(); unsigned int ackTime = m_conf.getDStarAckTime(); - DSTAR_ACK_MESSAGE ackMessage = m_conf.getDStarAckMessage(); + DSTAR_ACK ackMessage = m_conf.getDStarAckMessage(); bool errorReply = m_conf.getDStarErrorReply(); bool remoteGateway = m_conf.getDStarRemoteGateway(); m_dstarRFModeHang = m_conf.getDStarModeHang(); @@ -506,7 +506,7 @@ int CMMDVMHost::run() LogInfo(" Module: %s", module.c_str()); LogInfo(" Self Only: %s", selfOnly ? "yes" : "no"); LogInfo(" Ack Reply: %s", ackReply ? "yes" : "no"); - LogInfo(" Ack message: %s", ackMessage == DSTAR_ACK_RSSI? "RSSI" : (ackMessage == DSTAR_ACK_SMETER ? "SMETER" : "BER")); + LogInfo(" Ack message: %s", ackMessage == DSTAR_ACK::RSSI? "RSSI" : (ackMessage == DSTAR_ACK::SMETER ? "SMETER" : "BER")); LogInfo(" Ack Time: %ums", ackTime); LogInfo(" Error Reply: %s", errorReply ? "yes" : "no"); LogInfo(" Remote Gateway: %s", remoteGateway ? "yes" : "no"); @@ -520,7 +520,7 @@ int CMMDVMHost::run() m_dstar = new CDStarControl(m_callsign, module, selfOnly, ackReply, ackTime, ackMessage, errorReply, blackList, whiteList, m_dstarNetwork, m_display, m_timeout, m_duplex, remoteGateway, rssi); } - DMR_BEACONS dmrBeacons = DMR_BEACONS_OFF; + DMR_BEACONS dmrBeacons = DMR_BEACONS::OFF; CTimer dmrBeaconIntervalTimer(1000U); CTimer dmrBeaconDurationTimer(1000U); @@ -540,7 +540,7 @@ int CMMDVMHost::run() unsigned int jitter = m_conf.getDMRNetworkJitter(); m_dmrRFModeHang = m_conf.getDMRModeHang(); dmrBeacons = m_conf.getDMRBeacons(); - DMR_OVCM_TYPES ovcm = m_conf.getDMROVCM(); + DMR_OVCM ovcm = m_conf.getDMROVCM(); bool protect = m_conf.getDMRProtect(); if (txHang > m_dmrRFModeHang) @@ -574,22 +574,22 @@ int CMMDVMHost::run() LogInfo(" Call Hang: %us", callHang); LogInfo(" TX Hang: %us", txHang); LogInfo(" Mode Hang: %us", m_dmrRFModeHang); - if (ovcm == DMR_OVCM_OFF) + if (ovcm == DMR_OVCM::OFF) LogInfo(" OVCM: off"); - else if (ovcm == DMR_OVCM_RX_ON) + else if (ovcm == DMR_OVCM::RX_ON) LogInfo(" OVCM: on(rx only)"); - else if (ovcm == DMR_OVCM_TX_ON) + else if (ovcm == DMR_OVCM::TX_ON) LogInfo(" OVCM: on(tx only)"); - else if (ovcm == DMR_OVCM_ON) + else if (ovcm == DMR_OVCM::ON) LogInfo(" OVCM: on"); - else if (ovcm == DMR_OVCM_FORCE_OFF) + else if (ovcm == DMR_OVCM::FORCE_OFF) LogInfo(" OVCM: off (forced)"); if (protect) LogInfo(" Protect: yes"); switch (dmrBeacons) { - case DMR_BEACONS_NETWORK: { + case DMR_BEACONS::NETWORK: { unsigned int dmrBeaconDuration = m_conf.getDMRBeaconDuration(); LogInfo(" DMR Roaming Beacons Type: network"); @@ -598,7 +598,7 @@ int CMMDVMHost::run() dmrBeaconDurationTimer.setTimeout(dmrBeaconDuration); } break; - case DMR_BEACONS_TIMED: { + case DMR_BEACONS::TIMED: { unsigned int dmrBeaconInterval = m_conf.getDMRBeaconInterval(); unsigned int dmrBeaconDuration = m_conf.getDMRBeaconDuration(); @@ -1253,7 +1253,7 @@ int CMMDVMHost::run() } switch (dmrBeacons) { - case DMR_BEACONS_TIMED: + case DMR_BEACONS::TIMED: dmrBeaconIntervalTimer.clock(ms); if (dmrBeaconIntervalTimer.isRunning() && dmrBeaconIntervalTimer.hasExpired()) { if ((m_mode == MODE_IDLE || m_mode == MODE_DMR) && !m_modem->hasTX()) { @@ -1266,7 +1266,7 @@ int CMMDVMHost::run() } } break; - case DMR_BEACONS_NETWORK: + case DMR_BEACONS::NETWORK: if (m_dmrNetwork != NULL) { bool beacon = m_dmrNetwork->wantsBeacon(); if (beacon) { @@ -2544,131 +2544,131 @@ void CMMDVMHost::remoteControl() REMOTE_COMMAND command = m_remoteControl->getCommand(); switch (command) { - case RCD_MODE_IDLE: + case REMOTE_COMMAND::MODE_IDLE: m_fixedMode = false; setMode(MODE_IDLE); break; - case RCD_MODE_LOCKOUT: + case REMOTE_COMMAND::MODE_LOCKOUT: m_fixedMode = false; setMode(MODE_LOCKOUT); break; - case RCD_MODE_DSTAR: + case REMOTE_COMMAND::MODE_DSTAR: if (m_dstar != NULL) processModeCommand(MODE_DSTAR, m_dstarRFModeHang); break; - case RCD_MODE_DMR: + case REMOTE_COMMAND::MODE_DMR: if (m_dmr != NULL) processModeCommand(MODE_DMR, m_dmrRFModeHang); break; - case RCD_MODE_YSF: + case REMOTE_COMMAND::MODE_YSF: if (m_ysf != NULL) processModeCommand(MODE_YSF, m_ysfRFModeHang); break; - case RCD_MODE_P25: + case REMOTE_COMMAND::MODE_P25: if (m_p25 != NULL) processModeCommand(MODE_P25, m_p25RFModeHang); break; - case RCD_MODE_NXDN: + case REMOTE_COMMAND::MODE_NXDN: if (m_nxdn != NULL) processModeCommand(MODE_NXDN, m_nxdnRFModeHang); break; - case RCD_MODE_M17: + case REMOTE_COMMAND::MODE_M17: if (m_m17 != NULL) processModeCommand(MODE_M17, m_m17RFModeHang); break; - case RCD_MODE_FM: + case REMOTE_COMMAND::MODE_FM: if (m_fmEnabled) processModeCommand(MODE_FM, 0); break; - case RCD_ENABLE_DSTAR: + case REMOTE_COMMAND::ENABLE_DSTAR: if (m_dstar != NULL && !m_dstarEnabled) processEnableCommand(m_dstarEnabled, true); if (m_dstarNetwork != NULL) m_dstarNetwork->enable(true); break; - case RCD_ENABLE_DMR: + case REMOTE_COMMAND::ENABLE_DMR: if (m_dmr != NULL && !m_dmrEnabled) processEnableCommand(m_dmrEnabled, true); if (m_dmrNetwork != NULL) m_dmrNetwork->enable(true); break; - case RCD_ENABLE_YSF: + case REMOTE_COMMAND::ENABLE_YSF: if (m_ysf != NULL && !m_ysfEnabled) processEnableCommand(m_ysfEnabled, true); if (m_ysfNetwork != NULL) m_ysfNetwork->enable(true); break; - case RCD_ENABLE_P25: + case REMOTE_COMMAND::ENABLE_P25: if (m_p25 != NULL && !m_p25Enabled) processEnableCommand(m_p25Enabled, true); if (m_p25Network != NULL) m_p25Network->enable(true); break; - case RCD_ENABLE_NXDN: + case REMOTE_COMMAND::ENABLE_NXDN: if (m_nxdn != NULL && !m_nxdnEnabled) processEnableCommand(m_nxdnEnabled, true); if (m_nxdnNetwork != NULL) m_nxdnNetwork->enable(true); break; - case RCD_ENABLE_M17: + case REMOTE_COMMAND::ENABLE_M17: if (m_m17 != NULL && !m_m17Enabled) processEnableCommand(m_m17Enabled, true); if (m_m17Network != NULL) m_m17Network->enable(true); break; - case RCD_ENABLE_FM: + case REMOTE_COMMAND::ENABLE_FM: if (!m_fmEnabled) processEnableCommand(m_fmEnabled, true); break; - case RCD_ENABLE_AX25: + case REMOTE_COMMAND::ENABLE_AX25: if (!m_ax25Enabled) processEnableCommand(m_ax25Enabled, true); break; - case RCD_DISABLE_DSTAR: + case REMOTE_COMMAND::DISABLE_DSTAR: if (m_dstar != NULL && m_dstarEnabled) processEnableCommand(m_dstarEnabled, false); if (m_dstarNetwork != NULL) m_dstarNetwork->enable(false); break; - case RCD_DISABLE_DMR: + case REMOTE_COMMAND::DISABLE_DMR: if (m_dmr != NULL && m_dmrEnabled) processEnableCommand(m_dmrEnabled, false); if (m_dmrNetwork != NULL) m_dmrNetwork->enable(false); break; - case RCD_DISABLE_YSF: + case REMOTE_COMMAND::DISABLE_YSF: if (m_ysf != NULL && m_ysfEnabled) processEnableCommand(m_ysfEnabled, false); if (m_ysfNetwork != NULL) m_ysfNetwork->enable(false); break; - case RCD_DISABLE_P25: + case REMOTE_COMMAND::DISABLE_P25: if (m_p25 != NULL && m_p25Enabled) processEnableCommand(m_p25Enabled, false); if (m_p25Network != NULL) m_p25Network->enable(false); break; - case RCD_DISABLE_NXDN: + case REMOTE_COMMAND::DISABLE_NXDN: if (m_nxdn != NULL && m_nxdnEnabled) processEnableCommand(m_nxdnEnabled, false); if (m_nxdnNetwork != NULL) m_nxdnNetwork->enable(false); break; - case RCD_DISABLE_M17: + case REMOTE_COMMAND::DISABLE_M17: if (m_m17 != NULL && m_m17Enabled) processEnableCommand(m_m17Enabled, false); if (m_m17Network != NULL) m_m17Network->enable(false); break; - case RCD_DISABLE_FM: + case REMOTE_COMMAND::DISABLE_FM: if (m_fmEnabled) processEnableCommand(m_fmEnabled, false); break; - case RCD_DISABLE_AX25: + case REMOTE_COMMAND::DISABLE_AX25: if (m_ax25Enabled == true) processEnableCommand(m_ax25Enabled, false); break; - case RCD_PAGE: + case REMOTE_COMMAND::PAGE: if (m_pocsag != NULL) { unsigned int ric = m_remoteControl->getArgUInt(0U); std::string text; @@ -2680,7 +2680,7 @@ void CMMDVMHost::remoteControl() m_pocsag->sendPage(ric, text); } break; - case RCD_PAGE_BCD: + case REMOTE_COMMAND::PAGE_BCD: if (m_pocsag != NULL) { unsigned int ric = m_remoteControl->getArgUInt(0U); std::string text; @@ -2692,13 +2692,13 @@ void CMMDVMHost::remoteControl() m_pocsag->sendPageBCD(ric, text); } break; - case RCD_PAGE_A1: + case REMOTE_COMMAND::PAGE_A1: if (m_pocsag != NULL) { unsigned int ric = m_remoteControl->getArgUInt(0U); m_pocsag->sendPageAlert1(ric); } break; - case RCD_PAGE_A2: + case REMOTE_COMMAND::PAGE_A2: if (m_pocsag != NULL) { unsigned int ric = m_remoteControl->getArgUInt(0U); std::string text; @@ -2710,7 +2710,7 @@ void CMMDVMHost::remoteControl() m_pocsag->sendPageAlert2(ric, text); } break; - case RCD_CW: + case REMOTE_COMMAND::CW: setMode(MODE_IDLE); // Force the modem to go idle so that we can send the CW text. if (!m_modem->hasTX()) { std::string cwtext; @@ -2723,7 +2723,7 @@ void CMMDVMHost::remoteControl() m_modem->sendCWId(cwtext); } break; - case RCD_RELOAD: + case REMOTE_COMMAND::RELOAD: m_reload = true; break; default: @@ -2785,11 +2785,11 @@ void CMMDVMHost::buildNetworkHostsString(std::string &str) m_dstarNetwork->getStatus(status, &ref[0]); switch (status) { - case LINK_STATUS::LS_LINKED_LOOPBACK: - case LINK_STATUS::LS_LINKED_DEXTRA: - case LINK_STATUS::LS_LINKED_DPLUS: - case LINK_STATUS::LS_LINKED_DCS: - case LINK_STATUS::LS_LINKED_CCS: + case LINK_STATUS::LINKED_LOOPBACK: + case LINK_STATUS::LINKED_DEXTRA: + case LINK_STATUS::LINKED_DPLUS: + case LINK_STATUS::LINKED_DCS: + case LINK_STATUS::LINKED_CCS: dstarReflector = std::string((char *)ref); break; diff --git a/Modem.cpp b/Modem.cpp index d88162e..e16054d 100644 --- a/Modem.cpp +++ b/Modem.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2018,2020,2021 by Jonathan Naylor G4KLX + * Copyright (C) 2011-2018,2020,2021,2025 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 @@ -169,7 +169,7 @@ m_port(NULL), m_buffer(NULL), m_length(0U), m_offset(0U), -m_state(SS_START), +m_state(SERIAL_STATE::START), m_type(0U), m_rxDStarData(1000U, "Modem RX D-Star"), m_txDStarData(1000U, "Modem TX D-Star"), @@ -213,7 +213,7 @@ m_cd(false), m_lockout(false), m_error(false), m_mode(MODE_IDLE), -m_hwType(HWT_UNKNOWN), +m_hwType(HW_TYPE::UNKNOWN), m_ax25RXTwist(0), m_ax25TXDelay(300U), m_ax25SlotTime(30U), @@ -455,12 +455,12 @@ void CModem::clock(unsigned int ms) RESP_TYPE_MMDVM type = getResponse(); - if (type == RTM_TIMEOUT) { + if (type == RESP_TYPE_MMDVM::TIMEOUT) { // Nothing to do - } else if (type == RTM_ERROR) { + } else if (type == RESP_TYPE_MMDVM::ERR) { // Nothing to do } else { - // type == RTM_OK + // type == OK switch (m_type) { case MMDVM_DSTAR_HEADER: { if (m_trace) @@ -1996,31 +1996,31 @@ bool CModem::readVersion() for (unsigned int count = 0U; count < MAX_RESPONSES; count++) { CThread::sleep(10U); RESP_TYPE_MMDVM resp = getResponse(); - if (resp == RTM_OK && m_buffer[2U] == MMDVM_GET_VERSION) { + if ((resp == RESP_TYPE_MMDVM::OK) && (m_buffer[2U] == MMDVM_GET_VERSION)) { if (::memcmp(m_buffer + 4U, "MMDVM ", 6U) == 0) - m_hwType = HWT_MMDVM; + m_hwType = HW_TYPE::MMDVM; else if (::memcmp(m_buffer + 23U, "MMDVM ", 6U) == 0) - m_hwType = HWT_MMDVM; + m_hwType = HW_TYPE::MMDVM; else if (::memcmp(m_buffer + 4U, "DVMEGA", 6U) == 0) - m_hwType = HWT_DVMEGA; + m_hwType = HW_TYPE::DVMEGA; else if (::memcmp(m_buffer + 4U, "ZUMspot", 7U) == 0) - m_hwType = HWT_MMDVM_ZUMSPOT; + m_hwType = HW_TYPE::MMDVM_ZUMSPOT; else if (::memcmp(m_buffer + 4U, "MMDVM_HS_Hat", 12U) == 0) - m_hwType = HWT_MMDVM_HS_HAT; + m_hwType = HW_TYPE::MMDVM_HS_HAT; else if (::memcmp(m_buffer + 4U, "MMDVM_HS_Dual_Hat", 17U) == 0) - m_hwType = HWT_MMDVM_HS_DUAL_HAT; + m_hwType = HW_TYPE::MMDVM_HS_DUAL_HAT; else if (::memcmp(m_buffer + 4U, "Nano_hotSPOT", 12U) == 0) - m_hwType = HWT_NANO_HOTSPOT; + m_hwType = HW_TYPE::NANO_HOTSPOT; else if (::memcmp(m_buffer + 4U, "Nano_DV", 7U) == 0) - m_hwType = HWT_NANO_DV; + m_hwType = HW_TYPE::NANO_DV; else if (::memcmp(m_buffer + 4U, "D2RG_MMDVM_HS", 13U) == 0) - m_hwType = HWT_D2RG_MMDVM_HS; + m_hwType = HW_TYPE::D2RG_MMDVM_HS; else if (::memcmp(m_buffer + 4U, "MMDVM_HS-", 9U) == 0) - m_hwType = HWT_MMDVM_HS; + m_hwType = HW_TYPE::MMDVM_HS; else if (::memcmp(m_buffer + 4U, "OpenGD77_HS", 11U) == 0) - m_hwType = HWT_OPENGD77_HS; + m_hwType = HW_TYPE::OPENGD77_HS; else if (::memcmp(m_buffer + 4U, "SkyBridge", 9U) == 0) - m_hwType = HWT_SKYBRIDGE; + m_hwType = HW_TYPE::SKYBRIDGE; m_protocolVersion = m_buffer[3U]; @@ -2210,18 +2210,18 @@ bool CModem::setConfig1() CThread::sleep(10U); resp = getResponse(); - if (resp == RTM_OK && m_buffer[2U] != MMDVM_ACK && m_buffer[2U] != MMDVM_NAK) { + if ((resp == RESP_TYPE_MMDVM::OK) && (m_buffer[2U] != MMDVM_ACK) && (m_buffer[2U] != MMDVM_NAK)) { count++; if (count >= MAX_RESPONSES) { LogError("The MMDVM is not responding to the SET_CONFIG command"); return false; } } - } while (resp == RTM_OK && m_buffer[2U] != MMDVM_ACK && m_buffer[2U] != MMDVM_NAK); + } while ((resp == RESP_TYPE_MMDVM::OK) && (m_buffer[2U] != MMDVM_ACK) && (m_buffer[2U] != MMDVM_NAK)); // CUtils::dump(1U, "Response", m_buffer, m_length); - if (resp == RTM_OK && m_buffer[2U] == MMDVM_NAK) { + if ((resp == RESP_TYPE_MMDVM::OK) && (m_buffer[2U] == MMDVM_NAK)) { LogError("Received a NAK to the SET_CONFIG command from the modem"); return false; } @@ -2336,18 +2336,18 @@ bool CModem::setConfig2() CThread::sleep(10U); resp = getResponse(); - if (resp == RTM_OK && m_buffer[2U] != MMDVM_ACK && m_buffer[2U] != MMDVM_NAK) { + if ((resp == RESP_TYPE_MMDVM::OK) && (m_buffer[2U] != MMDVM_ACK) && (m_buffer[2U] != MMDVM_NAK)) { count++; if (count >= MAX_RESPONSES) { LogError("The MMDVM is not responding to the SET_CONFIG command"); return false; } } - } while (resp == RTM_OK && m_buffer[2U] != MMDVM_ACK && m_buffer[2U] != MMDVM_NAK); + } while ((resp == RESP_TYPE_MMDVM::OK) && (m_buffer[2U] != MMDVM_ACK) && (m_buffer[2U] != MMDVM_NAK)); // CUtils::dump(1U, "Response", m_buffer, m_length); - if (resp == RTM_OK && m_buffer[2U] == MMDVM_NAK) { + if ((resp == RESP_TYPE_MMDVM::OK) && (m_buffer[2U] == MMDVM_NAK)) { LogError("Received a NAK to the SET_CONFIG command from the modem"); return false; } @@ -2368,7 +2368,7 @@ bool CModem::setFrequency() if (m_pocsagEnabled) pocsagFrequency = m_pocsagFrequency; - if (m_hwType == HWT_DVMEGA) + if (m_hwType == HW_TYPE::DVMEGA) len = 12U; else { buffer[12U] = (unsigned char)(m_rfLevel * 2.55F + 0.5F); @@ -2411,18 +2411,18 @@ bool CModem::setFrequency() CThread::sleep(10U); resp = getResponse(); - if (resp == RTM_OK && m_buffer[2U] != MMDVM_ACK && m_buffer[2U] != MMDVM_NAK) { + if ((resp == RESP_TYPE_MMDVM::OK) && (m_buffer[2U] != MMDVM_ACK) && (m_buffer[2U] != MMDVM_NAK)) { count++; if (count >= MAX_RESPONSES) { LogError("The MMDVM is not responding to the SET_FREQ command"); return false; } } - } while (resp == RTM_OK && m_buffer[2U] != MMDVM_ACK && m_buffer[2U] != MMDVM_NAK); + } while ((resp == RESP_TYPE_MMDVM::OK) && (m_buffer[2U] != MMDVM_ACK) && (m_buffer[2U] != MMDVM_NAK)); // CUtils::dump(1U, "Response", m_buffer, m_length); - if (resp == RTM_OK && m_buffer[2U] == MMDVM_NAK) { + if ((resp == RESP_TYPE_MMDVM::OK) && (m_buffer[2U] == MMDVM_NAK)) { LogError("Received a NAK to the SET_FREQ command from the modem"); return false; } @@ -2434,90 +2434,90 @@ RESP_TYPE_MMDVM CModem::getResponse() { assert(m_port != NULL); - if (m_state == SS_START) { + if (m_state == SERIAL_STATE::START) { // Get the start of the frame or nothing at all int ret = m_port->read(m_buffer + 0U, 1U); if (ret < 0) { LogError("Error when reading from the modem"); - return RTM_ERROR; + return RESP_TYPE_MMDVM::ERR; } if (ret == 0) - return RTM_TIMEOUT; + return RESP_TYPE_MMDVM::TIMEOUT; if (m_buffer[0U] != MMDVM_FRAME_START) - return RTM_TIMEOUT; + return RESP_TYPE_MMDVM::TIMEOUT; - m_state = SS_LENGTH1; + m_state = SERIAL_STATE::LENGTH1; m_length = 1U; } - if (m_state == SS_LENGTH1) { + if (m_state == SERIAL_STATE::LENGTH1) { // Get the length of the frame, 1/2 int ret = m_port->read(m_buffer + 1U, 1U); if (ret < 0) { LogError("Error when reading from the modem"); - m_state = SS_START; - return RTM_ERROR; + m_state = SERIAL_STATE::START; + return RESP_TYPE_MMDVM::ERR; } if (ret == 0) - return RTM_TIMEOUT; + return RESP_TYPE_MMDVM::TIMEOUT; m_length = m_buffer[1U]; m_offset = 2U; if (m_length == 0U) - m_state = SS_LENGTH2; + m_state = SERIAL_STATE::LENGTH2; else - m_state = SS_TYPE; + m_state = SERIAL_STATE::TYPE; } - if (m_state == SS_LENGTH2) { + if (m_state == SERIAL_STATE::LENGTH2) { // Get the length of the frane, 2/2 int ret = m_port->read(m_buffer + 2U, 1U); if (ret < 0) { LogError("Error when reading from the modem"); - m_state = SS_START; - return RTM_ERROR; + m_state = SERIAL_STATE::START; + return RESP_TYPE_MMDVM::ERR; } if (ret == 0) - return RTM_TIMEOUT; + return RESP_TYPE_MMDVM::TIMEOUT; m_length = m_buffer[2U] + 255U; m_offset = 3U; - m_state = SS_TYPE; + m_state = SERIAL_STATE::TYPE; } - if (m_state == SS_TYPE) { + if (m_state == SERIAL_STATE::TYPE) { // Get the frame type int ret = m_port->read(&m_type, 1U); if (ret < 0) { LogError("Error when reading from the modem"); - m_state = SS_START; - return RTM_ERROR; + m_state = SERIAL_STATE::START; + return RESP_TYPE_MMDVM::ERR; } if (ret == 0) - return RTM_TIMEOUT; + return RESP_TYPE_MMDVM::TIMEOUT; m_buffer[m_offset++] = m_type; - m_state = SS_DATA; + m_state = SERIAL_STATE::DATA; } - if (m_state == SS_DATA) { + if (m_state == SERIAL_STATE::DATA) { while (m_offset < m_length) { int ret = m_port->read(m_buffer + m_offset, m_length - m_offset); if (ret < 0) { LogError("Error when reading from the modem"); - m_state = SS_START; - return RTM_ERROR; + m_state = SERIAL_STATE::START; + return RESP_TYPE_MMDVM::ERR; } if (ret == 0) - return RTM_TIMEOUT; + return RESP_TYPE_MMDVM::TIMEOUT; if (ret > 0) m_offset += ret; @@ -2527,9 +2527,9 @@ RESP_TYPE_MMDVM CModem::getResponse() // CUtils::dump(1U, "Received", m_buffer, m_length); m_offset = m_length > 255U ? 4U : 3U; - m_state = SS_START; + m_state = SERIAL_STATE::START; - return RTM_OK; + return RESP_TYPE_MMDVM::OK; } HW_TYPE CModem::getHWType() const @@ -2746,18 +2746,18 @@ bool CModem::setFMCallsignParams() CThread::sleep(10U); resp = getResponse(); - if (resp == RTM_OK && m_buffer[2U] != MMDVM_ACK && m_buffer[2U] != MMDVM_NAK) { + if ((resp == RESP_TYPE_MMDVM::OK) && (m_buffer[2U] != MMDVM_ACK) && (m_buffer[2U] != MMDVM_NAK)) { count++; if (count >= MAX_RESPONSES) { LogError("The MMDVM is not responding to the SET_FM_PARAMS1 command"); return false; } } - } while (resp == RTM_OK && m_buffer[2U] != MMDVM_ACK && m_buffer[2U] != MMDVM_NAK); + } while ((resp == RESP_TYPE_MMDVM::OK) && (m_buffer[2U] != MMDVM_ACK) && (m_buffer[2U] != MMDVM_NAK)); // CUtils::dump(1U, "Response", m_buffer, m_length); - if (resp == RTM_OK && m_buffer[2U] == MMDVM_NAK) { + if ((resp == RESP_TYPE_MMDVM::OK) && (m_buffer[2U] == MMDVM_NAK)) { LogError("Received a NAK to the SET_FM_PARAMS1 command from the modem"); return false; } @@ -2798,18 +2798,18 @@ bool CModem::setFMAckParams() CThread::sleep(10U); resp = getResponse(); - if (resp == RTM_OK && m_buffer[2U] != MMDVM_ACK && m_buffer[2U] != MMDVM_NAK) { + if ((resp == RESP_TYPE_MMDVM::OK) && (m_buffer[2U] != MMDVM_ACK) && (m_buffer[2U] != MMDVM_NAK)) { count++; if (count >= MAX_RESPONSES) { LogError("The MMDVM is not responding to the SET_FM_PARAMS2 command"); return false; } } - } while (resp == RTM_OK && m_buffer[2U] != MMDVM_ACK && m_buffer[2U] != MMDVM_NAK); + } while ((resp == RESP_TYPE_MMDVM::OK) && (m_buffer[2U] != MMDVM_ACK) && (m_buffer[2U] != MMDVM_NAK)); // CUtils::dump(1U, "Response", m_buffer, m_length); - if (resp == RTM_OK && m_buffer[2U] == MMDVM_NAK) { + if ((resp == RESP_TYPE_MMDVM::OK) && (m_buffer[2U] == MMDVM_NAK)) { LogError("Received a NAK to the SET_FM_PARAMS2 command from the modem"); return false; } @@ -2867,18 +2867,18 @@ bool CModem::setFMMiscParams() CThread::sleep(10U); resp = getResponse(); - if (resp == RTM_OK && m_buffer[2U] != MMDVM_ACK && m_buffer[2U] != MMDVM_NAK) { + if ((resp == RESP_TYPE_MMDVM::OK) && (m_buffer[2U] != MMDVM_ACK) && (m_buffer[2U] != MMDVM_NAK)) { count++; if (count >= MAX_RESPONSES) { LogError("The MMDVM is not responding to the SET_FM_PARAMS3 command"); return false; } } - } while (resp == RTM_OK && m_buffer[2U] != MMDVM_ACK && m_buffer[2U] != MMDVM_NAK); + } while ((resp == RESP_TYPE_MMDVM::OK) && (m_buffer[2U] != MMDVM_ACK) && (m_buffer[2U] != MMDVM_NAK)); // CUtils::dump(1U, "Response", m_buffer, m_length); - if (resp == RTM_OK && m_buffer[2U] == MMDVM_NAK) { + if ((resp == RESP_TYPE_MMDVM::OK) && (m_buffer[2U] == MMDVM_NAK)) { LogError("Received a NAK to the SET_FM_PARAMS3 command from the modem"); return false; } @@ -2918,18 +2918,18 @@ bool CModem::setFMExtParams() CThread::sleep(10U); resp = getResponse(); - if (resp == RTM_OK && m_buffer[2U] != MMDVM_ACK && m_buffer[2U] != MMDVM_NAK) { + if ((resp == RESP_TYPE_MMDVM::OK) && (m_buffer[2U] != MMDVM_ACK) && (m_buffer[2U] != MMDVM_NAK)) { count++; if (count >= MAX_RESPONSES) { LogError("The MMDVM is not responding to the SET_FM_PARAMS4 command"); return false; } } - } while (resp == RTM_OK && m_buffer[2U] != MMDVM_ACK && m_buffer[2U] != MMDVM_NAK); + } while ((resp == RESP_TYPE_MMDVM::OK) && (m_buffer[2U] != MMDVM_ACK) && (m_buffer[2U] != MMDVM_NAK)); // CUtils::dump(1U, "Response", m_buffer, m_length); - if (resp == RTM_OK && m_buffer[2U] == MMDVM_NAK) { + if ((resp == RESP_TYPE_MMDVM::OK) && (m_buffer[2U] == MMDVM_NAK)) { LogError("Received a NAK to the SET_FM_PARAMS4 command from the modem"); return false; } diff --git a/Modem.h b/Modem.h index 0a69311..45809cc 100644 --- a/Modem.h +++ b/Modem.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2018,2020,2021 by Jonathan Naylor G4KLX + * Copyright (C) 2011-2018,2020,2021,2025 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 @@ -26,18 +26,18 @@ #include -enum RESP_TYPE_MMDVM { - RTM_OK, - RTM_TIMEOUT, - RTM_ERROR +enum class RESP_TYPE_MMDVM { + OK, + TIMEOUT, + ERR }; -enum SERIAL_STATE { - SS_START, - SS_LENGTH1, - SS_LENGTH2, - SS_TYPE, - SS_DATA +enum class SERIAL_STATE { + START, + LENGTH1, + LENGTH2, + TYPE, + DATA }; class CModem { diff --git a/NXDNControl.cpp b/NXDNControl.cpp index a686091..0b01a6e 100644 --- a/NXDNControl.cpp +++ b/NXDNControl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015-2021 Jonathan Naylor, G4KLX + * Copyright (C) 2015-2021,2025 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 @@ -49,8 +49,8 @@ m_duplex(duplex), m_remoteGateway(remoteGateway), m_lookup(lookup), m_queue(5000U, "NXDN Control"), -m_rfState(RS_RF_LISTENING), -m_netState(RS_NET_IDLE), +m_rfState(RPT_RF_STATE::LISTENING), +m_netState(RPT_NET_STATE::IDLE), m_rfTimeoutTimer(1000U, timeout), m_netTimeoutTimer(1000U, timeout), m_packetTimer(1000U, 0U, 200U), @@ -92,7 +92,7 @@ bool CNXDNControl::writeModem(unsigned char *data, unsigned int len) unsigned char type = data[0U]; - if (type == TAG_LOST && m_rfState == RS_RF_AUDIO) { + if ((type == TAG_LOST) && (m_rfState == RPT_RF_STATE::AUDIO)) { unsigned short dstId = m_rfLayer3.getDestinationGroupId(); bool grp = m_rfLayer3.getIsGroup(); std::string source = m_lookup->find(m_rfLayer3.getSourceUnitId()); @@ -105,13 +105,13 @@ bool CNXDNControl::writeModem(unsigned char *data, unsigned int len) return false; } - if (type == TAG_LOST && m_rfState == RS_RF_DATA) { + if ((type == TAG_LOST) && (m_rfState == RPT_RF_STATE::DATA)) { writeEndRF(); return false; } if (type == TAG_LOST) { - m_rfState = RS_RF_LISTENING; + m_rfState = RPT_RF_STATE::LISTENING; m_rfMask = 0x00U; m_rfLayer3.reset(); return false; @@ -179,7 +179,7 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne unsigned char ran = sacch.getRAN(); if (ran != m_ran && ran != 0U) return false; - } else if (m_rfState == RS_RF_LISTENING) { + } else if (m_rfState == RPT_RF_STATE::LISTENING) { return false; } @@ -203,17 +203,17 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne unsigned char type = layer3.getMessageType(); if (type == NXDN_MESSAGE_TYPE_TX_REL) { - if (m_rfState != RS_RF_AUDIO) { - m_rfState = RS_RF_LISTENING; + if (m_rfState != RPT_RF_STATE::AUDIO) { + m_rfState = RPT_RF_STATE::LISTENING; m_rfMask = 0x00U; m_rfLayer3.reset(); return false; } } else if (type == NXDN_MESSAGE_TYPE_VCALL) { - if (m_rfState == RS_RF_LISTENING && m_selfOnly) { + if ((m_rfState == RPT_RF_STATE::LISTENING) && m_selfOnly) { unsigned short srcId = layer3.getSourceUnitId(); if (srcId != m_id) { - m_rfState = RS_RF_REJECTED; + m_rfState = RPT_RF_STATE::REJECTED; return true; } } @@ -254,7 +254,7 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne scrambler(data + 2U); - writeNetwork(netData, data[0U] == TAG_EOT ? NNMT_VOICE_TRAILER : NNMT_VOICE_HEADER); + writeNetwork(netData, data[0U] == TAG_EOT ? NXDN_NETWORK_MESSAGE_TYPE::VOICE_TRAILER : NXDN_NETWORK_MESSAGE_TYPE::VOICE_HEADER); #if defined(DUMP_NXDN) writeFile(data + 2U); @@ -278,7 +278,7 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne m_rfErrs = 0U; m_rfBits = 1U; m_rfTimeoutTimer.start(); - m_rfState = RS_RF_AUDIO; + m_rfState = RPT_RF_STATE::AUDIO; m_minRSSI = m_rssi; m_maxRSSI = m_rssi; m_aveRSSI = m_rssi; @@ -297,7 +297,7 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne return true; } else { - if (m_rfState == RS_RF_LISTENING) { + if (m_rfState == RPT_RF_STATE::LISTENING) { CNXDNFACCH1 facch; bool valid = false; switch (option) { @@ -374,7 +374,7 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne if (m_selfOnly) { if (srcId != m_id) { - m_rfState = RS_RF_REJECTED; + m_rfState = RPT_RF_STATE::REJECTED; return true; } } @@ -383,7 +383,7 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne m_rfErrs = 0U; m_rfBits = 1U; m_rfTimeoutTimer.start(); - m_rfState = RS_RF_AUDIO; + m_rfState = RPT_RF_STATE::AUDIO; m_minRSSI = m_rssi; m_maxRSSI = m_rssi; @@ -396,7 +396,7 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne LogMessage("NXDN, received RF late entry from %s to %s%u", source.c_str(), grp ? "TG " : "", dstId); m_display->writeNXDN(source.c_str(), grp, dstId, "R"); - m_rfState = RS_RF_AUDIO; + m_rfState = RPT_RF_STATE::AUDIO; // Create a dummy start message unsigned char start[NXDN_FRAME_LENGTH_BYTES + 2U]; @@ -438,7 +438,7 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne scrambler(start + 2U); - writeNetwork(netData, NNMT_VOICE_HEADER); + writeNetwork(netData, NXDN_NETWORK_MESSAGE_TYPE::VOICE_HEADER); #if defined(DUMP_NXDN) writeFile(start + 2U); @@ -448,7 +448,7 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne } } - if (m_rfState == RS_RF_AUDIO) { + if (m_rfState == RPT_RF_STATE::AUDIO) { // Regenerate the sync CSync::addNXDNSync(data + 2U); @@ -544,7 +544,7 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne scrambler(data + 2U); - writeNetwork(netData, NNMT_VOICE_BODY); + writeNetwork(netData, NXDN_NETWORK_MESSAGE_TYPE::VOICE_BODY); #if defined(DUMP_NXDN) writeFile(data + 2U); @@ -565,7 +565,7 @@ bool CNXDNControl::processData(unsigned char option, unsigned char *data) { CNXDNUDCH udch; bool validUDCH = udch.decode(data + 2U); - if (m_rfState == RS_RF_LISTENING && !validUDCH) + if ((m_rfState == RPT_RF_STATE::LISTENING) && !validUDCH) return false; if (validUDCH) { @@ -584,7 +584,7 @@ bool CNXDNControl::processData(unsigned char option, unsigned char *data) CNXDNLayer3 layer3; layer3.decode(buffer, 184U); - if (m_rfState == RS_RF_LISTENING) { + if (m_rfState == RPT_RF_STATE::LISTENING) { unsigned char type = layer3.getMessageType(); if (type != NXDN_MESSAGE_TYPE_DCALL_HDR) return false; @@ -610,14 +610,14 @@ bool CNXDNControl::processData(unsigned char option, unsigned char *data) m_rfLayer3 = layer3; m_rfFrames = 0U; - m_rfState = RS_RF_DATA; + m_rfState = RPT_RF_STATE::DATA; #if defined(DUMP_NXDN) openFile(); #endif } - if (m_rfState != RS_RF_DATA) + if (m_rfState != RPT_RF_STATE::DATA) return false; CSync::addNXDNSync(data + 2U); @@ -651,13 +651,13 @@ bool CNXDNControl::processData(unsigned char option, unsigned char *data) switch (type) { case NXDN_MESSAGE_TYPE_DCALL_HDR: - writeNetwork(netData, NNMT_DATA_HEADER); + writeNetwork(netData, NXDN_NETWORK_MESSAGE_TYPE::DATA_HEADER); break; case NXDN_MESSAGE_TYPE_TX_REL: - writeNetwork(netData, NNMT_DATA_TRAILER); + writeNetwork(netData, NXDN_NETWORK_MESSAGE_TYPE::DATA_TRAILER); break; default: - writeNetwork(netData, NNMT_DATA_BODY); + writeNetwork(netData, NXDN_NETWORK_MESSAGE_TYPE::DATA_BODY); break; } @@ -699,14 +699,14 @@ unsigned int CNXDNControl::readModem(unsigned char* data) void CNXDNControl::writeEndRF() { - m_rfState = RS_RF_LISTENING; + m_rfState = RPT_RF_STATE::LISTENING; m_rfMask = 0x00U; m_rfLayer3.reset(); m_rfTimeoutTimer.stop(); - if (m_netState == RS_NET_IDLE) { + if (m_netState == RPT_NET_STATE::IDLE) { m_display->clearNXDN(); if (m_network != NULL) @@ -720,7 +720,7 @@ void CNXDNControl::writeEndRF() void CNXDNControl::writeEndNet() { - m_netState = RS_NET_IDLE; + m_netState = RPT_NET_STATE::IDLE; m_netMask = 0x00U; m_netLayer3.reset(); @@ -745,7 +745,7 @@ void CNXDNControl::writeNetwork() if (!m_enabled) return; - if (m_rfState != RS_RF_LISTENING && m_netState == RS_NET_IDLE) + if ((m_rfState != RPT_RF_STATE::LISTENING) && (m_netState == RPT_NET_STATE::IDLE)) return; m_networkWatchdog.start(); @@ -766,7 +766,7 @@ void CNXDNControl::writeNetwork() layer3.setData(netData + 2U, 23U); unsigned char type = layer3.getMessageType(); - if (m_netState == RS_NET_IDLE) { + if (m_netState == RPT_NET_STATE::IDLE) { if (type == NXDN_MESSAGE_TYPE_DCALL_HDR) { unsigned short srcId = layer3.getSourceUnitId(); unsigned short dstId = layer3.getDestinationGroupId(); @@ -778,13 +778,13 @@ void CNXDNControl::writeNetwork() m_display->writeNXDN(source.c_str(), grp, dstId, "N"); LogMessage("NXDN, received network data header from %s to %s%u, %u blocks", source.c_str(), grp ? "TG " : "", dstId, frames); - m_netState = RS_NET_DATA; + m_netState = RPT_NET_STATE::DATA; } else { return; } } - if (m_netState == RS_NET_DATA) { + if (m_netState == RPT_NET_STATE::DATA) { data[0U] = type == NXDN_MESSAGE_TYPE_TX_REL ? TAG_EOT : TAG_DATA; data[1U] = 0x00U; @@ -810,9 +810,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_NET_IDLE) + if ((type == NXDN_MESSAGE_TYPE_TX_REL) && (m_netState == RPT_NET_STATE::IDLE)) return; - if (type == NXDN_MESSAGE_TYPE_VCALL && m_netState != RS_NET_IDLE) + if ((type == NXDN_MESSAGE_TYPE_VCALL) && (m_netState != RPT_NET_STATE::IDLE)) return; CNXDNSACCH sacch; @@ -849,14 +849,14 @@ void CNXDNControl::writeNetwork() m_netTimeoutTimer.start(); m_packetTimer.start(); m_elapsed.start(); - m_netState = RS_NET_AUDIO; + m_netState = RPT_NET_STATE::AUDIO; m_netFrames = 1U; } else { CUtils::dump(2U, "NXDN, interesting non superblock network frame", netData, 33U); return; } } else { - if (m_netState == RS_NET_IDLE) { + if (m_netState == RPT_NET_STATE::IDLE) { unsigned char structure = (netData[1U] >> 6) & 0x03U; switch (structure) { case NXDN_SR_1_4: @@ -901,7 +901,7 @@ void CNXDNControl::writeNetwork() m_netTimeoutTimer.start(); m_packetTimer.start(); m_elapsed.start(); - m_netState = RS_NET_AUDIO; + m_netState = RPT_NET_STATE::AUDIO; m_netFrames = 1U; // Create a dummy start message @@ -992,7 +992,7 @@ void CNXDNControl::clock(unsigned int ms) m_rfTimeoutTimer.clock(ms); m_netTimeoutTimer.clock(ms); - if (m_netState == RS_NET_AUDIO) { + if (m_netState == RPT_NET_STATE::AUDIO) { m_networkWatchdog.clock(ms); if (m_networkWatchdog.hasExpired()) { @@ -1006,7 +1006,7 @@ void CNXDNControl::writeQueueRF(const unsigned char *data) { assert(data != NULL); - if (m_netState != RS_NET_IDLE) + if (m_netState != RPT_NET_STATE::IDLE) return; if (m_rfTimeoutTimer.isRunning() && m_rfTimeoutTimer.hasExpired()) @@ -1108,7 +1108,7 @@ void CNXDNControl::closeFile() bool CNXDNControl::isBusy() const { - return m_rfState != RS_RF_LISTENING || m_netState != RS_NET_IDLE; + return (m_rfState != RPT_RF_STATE::LISTENING) || (m_netState != RPT_NET_STATE::IDLE); } void CNXDNControl::enable(bool enabled) @@ -1117,7 +1117,7 @@ void CNXDNControl::enable(bool enabled) m_queue.clear(); // Reset the RF section - m_rfState = RS_RF_LISTENING; + m_rfState = RPT_RF_STATE::LISTENING; m_rfMask = 0x00U; m_rfLayer3.reset(); @@ -1125,7 +1125,7 @@ void CNXDNControl::enable(bool enabled) m_rfTimeoutTimer.stop(); // Reset the networking section - m_netState = RS_NET_IDLE; + m_netState = RPT_NET_STATE::IDLE; m_netMask = 0x00U; m_netLayer3.reset(); diff --git a/NXDNDefines.h b/NXDNDefines.h index 31291c4..3a3076e 100644 --- a/NXDNDefines.h +++ b/NXDNDefines.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016,2017,2018 by Jonathan Naylor G4KLX + * Copyright (C) 2016,2017,2018,2025 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 @@ -50,7 +50,7 @@ const unsigned char NXDN_LICH_RFCT_RTCH_C = 3U; const unsigned char NXDN_LICH_USC_SACCH_NS = 0U; const unsigned char NXDN_LICH_USC_UDCH = 1U; const unsigned char NXDN_LICH_USC_SACCH_SS = 2U; -const unsigned char NXDN_LICH_USC_SACCH_SS_IDLE = 3U; +const unsigned char NXDN_LICH_USC_SACCH_IDLE = 3U; const unsigned char NXDN_LICH_STEAL_NONE = 3U; const unsigned char NXDN_LICH_STEAL_FACCH1_2 = 2U; diff --git a/NXDNIcomNetwork.cpp b/NXDNIcomNetwork.cpp index adc4ec6..c86509b 100644 --- a/NXDNIcomNetwork.cpp +++ b/NXDNIcomNetwork.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2014,2016,2018-2020 by Jonathan Naylor G4KLX + * Copyright (C) 2009-2014,2016,2018-2020,2025 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 @@ -76,20 +76,20 @@ bool CNXDNIcomNetwork::write(const unsigned char* data, NXDN_NETWORK_MESSAGE_TYP buffer[7U] = 0xE0U; switch (type) { - case NNMT_VOICE_HEADER: - case NNMT_VOICE_TRAILER: + case NXDN_NETWORK_MESSAGE_TYPE::VOICE_HEADER: + case NXDN_NETWORK_MESSAGE_TYPE::VOICE_TRAILER: buffer[37U] = 0x23U; buffer[38U] = 0x1CU; buffer[39U] = 0x21U; break; - case NNMT_VOICE_BODY: + case NXDN_NETWORK_MESSAGE_TYPE::VOICE_BODY: buffer[37U] = 0x23U; buffer[38U] = 0x10U; buffer[39U] = 0x21U; break; - case NNMT_DATA_HEADER: - case NNMT_DATA_BODY: - case NNMT_DATA_TRAILER: + case NXDN_NETWORK_MESSAGE_TYPE::DATA_HEADER: + case NXDN_NETWORK_MESSAGE_TYPE::DATA_BODY: + case NXDN_NETWORK_MESSAGE_TYPE::DATA_TRAILER: buffer[37U] = 0x23U; buffer[38U] = 0x02U; buffer[39U] = 0x18U; diff --git a/NXDNKenwoodNetwork.cpp b/NXDNKenwoodNetwork.cpp index 1b7432b..88dc43b 100644 --- a/NXDNKenwoodNetwork.cpp +++ b/NXDNKenwoodNetwork.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2014,2016,2018,2020 by Jonathan Naylor G4KLX + * Copyright (C) 2009-2014,2016,2018,2020,2025 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 @@ -110,15 +110,15 @@ bool CNXDNKenwoodNetwork::write(const unsigned char* data, NXDN_NETWORK_MESSAGE_ assert(data != NULL); switch (type) { - case NNMT_VOICE_HEADER: // Voice header or trailer - case NNMT_VOICE_TRAILER: + case NXDN_NETWORK_MESSAGE_TYPE::VOICE_HEADER: // Voice header or trailer + case NXDN_NETWORK_MESSAGE_TYPE::VOICE_TRAILER: return processIcomVoiceHeader(data); - case NNMT_VOICE_BODY: // Voice data + case NXDN_NETWORK_MESSAGE_TYPE::VOICE_BODY: // Voice data return processIcomVoiceData(data); - case NNMT_DATA_HEADER: // Data header or trailer - case NNMT_DATA_TRAILER: + case NXDN_NETWORK_MESSAGE_TYPE::DATA_HEADER: // Data header or trailer + case NXDN_NETWORK_MESSAGE_TYPE::DATA_TRAILER: return processIcomDataHeader(data); - case NNMT_DATA_BODY: // Data data + case NXDN_NETWORK_MESSAGE_TYPE::DATA_BODY: // Data data return processIcomDataData(data); default: return false; @@ -774,7 +774,7 @@ unsigned int CNXDNKenwoodNetwork::readRTP(unsigned char* data) if (length <= 0) return 0U; - if (!CUDPSocket::match(m_rtpAddr, address, IMT_ADDRESS_ONLY)) { + if (!CUDPSocket::match(m_rtpAddr, address, IPMATCHTYPE::IMT_ADDREONLY)) { LogMessage("NXDN, RTP packet received from an invalid source"); return 0U; } @@ -802,7 +802,7 @@ unsigned int CNXDNKenwoodNetwork::readRTCP(unsigned char* data) if (length <= 0) return 0U; - if (!CUDPSocket::match(m_rtpAddr, address, IMT_ADDRESS_ONLY)) { + if (!CUDPSocket::match(m_rtpAddr, address, IPMATCHTYPE::IMT_ADDREONLY)) { LogMessage("NXDN, RTCP packet received from an invalid source"); return 0U; } diff --git a/NXDNNetwork.h b/NXDNNetwork.h index 107e02f..62e8521 100644 --- a/NXDNNetwork.h +++ b/NXDNNetwork.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 by Jonathan Naylor G4KLX + * Copyright (C) 2020,2025 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 @@ -23,13 +23,13 @@ #include -enum NXDN_NETWORK_MESSAGE_TYPE { - NNMT_VOICE_HEADER, - NNMT_VOICE_BODY, - NNMT_VOICE_TRAILER, - NNMT_DATA_HEADER, - NNMT_DATA_BODY, - NNMT_DATA_TRAILER +enum class NXDN_NETWORK_MESSAGE_TYPE { + VOICE_HEADER, + VOICE_BODY, + VOICE_TRAILER, + DATA_HEADER, + DATA_BODY, + DATA_TRAILER }; class INXDNNetwork { diff --git a/NetworkInfo.cpp b/NetworkInfo.cpp index b85e8a6..b840530 100644 --- a/NetworkInfo.cpp +++ b/NetworkInfo.cpp @@ -1,4 +1,5 @@ /* + * Copyright (C) 2025 by Jonathan Naylor G4KLX * Copyright (C) 2017 by Lieven De Samblanx ON7LDS * * This program is free software; you can redistribute it and/or modify @@ -123,7 +124,7 @@ void CNetworkInfo::getNetworkInterface(unsigned char* info) struct rt_msghdr *rtm; for (char *p = buf; p < buf + size; p += rtm->rtm_msglen) { rtm = (struct rt_msghdr *)p; - if (rtm->rtm_version != RTM_VERSION) + if (rtm->rtm_version != VERSION) continue; #if defined(__OpenBSD__) struct sockaddr_in *sa = (struct sockaddr_in *)(p + rtm->rtm_hdrlen); diff --git a/P25Control.cpp b/P25Control.cpp index b7682cd..3968651 100644 --- a/P25Control.cpp +++ b/P25Control.cpp @@ -1,5 +1,5 @@ /* -* Copyright (C) 2016-2019,2021,2024 by Jonathan Naylor G4KLX +* Copyright (C) 2016-2019,2021,2024,2025 by Jonathan Naylor G4KLX * Copyright (C) 2018 by Bryan Biedenkapp N2PLL * * This program is free software; you can redistribute it and/or modify @@ -49,8 +49,8 @@ m_display(display), m_duplex(duplex), m_lookup(lookup), m_queue(1000U, "P25 Control"), -m_rfState(RS_RF_LISTENING), -m_netState(RS_NET_IDLE), +m_rfState(RPT_RF_STATE::LISTENING), +m_netState(RPT_NET_STATE::IDLE), m_rfTimeout(1000U, timeout), m_netTimeout(1000U, timeout), m_networkWatchdog(1000U, 0U, 1500U), @@ -124,7 +124,7 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len) bool sync = data[1U] == 0x01U; - if (data[0U] == TAG_LOST && m_rfState == RS_RF_AUDIO) { + if ((data[0U] == TAG_LOST) && (m_rfState == RPT_RF_STATE::AUDIO)) { bool grp = m_rfData.getLCF() == P25_LCF_GROUP; unsigned int dstId = m_rfData.getDstId(); std::string source = m_lookup->find(m_rfData.getSrcId()); @@ -136,12 +136,12 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len) // LogMessage("P25, total frames: %d, bits: %d, undecodable LC: %d, errors: %d, BER: %.4f%%", m_rfFrames, m_rfBits, m_rfUndecodableLC, m_rfErrs, float(m_rfErrs * 100U) / float(m_rfBits)); - if (m_netState == RS_NET_IDLE) + if (m_netState == RPT_NET_STATE::IDLE) m_display->clearP25(); writeNetwork(m_rfLDU, m_lastDUID, true); writeNetwork(data + 2U, P25_DUID_TERM, true); - m_rfState = RS_RF_LISTENING; + m_rfState = RPT_RF_STATE::LISTENING; m_rfTimeout.stop(); m_rfData.reset(); #if defined(DUMP_P25) @@ -150,11 +150,11 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len) return false; } - if (data[0U] == TAG_LOST && m_rfState == RS_RF_DATA) { - if (m_netState == RS_NET_IDLE) + if ((data[0U] == TAG_LOST) && (m_rfState == RPT_RF_STATE::DATA)) { + if (m_netState == RPT_NET_STATE::IDLE) m_display->clearP25(); - m_rfState = RS_RF_LISTENING; + m_rfState = RPT_RF_STATE::LISTENING; m_rfPDUCount = 0U; m_rfPDUBits = 0U; #if defined(DUMP_P25) @@ -164,17 +164,17 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len) } if (data[0U] == TAG_LOST) { - m_rfState = RS_RF_LISTENING; + m_rfState = RPT_RF_STATE::LISTENING; return false; } - if (!sync && m_rfState == RS_RF_LISTENING) + if (!sync && (m_rfState == RPT_RF_STATE::LISTENING)) return false; // Decode the NID bool valid = m_nid.decode(data + 2U); - if (m_rfState == RS_RF_LISTENING && !valid) + if ((m_rfState == RPT_RF_STATE::LISTENING) && !valid) return false; unsigned char duid = m_nid.getDUID(); @@ -222,7 +222,7 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len) } if (duid == P25_DUID_HEADER) { - if (m_rfState == RS_RF_LISTENING) { + if (m_rfState == RPT_RF_STATE::LISTENING) { m_rfData.reset(); bool ret = m_rfData.decodeHeader(data + 2U); if (!ret) { @@ -236,7 +236,7 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len) return true; } } else if (duid == P25_DUID_LDU1) { - if (m_rfState == RS_RF_LISTENING) { + if (m_rfState == RPT_RF_STATE::LISTENING) { m_rfData.reset(); bool ret = m_rfData.decodeLDU1(data + 2U); if (!ret) { @@ -275,7 +275,7 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len) LogMessage("P25, received RF voice transmission from %s to %s%u", source.c_str(), grp ? "TG " : "", dstId); m_display->writeP25(source.c_str(), grp, dstId, "R"); - m_rfState = RS_RF_AUDIO; + m_rfState = RPT_RF_STATE::AUDIO; m_minRSSI = m_rssi; m_maxRSSI = m_rssi; @@ -284,11 +284,11 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len) createRFHeader(); writeNetwork(data + 2U, P25_DUID_HEADER, false); - } else if (m_rfState == RS_RF_AUDIO) { + } else if (m_rfState == RPT_RF_STATE::AUDIO) { writeNetwork(m_rfLDU, m_lastDUID, false); } - if (m_rfState == RS_RF_AUDIO) { + if (m_rfState == RPT_RF_STATE::AUDIO) { /* bool ret = m_rfData.decodeLDU1(data + 2U); if (!ret) { @@ -342,7 +342,7 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len) return true; } } else if (duid == P25_DUID_LDU2) { - if (m_rfState == RS_RF_AUDIO) { + if (m_rfState == RPT_RF_STATE::AUDIO) { /* bool ret = m_rfData.decodeLDU2(data + 2U); if (!ret) { @@ -398,10 +398,10 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len) return true; } } else if (duid == P25_DUID_TSDU) { - if (m_rfState != RS_RF_DATA) { + if (m_rfState != RPT_RF_STATE::DATA) { m_rfPDUCount = 0U; m_rfPDUBits = 0U; - m_rfState = RS_RF_DATA; + m_rfState = RPT_RF_STATE::DATA; m_rfDataFrames = 0U; } @@ -475,10 +475,10 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len) break; } - m_rfState = RS_RF_LISTENING; + m_rfState = RPT_RF_STATE::LISTENING; return true; } else if (duid == P25_DUID_TERM || duid == P25_DUID_TERM_LC) { - if (m_rfState == RS_RF_AUDIO) { + if (m_rfState == RPT_RF_STATE::AUDIO) { writeNetwork(m_rfLDU, m_lastDUID, true); ::memset(data + 2U, 0x00U, P25_TERM_FRAME_LENGTH_BYTES); @@ -496,7 +496,7 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len) unsigned int dstId = m_rfData.getDstId(); std::string source = m_lookup->find(m_rfData.getSrcId()); - m_rfState = RS_RF_LISTENING; + m_rfState = RPT_RF_STATE::LISTENING; m_rfTimeout.stop(); m_rfData.reset(); m_lastDUID = duid; @@ -523,10 +523,10 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len) } } } else if (duid == P25_DUID_PDU) { - if (m_rfState != RS_RF_DATA) { + if (m_rfState != RPT_RF_STATE::DATA) { m_rfPDUCount = 0U; m_rfPDUBits = 0U; - m_rfState = RS_RF_DATA; + m_rfState = RPT_RF_STATE::DATA; m_rfDataFrames = 0U; } @@ -556,12 +556,12 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len) } else { m_rfPDUCount = 0U; m_rfPDUBits = 0U; - m_rfState = RS_RF_LISTENING; + m_rfState = RPT_RF_STATE::LISTENING; m_rfDataFrames = 0U; } } - if (m_rfState == RS_RF_DATA) { + if (m_rfState == RPT_RF_STATE::DATA) { m_rfPDUCount++; unsigned int bitLength = ((m_rfDataFrames + 1U) * P25_PDU_FEC_LENGTH_BITS) + P25_SYNC_LENGTH_BITS + P25_NID_LENGTH_BITS; @@ -620,7 +620,7 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len) m_rfPDUCount = 0U; m_rfPDUBits = 0U; - m_rfState = RS_RF_LISTENING; + m_rfState = RPT_RF_STATE::LISTENING; m_rfDataFrames = 0U; } @@ -660,7 +660,7 @@ void CP25Control::writeNetwork() if (!m_enabled) return; - if (m_rfState != RS_RF_LISTENING && m_netState == RS_NET_IDLE) + if ((m_rfState != RPT_RF_STATE::LISTENING) && (m_netState == RPT_NET_STATE::IDLE)) return; m_networkWatchdog.start(); @@ -701,7 +701,7 @@ void CP25Control::writeNetwork() case 0x6AU: ::memcpy(m_netLDU1 + 200U, data, 16U); checkNetLDU2(); - if (m_netState != RS_NET_IDLE) + if (m_netState != RPT_NET_STATE::IDLE) createNetLDU1(); break; case 0x6BU: @@ -738,7 +738,7 @@ void CP25Control::writeNetwork() break; case 0x73U: ::memcpy(m_netLDU2 + 200U, data, 16U); - if (m_netState == RS_NET_IDLE) { + if (m_netState == RPT_NET_STATE::IDLE) { createNetHeader(); createNetLDU1(); } else { @@ -762,14 +762,14 @@ void CP25Control::clock(unsigned int ms) m_rfTimeout.clock(ms); m_netTimeout.clock(ms); - if (m_netState == RS_NET_AUDIO) { + if (m_netState == RPT_NET_STATE::AUDIO) { m_networkWatchdog.clock(ms); if (m_networkWatchdog.hasExpired()) { LogMessage("P25, network watchdog has expired, %.1f seconds, %u%% packet loss", float(m_netFrames) / 50.0F, (m_netLost * 100U) / m_netFrames); m_display->clearP25(); m_networkWatchdog.stop(); - m_netState = RS_NET_IDLE; + m_netState = RPT_NET_STATE::IDLE; m_netData.reset(); m_netTimeout.stop(); } @@ -849,7 +849,7 @@ void CP25Control::addBusyBits(unsigned char* data, unsigned int length, bool b1, { assert(data != NULL); - for (unsigned int ss0Pos = P25_SS0_START; ss0Pos < length; ss0Pos += P25_SS_INCREMENT) { + for (unsigned int ss0Pos = P25_SS0_START; ss0Pos < length; ss0Pos += P25_INCREMENT) { unsigned int ss1Pos = ss0Pos + 1U; WRITE_BIT(data, ss0Pos, b1); WRITE_BIT(data, ss1Pos, b2); @@ -858,7 +858,7 @@ void CP25Control::addBusyBits(unsigned char* data, unsigned int length, bool b1, void CP25Control::checkNetLDU1() { - if (m_netState == RS_NET_IDLE) + if (m_netState == RPT_NET_STATE::IDLE) return; // Check for an unflushed LDU1 @@ -870,7 +870,7 @@ void CP25Control::checkNetLDU1() void CP25Control::checkNetLDU2() { - if (m_netState == RS_NET_IDLE) + if (m_netState == RPT_NET_STATE::IDLE) return; // Check for an unflushed LDU1 @@ -1018,7 +1018,7 @@ void CP25Control::createNetHeader() m_display->writeP25(source.c_str(), lcf == P25_LCF_GROUP, dstId, "N"); - m_netState = RS_NET_AUDIO; + m_netState = RPT_NET_STATE::AUDIO; m_netTimeout.start(); m_netFrames = 0U; m_netLost = 0U; @@ -1193,7 +1193,7 @@ void CP25Control::createNetTerminator() m_netTimeout.stop(); m_networkWatchdog.stop(); m_netData.reset(); - m_netState = RS_NET_IDLE; + m_netState = RPT_NET_STATE::IDLE; } bool CP25Control::openFile() @@ -1240,7 +1240,7 @@ void CP25Control::closeFile() bool CP25Control::isBusy() const { - return m_rfState != RS_RF_LISTENING || m_netState != RS_NET_IDLE; + return (m_rfState != RPT_RF_STATE::LISTENING) || (m_netState != RPT_NET_STATE::IDLE); } void CP25Control::enable(bool enabled) @@ -1249,7 +1249,7 @@ void CP25Control::enable(bool enabled) m_queue.clear(); // Reset the RF section - m_rfState = RS_RF_LISTENING; + m_rfState = RPT_RF_STATE::LISTENING; m_rfTimeout.stop(); m_rfData.reset(); @@ -1257,7 +1257,7 @@ void CP25Control::enable(bool enabled) m_netTimeout.stop(); m_networkWatchdog.stop(); m_netData.reset(); - m_netState = RS_NET_IDLE; + m_netState = RPT_NET_STATE::IDLE; } m_enabled = enabled; diff --git a/P25Defines.h b/P25Defines.h index 815f75a..7824751 100644 --- a/P25Defines.h +++ b/P25Defines.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 by Jonathan Naylor G4KLX + * Copyright (C) 2016,2025 by Jonathan Naylor G4KLX * Copyright (C) 2018 by Bryan Biedenkapp * * This program is free software; you can redistribute it and/or modify @@ -65,7 +65,7 @@ const unsigned char P25_LCF_TSBK_ACK_RSP_FNE = 0x20U; const unsigned int P25_SS0_START = 70U; const unsigned int P25_SS1_START = 71U; -const unsigned int P25_SS_INCREMENT = 72U; +const unsigned int P25_INCREMENT = 72U; const unsigned char P25_DUID_HEADER = 0x00U; const unsigned char P25_DUID_TERM = 0x03U; diff --git a/P25Utils.cpp b/P25Utils.cpp index 70f5c29..3c00410 100644 --- a/P25Utils.cpp +++ b/P25Utils.cpp @@ -1,5 +1,5 @@ /* -* Copyright (C) 2016,2018 by Jonathan Naylor G4KLX +* Copyright (C) 2016,2018,2025 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 @@ -37,16 +37,16 @@ unsigned int CP25Utils::decode(const unsigned char* in, unsigned char* out, unsi unsigned int ss1Pos = P25_SS1_START; while (ss0Pos < start) { - ss0Pos += P25_SS_INCREMENT; - ss1Pos += P25_SS_INCREMENT; + ss0Pos += P25_INCREMENT; + ss1Pos += P25_INCREMENT; } unsigned int n = 0U; for (unsigned int i = start; i < stop; i++) { if (i == ss0Pos) { - ss0Pos += P25_SS_INCREMENT; + ss0Pos += P25_INCREMENT; } else if (i == ss1Pos) { - ss1Pos += P25_SS_INCREMENT; + ss1Pos += P25_INCREMENT; } else { bool b = READ_BIT(in, i); WRITE_BIT(out, n, b); @@ -67,16 +67,16 @@ unsigned int CP25Utils::encode(const unsigned char* in, unsigned char* out, unsi unsigned int ss1Pos = P25_SS1_START; while (ss0Pos < start) { - ss0Pos += P25_SS_INCREMENT; - ss1Pos += P25_SS_INCREMENT; + ss0Pos += P25_INCREMENT; + ss1Pos += P25_INCREMENT; } unsigned int n = 0U; for (unsigned int i = start; i < stop; i++) { if (i == ss0Pos) { - ss0Pos += P25_SS_INCREMENT; + ss0Pos += P25_INCREMENT; } else if (i == ss1Pos) { - ss1Pos += P25_SS_INCREMENT; + ss1Pos += P25_INCREMENT; } else { bool b = READ_BIT(in, n); WRITE_BIT(out, i, b); @@ -100,9 +100,9 @@ unsigned int CP25Utils::encode(const unsigned char* in, unsigned char* out, unsi unsigned int pos = 0U; while (n < length) { if (pos == ss0Pos) { - ss0Pos += P25_SS_INCREMENT; + ss0Pos += P25_INCREMENT; } else if (pos == ss1Pos) { - ss1Pos += P25_SS_INCREMENT; + ss1Pos += P25_INCREMENT; } else { bool b = READ_BIT(in, n); WRITE_BIT(out, pos, b); diff --git a/POCSAGControl.cpp b/POCSAGControl.cpp index 0568271..69e5df5 100644 --- a/POCSAGControl.cpp +++ b/POCSAGControl.cpp @@ -1,5 +1,5 @@ /* -* Copyright (C) 2018,2019,2020 Jonathan Naylor, G4KLX +* Copyright (C) 2018,2019,2020,2025 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 @@ -68,7 +68,7 @@ m_output(), m_buffer(), m_ric(0U), m_data(), -m_state(PS_NONE), +m_state(POCSAG_STATE::NONE), m_enabled(true), m_fp(NULL) { @@ -289,7 +289,7 @@ bool CPOCSAGControl::processData() void CPOCSAGControl::clock(unsigned int ms) { - if (m_state == PS_NONE) { + if (m_state == POCSAG_STATE::NONE) { bool ret = readNetwork(); if (!ret) return; @@ -298,7 +298,7 @@ void CPOCSAGControl::clock(unsigned int ms) if (!ret) return; - m_state = PS_WAITING; + m_state = POCSAG_STATE::WAITING; m_frames = 0U; m_count = 1U; @@ -311,7 +311,7 @@ void CPOCSAGControl::clock(unsigned int ms) m_output.push_back(POCSAG_SYNC_WORD); for (unsigned int i = 0U; i < POCSAG_FRAME_ADDRESSES; i++) { - if (m_state == PS_WAITING) { + if (m_state == POCSAG_STATE::WAITING) { if (i == (m_ric % POCSAG_FRAME_ADDRESSES)) { uint32_t w1 = m_buffer.front(); m_buffer.pop_front(); @@ -321,22 +321,22 @@ void CPOCSAGControl::clock(unsigned int ms) m_output.push_back(w1); m_output.push_back(w2); - m_state = PS_SENDING; + m_state = POCSAG_STATE::SENDING; } else { m_output.push_back(POCSAG_IDLE_WORD); m_output.push_back(POCSAG_IDLE_WORD); } - } else if (m_state == PS_SENDING) { + } else if (m_state == POCSAG_STATE::SENDING) { if (m_buffer.empty()) { m_output.push_back(POCSAG_IDLE_WORD); m_output.push_back(POCSAG_IDLE_WORD); bool ret = processData(); if (ret) { - m_state = PS_WAITING; + m_state = POCSAG_STATE::WAITING; m_count++; } else { - m_state = PS_ENDING; + m_state = POCSAG_STATE::ENDING; } } else { uint32_t w1 = m_buffer.front(); @@ -347,7 +347,7 @@ void CPOCSAGControl::clock(unsigned int ms) m_output.push_back(w1); m_output.push_back(w2); } - } else { // PS_ENDING + } else { // ENDING m_output.push_back(POCSAG_IDLE_WORD); m_output.push_back(POCSAG_IDLE_WORD); } @@ -356,10 +356,10 @@ void CPOCSAGControl::clock(unsigned int ms) writeQueue(); m_frames++; - if (m_state == PS_ENDING) { + if (m_state == POCSAG_STATE::ENDING) { LogMessage("POCSAG, transmitted %u frame(s) of data from %u message(s)", m_frames, m_count); m_display->clearPOCSAG(); - m_state = PS_NONE; + m_state = POCSAG_STATE::NONE; #if defined(DUMP_POCSAG) closeFile(); @@ -568,7 +568,7 @@ void CPOCSAGControl::enable(bool enabled) delete *it; m_data.clear(); - m_state = PS_NONE; + m_state = POCSAG_STATE::NONE; } m_enabled = enabled; diff --git a/POCSAGControl.h b/POCSAGControl.h index 42fed7e..0e24d12 100644 --- a/POCSAGControl.h +++ b/POCSAGControl.h @@ -1,5 +1,5 @@ /* -* Copyright (C) 2018,2019,2020 by Jonathan Naylor G4KLX +* Copyright (C) 2018,2019,2020,2025 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 @@ -60,11 +60,11 @@ private: unsigned int m_frames; unsigned int m_count; - enum POCSAG_STATE { - PS_NONE, - PS_WAITING, - PS_SENDING, - PS_ENDING + enum class POCSAG_STATE { + NONE, + WAITING, + SENDING, + ENDING }; std::deque m_output; diff --git a/RemoteCommand.cpp b/RemoteCommand.cpp index 0e8918d..1bfea48 100644 --- a/RemoteCommand.cpp +++ b/RemoteCommand.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019,2020 by Jonathan Naylor G4KLX + * Copyright (C) 2019,2020,2025 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 @@ -85,7 +85,7 @@ int CRemoteCommand::send(const std::string& command) if (!ret) return 1; - ret = socket.write((unsigned char*)command.c_str(), command.length(), addr, addrLen); + ret = socket.write((unsigned char*)command.c_str(), (unsigned int)command.length(), addr, addrLen); if (!ret) { socket.close(); return 1; diff --git a/RemoteControl.cpp b/RemoteControl.cpp index 3951693..8e23fbf 100644 --- a/RemoteControl.cpp +++ b/RemoteControl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019,2020,2021,2024 by Jonathan Naylor G4KLX + * Copyright (C) 2019,2020,2021,2024,2025 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 @@ -38,7 +38,7 @@ m_host(host), m_socket(address, port), m_addr(), m_addrLen(0U), -m_command(RCD_NONE), +m_command(REMOTE_COMMAND::NONE), m_args() { assert(port > 0U); @@ -63,7 +63,7 @@ bool CRemoteControl::open() REMOTE_COMMAND CRemoteControl::getCommand() { - m_command = RCD_NONE; + m_command = REMOTE_COMMAND::NONE; m_args.clear(); char command[BUFFER_LENGTH]; @@ -89,79 +89,79 @@ REMOTE_COMMAND CRemoteControl::getCommand() if (m_args.at(0U) == "mode" && m_args.size() >= SET_MODE_ARGS) { // Mode command is in the form of "mode [|fixed]" if (m_args.at(1U) == "idle") - m_command = RCD_MODE_IDLE; + m_command = REMOTE_COMMAND::MODE_IDLE; else if (m_args.at(1U) == "lockout") - m_command = RCD_MODE_LOCKOUT; + m_command = REMOTE_COMMAND::MODE_LOCKOUT; else if (m_args.at(1U) == "d-star") - m_command = RCD_MODE_DSTAR; + m_command = REMOTE_COMMAND::MODE_DSTAR; else if (m_args.at(1U) == "dmr") - m_command = RCD_MODE_DMR; + m_command = REMOTE_COMMAND::MODE_DMR; else if (m_args.at(1U) == "ysf") - m_command = RCD_MODE_YSF; + m_command = REMOTE_COMMAND::MODE_YSF; else if (m_args.at(1U) == "p25") - m_command = RCD_MODE_P25; + m_command = REMOTE_COMMAND::MODE_P25; else if (m_args.at(1U) == "nxdn") - m_command = RCD_MODE_NXDN; + m_command = REMOTE_COMMAND::MODE_NXDN; else if (m_args.at(1U) == "m17") - m_command = RCD_MODE_M17; + m_command = REMOTE_COMMAND::MODE_M17; else replyStr = "KO"; } else if (m_args.at(0U) == "enable" && m_args.size() >= ENABLE_ARGS) { if (m_args.at(1U) == "dstar") - m_command = RCD_ENABLE_DSTAR; + m_command = REMOTE_COMMAND::ENABLE_DSTAR; else if (m_args.at(1U) == "dmr") - m_command = RCD_ENABLE_DMR; + m_command = REMOTE_COMMAND::ENABLE_DMR; else if (m_args.at(1U) == "ysf") - m_command = RCD_ENABLE_YSF; + m_command = REMOTE_COMMAND::ENABLE_YSF; else if (m_args.at(1U) == "p25") - m_command = RCD_ENABLE_P25; + m_command = REMOTE_COMMAND::ENABLE_P25; else if (m_args.at(1U) == "nxdn") - m_command = RCD_ENABLE_NXDN; + m_command = REMOTE_COMMAND::ENABLE_NXDN; else if (m_args.at(1U) == "m17") - m_command = RCD_ENABLE_M17; + m_command = REMOTE_COMMAND::ENABLE_M17; else if (m_args.at(1U) == "fm") - m_command = RCD_ENABLE_FM; + m_command = REMOTE_COMMAND::ENABLE_FM; else if (m_args.at(1U) == "ax25") - m_command = RCD_ENABLE_AX25; + m_command = REMOTE_COMMAND::ENABLE_AX25; else replyStr = "KO"; } else if (m_args.at(0U) == "disable" && m_args.size() >= DISABLE_ARGS) { if (m_args.at(1U) == "dstar") - m_command = RCD_DISABLE_DSTAR; + m_command = REMOTE_COMMAND::DISABLE_DSTAR; else if (m_args.at(1U) == "dmr") - m_command = RCD_DISABLE_DMR; + m_command = REMOTE_COMMAND::DISABLE_DMR; else if (m_args.at(1U) == "ysf") - m_command = RCD_DISABLE_YSF; + m_command = REMOTE_COMMAND::DISABLE_YSF; else if (m_args.at(1U) == "p25") - m_command = RCD_DISABLE_P25; + m_command = REMOTE_COMMAND::DISABLE_P25; else if (m_args.at(1U) == "nxdn") - m_command = RCD_DISABLE_NXDN; + m_command = REMOTE_COMMAND::DISABLE_NXDN; else if (m_args.at(1U) == "m17") - m_command = RCD_DISABLE_M17; + m_command = REMOTE_COMMAND::DISABLE_M17; else if (m_args.at(1U) == "fm") - m_command = RCD_DISABLE_FM; + m_command = REMOTE_COMMAND::DISABLE_FM; else if (m_args.at(1U) == "ax25") - m_command = RCD_DISABLE_AX25; + m_command = REMOTE_COMMAND::DISABLE_AX25; else replyStr = "KO"; } else if (m_args.at(0U) == "page" && m_args.size() >= PAGE_ARGS) { // Page command is in the form of "page " - m_command = RCD_PAGE; + m_command = REMOTE_COMMAND::PAGE; } else if (m_args.at(0U) == "page_bcd" && m_args.size() >= PAGE_ARGS) { // BCD page command is in the form of "page_bcd " - m_command = RCD_PAGE_BCD; + m_command = REMOTE_COMMAND::PAGE_BCD; } else if (m_args.at(0U) == "page_a1" && m_args.size() == 2) { // Alert1 page command is in the form of "page_a1 " - m_command = RCD_PAGE_A1; + m_command = REMOTE_COMMAND::PAGE_A1; } else if (m_args.at(0U) == "page_a2" && m_args.size() >= PAGE_ARGS) { // Alert2 page command is in the form of "page_a2 " - m_command = RCD_PAGE_A2; + m_command = REMOTE_COMMAND::PAGE_A2; } else if (m_args.at(0U) == "cw" && m_args.size() >= CW_ARGS) { // CW command is in the form of "cw " - m_command = RCD_CW; + m_command = REMOTE_COMMAND::CW; } else if (m_args.at(0U) == "reload") { // Reload command is in the form of "reload" - m_command = RCD_RELOAD; + m_command = REMOTE_COMMAND::RELOAD; } else if (m_args.at(0U) == "status") { if (m_host != NULL) { m_host->buildNetworkStatusString(replyStr); @@ -169,7 +169,7 @@ REMOTE_COMMAND CRemoteControl::getCommand() replyStr = "KO"; } - m_command = RCD_CONNECTION_STATUS; + m_command = REMOTE_COMMAND::CONNECTION_STATUS; } else if (m_args.at(0U) == "hosts") { if (m_host != NULL) { m_host->buildNetworkHostsString(replyStr); @@ -177,13 +177,13 @@ REMOTE_COMMAND CRemoteControl::getCommand() replyStr = "KO"; } - m_command = RCD_CONFIG_HOSTS; + m_command = REMOTE_COMMAND::CONFIG_HOSTS; } else { replyStr = "KO"; } - ::snprintf(buffer, BUFFER_LENGTH * 2, "%s remote command of \"%s\" received", ((m_command == RCD_NONE) ? "Invalid" : "Valid"), command); - if (m_command == RCD_NONE) { + ::snprintf(buffer, BUFFER_LENGTH * 2, "%s remote command of \"%s\" received", ((m_command == REMOTE_COMMAND::NONE) ? "Invalid" : "Valid"), command); + if (m_command == REMOTE_COMMAND::NONE) { m_args.clear(); LogWarning(buffer); } else { @@ -201,21 +201,21 @@ REMOTE_COMMAND CRemoteControl::getCommand() unsigned int CRemoteControl::getArgCount() const { switch (m_command) { - case RCD_MODE_IDLE: - case RCD_MODE_LOCKOUT: - case RCD_MODE_DSTAR: - case RCD_MODE_DMR: - case RCD_MODE_YSF: - case RCD_MODE_P25: - case RCD_MODE_NXDN: - case RCD_MODE_M17: + case REMOTE_COMMAND::MODE_IDLE: + case REMOTE_COMMAND::MODE_LOCKOUT: + case REMOTE_COMMAND::MODE_DSTAR: + case REMOTE_COMMAND::MODE_DMR: + case REMOTE_COMMAND::MODE_YSF: + case REMOTE_COMMAND::MODE_P25: + case REMOTE_COMMAND::MODE_NXDN: + case REMOTE_COMMAND::MODE_M17: return (unsigned int)m_args.size() - SET_MODE_ARGS; - case RCD_PAGE: - case RCD_PAGE_BCD: - case RCD_PAGE_A1: - case RCD_PAGE_A2: + case REMOTE_COMMAND::PAGE: + case REMOTE_COMMAND::PAGE_BCD: + case REMOTE_COMMAND::PAGE_A1: + case REMOTE_COMMAND::PAGE_A2: return (unsigned int)m_args.size() - 1U; - case RCD_CW: + case REMOTE_COMMAND::CW: return (unsigned int)m_args.size() - 1U; default: return 0U; @@ -225,23 +225,23 @@ unsigned int CRemoteControl::getArgCount() const std::string CRemoteControl::getArgString(unsigned int n) const { switch (m_command) { - case RCD_MODE_IDLE: - case RCD_MODE_LOCKOUT: - case RCD_MODE_DSTAR: - case RCD_MODE_DMR: - case RCD_MODE_YSF: - case RCD_MODE_P25: - case RCD_MODE_NXDN: - case RCD_MODE_M17: + case REMOTE_COMMAND::MODE_IDLE: + case REMOTE_COMMAND::MODE_LOCKOUT: + case REMOTE_COMMAND::MODE_DSTAR: + case REMOTE_COMMAND::MODE_DMR: + case REMOTE_COMMAND::MODE_YSF: + case REMOTE_COMMAND::MODE_P25: + case REMOTE_COMMAND::MODE_NXDN: + case REMOTE_COMMAND::MODE_M17: n += SET_MODE_ARGS; break; - case RCD_PAGE: - case RCD_PAGE_BCD: - case RCD_PAGE_A1: - case RCD_PAGE_A2: + case REMOTE_COMMAND::PAGE: + case REMOTE_COMMAND::PAGE_BCD: + case REMOTE_COMMAND::PAGE_A1: + case REMOTE_COMMAND::PAGE_A2: n += 1U; break; - case RCD_CW: + case REMOTE_COMMAND::CW: n += 1U; break; default: diff --git a/RemoteControl.h b/RemoteControl.h index 61d0516..b5b0bd7 100644 --- a/RemoteControl.h +++ b/RemoteControl.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019,2020,2021,2024 by Jonathan Naylor G4KLX + * Copyright (C) 2019,2020,2021,2024,2025 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 @@ -26,41 +26,41 @@ class CMMDVMHost; -enum REMOTE_COMMAND { - RCD_NONE, - RCD_MODE_IDLE, - RCD_MODE_LOCKOUT, - RCD_MODE_DSTAR, - RCD_MODE_DMR, - RCD_MODE_YSF, - RCD_MODE_P25, - RCD_MODE_NXDN, - RCD_MODE_M17, - RCD_MODE_FM, - RCD_ENABLE_DSTAR, - RCD_ENABLE_DMR, - RCD_ENABLE_YSF, - RCD_ENABLE_P25, - RCD_ENABLE_NXDN, - RCD_ENABLE_M17, - RCD_ENABLE_FM, - RCD_ENABLE_AX25, - RCD_DISABLE_DSTAR, - RCD_DISABLE_DMR, - RCD_DISABLE_YSF, - RCD_DISABLE_P25, - RCD_DISABLE_NXDN, - RCD_DISABLE_M17, - RCD_DISABLE_FM, - RCD_DISABLE_AX25, - RCD_PAGE, - RCD_PAGE_BCD, - RCD_PAGE_A1, - RCD_PAGE_A2, - RCD_CW, - RCD_RELOAD, - RCD_CONNECTION_STATUS, - RCD_CONFIG_HOSTS +enum class REMOTE_COMMAND { + NONE, + MODE_IDLE, + MODE_LOCKOUT, + MODE_DSTAR, + MODE_DMR, + MODE_YSF, + MODE_P25, + MODE_NXDN, + MODE_M17, + MODE_FM, + ENABLE_DSTAR, + ENABLE_DMR, + ENABLE_YSF, + ENABLE_P25, + ENABLE_NXDN, + ENABLE_M17, + ENABLE_FM, + ENABLE_AX25, + DISABLE_DSTAR, + DISABLE_DMR, + DISABLE_YSF, + DISABLE_P25, + DISABLE_NXDN, + DISABLE_M17, + DISABLE_FM, + DISABLE_AX25, + PAGE, + PAGE_BCD, + PAGE_A1, + PAGE_A2, + CW, + RELOAD, + CONNECTION_STATUS, + CONFIG_HOSTS }; class CRemoteControl { diff --git a/SHA256.h b/SHA256.h index 7c48f19..9174834 100644 --- a/SHA256.h +++ b/SHA256.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2005, 2006, 2008, 2009 Free Software Foundation, Inc. - * Copyright (C) 2011,2015,2016 by Jonathan Naylor G4KLX + * Copyright (C) 2005,2006,2008,2009 Free Software Foundation, Inc. + * Copyright (C) 2011,2015,2016,2025 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 @@ -22,9 +22,7 @@ #include -enum { - SHA256_DIGEST_SIZE = 256 / 8 -}; +const unsigned int SHA256_DIGEST_SIZE = 256U / 8U; class CSHA256 { public: diff --git a/TFTSurenoo.cpp b/TFTSurenoo.cpp index 7d8f5f7..899eac3 100644 --- a/TFTSurenoo.cpp +++ b/TFTSurenoo.cpp @@ -1,6 +1,6 @@ /* * Copyright (C) 2019 by SASANO Takayoshi JG1UAA - * Copyright (C) 2015,2016,2018,2019,2020 by Jonathan Naylor G4KLX + * Copyright (C) 2015,2016,2018,2019,2020,2025 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 @@ -56,18 +56,28 @@ static const struct layoutdef Layout[] = { #define Y_WIDTH Layout[m_screenLayout].y_width #define ROTATION Layout[m_screenLayout].rotation -enum LcdColour { - COLOUR_BLACK, COLOUR_RED, COLOUR_GREEN, COLOUR_BLUE, - COLOUR_YELLOW, COLOUR_CYAN, COLOUR_MAGENTA, COLOUR_GREY, - COLOUR_DARK_GREY, COLOUR_DARK_RED, COLOUR_DARK_GREEN, COLOUR_DARK_BLUE, - COLOUR_DARK_YELLOW, COLOUR_DARK_CYAN, COLOUR_DARK_MAGENTA, COLOUR_WHITE -}; +#define COLOUR_BLACK 0 +#define COLOUR_RED 1 +#define COLOUR_GREEN 2 +#define COLOUR_BLUE 3 +#define COLOUR_YELLOW 4 +#define COLOUR_CYAN 5 +#define COLOUR_MAGENTA 6 +#define COLOUR_GREY 7 +#define COLOUR_DARK_GREY 8 +#define COLOUR_DARK_RED 9 +#define COLOUR_DARK_GREEN 10 +#define COLOUR_DARK_BLUE 11 +#define COLOUR_DARK_YELLOW 12 +#define COLOUR_DARK_CYAN 13 +#define COLOUR_DARK_MAGENTA 14 +#define COLOUR_WHITE 15 -#define INFO_COLOUR COLOUR_CYAN -#define EXT_COLOUR COLOUR_DARK_GREEN -#define BG_COLOUR COLOUR_BLACK -#define ERROR_COLOUR COLOUR_DARK_RED -#define MODE_COLOUR COLOUR_YELLOW +#define INFO_COLOUR COLOUR_CYAN +#define EXT_COLOUR COLOUR_DARK_GREEN +#define BG_COLOUR COLOUR_BLACK +#define ERROR_COLOUR COLOUR_DARK_RED +#define MODE_COLOUR COLOUR_YELLOW // MODE_FONT_SIZE should be equal or larger than STATUS_FONT_SIZE #define MODE_FONT_SIZE Layout[m_screenLayout].mode_font_size @@ -107,6 +117,7 @@ m_duplex(duplex), m_refresh(false), m_refreshTimer(1000U, 0U, REFRESH_PERIOD), m_lineBuf(NULL), +m_temp(), m_screenLayout(screenLayout) { assert(serial != NULL); @@ -127,12 +138,6 @@ bool CTFTSurenoo::open() } m_lineBuf = new char[statusLineOffset(STATUS_LINES)]; - if (m_lineBuf == NULL) { - LogError("Cannot allocate line buffer"); - m_serial->close(); - delete m_serial; - return false; - } lcdReset(); clearScreen(BG_COLOUR); @@ -477,7 +482,7 @@ void CTFTSurenoo::refreshDisplay(void) // clear display ::snprintf(m_temp, sizeof(m_temp), "BOXF(%d,%d,%d,%d,%d);", 0, 0, X_WIDTH - 1, Y_WIDTH - 1, BG_COLOUR); - m_serial->write((unsigned char*)m_temp, ::strlen(m_temp)); + m_serial->write((unsigned char*)m_temp, (unsigned int)::strlen(m_temp)); // mode line ::snprintf(m_temp, sizeof(m_temp), "DCV%d(%d,%d,'%s',%d);", diff --git a/UDPSocket.cpp b/UDPSocket.cpp index c28c039..6697670 100644 --- a/UDPSocket.cpp +++ b/UDPSocket.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2016,2020,2024 by Jonathan Naylor G4KLX + * Copyright (C) 2006-2016,2020,2024,2025 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 @@ -119,7 +119,7 @@ bool CUDPSocket::match(const sockaddr_storage& addr1, const sockaddr_storage& ad if (addr1.ss_family != addr2.ss_family) return false; - if (type == IMT_ADDRESS_AND_PORT) { + if (type == IPMATCHTYPE::IMT_ADDREAND_PORT) { switch (addr1.ss_family) { case AF_INET: struct sockaddr_in *in_1, *in_2; @@ -134,7 +134,7 @@ bool CUDPSocket::match(const sockaddr_storage& addr1, const sockaddr_storage& ad default: return false; } - } else if (type == IMT_ADDRESS_ONLY) { + } else if (type == IPMATCHTYPE::IMT_ADDREONLY) { switch (addr1.ss_family) { case AF_INET: struct sockaddr_in *in_1, *in_2; diff --git a/UDPSocket.h b/UDPSocket.h index 07bf274..fc0c422 100644 --- a/UDPSocket.h +++ b/UDPSocket.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2011,2013,2015,2016,2020,2024 by Jonathan Naylor G4KLX + * Copyright (C) 2009-2011,2013,2015,2016,2020,2024.2025 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 @@ -36,9 +36,9 @@ #include #endif -enum IPMATCHTYPE { - IMT_ADDRESS_AND_PORT, - IMT_ADDRESS_ONLY +enum class IPMATCHTYPE { + IMT_ADDREAND_PORT, + IMT_ADDREONLY }; class CUDPSocket { @@ -61,7 +61,7 @@ public: static int lookup(const std::string& hostName, unsigned short port, sockaddr_storage& address, unsigned int& addressLength); static int lookup(const std::string& hostName, unsigned short port, sockaddr_storage& address, unsigned int& addressLength, struct addrinfo& hints); - static bool match(const sockaddr_storage& addr1, const sockaddr_storage& addr2, IPMATCHTYPE type = IMT_ADDRESS_AND_PORT); + static bool match(const sockaddr_storage& addr1, const sockaddr_storage& addr2, IPMATCHTYPE type = IPMATCHTYPE::IMT_ADDREAND_PORT); static bool isNone(const sockaddr_storage& addr); diff --git a/Version.h b/Version.h index bb8d3e3..382c3a4 100644 --- a/Version.h +++ b/Version.h @@ -19,6 +19,6 @@ #if !defined(VERSION_H) #define VERSION_H -const char* VERSION = "20250312"; +const char* VERSION = "20250313"; #endif diff --git a/YSFControl.cpp b/YSFControl.cpp index 6467a92..56773c0 100644 --- a/YSFControl.cpp +++ b/YSFControl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015-2021 Jonathan Naylor, G4KLX + * Copyright (C) 2015-2021,2025 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 @@ -33,8 +33,8 @@ m_duplex(duplex), m_lowDeviation(lowDeviation), m_remoteGateway(remoteGateway), m_queue(5000U, "YSF Control"), -m_rfState(RS_RF_LISTENING), -m_netState(RS_NET_IDLE), +m_rfState(RPT_RF_STATE::LISTENING), +m_netState(RPT_NET_STATE::IDLE), m_rfTimeoutTimer(1000U, timeout), m_netTimeoutTimer(1000U, timeout), m_packetTimer(1000U, 0U, 200U), @@ -107,7 +107,7 @@ bool CYSFControl::writeModem(unsigned char *data, unsigned int len) unsigned char type = data[0U]; - if (type == TAG_LOST && m_rfState == RS_RF_AUDIO) { + if ((type == TAG_LOST) && (m_rfState == RPT_RF_STATE::AUDIO)) { if (m_rssi != 0U) LogMessage("YSF, transmission lost from %10.10s to %10.10s, %.1f seconds, BER: %.1f%%, RSSI: -%u/-%u/-%u dBm", m_rfSource, m_rfDest, float(m_rfFrames) / 10.0F, float(m_rfErrs * 100U) / float(m_rfBits), m_minRSSI, m_maxRSSI, m_aveRSSI / m_rssiCount); else @@ -116,17 +116,17 @@ bool CYSFControl::writeModem(unsigned char *data, unsigned int len) return false; } - if (type == TAG_LOST && m_rfState == RS_RF_REJECTED) { + if ((type == TAG_LOST) && (m_rfState == RPT_RF_STATE::REJECTED)) { m_rfPayload.reset(); m_rfSource = NULL; m_rfDest = NULL; - m_rfState = RS_RF_LISTENING; + m_rfState = RPT_RF_STATE::LISTENING; return false; } if (type == TAG_LOST) { m_rfPayload.reset(); - m_rfState = RS_RF_LISTENING; + m_rfState = RPT_RF_STATE::LISTENING; return false; } @@ -221,7 +221,7 @@ bool CYSFControl::processVWData(bool valid, unsigned char *data) unsigned char dgid = m_lastFICH.getDGId(); if (valid && fi == YSF_FI_HEADER) { - if (m_rfState == RS_RF_LISTENING) { + if (m_rfState == RPT_RF_STATE::LISTENING) { bool valid = m_rfPayload.processHeaderData(data + 2U); if (!valid) return false; @@ -232,7 +232,7 @@ bool CYSFControl::processVWData(bool valid, unsigned char *data) bool ret = checkCallsign(m_rfSource); if (!ret) { LogMessage("YSF, invalid access attempt from %10.10s to DG-ID %u", m_rfSource, dgid); - m_rfState = RS_RF_REJECTED; + m_rfState = RPT_RF_STATE::REJECTED; return true; } } @@ -247,7 +247,7 @@ bool CYSFControl::processVWData(bool valid, unsigned char *data) m_rfErrs = 0U; m_rfBits = 1U; m_rfTimeoutTimer.start(); - m_rfState = RS_RF_AUDIO; + m_rfState = RPT_RF_STATE::AUDIO; m_minRSSI = m_rssi; m_maxRSSI = m_rssi; @@ -286,13 +286,13 @@ bool CYSFControl::processVWData(bool valid, unsigned char *data) return true; } - } else if (valid && fi == YSF_FI_TERMINATOR) { - if (m_rfState == RS_RF_REJECTED) { + } else if (valid && (fi == YSF_FI_TERMINATOR)) { + if (m_rfState == RPT_RF_STATE::REJECTED) { m_rfPayload.reset(); m_rfSource = NULL; m_rfDest = NULL; - m_rfState = RS_RF_LISTENING; - } else if (m_rfState == RS_RF_AUDIO) { + m_rfState = RPT_RF_STATE::LISTENING; + } else if (m_rfState == RPT_RF_STATE::AUDIO) { m_rfPayload.processHeaderData(data + 2U); CSync::addYSFSync(data + 2U); @@ -325,7 +325,7 @@ bool CYSFControl::processVWData(bool valid, unsigned char *data) writeEndRF(); } } else { - if (m_rfState == RS_RF_AUDIO) { + if (m_rfState == RPT_RF_STATE::AUDIO) { // If valid is false, update the m_lastFICH for this transmission if (!valid) { // XXX Check these values @@ -390,7 +390,7 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data) unsigned char dgid = m_lastFICH.getDGId(); if (valid && fi == YSF_FI_HEADER) { - if (m_rfState == RS_RF_LISTENING) { + if (m_rfState == RPT_RF_STATE::LISTENING) { bool valid = m_rfPayload.processHeaderData(data + 2U); if (!valid) return false; @@ -401,7 +401,7 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data) bool ret = checkCallsign(m_rfSource); if (!ret) { LogMessage("YSF, invalid access attempt from %10.10s to DG-ID %u", m_rfSource, dgid); - m_rfState = RS_RF_REJECTED; + m_rfState = RPT_RF_STATE::REJECTED; return true; } } @@ -416,7 +416,7 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data) m_rfErrs = 0U; m_rfBits = 1U; m_rfTimeoutTimer.start(); - m_rfState = RS_RF_AUDIO; + m_rfState = RPT_RF_STATE::AUDIO; m_minRSSI = m_rssi; m_maxRSSI = m_rssi; @@ -455,13 +455,13 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data) return true; } - } else if (valid && fi == YSF_FI_TERMINATOR) { - if (m_rfState == RS_RF_REJECTED) { + } else if (valid && (fi == YSF_FI_TERMINATOR)) { + if (m_rfState == RPT_RF_STATE::REJECTED) { m_rfPayload.reset(); m_rfSource = NULL; m_rfDest = NULL; - m_rfState = RS_RF_LISTENING; - } else if (m_rfState == RS_RF_AUDIO) { + m_rfState = RPT_RF_STATE::LISTENING; + } else if (m_rfState == RPT_RF_STATE::AUDIO) { m_rfPayload.processHeaderData(data + 2U); CSync::addYSFSync(data + 2U); @@ -494,7 +494,7 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data) writeEndRF(); } } else { - if (m_rfState == RS_RF_AUDIO) { + if (m_rfState == RPT_RF_STATE::AUDIO) { // If valid is false, update the m_lastFICH for this transmission if (!valid) { unsigned char ft = m_lastFICH.getFT(); @@ -560,7 +560,7 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data) m_display->writeFusionRSSI(m_rssi); return true; - } else if (valid && m_rfState == RS_RF_LISTENING) { + } else if (valid && (m_rfState == RPT_RF_STATE::LISTENING)) { // Only use clean frames for late entry. unsigned char fn = m_lastFICH.getFN(); unsigned char dt = m_lastFICH.getDT(); @@ -597,7 +597,7 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data) bool ret = checkCallsign(m_rfSource); if (!ret) { LogMessage("YSF, invalid access attempt from %10.10s to DG-ID %u", m_rfSource, dgid); - m_rfState = RS_RF_REJECTED; + m_rfState = RPT_RF_STATE::REJECTED; return true; } } @@ -606,7 +606,7 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data) m_rfErrs = 0U; m_rfBits = 1U; m_rfTimeoutTimer.start(); - m_rfState = RS_RF_AUDIO; + m_rfState = RPT_RF_STATE::AUDIO; m_minRSSI = m_rssi; m_maxRSSI = m_rssi; @@ -692,7 +692,7 @@ bool CYSFControl::processFRData(bool valid, unsigned char *data) unsigned char dgid = m_lastFICH.getDGId(); if (valid && fi == YSF_FI_HEADER) { - if (m_rfState == RS_RF_LISTENING) { + if (m_rfState == RPT_RF_STATE::LISTENING) { valid = m_rfPayload.processHeaderData(data + 2U); if (!valid) return false; @@ -703,7 +703,7 @@ bool CYSFControl::processFRData(bool valid, unsigned char *data) bool ret = checkCallsign(m_rfSource); if (!ret) { LogMessage("YSF, invalid access attempt from %10.10s to DG-ID %u", m_rfSource, dgid); - m_rfState = RS_RF_REJECTED; + m_rfState = RPT_RF_STATE::REJECTED; return true; } } @@ -715,7 +715,7 @@ bool CYSFControl::processFRData(bool valid, unsigned char *data) m_rfDest = m_rfPayload.getDest(); m_rfFrames = 0U; - m_rfState = RS_RF_DATA; + m_rfState = RPT_RF_STATE::DATA; m_minRSSI = m_rssi; m_maxRSSI = m_rssi; @@ -754,12 +754,12 @@ bool CYSFControl::processFRData(bool valid, unsigned char *data) return true; } } else if (valid && fi == YSF_FI_TERMINATOR) { - if (m_rfState == RS_RF_REJECTED) { + if (m_rfState == RPT_RF_STATE::REJECTED) { m_rfPayload.reset(); m_rfSource = NULL; m_rfDest = NULL; - m_rfState = RS_RF_LISTENING; - } else if (m_rfState == RS_RF_DATA) { + m_rfState = RPT_RF_STATE::LISTENING; + } else if (m_rfState == RPT_RF_STATE::DATA) { m_rfPayload.processHeaderData(data + 2U); CSync::addYSFSync(data + 2U); @@ -792,7 +792,7 @@ bool CYSFControl::processFRData(bool valid, unsigned char *data) writeEndRF(); } } else { - if (m_rfState == RS_RF_DATA) { + if (m_rfState == RPT_RF_STATE::DATA) { // If valid is false, update the m_lastFICH for this transmission if (!valid) { unsigned char ft = m_lastFICH.getFT(); @@ -857,7 +857,7 @@ unsigned int CYSFControl::readModem(unsigned char* data) void CYSFControl::writeEndRF() { - m_rfState = RS_RF_LISTENING; + m_rfState = RPT_RF_STATE::LISTENING; m_rfTimeoutTimer.stop(); m_rfPayload.reset(); @@ -866,7 +866,7 @@ void CYSFControl::writeEndRF() m_rfSource = NULL; m_rfDest = NULL; - if (m_netState == RS_NET_IDLE) { + if (m_netState == RPT_NET_STATE::IDLE) { m_display->clearFusion(); if (m_network != NULL) @@ -880,7 +880,7 @@ void CYSFControl::writeEndRF() void CYSFControl::writeEndNet() { - m_netState = RS_NET_IDLE; + m_netState = RPT_NET_STATE::IDLE; m_netTimeoutTimer.stop(); m_networkWatchdog.stop(); @@ -904,7 +904,7 @@ void CYSFControl::writeNetwork() if (!m_enabled) return; - if (m_rfState != RS_RF_LISTENING && m_netState == RS_NET_IDLE) + if ((m_rfState != RPT_RF_STATE::LISTENING) && (m_netState == RPT_NET_STATE::IDLE)) return; m_networkWatchdog.start(); @@ -937,7 +937,7 @@ void CYSFControl::writeNetwork() m_netPayload.reset(); m_packetTimer.start(); m_elapsed.start(); - m_netState = RS_NET_AUDIO; + m_netState = RPT_NET_STATE::AUDIO; m_netFrames = 0U; m_netLost = 0U; m_netErrs = 0U; @@ -1060,7 +1060,7 @@ void CYSFControl::clock(unsigned int ms) m_rfTimeoutTimer.clock(ms); m_netTimeoutTimer.clock(ms); - if (m_netState == RS_NET_AUDIO) { + if (m_netState == RPT_NET_STATE::AUDIO) { m_networkWatchdog.clock(ms); if (m_networkWatchdog.hasExpired()) { @@ -1074,7 +1074,7 @@ void CYSFControl::writeQueueRF(const unsigned char *data) { assert(data != NULL); - if (m_netState != RS_NET_IDLE) + if (m_netState != RPT_NET_STATE::IDLE) return; if (m_rfTimeoutTimer.isRunning() && m_rfTimeoutTimer.hasExpired()) @@ -1197,7 +1197,7 @@ void CYSFControl::processNetCallsigns(const unsigned char* data, unsigned char d bool CYSFControl::isBusy() const { - return m_rfState != RS_RF_LISTENING || m_netState != RS_NET_IDLE; + return (m_rfState != RPT_RF_STATE::LISTENING) || (m_netState != RPT_NET_STATE::IDLE); } void CYSFControl::enable(bool enabled) @@ -1206,7 +1206,7 @@ void CYSFControl::enable(bool enabled) m_queue.clear(); // Reset the RF section - m_rfState = RS_RF_LISTENING; + m_rfState = RPT_RF_STATE::LISTENING; m_rfTimeoutTimer.stop(); m_rfPayload.reset(); @@ -1216,7 +1216,7 @@ void CYSFControl::enable(bool enabled) m_rfDest = NULL; // Reset the networking section - m_netState = RS_NET_IDLE; + m_netState = RPT_NET_STATE::IDLE; m_netTimeoutTimer.stop(); m_networkWatchdog.stop(); From cf15f42a0f41dc373795f51d4e2117714eabafc8 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Fri, 14 Mar 2025 12:13:11 +0000 Subject: [PATCH 3/3] Convert to C++ nullptr from NULL. --- AMBEFEC.cpp | 8 +- AX25Control.cpp | 26 +- AX25Network.cpp | 10 +- BCH.cpp | 2 +- BPTC19696.cpp | 14 +- CASTInfo.cpp | 18 +- CRC.cpp | 16 +- Conf.cpp | 52 +-- DMRCSBK.cpp | 6 +- DMRControl.cpp | 20 +- DMRData.cpp | 8 +- DMRDataHeader.cpp | 8 +- DMRDirectNetwork.cpp | 10 +- DMREMB.cpp | 6 +- DMREmbeddedData.cpp | 14 +- DMRFullLC.cpp | 10 +- DMRGatewayNetwork.cpp | 8 +- DMRLC.cpp | 8 +- DMRLookup.cpp | 4 +- DMRShortLC.cpp | 22 +- DMRSlot.cpp | 90 +++--- DMRSlotType.cpp | 6 +- DMRTA.cpp | 4 +- DMRTrellis.cpp | 10 +- DStarControl.cpp | 92 +++--- DStarDefines.h | 14 +- DStarHeader.cpp | 30 +- DStarNetwork.cpp | 12 +- DStarSlowData.cpp | 26 +- Display.cpp | 52 +-- FMControl.cpp | 22 +- FMNetwork.cpp | 22 +- Golay2087.cpp | 6 +- Golay24128.cpp | 4 +- Hamming.cpp | 26 +- LCDproc.cpp | 42 +-- Log.cpp | 18 +- M17CRC.cpp | 8 +- M17Control.cpp | 46 +-- M17Convolution.cpp | 36 +-- M17Defines.h | 4 +- M17LSF.cpp | 22 +- M17Network.cpp | 6 +- M17Utils.cpp | 14 +- MMDVMHost.cpp | 682 ++++++++++++++++++++-------------------- Modem.cpp | 154 ++++----- ModemSerialPort.cpp | 8 +- Mutex.cpp | 4 +- NXDNAudio.cpp | 18 +- NXDNCRC.cpp | 14 +- NXDNControl.cpp | 38 +-- NXDNConvolution.cpp | 20 +- NXDNFACCH1.cpp | 18 +- NXDNIcomNetwork.cpp | 4 +- NXDNKenwoodNetwork.cpp | 40 +-- NXDNLICH.cpp | 10 +- NXDNLayer3.cpp | 10 +- NXDNLookup.cpp | 4 +- NXDNSACCH.cpp | 18 +- NXDNUDCH.cpp | 18 +- NetworkInfo.cpp | 32 +- Nextion.cpp | 54 ++-- NullDisplay.h | 6 +- P25Audio.cpp | 12 +- P25Control.cpp | 50 +-- P25Data.cpp | 28 +- P25Defines.h | 2 +- P25LowSpeedData.cpp | 6 +- P25NID.cpp | 20 +- P25Network.cpp | 8 +- P25Trellis.cpp | 18 +- P25Utils.cpp | 16 +- POCSAGControl.cpp | 22 +- POCSAGNetwork.cpp | 4 +- PseudoTTYController.cpp | 4 +- QR1676.cpp | 6 +- RS.h | 10 +- RS129.cpp | 8 +- RS634717.cpp | 14 +- RSSIInterpolator.cpp | 10 +- RemoteControl.cpp | 10 +- RingBuffer.h | 6 +- SHA256.cpp | 24 +- StopWatch.cpp | 4 +- Sync.cpp | 20 +- TFTSurenoo.cpp | 44 +-- Thread.cpp | 14 +- UARTController.cpp | 38 +-- UDPController.cpp | 6 +- UDPSocket.cpp | 6 +- UserDB.cpp | 18 +- Utils.cpp | 18 +- Version.h | 2 +- YSFControl.cpp | 78 ++--- YSFConvolution.cpp | 20 +- YSFFICH.cpp | 10 +- YSFNetwork.cpp | 12 +- YSFPayload.cpp | 78 ++--- 98 files changed, 1340 insertions(+), 1340 deletions(-) diff --git a/AMBEFEC.cpp b/AMBEFEC.cpp index 3e141ed..1f2563d 100644 --- a/AMBEFEC.cpp +++ b/AMBEFEC.cpp @@ -475,7 +475,7 @@ CAMBEFEC::~CAMBEFEC() unsigned int CAMBEFEC::regenerateDMR(unsigned char* bytes) const { - assert(bytes != NULL); + assert(bytes != nullptr); unsigned int a1 = 0U, a2 = 0U, a3 = 0U; unsigned int MASK = 0x800000U; @@ -576,7 +576,7 @@ unsigned int CAMBEFEC::regenerateDMR(unsigned char* bytes) const unsigned int CAMBEFEC::regenerateDStar(unsigned char* bytes) const { - assert(bytes != NULL); + assert(bytes != nullptr); unsigned int a = 0U; unsigned int b = 0U; @@ -608,7 +608,7 @@ unsigned int CAMBEFEC::regenerateDStar(unsigned char* bytes) const unsigned int CAMBEFEC::regenerateYSFDN(unsigned char* bytes) const { - assert(bytes != NULL); + assert(bytes != nullptr); unsigned int a = 0U; unsigned int MASK = 0x800000U; @@ -659,7 +659,7 @@ unsigned int CAMBEFEC::regenerateYSFDN(unsigned char* bytes) const unsigned int CAMBEFEC::regenerateIMBE(unsigned char* bytes) const { - assert(bytes != NULL); + assert(bytes != nullptr); bool orig[144U]; bool temp[144U]; diff --git a/AX25Control.cpp b/AX25Control.cpp index 3b108fc..bcb5587 100644 --- a/AX25Control.cpp +++ b/AX25Control.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Jonathan Naylor, G4KLX + * Copyright (C) 2020,2025 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 @@ -32,7 +32,7 @@ CAX25Control::CAX25Control(CAX25Network* network, bool trace) : m_network(network), m_trace(trace), m_enabled(true), -m_fp(NULL) +m_fp(nullptr) { } @@ -42,7 +42,7 @@ CAX25Control::~CAX25Control() bool CAX25Control::writeModem(unsigned char *data, unsigned int len) { - assert(data != NULL); + assert(data != nullptr); if (!m_enabled) return false; @@ -52,7 +52,7 @@ bool CAX25Control::writeModem(unsigned char *data, unsigned int len) CUtils::dump(1U, "AX.25 received packet", data, len); - if (m_network == NULL) + if (m_network == nullptr) return true; return m_network->write(data, len); @@ -60,9 +60,9 @@ bool CAX25Control::writeModem(unsigned char *data, unsigned int len) unsigned int CAX25Control::readModem(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); - if (m_network == NULL) + if (m_network == nullptr) return 0U; if (!m_enabled) @@ -78,7 +78,7 @@ unsigned int CAX25Control::readModem(unsigned char* data) bool CAX25Control::openFile() { - if (m_fp != NULL) + if (m_fp != nullptr) return true; time_t t; @@ -90,7 +90,7 @@ bool CAX25Control::openFile() ::sprintf(name, "AX25_%04d%02d%02d_%02d%02d%02d.ambe", tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec); m_fp = ::fopen(name, "wb"); - if (m_fp == NULL) + if (m_fp == nullptr) return false; ::fwrite("AX25", 1U, 4U, m_fp); @@ -100,7 +100,7 @@ bool CAX25Control::openFile() bool CAX25Control::writeFile(const unsigned char* data, unsigned int length) { - if (m_fp == NULL) + if (m_fp == nullptr) return false; ::fwrite(&length, 1U, sizeof(unsigned int), m_fp); @@ -111,9 +111,9 @@ bool CAX25Control::writeFile(const unsigned char* data, unsigned int length) void CAX25Control::closeFile() { - if (m_fp != NULL) { + if (m_fp != nullptr) { ::fclose(m_fp); - m_fp = NULL; + m_fp = nullptr; } } @@ -124,7 +124,7 @@ void CAX25Control::enable(bool enabled) void CAX25Control::decode(const unsigned char* data, unsigned int length) { - assert(data != NULL); + assert(data != nullptr); assert(length >= 15U); std::string text; @@ -223,7 +223,7 @@ void CAX25Control::decode(const unsigned char* data, unsigned int length) bool CAX25Control::decodeAddress(const unsigned char* data, std::string& text, bool isDigi) const { - assert(data != NULL); + assert(data != nullptr); for (unsigned int i = 0U; i < 6U; i++) { char c = data[i] >> 1; diff --git a/AX25Network.cpp b/AX25Network.cpp index d7f876d..36c84e5 100644 --- a/AX25Network.cpp +++ b/AX25Network.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 by Jonathan Naylor G4KLX + * Copyright (C) 2020,2025 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 @@ -31,8 +31,8 @@ const unsigned int BUFFER_LENGTH = 500U; CAX25Network::CAX25Network(const std::string& port, unsigned int speed, bool debug) : m_serial(port, speed, false), -m_txData(NULL), -m_rxData(NULL), +m_txData(nullptr), +m_rxData(nullptr), m_rxLength(0U), m_rxLastChar(0U), m_debug(debug), @@ -60,7 +60,7 @@ bool CAX25Network::open() bool CAX25Network::write(const unsigned char* data, unsigned int length) { - assert(data != NULL); + assert(data != nullptr); if (!m_enabled) return true; @@ -98,7 +98,7 @@ bool CAX25Network::write(const unsigned char* data, unsigned int length) unsigned int CAX25Network::read(unsigned char* data, unsigned int length) { - assert(data != NULL); + assert(data != nullptr); bool complete = false; diff --git a/BCH.cpp b/BCH.cpp index fa02351..938f322 100644 --- a/BCH.cpp +++ b/BCH.cpp @@ -123,7 +123,7 @@ void CBCH::encode(const int* data, int* bb) void CBCH::encode(unsigned char* nid) { - assert(nid != NULL); + assert(nid != nullptr); int data[16]; for (int i = 0; i < 16; i++) diff --git a/BPTC19696.cpp b/BPTC19696.cpp index 289005a..334fec2 100644 --- a/BPTC19696.cpp +++ b/BPTC19696.cpp @@ -1,6 +1,6 @@ /* * Copyright (C) 2012 by Ian Wraith - * Copyright (C) 2015 by Jonathan Naylor G4KLX + * Copyright (C) 2015,2025 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 @@ -27,8 +27,8 @@ #include CBPTC19696::CBPTC19696() : -m_rawData(NULL), -m_deInterData(NULL) +m_rawData(nullptr), +m_deInterData(nullptr) { m_rawData = new bool[196]; m_deInterData = new bool[196]; @@ -43,8 +43,8 @@ CBPTC19696::~CBPTC19696() // The main decode function void CBPTC19696::decode(const unsigned char* in, unsigned char* out) { - assert(in != NULL); - assert(out != NULL); + assert(in != nullptr); + assert(out != nullptr); // Get the raw binary decodeExtractBinary(in); @@ -62,8 +62,8 @@ void CBPTC19696::decode(const unsigned char* in, unsigned char* out) // The main encode function void CBPTC19696::encode(const unsigned char* in, unsigned char* out) { - assert(in != NULL); - assert(out != NULL); + assert(in != nullptr); + assert(out != nullptr); // Extract Data encodeExtractData(in); diff --git a/CASTInfo.cpp b/CASTInfo.cpp index 1c347cc..a0bc82b 100644 --- a/CASTInfo.cpp +++ b/CASTInfo.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016,2018,2020,2021 by Jonathan Naylor G4KLX + * Copyright (C) 2016,2018,2020,2021,2025 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 @@ -54,7 +54,7 @@ void CCASTInfo::setIdleInt() m_ipaddress = (char*)info; delete m_network; - if (m_modem != NULL) + if (m_modem != nullptr) m_modem->writeIPInfo(m_ipaddress); networkInfoInitialized = true; @@ -80,7 +80,7 @@ void CCASTInfo::setFMInt() void CCASTInfo::writeDStarInt(const char* my1, const char* my2, const char* your, const char* type, const char* reflector) { - if (m_modem != NULL) + if (m_modem != nullptr) m_modem->writeDStarInfo(my1, my2, your, type, reflector); } @@ -90,7 +90,7 @@ void CCASTInfo::clearDStarInt() void CCASTInfo::writeDMRInt(unsigned int slotNo, const std::string& src, bool group, const std::string& dst, const char* type) { - if (m_modem != NULL) + if (m_modem != nullptr) m_modem->writeDMRInfo(slotNo, src, group, dst, type); } @@ -100,7 +100,7 @@ void CCASTInfo::clearDMRInt(unsigned int slotNo) void CCASTInfo::writeFusionInt(const char* source, const char* dest, unsigned char dgid, const char* type, const char* origin) { - if (m_modem != NULL) + if (m_modem != nullptr) m_modem->writeYSFInfo(source, dest, dgid, type, origin); } @@ -110,7 +110,7 @@ void CCASTInfo::clearFusionInt() void CCASTInfo::writeP25Int(const char* source, bool group, unsigned int dest, const char* type) { - if (m_modem != NULL) + if (m_modem != nullptr) m_modem->writeP25Info(source, group, dest, type); } @@ -120,7 +120,7 @@ void CCASTInfo::clearP25Int() void CCASTInfo::writeNXDNInt(const char* source, bool group, unsigned int dest, const char* type) { - if (m_modem != NULL) + if (m_modem != nullptr) m_modem->writeNXDNInfo(source, group, dest, type); } @@ -130,7 +130,7 @@ void CCASTInfo::clearNXDNInt() void CCASTInfo::writeM17Int(const char* source, const char* dest, const char* type) { - if (m_modem != NULL) + if (m_modem != nullptr) m_modem->writeM17Info(source, dest, type); } @@ -140,7 +140,7 @@ void CCASTInfo::clearM17Int() void CCASTInfo::writePOCSAGInt(uint32_t ric, const std::string& message) { - if (m_modem != NULL) + if (m_modem != nullptr) m_modem->writePOCSAGInfo(ric, message); } diff --git a/CRC.cpp b/CRC.cpp index c99ca6c..d7a8390 100644 --- a/CRC.cpp +++ b/CRC.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015,2016 by Jonathan Naylor G4KLX + * Copyright (C) 2015,2016,2025 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 @@ -121,7 +121,7 @@ const uint16_t CCITT16_TABLE2[] = { bool CCRC::checkFiveBit(bool* in, unsigned int tcrc) { - assert(in != NULL); + assert(in != nullptr); unsigned int crc; encodeFiveBit(in, crc); @@ -131,7 +131,7 @@ bool CCRC::checkFiveBit(bool* in, unsigned int tcrc) void CCRC::encodeFiveBit(const bool* in, unsigned int& tcrc) { - assert(in != NULL); + assert(in != nullptr); unsigned short total = 0U; for (unsigned int i = 0U; i < 72U; i += 8U) { @@ -147,7 +147,7 @@ void CCRC::encodeFiveBit(const bool* in, unsigned int& tcrc) void CCRC::addCCITT162(unsigned char *in, unsigned int length) { - assert(in != NULL); + assert(in != nullptr); assert(length > 2U); union { @@ -168,7 +168,7 @@ void CCRC::addCCITT162(unsigned char *in, unsigned int length) bool CCRC::checkCCITT162(const unsigned char *in, unsigned int length) { - assert(in != NULL); + assert(in != nullptr); assert(length > 2U); union { @@ -188,7 +188,7 @@ bool CCRC::checkCCITT162(const unsigned char *in, unsigned int length) void CCRC::addCCITT161(unsigned char *in, unsigned int length) { - assert(in != NULL); + assert(in != nullptr); assert(length > 2U); union { @@ -209,7 +209,7 @@ void CCRC::addCCITT161(unsigned char *in, unsigned int length) bool CCRC::checkCCITT161(const unsigned char *in, unsigned int length) { - assert(in != NULL); + assert(in != nullptr); assert(length > 2U); union { @@ -229,7 +229,7 @@ bool CCRC::checkCCITT161(const unsigned char *in, unsigned int length) unsigned char CCRC::crc8(const unsigned char *in, unsigned int length) { - assert(in != NULL); + assert(in != nullptr); uint8_t crc = 0U; diff --git a/Conf.cpp b/Conf.cpp index fe6f1b5..b401462 100644 --- a/Conf.cpp +++ b/Conf.cpp @@ -356,7 +356,7 @@ CConf::~CConf() bool CConf::read() { FILE* fp = ::fopen(m_file.c_str(), "rt"); - if (fp == NULL) { + if (fp == nullptr) { ::fprintf(stderr, "Couldn't open the .ini file - %s\n", m_file.c_str()); return false; } @@ -364,7 +364,7 @@ bool CConf::read() SECTION section = SECTION::NONE; char buffer[BUFFER_SIZE]; - while (::fgets(buffer, BUFFER_SIZE, fp) != NULL) { + while (::fgets(buffer, BUFFER_SIZE, fp) != nullptr) { if (buffer[0U] == '#') continue; @@ -442,11 +442,11 @@ bool CConf::read() } char* key = ::strtok(buffer, " \t=\r\n"); - if (key == NULL) + if (key == nullptr) continue; - char* value = ::strtok(NULL, "\r\n"); - if (value == NULL) + char* value = ::strtok(nullptr, "\r\n"); + if (value == nullptr) continue; // Remove quotes from the value @@ -458,7 +458,7 @@ bool CConf::read() char *p; // if value is not quoted, remove after # (to make comment) - if ((p = strchr(value, '#')) != NULL) + if ((p = strchr(value, '#')) != nullptr) *p = '\0'; // remove trailing tab/space @@ -550,7 +550,7 @@ bool CConf::read() else if (::strcmp(key, "I2CPort") == 0) m_modemI2CPort = value; else if (::strcmp(key, "I2CAddress") == 0) - m_modemI2CAddress = (unsigned int)::strtoul(value, NULL, 16); + m_modemI2CAddress = (unsigned int)::strtoul(value, nullptr, 16); else if (::strcmp(key, "ModemAddress") == 0) m_modemModemAddress = value; else if (::strcmp(key, "ModemPort") == 0) @@ -634,7 +634,7 @@ bool CConf::read() m_dstarSelfOnly = ::atoi(value) == 1; else if (::strcmp(key, "BlackList") == 0) { char* p = ::strtok(value, ",\r\n"); - while (p != NULL) { + while (p != nullptr) { if (::strlen(p) > 0U) { for (unsigned int i = 0U; p[i] != 0; i++) p[i] = ::toupper(p[i]); @@ -642,11 +642,11 @@ bool CConf::read() callsign.resize(DSTAR_LONG_CALLSIGN_LENGTH, ' '); m_dstarBlackList.push_back(callsign); } - p = ::strtok(NULL, ",\r\n"); + p = ::strtok(nullptr, ",\r\n"); } } else if (::strcmp(key, "WhiteList") == 0) { char* p = ::strtok(value, ",\r\n"); - while (p != NULL) { + while (p != nullptr) { if (::strlen(p) > 0U) { for (unsigned int i = 0U; p[i] != 0; i++) p[i] = ::toupper(p[i]); @@ -654,7 +654,7 @@ bool CConf::read() callsign.resize(DSTAR_LONG_CALLSIGN_LENGTH, ' '); m_dstarWhiteList.push_back(callsign); } - p = ::strtok(NULL, ",\r\n"); + p = ::strtok(nullptr, ",\r\n"); } } else if (::strcmp(key, "AckReply") == 0) m_dstarAckReply = ::atoi(value) == 1; @@ -692,43 +692,43 @@ bool CConf::read() m_dmrDumpTAData = ::atoi(value) == 1; else if (::strcmp(key, "Prefixes") == 0) { char* p = ::strtok(value, ",\r\n"); - while (p != NULL) { + while (p != nullptr) { unsigned int prefix = (unsigned int)::atoi(p); if (prefix > 0U && prefix <= 999U) m_dmrPrefixes.push_back(prefix); - p = ::strtok(NULL, ",\r\n"); + p = ::strtok(nullptr, ",\r\n"); } } else if (::strcmp(key, "BlackList") == 0) { char* p = ::strtok(value, ",\r\n"); - while (p != NULL) { + while (p != nullptr) { unsigned int id = (unsigned int)::atoi(p); if (id > 0U) m_dmrBlackList.push_back(id); - p = ::strtok(NULL, ",\r\n"); + p = ::strtok(nullptr, ",\r\n"); } } else if (::strcmp(key, "WhiteList") == 0) { char* p = ::strtok(value, ",\r\n"); - while (p != NULL) { + while (p != nullptr) { unsigned int id = (unsigned int)::atoi(p); if (id > 0U) m_dmrWhiteList.push_back(id); - p = ::strtok(NULL, ",\r\n"); + p = ::strtok(nullptr, ",\r\n"); } } else if (::strcmp(key, "Slot1TGWhiteList") == 0) { char* p = ::strtok(value, ",\r\n"); - while (p != NULL) { + while (p != nullptr) { unsigned int id = (unsigned int)::atoi(p); if (id > 0U) m_dmrSlot1TGWhiteList.push_back(id); - p = ::strtok(NULL, ",\r\n"); + p = ::strtok(nullptr, ",\r\n"); } } else if (::strcmp(key, "Slot2TGWhiteList") == 0) { char* p = ::strtok(value, ",\r\n"); - while (p != NULL) { + while (p != nullptr) { unsigned int id = (unsigned int)::atoi(p); if (id > 0U) m_dmrSlot2TGWhiteList.push_back(id); - p = ::strtok(NULL, ",\r\n"); + p = ::strtok(nullptr, ",\r\n"); } } else if (::strcmp(key, "TXHang") == 0) m_dmrTXHang = (unsigned int)::atoi(value); @@ -775,7 +775,7 @@ bool CConf::read() else if (::strcmp(key, "Id") == 0) m_p25Id = (unsigned int)::atoi(value); else if (::strcmp(key, "NAC") == 0) - m_p25NAC = (unsigned int)::strtoul(value, NULL, 16); + m_p25NAC = (unsigned int)::strtoul(value, nullptr, 16); else if (::strcmp(key, "OverrideUIDCheck") == 0) m_p25OverrideUID = ::atoi(value) == 1; else if (::strcmp(key, "SelfOnly") == 0) @@ -1086,7 +1086,7 @@ bool CConf::read() else if (::strcmp(key, "Columns") == 0) m_hd44780Columns = (unsigned int)::atoi(value); else if (::strcmp(key, "I2CAddress") == 0) - m_hd44780i2cAddress = (unsigned int)::strtoul(value, NULL, 16); + m_hd44780i2cAddress = (unsigned int)::strtoul(value, nullptr, 16); else if (::strcmp(key, "PWM") == 0) m_hd44780PWM = ::atoi(value) == 1; else if (::strcmp(key, "PWMPin") == 0) @@ -1101,10 +1101,10 @@ bool CConf::read() m_hd44780UTC = ::atoi(value) == 1; else if (::strcmp(key, "Pins") == 0) { char* p = ::strtok(value, ",\r\n"); - while (p != NULL) { + while (p != nullptr) { unsigned int pin = (unsigned int)::atoi(p); m_hd44780Pins.push_back(pin); - p = ::strtok(NULL, ",\r\n"); + p = ::strtok(nullptr, ",\r\n"); } } } else if (section == SECTION::NEXTION) { @@ -1119,7 +1119,7 @@ bool CConf::read() else if (::strcmp(key, "IdleBrightness") == 0) m_nextionIdleBrightness = (unsigned int)::atoi(value); else if (::strcmp(key, "ScreenLayout") == 0) - m_nextionScreenLayout = (unsigned int)::strtoul(value, NULL, 0); + m_nextionScreenLayout = (unsigned int)::strtoul(value, nullptr, 0); else if (::strcmp(key, "DisplayTempInFahrenheit") == 0) m_nextionTempInFahrenheit = ::atoi(value) == 1; else if (::strcmp(key, "NextionOutput") == 0) diff --git a/DMRCSBK.cpp b/DMRCSBK.cpp index c30e8e7..e909ae6 100644 --- a/DMRCSBK.cpp +++ b/DMRCSBK.cpp @@ -26,7 +26,7 @@ #include CDMRCSBK::CDMRCSBK() : -m_data(NULL), +m_data(nullptr), m_CSBKO(CSBKO::NONE), m_FID(0x00U), m_GI(false), @@ -47,7 +47,7 @@ CDMRCSBK::~CDMRCSBK() bool CDMRCSBK::put(const unsigned char* bytes) { - assert(bytes != NULL); + assert(bytes != nullptr); CBPTC19696 bptc; bptc.decode(bytes, m_data); @@ -171,7 +171,7 @@ bool CDMRCSBK::put(const unsigned char* bytes) void CDMRCSBK::get(unsigned char* bytes) const { - assert(bytes != NULL); + assert(bytes != nullptr); m_data[10U] ^= CSBK_CRC_MASK[0U]; m_data[11U] ^= CSBK_CRC_MASK[1U]; diff --git a/DMRControl.cpp b/DMRControl.cpp index 20fd49b..3943e9a 100644 --- a/DMRControl.cpp +++ b/DMRControl.cpp @@ -30,10 +30,10 @@ m_slot2(2U, timeout), m_lookup(lookup) { assert(id != 0U); - assert(modem != NULL); - assert(display != NULL); - assert(lookup != NULL); - assert(rssi != NULL); + assert(modem != nullptr); + assert(display != nullptr); + assert(lookup != nullptr); + assert(rssi != nullptr); // Load black and white lists to DMRAccessControl CDMRAccessControl::init(blacklist, whitelist, slot1TGWhitelist, slot2TGWhitelist, selfOnly, prefixes, id); @@ -47,7 +47,7 @@ CDMRControl::~CDMRControl() bool CDMRControl::processWakeup(const unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); // Wakeups always come in on slot 1 if (data[0U] != TAG_DATA || data[1U] != (DMR_IDLE_RX | DMR_SYNC_DATA | DT_CSBK)) @@ -78,35 +78,35 @@ bool CDMRControl::processWakeup(const unsigned char* data) bool CDMRControl::writeModemSlot1(unsigned char *data, unsigned int len) { - assert(data != NULL); + assert(data != nullptr); return m_slot1.writeModem(data, len); } bool CDMRControl::writeModemSlot2(unsigned char *data, unsigned int len) { - assert(data != NULL); + assert(data != nullptr); return m_slot2.writeModem(data, len); } unsigned int CDMRControl::readModemSlot1(unsigned char *data) { - assert(data != NULL); + assert(data != nullptr); return m_slot1.readModem(data); } unsigned int CDMRControl::readModemSlot2(unsigned char *data) { - assert(data != NULL); + assert(data != nullptr); return m_slot2.readModem(data); } void CDMRControl::clock() { - if (m_network != NULL) { + if (m_network != nullptr) { CDMRData data; bool ret = m_network->read(data); if (ret) { diff --git a/DMRData.cpp b/DMRData.cpp index 39830d8..3ac72a6 100644 --- a/DMRData.cpp +++ b/DMRData.cpp @@ -23,7 +23,7 @@ CDMRData::CDMRData(const CDMRData& data) : m_slotNo(data.m_slotNo), -m_data(NULL), +m_data(nullptr), m_srcId(data.m_srcId), m_dstId(data.m_dstId), m_flco(data.m_flco), @@ -39,7 +39,7 @@ m_rssi(data.m_rssi) CDMRData::CDMRData() : m_slotNo(1U), -m_data(NULL), +m_data(nullptr), m_srcId(0U), m_dstId(0U), m_flco(FLCO::GROUP), @@ -170,7 +170,7 @@ void CDMRData::setRSSI(unsigned char rssi) unsigned int CDMRData::getData(unsigned char* buffer) const { - assert(buffer != NULL); + assert(buffer != nullptr); ::memcpy(buffer, m_data, DMR_FRAME_LENGTH_BYTES); @@ -179,7 +179,7 @@ unsigned int CDMRData::getData(unsigned char* buffer) const void CDMRData::setData(const unsigned char* buffer) { - assert(buffer != NULL); + assert(buffer != nullptr); ::memcpy(m_data, buffer, DMR_FRAME_LENGTH_BYTES); } diff --git a/DMRDataHeader.cpp b/DMRDataHeader.cpp index 4a819f6..0b44be4 100644 --- a/DMRDataHeader.cpp +++ b/DMRDataHeader.cpp @@ -1,6 +1,6 @@ /* * Copyright (C) 2012 by Ian Wraith - * Copyright (C) 2015,2016,2017 by Jonathan Naylor G4KLX + * Copyright (C) 2015,2016,2017,2025 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 @@ -32,7 +32,7 @@ const unsigned char UDTF_NMEA = 0x05U; CDMRDataHeader::CDMRDataHeader() : -m_data(NULL), +m_data(nullptr), m_GI(false), m_A(false), m_srcId(0U), @@ -52,7 +52,7 @@ CDMRDataHeader::~CDMRDataHeader() bool CDMRDataHeader::put(const unsigned char* bytes) { - assert(bytes != NULL); + assert(bytes != nullptr); CBPTC19696 bptc; bptc.decode(bytes, m_data); @@ -131,7 +131,7 @@ bool CDMRDataHeader::put(const unsigned char* bytes) void CDMRDataHeader::get(unsigned char* bytes) const { - assert(bytes != NULL); + assert(bytes != nullptr); CBPTC19696 bptc; bptc.encode(m_data, bytes); diff --git a/DMRDirectNetwork.cpp b/DMRDirectNetwork.cpp index d231972..1d0902b 100644 --- a/DMRDirectNetwork.cpp +++ b/DMRDirectNetwork.cpp @@ -35,7 +35,7 @@ m_address(address), m_port(port), m_addr(), m_addrLen(0U), -m_id(NULL), +m_id(nullptr), m_password(password), m_duplex(duplex), m_version(version), @@ -48,9 +48,9 @@ m_hwType(hwType), m_status(STATUS::WAITING_CONNECT), m_retryTimer(1000U, 10U), m_timeoutTimer(1000U, 60U), -m_buffer(NULL), -m_streamId(NULL), -m_salt(NULL), +m_buffer(nullptr), +m_streamId(nullptr), +m_salt(nullptr), m_rxData(1000U, "DMR Network"), m_options(), m_random(), @@ -626,7 +626,7 @@ bool CDMRDirectNetwork::wantsBeacon() bool CDMRDirectNetwork::write(const unsigned char* data, unsigned int length) { - assert(data != NULL); + assert(data != nullptr); assert(length > 0U); if (m_debug) diff --git a/DMREMB.cpp b/DMREMB.cpp index 7b62cba..9bc361b 100644 --- a/DMREMB.cpp +++ b/DMREMB.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015,2016 by Jonathan Naylor G4KLX + * Copyright (C) 2015,2016,2025 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 @@ -36,7 +36,7 @@ CDMREMB::~CDMREMB() void CDMREMB::putData(const unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); unsigned char DMREMB[2U]; DMREMB[0U] = (data[13U] << 4) & 0xF0U; @@ -53,7 +53,7 @@ void CDMREMB::putData(const unsigned char* data) void CDMREMB::getData(unsigned char* data) const { - assert(data != NULL); + assert(data != nullptr); unsigned char DMREMB[2U]; DMREMB[0U] = (m_colorCode << 4) & 0xF0U; diff --git a/DMREmbeddedData.cpp b/DMREmbeddedData.cpp index f2fb365..affb6f3 100644 --- a/DMREmbeddedData.cpp +++ b/DMREmbeddedData.cpp @@ -27,9 +27,9 @@ #include CDMREmbeddedData::CDMREmbeddedData() : -m_raw(NULL), +m_raw(nullptr), m_state(LC_STATE::NONE), -m_data(NULL), +m_data(nullptr), m_FLCO(FLCO::GROUP), m_valid(false) { @@ -46,7 +46,7 @@ CDMREmbeddedData::~CDMREmbeddedData() // Add LC data (which may consist of 4 blocks) to the data store bool CDMREmbeddedData::addData(const unsigned char* data, unsigned char lcss) { - assert(data != NULL); + assert(data != nullptr); bool rawData[40U]; CUtils::byteToBitsBE(data[14U], rawData + 0U); @@ -168,7 +168,7 @@ void CDMREmbeddedData::encodeEmbeddedData() unsigned char CDMREmbeddedData::getData(unsigned char* data, unsigned char n) const { - assert(data != NULL); + assert(data != nullptr); if (n >= 1U && n < 5U) { n--; @@ -277,10 +277,10 @@ void CDMREmbeddedData::decodeEmbeddedData() CDMRLC* CDMREmbeddedData::getLC() const { if (!m_valid) - return NULL; + return nullptr; if ((m_FLCO != FLCO::GROUP) && (m_FLCO != FLCO::USER_USER)) - return NULL; + return nullptr; return new CDMRLC(m_data); } @@ -303,7 +303,7 @@ void CDMREmbeddedData::reset() bool CDMREmbeddedData::getRawData(unsigned char* data) const { - assert(data != NULL); + assert(data != nullptr); if (!m_valid) return false; diff --git a/DMRFullLC.cpp b/DMRFullLC.cpp index dbcd6cc..f9c9c6c 100644 --- a/DMRFullLC.cpp +++ b/DMRFullLC.cpp @@ -1,6 +1,6 @@ /* * Copyright (C) 2012 by Ian Wraith - * Copyright (C) 2015,2016 by Jonathan Naylor G4KLX + * Copyright (C) 2015,2016,2025 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 @@ -38,7 +38,7 @@ CDMRFullLC::~CDMRFullLC() CDMRLC* CDMRFullLC::decode(const unsigned char* data, unsigned char type) { - assert(data != NULL); + assert(data != nullptr); unsigned char lcData[12U]; m_bptc.decode(data, lcData); @@ -58,18 +58,18 @@ CDMRLC* CDMRFullLC::decode(const unsigned char* data, unsigned char type) default: ::LogError("Unsupported LC type - %d", int(type)); - return NULL; + return nullptr; } if (!CRS129::check(lcData)) - return NULL; + return nullptr; return new CDMRLC(lcData); } void CDMRFullLC::encode(const CDMRLC& lc, unsigned char* data, unsigned char type) { - assert(data != NULL); + assert(data != nullptr); unsigned char lcData[12U]; lc.getData(lcData); diff --git a/DMRGatewayNetwork.cpp b/DMRGatewayNetwork.cpp index 0bb3e66..94a659f 100644 --- a/DMRGatewayNetwork.cpp +++ b/DMRGatewayNetwork.cpp @@ -36,7 +36,7 @@ m_addressStr(address), m_addr(), m_addrLen(0U), m_port(port), -m_id(NULL), +m_id(nullptr), m_duplex(duplex), m_version(version), m_debug(debug), @@ -45,8 +45,8 @@ m_enabled(false), m_slot1(slot1), m_slot2(slot2), m_hwType(hwType), -m_buffer(NULL), -m_streamId(NULL), +m_buffer(nullptr), +m_streamId(nullptr), m_rxData(1000U, "DMR Network"), m_beacon(false), m_random(), @@ -434,7 +434,7 @@ bool CDMRGatewayNetwork::wantsBeacon() bool CDMRGatewayNetwork::write(const unsigned char* data, unsigned int length) { - assert(data != NULL); + assert(data != nullptr); assert(length > 0U); if (m_debug) diff --git a/DMRLC.cpp b/DMRLC.cpp index 36c0cfa..5bd6fde 100644 --- a/DMRLC.cpp +++ b/DMRLC.cpp @@ -43,7 +43,7 @@ m_options(0U), m_srcId(0U), m_dstId(0U) { - assert(bytes != NULL); + assert(bytes != nullptr); m_PF = (bytes[0U] & 0x80U) == 0x80U; m_R = (bytes[0U] & 0x40U) == 0x40U; @@ -67,7 +67,7 @@ m_options(0U), m_srcId(0U), m_dstId(0U) { - assert(bits != NULL); + assert(bits != nullptr); m_PF = bits[0U]; m_R = bits[1U]; @@ -113,7 +113,7 @@ CDMRLC::~CDMRLC() void CDMRLC::getData(unsigned char* bytes) const { - assert(bytes != NULL); + assert(bytes != nullptr); bytes[0U] = (unsigned char)m_FLCO; @@ -138,7 +138,7 @@ void CDMRLC::getData(unsigned char* bytes) const void CDMRLC::getData(bool* bits) const { - assert(bits != NULL); + assert(bits != nullptr); unsigned char bytes[9U]; getData(bytes); diff --git a/DMRLookup.cpp b/DMRLookup.cpp index 413a950..afe0920 100644 --- a/DMRLookup.cpp +++ b/DMRLookup.cpp @@ -1,5 +1,5 @@ /* -* Copyright (C) 2016,2017 by Jonathan Naylor G4KLX +* Copyright (C) 2016,2017,2025 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 @@ -132,5 +132,5 @@ std::string CDMRLookup::find(unsigned int id) bool CDMRLookup::exists(unsigned int id) { - return m_table.lookup(id, NULL); + return m_table.lookup(id, nullptr); } diff --git a/DMRShortLC.cpp b/DMRShortLC.cpp index 9341db7..a511aca 100644 --- a/DMRShortLC.cpp +++ b/DMRShortLC.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015,2016 by Jonathan Naylor G4KLX + * Copyright (C) 2015,2016,2025 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 @@ -26,8 +26,8 @@ #include CDMRShortLC::CDMRShortLC() : -m_rawData(NULL), -m_deInterData(NULL) +m_rawData(nullptr), +m_deInterData(nullptr) { m_rawData = new bool[72U]; m_deInterData = new bool[68U]; @@ -42,8 +42,8 @@ CDMRShortLC::~CDMRShortLC() // The main decode function bool CDMRShortLC::decode(const unsigned char* in, unsigned char* out) { - assert(in != NULL); - assert(out != NULL); + assert(in != nullptr); + assert(out != nullptr); // Get the raw binary decodeExtractBinary(in); @@ -65,8 +65,8 @@ bool CDMRShortLC::decode(const unsigned char* in, unsigned char* out) // The main encode function void CDMRShortLC::encode(const unsigned char* in, unsigned char* out) { - assert(in != NULL); - assert(out != NULL); + assert(in != nullptr); + assert(out != nullptr); // Extract Data encodeExtractData(in); @@ -83,7 +83,7 @@ void CDMRShortLC::encode(const unsigned char* in, unsigned char* out) void CDMRShortLC::decodeExtractBinary(const unsigned char* in) { - assert(in != NULL); + assert(in != nullptr); CUtils::byteToBitsBE(in[0U], m_rawData + 0U); CUtils::byteToBitsBE(in[1U], m_rawData + 8U); @@ -133,7 +133,7 @@ bool CDMRShortLC::decodeErrorCheck() // Extract the 36 bits of payload void CDMRShortLC::decodeExtractData(unsigned char* data) const { - assert(data != NULL); + assert(data != nullptr); bool bData[40U]; @@ -160,7 +160,7 @@ void CDMRShortLC::decodeExtractData(unsigned char* data) const // Extract the 36 bits of payload void CDMRShortLC::encodeExtractData(const unsigned char* in) const { - assert(in != NULL); + assert(in != nullptr); bool bData[40U]; CUtils::byteToBitsBE(in[0U], bData + 0U); @@ -214,7 +214,7 @@ void CDMRShortLC::encodeInterleave() void CDMRShortLC::encodeExtractBinary(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); CUtils::bitsToByteBE(m_rawData + 0U, data[0U]); CUtils::bitsToByteBE(m_rawData + 8U, data[1U]); diff --git a/DMRSlot.cpp b/DMRSlot.cpp index 0ae4fa8..054b81b 100644 --- a/DMRSlot.cpp +++ b/DMRSlot.cpp @@ -37,21 +37,21 @@ unsigned int CDMRSlot::m_colorCode = 0U; bool CDMRSlot::m_embeddedLCOnly = false; bool CDMRSlot::m_dumpTAData = true; -CModem* CDMRSlot::m_modem = NULL; -IDMRNetwork* CDMRSlot::m_network = NULL; -CDisplay* CDMRSlot::m_display = NULL; +CModem* CDMRSlot::m_modem = nullptr; +IDMRNetwork* CDMRSlot::m_network = nullptr; +CDisplay* CDMRSlot::m_display = nullptr; bool CDMRSlot::m_duplex = true; -CDMRLookup* CDMRSlot::m_lookup = NULL; +CDMRLookup* CDMRSlot::m_lookup = nullptr; unsigned int CDMRSlot::m_hangCount = 3U * 17U; DMR_OVCM CDMRSlot::m_ovcm = DMR_OVCM::OFF; bool CDMRSlot::m_protect = false; -CRSSIInterpolator* CDMRSlot::m_rssiMapper = NULL; +CRSSIInterpolator* CDMRSlot::m_rssiMapper = nullptr; unsigned int CDMRSlot::m_jitterTime = 360U; unsigned int CDMRSlot::m_jitterSlots = 6U; -unsigned char* CDMRSlot::m_idle = NULL; +unsigned char* CDMRSlot::m_idle = nullptr; FLCO CDMRSlot::m_flco1; unsigned char CDMRSlot::m_id1 = 0U; @@ -78,19 +78,19 @@ m_queue(5000U, "DMR Slot"), m_rfState(RPT_RF_STATE::LISTENING), m_netState(RPT_NET_STATE::IDLE), m_rfEmbeddedLC(), -m_rfEmbeddedData(NULL), +m_rfEmbeddedData(nullptr), m_rfEmbeddedReadN(0U), m_rfEmbeddedWriteN(1U), m_rfTalkerId(TALKER_ID_NONE), m_rfTalkerAlias(slotNo), m_netEmbeddedLC(), -m_netEmbeddedData(NULL), +m_netEmbeddedData(nullptr), m_netEmbeddedReadN(0U), m_netEmbeddedWriteN(1U), m_netTalkerId(TALKER_ID_NONE), m_netTalkerAlias(slotNo), -m_rfLC(NULL), -m_netLC(NULL), +m_rfLC(nullptr), +m_netLC(nullptr), m_rfSeqNo(0U), m_rfN(0U), m_lastrfN(0U), @@ -111,7 +111,7 @@ m_rfErrs(0U), m_netErrs(0U), m_rfTimeout(false), m_netTimeout(false), -m_lastFrame(NULL), +m_lastFrame(nullptr), m_lastFrameValid(false), m_rssi(0U), m_maxRSSI(0U), @@ -119,7 +119,7 @@ m_minRSSI(0U), m_aveRSSI(0U), m_rssiCount(0U), m_enabled(true), -m_fp(NULL) +m_fp(nullptr) { m_lastFrame = new unsigned char[DMR_FRAME_LENGTH_BYTES + 2U]; @@ -138,7 +138,7 @@ CDMRSlot::~CDMRSlot() bool CDMRSlot::writeModem(unsigned char *data, unsigned int len) { - assert(data != NULL); + assert(data != nullptr); if (!m_enabled) return false; @@ -216,7 +216,7 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len) CDMRFullLC fullLC; CDMRLC* lc = fullLC.decode(data + 2U, DT_VOICE_LC_HEADER); - if (lc == NULL) + if (lc == nullptr) return false; unsigned int srcId = lc->getSrcId(); @@ -373,7 +373,7 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len) else LogMessage("DMR Slot %u, received RF end of voice transmission from %s to %s%s, %.1f seconds, BER: %.1f%%", m_slotNo, src.c_str(), flco == FLCO::GROUP ? "TG " : "", dst.c_str(), float(m_rfFrames) / 16.667F, float(m_rfErrs * 100U) / float(m_rfBits)); - m_display->writeDMRTA(m_slotNo, NULL, " "); + m_display->writeDMRTA(m_slotNo, nullptr, " "); if (m_rfTimeout) { writeEndRF(); @@ -685,12 +685,12 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len) CUtils::dump(1U, text, data, 9U); logGPSPosition(data); } - if (m_network != NULL) + if (m_network != nullptr) m_network->writeRadioPosition(m_rfLC->getSrcId(), data); break; case FLCO::TALKER_ALIAS_HEADER: - if (m_network != NULL) + if (m_network != nullptr) m_network->writeTalkerAlias(m_rfLC->getSrcId(), 0U, data); if (!(m_rfTalkerId & TALKER_ID_HEADER)) { @@ -709,7 +709,7 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len) break; case FLCO::TALKER_ALIAS_BLOCK1: - if (m_network != NULL) + if (m_network != nullptr) m_network->writeTalkerAlias(m_rfLC->getSrcId(), 1U, data); if (!(m_rfTalkerId & TALKER_ID_BLOCK1)) { @@ -728,7 +728,7 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len) break; case FLCO::TALKER_ALIAS_BLOCK2: - if (m_network != NULL) + if (m_network != nullptr) m_network->writeTalkerAlias(m_rfLC->getSrcId(), 2U, data); if (!(m_rfTalkerId & TALKER_ID_BLOCK2)) { @@ -747,7 +747,7 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len) break; case FLCO::TALKER_ALIAS_BLOCK3: - if (m_network != NULL) + if (m_network != nullptr) m_network->writeTalkerAlias(m_rfLC->getSrcId(), 3U, data); if (!(m_rfTalkerId & TALKER_ID_BLOCK3)) { @@ -817,7 +817,7 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len) m_rfEmbeddedLC.addData(data + 2U, emb.getLCSS()); CDMRLC* lc = m_rfEmbeddedLC.getLC(); - if (lc != NULL) { + if (lc != nullptr) { unsigned int srcId = lc->getSrcId(); unsigned int dstId = lc->getDstId(); FLCO flco = lc->getFLCO(); @@ -954,7 +954,7 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len) unsigned int CDMRSlot::readModem(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); if (m_queue.isEmpty()) return 0U; @@ -1010,7 +1010,7 @@ void CDMRSlot::writeEndRF(bool writeEnd) m_rfN = 0U; delete m_rfLC; - m_rfLC = NULL; + m_rfLC = nullptr; } void CDMRSlot::writeEndNet(bool writeEnd) @@ -1063,7 +1063,7 @@ void CDMRSlot::writeEndNet(bool writeEnd) m_netN = 0U; delete m_netLC; - m_netLC = NULL; + m_netLC = nullptr; #if defined(DUMP_DMR) closeFile(); @@ -1091,7 +1091,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) CDMRFullLC fullLC; CDMRLC* lc = fullLC.decode(data + 2U, DT_VOICE_LC_HEADER); - if (lc == NULL) { + if (lc == nullptr) { LogMessage("DMR Slot %u, bad LC received from the network, replacing", m_slotNo); lc = new CDMRLC(dmrData.getFLCO(), dmrData.getSrcId(), dmrData.getDstId()); } @@ -1314,7 +1314,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) // We've received the voice header and terminator haven't we? m_netFrames += 2U; LogMessage("DMR Slot %u, received network end of voice transmission from %s to %s%s, %.1f seconds, %u%% packet loss, BER: %.1f%%", m_slotNo, src.c_str(), flco == FLCO::GROUP ? "TG " : "", dst.c_str(), float(m_netFrames) / 16.667F, (m_netLost * 100U) / m_netFrames, float(m_netErrs * 100U) / float(m_netBits)); - m_display->writeDMRTA(m_slotNo, NULL, " "); + m_display->writeDMRTA(m_slotNo, nullptr, " "); writeEndNet(); } else if (dataType == DT_DATA_HEADER) { if (m_netState == RPT_NET_STATE::DATA) @@ -1910,7 +1910,7 @@ void CDMRSlot::clock() void CDMRSlot::writeQueueRF(const unsigned char *data) { - assert(data != NULL); + assert(data != nullptr); if (m_netState != RPT_NET_STATE::IDLE) return; @@ -1929,12 +1929,12 @@ void CDMRSlot::writeQueueRF(const unsigned char *data) void CDMRSlot::writeNetworkRF(const unsigned char* data, unsigned char dataType, FLCO flco, unsigned int srcId, unsigned int dstId, unsigned char errors) { - assert(data != NULL); + assert(data != nullptr); if (m_netState != RPT_NET_STATE::IDLE) return; - if (m_network == NULL) + if (m_network == nullptr) return; CDMRData dmrData; @@ -1957,15 +1957,15 @@ void CDMRSlot::writeNetworkRF(const unsigned char* data, unsigned char dataType, void CDMRSlot::writeNetworkRF(const unsigned char* data, unsigned char dataType, unsigned char errors) { - assert(data != NULL); - assert(m_rfLC != NULL); + assert(data != nullptr); + assert(m_rfLC != nullptr); writeNetworkRF(data, dataType, m_rfLC->getFLCO(), m_rfLC->getSrcId(), m_rfLC->getDstId(), errors); } void CDMRSlot::writeQueueNet(const unsigned char *data) { - assert(data != NULL); + assert(data != nullptr); unsigned char len = DMR_FRAME_LENGTH_BYTES + 2U; @@ -1981,10 +1981,10 @@ void CDMRSlot::writeQueueNet(const unsigned char *data) void CDMRSlot::init(unsigned int colorCode, bool embeddedLCOnly, bool dumpTAData, unsigned int callHang, CModem* modem, IDMRNetwork* network, CDisplay* display, bool duplex, CDMRLookup* lookup, CRSSIInterpolator* rssiMapper, unsigned int jitter, DMR_OVCM ovcm, bool protect) { - assert(modem != NULL); - assert(display != NULL); - assert(lookup != NULL); - assert(rssiMapper != NULL); + assert(modem != nullptr); + assert(display != nullptr); + assert(lookup != nullptr); + assert(rssiMapper != nullptr); m_colorCode = colorCode; m_embeddedLCOnly = embeddedLCOnly; @@ -2017,7 +2017,7 @@ void CDMRSlot::init(unsigned int colorCode, bool embeddedLCOnly, bool dumpTAData void CDMRSlot::setShortLC(unsigned int slotNo, unsigned int id, FLCO flco, ACTIVITY_TYPE type) { - assert(m_modem != NULL); + assert(m_modem != nullptr); switch (slotNo) { case 1U: @@ -2111,7 +2111,7 @@ void CDMRSlot::setShortLC(unsigned int slotNo, unsigned int id, FLCO flco, ACTIV bool CDMRSlot::openFile() { - if (m_fp != NULL) + if (m_fp != nullptr) return true; time_t t; @@ -2123,7 +2123,7 @@ bool CDMRSlot::openFile() ::sprintf(name, "DMR_%u_%04d%02d%02d_%02d%02d%02d.ambe", m_slotNo, tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec); m_fp = ::fopen(name, "wb"); - if (m_fp == NULL) + if (m_fp == nullptr) return false; ::fwrite("DMR", 1U, 3U, m_fp); @@ -2133,7 +2133,7 @@ bool CDMRSlot::openFile() bool CDMRSlot::writeFile(const unsigned char* data) { - if (m_fp == NULL) + if (m_fp == nullptr) return false; ::fwrite(data, 1U, DMR_FRAME_LENGTH_BYTES + 2U, m_fp); @@ -2143,15 +2143,15 @@ bool CDMRSlot::writeFile(const unsigned char* data) void CDMRSlot::closeFile() { - if (m_fp != NULL) { + if (m_fp != nullptr) { ::fclose(m_fp); - m_fp = NULL; + m_fp = nullptr; } } bool CDMRSlot::insertSilence(const unsigned char* data, unsigned char seqNo) { - assert(data != NULL); + assert(data != nullptr); // Do not send duplicate if (seqNo == m_netN) @@ -2251,7 +2251,7 @@ void CDMRSlot::enable(bool enabled) m_rfN = 0U; delete m_rfLC; - m_rfLC = NULL; + m_rfLC = nullptr; // Reset the networking section m_netState = RPT_NET_STATE::IDLE; @@ -2272,7 +2272,7 @@ void CDMRSlot::enable(bool enabled) m_netN = 0U; delete m_netLC; - m_netLC = NULL; + m_netLC = nullptr; } m_enabled = enabled; diff --git a/DMRSlotType.cpp b/DMRSlotType.cpp index d855303..aa043c2 100644 --- a/DMRSlotType.cpp +++ b/DMRSlotType.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015,2016 by Jonathan Naylor G4KLX + * Copyright (C) 2015,2016,2025 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 @@ -35,7 +35,7 @@ CDMRSlotType::~CDMRSlotType() void CDMRSlotType::putData(const unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); unsigned char DMRSlotType[3U]; DMRSlotType[0U] = (data[12U] << 2) & 0xFCU; @@ -55,7 +55,7 @@ void CDMRSlotType::putData(const unsigned char* data) void CDMRSlotType::getData(unsigned char* data) const { - assert(data != NULL); + assert(data != nullptr); unsigned char DMRSlotType[3U]; DMRSlotType[0U] = (m_colorCode << 4) & 0xF0U; diff --git a/DMRTA.cpp b/DMRTA.cpp index 94ecbaf..b10da90 100644 --- a/DMRTA.cpp +++ b/DMRTA.cpp @@ -1,5 +1,5 @@ /* -* Copyright (C) 2015,2016,2017,2018,2023 Jonathan Naylor, G4KLX +* Copyright (C) 2015,2016,2017,2018,2023,2025 Jonathan Naylor, G4KLX * Copyright (C) 2018 by Shawn Chain, BG5HHP * * This program is free software; you can redistribute it and/or modify @@ -31,7 +31,7 @@ CDMRTA::~CDMRTA() bool CDMRTA::add(unsigned int blockId, const unsigned char* data, unsigned int len) { - assert(data != NULL); + assert(data != nullptr); if (blockId > 3U) { // invalid block id diff --git a/DMRTrellis.cpp b/DMRTrellis.cpp index cdf30ed..6f0032b 100644 --- a/DMRTrellis.cpp +++ b/DMRTrellis.cpp @@ -1,5 +1,5 @@ /* -* Copyright (C) 2016 by Jonathan Naylor, G4KLX +* Copyright (C) 2016,2025 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 @@ -49,8 +49,8 @@ CDMRTrellis::~CDMRTrellis() bool CDMRTrellis::decode(const unsigned char* data, unsigned char* payload) { - assert(data != NULL); - assert(payload != NULL); + assert(data != nullptr); + assert(payload != nullptr); signed char dibits[98U]; deinterleave(data, dibits); @@ -83,8 +83,8 @@ bool CDMRTrellis::decode(const unsigned char* data, unsigned char* payload) void CDMRTrellis::encode(const unsigned char* payload, unsigned char* data) { - assert(payload != NULL); - assert(data != NULL); + assert(payload != nullptr); + assert(data != nullptr); unsigned char tribits[49U]; bitsToTribits(payload, tribits); diff --git a/DStarControl.cpp b/DStarControl.cpp index 240a75e..2406500 100644 --- a/DStarControl.cpp +++ b/DStarControl.cpp @@ -38,8 +38,8 @@ bool CallsignCompare(const std::string& arg, const unsigned char* my) // #define DUMP_DSTAR CDStarControl::CDStarControl(const std::string& callsign, const std::string& module, bool selfOnly, bool ackReply, unsigned int ackTime, DSTAR_ACK ackMessage, bool errorReply, const std::vector& blackList, const std::vector& whiteList, CDStarNetwork* network, CDisplay* display, unsigned int timeout, bool duplex, bool remoteGateway, CRSSIInterpolator* rssiMapper) : -m_callsign(NULL), -m_gateway(NULL), +m_callsign(nullptr), +m_gateway(nullptr), m_selfOnly(selfOnly), m_ackReply(ackReply), m_ackMessage(ackMessage), @@ -76,7 +76,7 @@ m_rfBits(1U), m_netBits(1U), m_rfErrs(0U), m_netErrs(0U), -m_lastFrame(NULL), +m_lastFrame(nullptr), m_lastFrameValid(false), m_rssiMapper(rssiMapper), m_rssi(0U), @@ -85,10 +85,10 @@ m_minRSSI(0U), m_aveRSSI(0U), m_rssiCount(0U), m_enabled(true), -m_fp(NULL) +m_fp(nullptr) { - assert(display != NULL); - assert(rssiMapper != NULL); + assert(display != nullptr); + assert(rssiMapper != nullptr); m_callsign = new unsigned char[DSTAR_LONG_CALLSIGN_LENGTH]; m_gateway = new unsigned char[DSTAR_LONG_CALLSIGN_LENGTH]; @@ -122,7 +122,7 @@ CDStarControl::~CDStarControl() bool CDStarControl::writeModem(unsigned char *data, unsigned int len) { - assert(data != NULL); + assert(data != nullptr); if (!m_enabled) return false; @@ -152,7 +152,7 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len) if (m_errorReply) m_errTimer.start(); - if (m_network != NULL) + if (m_network != nullptr) m_network->reset(); } @@ -315,7 +315,7 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len) if (m_errorReply) m_errTimer.start(); - if (m_network != NULL) + if (m_network != nullptr) m_network->reset(); } @@ -409,7 +409,7 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len) m_display->writeDStarRSSI(m_rssi); unsigned int errors = 0U; - if (::memcmp(data + 1U, DSTAR_NULL_AMBE_DATA_BYTES_SCRAMBLED, DSTAR_VOICE_FRAME_LENGTH_BYTES) == 0) { + if (::memcmp(data + 1U, DSTAR_nullptr_AMBE_DATA_BYTES_SCRAMBLED, DSTAR_VOICE_FRAME_LENGTH_BYTES) == 0) { LogDebug("D-Star, audio sequence no. %u, null audio", m_rfN); } else { errors = m_fec.regenerateDStar(data + 1U); @@ -423,7 +423,7 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len) if (m_rfN != 0U) { const unsigned char* text = m_rfSlowData.addText(data + 1U, m_rfN); - if (text != NULL) + if (text != nullptr) LogMessage("D-Star, RF slow data text = \"%s\"", text); } @@ -446,7 +446,7 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len) return false; } else { CDStarHeader* header = m_rfSlowData.addHeader(data + 1U, m_rfN); - if (header == NULL) { + if (header == nullptr) { m_rfN = (m_rfN + 1U) % 21U; return false; } @@ -546,7 +546,7 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len) } unsigned int errors = 0U; - if (::memcmp(data + 1U, DSTAR_NULL_AMBE_DATA_BYTES_SCRAMBLED, DSTAR_VOICE_FRAME_LENGTH_BYTES) == 0) { + if (::memcmp(data + 1U, DSTAR_nullptr_AMBE_DATA_BYTES_SCRAMBLED, DSTAR_VOICE_FRAME_LENGTH_BYTES) == 0) { LogDebug("D-Star, audio sequence no. %u, null audio", m_rfN); } else { errors = m_fec.regenerateDStar(data + 1U); @@ -585,7 +585,7 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len) unsigned int CDStarControl::readModem(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); if (m_queue.isEmpty()) return 0U; @@ -609,7 +609,7 @@ void CDStarControl::writeEndRF() m_ackTimer.start(); - if (m_network != NULL) + if (m_network != nullptr) m_network->reset(); } } @@ -626,7 +626,7 @@ void CDStarControl::writeEndNet() m_networkWatchdog.stop(); m_packetTimer.stop(); - if (m_network != NULL) + if (m_network != nullptr) m_network->reset(); #if defined(DUMP_DSTAR) @@ -636,7 +636,7 @@ void CDStarControl::writeEndNet() void CDStarControl::writeNetwork() { - assert(m_network != NULL); + assert(m_network != nullptr); unsigned char data[DSTAR_HEADER_LENGTH_BYTES + 2U]; unsigned int length = m_network->read(data, DSTAR_HEADER_LENGTH_BYTES + 2U); @@ -760,7 +760,7 @@ void CDStarControl::writeNetwork() unsigned char n = data[1U]; unsigned int errors = 0U; - if (::memcmp(data + 2U, DSTAR_NULL_AMBE_DATA_BYTES_SCRAMBLED, DSTAR_VOICE_FRAME_LENGTH_BYTES) != 0) { + if (::memcmp(data + 2U, DSTAR_nullptr_AMBE_DATA_BYTES_SCRAMBLED, DSTAR_VOICE_FRAME_LENGTH_BYTES) != 0) { errors = m_fec.regenerateDStar(data + 2U); blankDTMF(data + 2U); } @@ -783,7 +783,7 @@ void CDStarControl::writeNetwork() m_netSlowData.start(); } else { const unsigned char* text = m_netSlowData.addText(data + 2U, m_netN); - if (text != NULL) + if (text != nullptr) LogMessage("D-Star, network slow data text = \"%s\"", text); } @@ -837,7 +837,7 @@ void CDStarControl::clock() unsigned int ms = m_interval.elapsed(); m_interval.start(); - if (m_network != NULL) + if (m_network != nullptr) writeNetwork(); m_ackTimer.clock(ms); @@ -892,7 +892,7 @@ void CDStarControl::clock() void CDStarControl::writeQueueHeaderRF(const unsigned char *data) { - assert(data != NULL); + assert(data != nullptr); if (m_netState != RPT_NET_STATE::IDLE) return; @@ -915,7 +915,7 @@ void CDStarControl::writeQueueHeaderRF(const unsigned char *data) void CDStarControl::writeQueueDataRF(const unsigned char *data) { - assert(data != NULL); + assert(data != nullptr); if (m_netState != RPT_NET_STATE::IDLE) return; @@ -960,7 +960,7 @@ void CDStarControl::writeQueueEOTRF() void CDStarControl::writeQueueHeaderNet(const unsigned char *data) { - assert(data != NULL); + assert(data != nullptr); if (m_netTimeoutTimer.isRunning() && m_netTimeoutTimer.hasExpired()) return; @@ -980,7 +980,7 @@ void CDStarControl::writeQueueHeaderNet(const unsigned char *data) void CDStarControl::writeQueueDataNet(const unsigned char *data) { - assert(data != NULL); + assert(data != nullptr); if (m_netTimeoutTimer.isRunning() && m_netTimeoutTimer.hasExpired()) return; @@ -1019,9 +1019,9 @@ void CDStarControl::writeQueueEOTNet() void CDStarControl::writeNetworkHeaderRF(const unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); - if (m_network == NULL) + if (m_network == nullptr) return; // Don't send to the network if the timeout has expired @@ -1033,9 +1033,9 @@ void CDStarControl::writeNetworkHeaderRF(const unsigned char* data) void CDStarControl::writeNetworkDataRF(const unsigned char* data, unsigned int errors, bool end) { - assert(data != NULL); + assert(data != nullptr); - if (m_network == NULL) + if (m_network == nullptr) return; // Don't send to the network if the timeout has expired @@ -1047,7 +1047,7 @@ void CDStarControl::writeNetworkDataRF(const unsigned char* data, unsigned int e bool CDStarControl::openFile() { - if (m_fp != NULL) + if (m_fp != nullptr) return true; time_t t; @@ -1059,7 +1059,7 @@ bool CDStarControl::openFile() ::sprintf(name, "DStar_%04d%02d%02d_%02d%02d%02d.ambe", tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec); m_fp = ::fopen(name, "wb"); - if (m_fp == NULL) + if (m_fp == nullptr) return false; ::fwrite("DSTAR", 1U, 4U, m_fp); @@ -1069,7 +1069,7 @@ bool CDStarControl::openFile() bool CDStarControl::writeFile(const unsigned char* data, unsigned int length) { - if (m_fp == NULL) + if (m_fp == nullptr) return false; ::fwrite(data, 1U, length, m_fp); @@ -1079,15 +1079,15 @@ bool CDStarControl::writeFile(const unsigned char* data, unsigned int length) void CDStarControl::closeFile() { - if (m_fp != NULL) { + if (m_fp != nullptr) { ::fclose(m_fp); - m_fp = NULL; + m_fp = nullptr; } } bool CDStarControl::insertSilence(const unsigned char* data, unsigned char seqNo) { - assert(data != NULL); + assert(data != nullptr); // Check to see if we have any spaces to fill? unsigned int oldSeqNo = (m_netN + 1U) % 21U; @@ -1122,19 +1122,19 @@ void CDStarControl::insertSilence(unsigned int count) for (unsigned int i = 0U; i < count; i++) { if (i < 3U && m_lastFrameValid) { if (n == 0U) { - ::memcpy(m_lastFrame + DSTAR_VOICE_FRAME_LENGTH_BYTES + 1U, DSTAR_NULL_SLOW_SYNC_BYTES, DSTAR_DATA_FRAME_LENGTH_BYTES); + ::memcpy(m_lastFrame + DSTAR_VOICE_FRAME_LENGTH_BYTES + 1U, DSTAR_nullptr_SLOW_SYNC_BYTES, DSTAR_DATA_FRAME_LENGTH_BYTES); writeQueueDataNet(m_lastFrame); } else { - ::memcpy(m_lastFrame + DSTAR_VOICE_FRAME_LENGTH_BYTES + 1U, DSTAR_NULL_SLOW_DATA_BYTES, DSTAR_DATA_FRAME_LENGTH_BYTES); + ::memcpy(m_lastFrame + DSTAR_VOICE_FRAME_LENGTH_BYTES + 1U, DSTAR_nullptr_SLOW_DATA_BYTES, DSTAR_DATA_FRAME_LENGTH_BYTES); writeQueueDataNet(m_lastFrame); } } else { m_lastFrameValid = false; if (n == 0U) - writeQueueDataNet(DSTAR_NULL_FRAME_SYNC_BYTES); + writeQueueDataNet(DSTAR_nullptr_FRAME_SYNC_BYTES); else - writeQueueDataNet(DSTAR_NULL_FRAME_DATA_BYTES); + writeQueueDataNet(DSTAR_nullptr_FRAME_DATA_BYTES); } m_netN = n; @@ -1148,7 +1148,7 @@ void CDStarControl::insertSilence(unsigned int count) void CDStarControl::blankDTMF(unsigned char* data) const { - assert(data != NULL); + assert(data != nullptr); // DTMF begins with these byte values if ((data[0] & DSTAR_DTMF_MASK[0]) == DSTAR_DTMF_SIG[0] && (data[1] & DSTAR_DTMF_MASK[1]) == DSTAR_DTMF_SIG[1] && @@ -1156,7 +1156,7 @@ void CDStarControl::blankDTMF(unsigned char* data) const (data[4] & DSTAR_DTMF_MASK[4]) == DSTAR_DTMF_SIG[4] && (data[5] & DSTAR_DTMF_MASK[5]) == DSTAR_DTMF_SIG[5] && (data[6] & DSTAR_DTMF_MASK[6]) == DSTAR_DTMF_SIG[6] && (data[7] & DSTAR_DTMF_MASK[7]) == DSTAR_DTMF_SIG[7] && (data[8] & DSTAR_DTMF_MASK[8]) == DSTAR_DTMF_SIG[8]) - ::memcpy(data, DSTAR_NULL_AMBE_DATA_BYTES, DSTAR_VOICE_FRAME_LENGTH_BYTES); + ::memcpy(data, DSTAR_nullptr_AMBE_DATA_BYTES, DSTAR_VOICE_FRAME_LENGTH_BYTES); } void CDStarControl::sendAck() @@ -1182,11 +1182,11 @@ void CDStarControl::sendAck() writeQueueHeaderRF(data); - writeQueueDataRF(DSTAR_NULL_FRAME_SYNC_BYTES); + writeQueueDataRF(DSTAR_nullptr_FRAME_SYNC_BYTES); LINK_STATUS status = LINK_STATUS::NONE; unsigned char reflector[DSTAR_LONG_CALLSIGN_LENGTH]; - if (m_network != NULL) + if (m_network != nullptr) m_network->getStatus(status, reflector); char text[40U]; @@ -1219,7 +1219,7 @@ void CDStarControl::sendAck() m_rfSlowData.setText(text); - ::memcpy(data, DSTAR_NULL_FRAME_DATA_BYTES, DSTAR_FRAME_LENGTH_BYTES + 1U); + ::memcpy(data, DSTAR_nullptr_FRAME_DATA_BYTES, DSTAR_FRAME_LENGTH_BYTES + 1U); for (unsigned int i = 0U; i < 19U; i++) { m_rfSlowData.getSlowData(data + 1U + DSTAR_VOICE_FRAME_LENGTH_BYTES); @@ -1247,11 +1247,11 @@ void CDStarControl::sendError() writeQueueHeaderRF(data); - writeQueueDataRF(DSTAR_NULL_FRAME_SYNC_BYTES); + writeQueueDataRF(DSTAR_nullptr_FRAME_SYNC_BYTES); LINK_STATUS status = LINK_STATUS::NONE; unsigned char reflector[DSTAR_LONG_CALLSIGN_LENGTH]; - if (m_network != NULL) + if (m_network != nullptr) m_network->getStatus(status, reflector); char text[40U]; @@ -1284,7 +1284,7 @@ void CDStarControl::sendError() m_rfSlowData.setText(text); - ::memcpy(data, DSTAR_NULL_FRAME_DATA_BYTES, DSTAR_FRAME_LENGTH_BYTES + 1U); + ::memcpy(data, DSTAR_nullptr_FRAME_DATA_BYTES, DSTAR_FRAME_LENGTH_BYTES + 1U); for (unsigned int i = 0U; i < 19U; i++) { m_rfSlowData.getSlowData(data + 1U + DSTAR_VOICE_FRAME_LENGTH_BYTES); diff --git a/DStarDefines.h b/DStarDefines.h index 0098f9e..83b9d70 100644 --- a/DStarDefines.h +++ b/DStarDefines.h @@ -27,16 +27,16 @@ const unsigned int DSTAR_FRAME_LENGTH_BYTES = 12U; const unsigned char DSTAR_END_PATTERN_BYTES[] = { TAG_EOT, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xC8, 0x7A }; const unsigned int DSTAR_END_PATTERN_LENGTH_BYTES = 6U; -const unsigned char DSTAR_NULL_AMBE_DATA_BYTES[] = { 0x9E, 0x8D, 0x32, 0x88, 0x26, 0x1A, 0x3F, 0x61, 0xE8 }; -// DSTAR_NULL_AMBE_DATA_BYTES_SCRAMBLED is DSTAR_NULL_AMBE_DATA_BYTES XORed with DSTAR_SCRAMBLER_BYTES. -const unsigned char DSTAR_NULL_AMBE_DATA_BYTES_SCRAMBLED[] = { 0xEEU, 0xC2U, 0xA1U, 0xC8U, 0x42U, 0x6EU, 0x52U, 0x51U, 0xC3U }; +const unsigned char DSTAR_nullptr_AMBE_DATA_BYTES[] = { 0x9E, 0x8D, 0x32, 0x88, 0x26, 0x1A, 0x3F, 0x61, 0xE8 }; +// DSTAR_nullptr_AMBE_DATA_BYTES_SCRAMBLED is DSTAR_nullptr_AMBE_DATA_BYTES XORed with DSTAR_SCRAMBLER_BYTES. +const unsigned char DSTAR_nullptr_AMBE_DATA_BYTES_SCRAMBLED[] = { 0xEEU, 0xC2U, 0xA1U, 0xC8U, 0x42U, 0x6EU, 0x52U, 0x51U, 0xC3U }; -const unsigned char DSTAR_NULL_SLOW_SYNC_BYTES[] = { 0x55, 0x2D, 0x16 }; +const unsigned char DSTAR_nullptr_SLOW_SYNC_BYTES[] = { 0x55, 0x2D, 0x16 }; // Note that these are already scrambled, 0x66 0x66 0x66 otherwise -const unsigned char DSTAR_NULL_SLOW_DATA_BYTES[] = { 0x16, 0x29, 0xF5 }; +const unsigned char DSTAR_nullptr_SLOW_DATA_BYTES[] = { 0x16, 0x29, 0xF5 }; -const unsigned char DSTAR_NULL_FRAME_SYNC_BYTES[] = { TAG_DATA, 0x9E, 0x8D, 0x32, 0x88, 0x26, 0x1A, 0x3F, 0x61, 0xE8, 0x55, 0x2D, 0x16 }; -const unsigned char DSTAR_NULL_FRAME_DATA_BYTES[] = { TAG_DATA, 0x9E, 0x8D, 0x32, 0x88, 0x26, 0x1A, 0x3F, 0x61, 0xE8, 0x16, 0x29, 0xF5 }; +const unsigned char DSTAR_nullptr_FRAME_SYNC_BYTES[] = { TAG_DATA, 0x9E, 0x8D, 0x32, 0x88, 0x26, 0x1A, 0x3F, 0x61, 0xE8, 0x55, 0x2D, 0x16 }; +const unsigned char DSTAR_nullptr_FRAME_DATA_BYTES[] = { TAG_DATA, 0x9E, 0x8D, 0x32, 0x88, 0x26, 0x1A, 0x3F, 0x61, 0xE8, 0x16, 0x29, 0xF5 }; const unsigned int DSTAR_VOICE_FRAME_LENGTH_BYTES = 9U; const unsigned int DSTAR_DATA_FRAME_LENGTH_BYTES = 3U; diff --git a/DStarHeader.cpp b/DStarHeader.cpp index e06ed1a..9c600bd 100644 --- a/DStarHeader.cpp +++ b/DStarHeader.cpp @@ -1,5 +1,5 @@ /* -* Copyright (C) 2016 by Jonathan Naylor G4KLX +* Copyright (C) 2016,2025 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 @@ -25,9 +25,9 @@ #include CDStarHeader::CDStarHeader(const unsigned char* header) : -m_header(NULL) +m_header(nullptr) { - assert(header != NULL); + assert(header != nullptr); m_header = new unsigned char[DSTAR_HEADER_LENGTH_BYTES]; @@ -35,7 +35,7 @@ m_header(NULL) } CDStarHeader::CDStarHeader() : -m_header(NULL) +m_header(nullptr) { m_header = new unsigned char[DSTAR_HEADER_LENGTH_BYTES]; @@ -87,77 +87,77 @@ void CDStarHeader::setUnavailable(bool on) void CDStarHeader::getMyCall1(unsigned char* call1) const { - assert(call1 != NULL); + assert(call1 != nullptr); ::memcpy(call1, m_header + 27U, DSTAR_LONG_CALLSIGN_LENGTH); } void CDStarHeader::getMyCall2(unsigned char* call2) const { - assert(call2 != NULL); + assert(call2 != nullptr); ::memcpy(call2, m_header + 35U, DSTAR_SHORT_CALLSIGN_LENGTH); } void CDStarHeader::setMyCall1(const unsigned char* call1) { - assert(call1 != NULL); + assert(call1 != nullptr); ::memcpy(m_header + 27U, call1, DSTAR_LONG_CALLSIGN_LENGTH); } void CDStarHeader::setMyCall2(const unsigned char* call2) { - assert(call2 != NULL); + assert(call2 != nullptr); ::memcpy(m_header + 35U, call2, DSTAR_SHORT_CALLSIGN_LENGTH); } void CDStarHeader::getRPTCall1(unsigned char* call1) const { - assert(call1 != NULL); + assert(call1 != nullptr); ::memcpy(call1, m_header + 11U, DSTAR_LONG_CALLSIGN_LENGTH); } void CDStarHeader::getRPTCall2(unsigned char* call2) const { - assert(call2 != NULL); + assert(call2 != nullptr); ::memcpy(call2, m_header + 3U, DSTAR_LONG_CALLSIGN_LENGTH); } void CDStarHeader::setRPTCall1(const unsigned char* call1) { - assert(call1 != NULL); + assert(call1 != nullptr); ::memcpy(m_header + 11U, call1, DSTAR_LONG_CALLSIGN_LENGTH); } void CDStarHeader::setRPTCall2(const unsigned char* call2) { - assert(call2 != NULL); + assert(call2 != nullptr); ::memcpy(m_header + 3U, call2, DSTAR_LONG_CALLSIGN_LENGTH); } void CDStarHeader::getYourCall(unsigned char* call) const { - assert(call != NULL); + assert(call != nullptr); ::memcpy(call, m_header + 19U, DSTAR_LONG_CALLSIGN_LENGTH); } void CDStarHeader::setYourCall(const unsigned char* call) { - assert(call != NULL); + assert(call != nullptr); ::memcpy(m_header + 19U, call, DSTAR_LONG_CALLSIGN_LENGTH); } void CDStarHeader::get(unsigned char* header) const { - assert(header != NULL); + assert(header != nullptr); ::memcpy(header, m_header, DSTAR_HEADER_LENGTH_BYTES); diff --git a/DStarNetwork.cpp b/DStarNetwork.cpp index eb8d914..ead40a7 100644 --- a/DStarNetwork.cpp +++ b/DStarNetwork.cpp @@ -44,7 +44,7 @@ m_inId(0U), m_buffer(1000U, "D-Star Network"), m_pollTimer(1000U, 60U), m_linkStatus(LINK_STATUS::NONE), -m_linkReflector(NULL), +m_linkReflector(nullptr), m_random() { if (CUDPSocket::lookup(gatewayAddress, gatewayPort, m_addr, m_addrLen) != 0) @@ -79,7 +79,7 @@ bool CDStarNetwork::open() bool CDStarNetwork::writeHeader(const unsigned char* header, unsigned int length, bool busy) { - assert(header != NULL); + assert(header != nullptr); unsigned char buffer[50U]; @@ -117,7 +117,7 @@ bool CDStarNetwork::writeHeader(const unsigned char* header, unsigned int length bool CDStarNetwork::writeData(const unsigned char* data, unsigned int length, unsigned int errors, bool end, bool busy) { - assert(data != NULL); + assert(data != nullptr); unsigned char buffer[30U]; @@ -155,7 +155,7 @@ bool CDStarNetwork::writeData(const unsigned char* data, unsigned int length, un bool CDStarNetwork::writePoll(const char* text) { - assert(text != NULL); + assert(text != nullptr); unsigned char buffer[40U]; @@ -285,7 +285,7 @@ void CDStarNetwork::clock(unsigned int ms) unsigned int CDStarNetwork::read(unsigned char* data, unsigned int length) { - assert(data != NULL); + assert(data != nullptr); if (m_buffer.isEmpty()) return 0U; @@ -340,7 +340,7 @@ void CDStarNetwork::enable(bool enabled) void CDStarNetwork::getStatus(LINK_STATUS& status, unsigned char* reflector) { - assert(reflector != NULL); + assert(reflector != nullptr); status = m_linkStatus; diff --git a/DStarSlowData.cpp b/DStarSlowData.cpp index 9aec2e6..686dc76 100644 --- a/DStarSlowData.cpp +++ b/DStarSlowData.cpp @@ -27,10 +27,10 @@ #include CDStarSlowData::CDStarSlowData() : -m_header(NULL), +m_header(nullptr), m_ptr(0U), -m_buffer(NULL), -m_text(NULL), +m_buffer(nullptr), +m_text(nullptr), m_textPtr(0U), m_textBits(0x00U), m_type(0x00U), @@ -50,7 +50,7 @@ CDStarSlowData::~CDStarSlowData() void CDStarSlowData::peakSlowData(const unsigned char* data, unsigned int n) { - assert(data != NULL); + assert(data != nullptr); if ((n % 2U) == 0U) { m_type = data[9U] ^ DSTAR_SCRAMBLER_BYTES[0U]; @@ -62,7 +62,7 @@ void CDStarSlowData::peakSlowData(const unsigned char* data, unsigned int n) CDStarHeader* CDStarSlowData::addHeader(const unsigned char* data, unsigned int n) { - assert(data != NULL); + assert(data != nullptr); if ((n % 2U) == 0U) { m_type = data[9U] ^ DSTAR_SCRAMBLER_BYTES[0U]; @@ -78,10 +78,10 @@ CDStarHeader* CDStarSlowData::addHeader(const unsigned char* data, unsigned int } if ((m_buffer[0U] & DSTAR_SLOW_DATA_TYPE_MASK) != DSTAR_SLOW_DATA_TYPE_HEADER) - return NULL; + return nullptr; if (m_ptr >= 45U) - return NULL; + return nullptr; ::memcpy(m_header + m_ptr, m_buffer + 1U, 5U); m_ptr += 5U; @@ -99,7 +99,7 @@ CDStarHeader* CDStarSlowData::addHeader(const unsigned char* data, unsigned int if (!ret) { if (m_ptr == 45U) LogMessage("D-Star, invalid slow data header"); - return NULL; + return nullptr; } return new CDStarHeader(m_header); @@ -107,7 +107,7 @@ CDStarHeader* CDStarSlowData::addHeader(const unsigned char* data, unsigned int const unsigned char* CDStarSlowData::addText(const unsigned char* data, unsigned int n) { - assert(data != NULL); + assert(data != nullptr); if ((n % 2U) == 0U) { m_type = data[9U] ^ DSTAR_SCRAMBLER_BYTES[0U]; @@ -161,11 +161,11 @@ const unsigned char* CDStarSlowData::addText(const unsigned char* data, unsigned m_textBits |= 0x08U; break; default: - return NULL; + return nullptr; } if (m_textBits != 0x0FU) - return NULL; + return nullptr; CUtils::dump(1U, "D-Star slow data text", m_text, 20U); @@ -194,7 +194,7 @@ void CDStarSlowData::reset() void CDStarSlowData::setText(const char* text) { - assert(text != NULL); + assert(text != nullptr); m_text[0U] = DSTAR_SLOW_DATA_TYPE_TEXT | 0U; m_text[1U] = text[0U]; @@ -230,7 +230,7 @@ void CDStarSlowData::setText(const char* text) void CDStarSlowData::getSlowData(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); if (m_textPtr < 24U) { data[0U] = m_text[m_textPtr++] ^ DSTAR_SCRAMBLER_BYTES[0U]; diff --git a/Display.cpp b/Display.cpp index ab0c0bb..112b8d0 100644 --- a/Display.cpp +++ b/Display.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016,2017,2018,2020,2021,2023,2024 by Jonathan Naylor G4KLX + * Copyright (C) 2016,2017,2018,2020,2021,2023,2024,2025 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 @@ -78,7 +78,7 @@ void CDisplay::setLockout() void CDisplay::setError(const char* text) { - assert(text != NULL); + assert(text != nullptr); m_timer1.stop(); m_timer2.stop(); @@ -113,11 +113,11 @@ void CDisplay::setFM() void CDisplay::writeDStar(const char* my1, const char* my2, const char* your, const char* type, const char* reflector) { - assert(my1 != NULL); - assert(my2 != NULL); - assert(your != NULL); - assert(type != NULL); - assert(reflector != NULL); + assert(my1 != nullptr); + assert(my2 != nullptr); + assert(your != nullptr); + assert(type != nullptr); + assert(reflector != nullptr); m_timer1.start(); m_mode1 = MODE_IDLE; @@ -149,7 +149,7 @@ void CDisplay::clearDStar() void CDisplay::writeDMR(unsigned int slotNo, const std::string& src, bool group, const std::string& dst, const char* type) { - assert(type != NULL); + assert(type != nullptr); if (slotNo == 1U) { m_timer1.start(); @@ -163,7 +163,7 @@ void CDisplay::writeDMR(unsigned int slotNo, const std::string& src, bool group, void CDisplay::writeDMR(unsigned int slotNo, const class CUserDBentry& src, bool group, const std::string& dst, const char* type) { - assert(type != NULL); + assert(type != nullptr); if (slotNo == 1U) { m_timer1.start(); @@ -229,10 +229,10 @@ void CDisplay::clearDMR(unsigned int slotNo) void CDisplay::writeFusion(const char* source, const char* dest, unsigned char dgid, const char* type, const char* origin) { - assert(source != NULL); - assert(dest != NULL); - assert(type != NULL); - assert(origin != NULL); + assert(source != nullptr); + assert(dest != nullptr); + assert(type != nullptr); + assert(origin != nullptr); m_timer1.start(); m_mode1 = MODE_IDLE; @@ -264,8 +264,8 @@ void CDisplay::clearFusion() void CDisplay::writeP25(const char* source, bool group, unsigned int dest, const char* type) { - assert(source != NULL); - assert(type != NULL); + assert(source != nullptr); + assert(type != nullptr); m_timer1.start(); m_mode1 = MODE_IDLE; @@ -297,8 +297,8 @@ void CDisplay::clearP25() void CDisplay::writeNXDN(const char* source, bool group, unsigned int dest, const char* type) { - assert(source != NULL); - assert(type != NULL); + assert(source != nullptr); + assert(type != nullptr); m_timer1.start(); m_mode1 = MODE_IDLE; @@ -308,7 +308,7 @@ void CDisplay::writeNXDN(const char* source, bool group, unsigned int dest, cons void CDisplay::writeNXDN(const class CUserDBentry& source, bool group, unsigned int dest, const char* type) { - assert(type != NULL); + assert(type != nullptr); m_timer1.start(); m_mode1 = MODE_IDLE; @@ -341,9 +341,9 @@ void CDisplay::clearNXDN() void CDisplay::writeM17(const char* source, const char* dest, const char* type) { - assert(source != NULL); - assert(dest != NULL); - assert(type != NULL); + assert(source != nullptr); + assert(dest != nullptr); + assert(type != nullptr); m_timer1.start(); m_mode1 = MODE_IDLE; @@ -543,7 +543,7 @@ int CDisplay::writeNXDNIntEx(const class CUserDBentry& source, bool group, unsig /* Factory method extracted from MMDVMHost.cpp - BG5HHP */ CDisplay* CDisplay::createDisplay(const CConf& conf, CModem* modem) { - CDisplay *display = NULL; + CDisplay *display = nullptr; std::string type = conf.getDisplay(); unsigned int dmrid = conf.getDMRId(); @@ -560,7 +560,7 @@ CDisplay* CDisplay::createDisplay(const CConf& conf, CModem* modem) LogInfo(" Brightness: %u", brightness); LogInfo(" Screen Layout: %u", screenLayout); - ISerialPort* serial = NULL; + ISerialPort* serial = nullptr; if (port == "modem") serial = new IModemSerialPort(modem); else @@ -605,7 +605,7 @@ CDisplay* CDisplay::createDisplay(const CConf& conf, CModem* modem) } if (port == "modem") { - CUDPSocket* socket = NULL; + CUDPSocket* socket = nullptr; struct sockaddr_storage addr; unsigned int addrLength = 0U; @@ -622,12 +622,12 @@ CDisplay* CDisplay::createDisplay(const CConf& conf, CModem* modem) bool ret = socket->open(addr); if (!ret) { delete socket; - socket = NULL; + socket = nullptr; } } } - if (socket == NULL) { + if (socket == nullptr) { ISerialPort* serial = new IModemSerialPort(modem); display = new CNextion(conf.getCallsign(), dmrid, serial, brightness, displayClock, utc, idleBrightness, screenLayout, txFrequency, rxFrequency, displayTempInF); } else { diff --git a/FMControl.cpp b/FMControl.cpp index 8cb7183..478edf9 100644 --- a/FMControl.cpp +++ b/FMControl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020,2021 by Jonathan Naylor G4KLX + * Copyright (C) 2020,2021,2025 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 @@ -39,11 +39,11 @@ m_preEmphasisOn(preEmphasisOn), m_deEmphasisOn(deEmphasisOn), m_enabled(false), m_incomingRFAudio(1600U, "Incoming RF FM Audio"), -m_preEmphasis(NULL), -m_deEmphasis(NULL), -m_filterStage1(NULL), -m_filterStage2(NULL), -m_filterStage3(NULL) +m_preEmphasis(nullptr), +m_deEmphasis(nullptr), +m_filterStage1(nullptr), +m_filterStage2(nullptr), +m_filterStage3(nullptr) { assert(txAudioGain > 0.0F); assert(rxAudioGain > 0.0F); @@ -69,10 +69,10 @@ CFMControl::~CFMControl() bool CFMControl::writeModem(const unsigned char* data, unsigned int length) { - assert(data != NULL); + assert(data != nullptr); assert(length > 0U); - if (m_network == NULL) + if (m_network == nullptr) return true; if (data[0U] == TAG_HEADER) @@ -124,7 +124,7 @@ bool CFMControl::writeModem(const unsigned char* data, unsigned int length) #if defined(DUMP_RF_AUDIO) FILE * audiofile = fopen("./audiodump.bin", "ab"); - if (audiofile != NULL) { + if (audiofile != nullptr) { fwrite(out, sizeof(float), nOut, audiofile); fclose(audiofile); } @@ -137,10 +137,10 @@ bool CFMControl::writeModem(const unsigned char* data, unsigned int length) unsigned int CFMControl::readModem(unsigned char* data, unsigned int space) { - assert(data != NULL); + assert(data != nullptr); assert(space > 0U); - if (m_network == NULL) + if (m_network == nullptr) return 0U; if (space > 240U) // 160 samples 12-bit diff --git a/FMNetwork.cpp b/FMNetwork.cpp index bd634ed..e0c784e 100644 --- a/FMNetwork.cpp +++ b/FMNetwork.cpp @@ -46,10 +46,10 @@ m_enabled(false), m_buffer(2000U, "FM Network"), m_seqNo(0U), #if defined(HAS_SRC) -m_resampler(NULL), +m_resampler(nullptr), #endif m_error(0), -m_fp(NULL) +m_fp(nullptr) { assert(!callsign.empty()); assert(gatewayPort > 0U); @@ -93,7 +93,7 @@ bool CFMNetwork::open() if (m_protocol == FM_NETWORK_PROTOCOL::RAW) { if (!m_squelchFile.empty()) { m_fp = ::fopen(m_squelchFile.c_str(), "wb"); - if (m_fp == NULL) { + if (m_fp == nullptr) { #if !defined(_WIN32) && !defined(_WIN64) LogError("Cannot open the squelch file: %s, errno=%d", m_squelchFile.c_str(), errno); #else @@ -116,7 +116,7 @@ bool CFMNetwork::open() bool CFMNetwork::writeData(const float* data, unsigned int nSamples) { - assert(data != NULL); + assert(data != nullptr); assert(nSamples > 0U); if (m_protocol == FM_NETWORK_PROTOCOL::USRP) @@ -129,7 +129,7 @@ bool CFMNetwork::writeData(const float* data, unsigned int nSamples) bool CFMNetwork::writeUSRPData(const float* data, unsigned int nSamples) { - assert(data != NULL); + assert(data != nullptr); assert(nSamples > 0U); if (m_seqNo == 0U) { @@ -203,7 +203,7 @@ bool CFMNetwork::writeUSRPData(const float* data, unsigned int nSamples) bool CFMNetwork::writeRawData(const float* in, unsigned int nIn) { - assert(in != NULL); + assert(in != nullptr); assert(nIn > 0U); if (m_seqNo == 0U) { @@ -338,7 +338,7 @@ bool CFMNetwork::writeRawEnd() { m_seqNo = 0U; - if (m_fp != NULL) { + if (m_fp != nullptr) { size_t n = ::fwrite("Z", 1, 1, m_fp); if (n != 1) { #if !defined(_WIN32) && !defined(_WIN64) @@ -407,7 +407,7 @@ void CFMNetwork::clock(unsigned int ms) unsigned int CFMNetwork::readData(float* out, unsigned int nOut) { - assert(out != NULL); + assert(out != nullptr); assert(nOut > 0U); unsigned int bytes = m_buffer.dataSize() / sizeof(unsigned short); @@ -474,9 +474,9 @@ void CFMNetwork::close() { m_socket.close(); - if (m_fp != NULL) { + if (m_fp != nullptr) { ::fclose(m_fp); - m_fp = NULL; + m_fp = nullptr; } LogMessage("Closing FM network connection"); @@ -591,7 +591,7 @@ bool CFMNetwork::writeUSRPStart() bool CFMNetwork::writeRawStart() { - if (m_fp != NULL) { + if (m_fp != nullptr) { size_t n = ::fwrite("O", 1, 1, m_fp); if (n != 1) { #if !defined(_WIN32) && !defined(_WIN64) diff --git a/Golay2087.cpp b/Golay2087.cpp index 61942d8..d68ec6a 100644 --- a/Golay2087.cpp +++ b/Golay2087.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015,2016 by Jonathan Naylor G4KLX + * Copyright (C) 2015,2016,2025 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 @@ -237,7 +237,7 @@ unsigned int CGolay2087::getSyndrome1987(unsigned int pattern) unsigned char CGolay2087::decode(const unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); unsigned int code = (data[0U] << 11) + (data[1U] << 3) + (data[2U] >> 5); unsigned int syndrome = getSyndrome1987(code); @@ -251,7 +251,7 @@ unsigned char CGolay2087::decode(const unsigned char* data) void CGolay2087::encode(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); unsigned int value = data[0U]; diff --git a/Golay24128.cpp b/Golay24128.cpp index 22cef65..b414e05 100644 --- a/Golay24128.cpp +++ b/Golay24128.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010,2016,2021 by Jonathan Naylor G4KLX + * Copyright (C) 2010,2016,2021,2025 by Jonathan Naylor G4KLX * Copyright (C) 2002 by Robert H. Morelos-Zaragoza. All rights reserved. */ @@ -1106,7 +1106,7 @@ bool CGolay24128::decode24128(unsigned int in, unsigned int& out) bool CGolay24128::decode24128(unsigned char* in, unsigned int& out) { - assert(in != NULL); + assert(in != nullptr); unsigned int code = (in[0U] << 16) | (in[1U] << 8) | (in[2U] << 0); diff --git a/Hamming.cpp b/Hamming.cpp index 166e012..a0a6415 100644 --- a/Hamming.cpp +++ b/Hamming.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015,2016 by Jonathan Naylor G4KLX + * Copyright (C) 2015,2016,2025 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 @@ -24,7 +24,7 @@ // Hamming (15,11,3) check a boolean data array bool CHamming::decode15113_1(bool* d) { - assert(d != NULL); + assert(d != nullptr); // Calculate the parity it should have bool c0 = d[0] ^ d[1] ^ d[2] ^ d[3] ^ d[4] ^ d[5] ^ d[6]; @@ -66,7 +66,7 @@ bool CHamming::decode15113_1(bool* d) void CHamming::encode15113_1(bool* d) { - assert(d != NULL); + assert(d != nullptr); // Calculate the checksum this row should have d[11] = d[0] ^ d[1] ^ d[2] ^ d[3] ^ d[4] ^ d[5] ^ d[6]; @@ -78,7 +78,7 @@ void CHamming::encode15113_1(bool* d) // Hamming (15,11,3) check a boolean data array bool CHamming::decode15113_2(bool* d) { - assert(d != NULL); + assert(d != nullptr); // Calculate the checksum this row should have bool c0 = d[0] ^ d[1] ^ d[2] ^ d[3] ^ d[5] ^ d[7] ^ d[8]; @@ -119,7 +119,7 @@ bool CHamming::decode15113_2(bool* d) void CHamming::encode15113_2(bool* d) { - assert(d != NULL); + assert(d != nullptr); // Calculate the checksum this row should have d[11] = d[0] ^ d[1] ^ d[2] ^ d[3] ^ d[5] ^ d[7] ^ d[8]; @@ -131,7 +131,7 @@ void CHamming::encode15113_2(bool* d) // Hamming (13,9,3) check a boolean data array bool CHamming::decode1393(bool* d) { - assert(d != NULL); + assert(d != nullptr); // Calculate the checksum this column should have bool c0 = d[0] ^ d[1] ^ d[3] ^ d[5] ^ d[6]; @@ -170,7 +170,7 @@ bool CHamming::decode1393(bool* d) void CHamming::encode1393(bool* d) { - assert(d != NULL); + assert(d != nullptr); // Calculate the checksum this column should have d[9] = d[0] ^ d[1] ^ d[3] ^ d[5] ^ d[6]; @@ -182,7 +182,7 @@ void CHamming::encode1393(bool* d) // Hamming (10,6,3) check a boolean data array bool CHamming::decode1063(bool* d) { - assert(d != NULL); + assert(d != nullptr); // Calculate the checksum this column should have bool c0 = d[0] ^ d[1] ^ d[2] ^ d[5]; @@ -218,7 +218,7 @@ bool CHamming::decode1063(bool* d) void CHamming::encode1063(bool* d) { - assert(d != NULL); + assert(d != nullptr); // Calculate the checksum this column should have d[6] = d[0] ^ d[1] ^ d[2] ^ d[5]; @@ -230,7 +230,7 @@ void CHamming::encode1063(bool* d) // A Hamming (16,11,4) Check bool CHamming::decode16114(bool* d) { - assert(d != NULL); + assert(d != nullptr); // Calculate the checksum this column should have bool c0 = d[0] ^ d[1] ^ d[2] ^ d[3] ^ d[5] ^ d[7] ^ d[8]; @@ -278,7 +278,7 @@ bool CHamming::decode16114(bool* d) void CHamming::encode16114(bool* d) { - assert(d != NULL); + assert(d != nullptr); d[11] = d[0] ^ d[1] ^ d[2] ^ d[3] ^ d[5] ^ d[7] ^ d[8]; d[12] = d[1] ^ d[2] ^ d[3] ^ d[4] ^ d[6] ^ d[8] ^ d[9]; @@ -290,7 +290,7 @@ void CHamming::encode16114(bool* d) // A Hamming (17,12,3) Check bool CHamming::decode17123(bool* d) { - assert(d != NULL); + assert(d != nullptr); // Calculate the checksum this column should have bool c0 = d[0] ^ d[1] ^ d[2] ^ d[3] ^ d[6] ^ d[7] ^ d[9]; @@ -339,7 +339,7 @@ bool CHamming::decode17123(bool* d) void CHamming::encode17123(bool* d) { - assert(d != NULL); + assert(d != nullptr); d[12] = d[0] ^ d[1] ^ d[2] ^ d[3] ^ d[6] ^ d[7] ^ d[9]; d[13] = d[0] ^ d[1] ^ d[2] ^ d[3] ^ d[4] ^ d[7] ^ d[8] ^ d[10]; diff --git a/LCDproc.cpp b/LCDproc.cpp index f9a336b..1b112c5 100644 --- a/LCDproc.cpp +++ b/LCDproc.cpp @@ -151,7 +151,7 @@ bool CLCDproc::open() /* Lookup the client address (random port - need to specify manual port from ini file) */ hints.ai_flags = AI_NUMERICSERV | AI_PASSIVE; hints.ai_family = serverAddress.ss_family; - err = getaddrinfo(NULL, localPort.c_str(), &hints, &res); + err = getaddrinfo(nullptr, localPort.c_str(), &hints, &res); if (err) { LogError("LCDproc, cannot lookup client"); return false; @@ -204,7 +204,7 @@ void CLCDproc::setIdleInt() void CLCDproc::setErrorInt(const char* text) { - assert(text != NULL); + assert(text != nullptr); m_clockDisplayTimer.stop(); // Stop the clock display @@ -280,11 +280,11 @@ void CLCDproc::setFMInt() void CLCDproc::writeDStarInt(const char* my1, const char* my2, const char* your, const char* type, const char* reflector) { - assert(my1 != NULL); - assert(my2 != NULL); - assert(your != NULL); - assert(type != NULL); - assert(reflector != NULL); + assert(my1 != nullptr); + assert(my2 != nullptr); + assert(your != nullptr); + assert(type != nullptr); + assert(reflector != nullptr); m_clockDisplayTimer.stop(); // Stop the clock display @@ -341,7 +341,7 @@ void CLCDproc::clearDStarInt() void CLCDproc::writeDMRInt(unsigned int slotNo, const std::string& src, bool group, const std::string& dst, const char* type) { - assert(type != NULL); + assert(type != nullptr); if (!m_dmr) { m_clockDisplayTimer.stop(); // Stop the clock display @@ -435,10 +435,10 @@ void CLCDproc::clearDMRInt(unsigned int slotNo) void CLCDproc::writeFusionInt(const char* source, const char* dest, unsigned char dgid, const char* type, const char* origin) { - assert(source != NULL); - assert(dest != NULL); - assert(type != NULL); - assert(origin != NULL); + assert(source != nullptr); + assert(dest != nullptr); + assert(type != nullptr); + assert(origin != nullptr); m_clockDisplayTimer.stop(); // Stop the clock display @@ -481,8 +481,8 @@ void CLCDproc::clearFusionInt() void CLCDproc::writeP25Int(const char* source, bool group, unsigned int dest, const char* type) { - assert(source != NULL); - assert(type != NULL); + assert(source != nullptr); + assert(type != nullptr); m_clockDisplayTimer.stop(); // Stop the clock display @@ -526,8 +526,8 @@ void CLCDproc::clearP25Int() void CLCDproc::writeNXDNInt(const char* source, bool group, unsigned int dest, const char* type) { - assert(source != NULL); - assert(type != NULL); + assert(source != nullptr); + assert(type != nullptr); m_clockDisplayTimer.stop(); // Stop the clock display @@ -569,9 +569,9 @@ void CLCDproc::clearNXDNInt() void CLCDproc::writeM17Int(const char* source, const char* dest, const char* type) { - assert(source != NULL); - assert(dest != NULL); - assert(type != NULL); + assert(source != nullptr); + assert(dest != nullptr); + assert(type != nullptr); m_clockDisplayTimer.stop(); // Stop the clock display @@ -675,7 +675,7 @@ void CLCDproc::clockInt(unsigned int ms) * exceptfds = we are not waiting for exception fds */ - if (select(int(m_socketfd) + 1, &m_readfds, NULL, NULL, &m_timeout) == -1) { + if (select(int(m_socketfd) + 1, &m_readfds, nullptr, nullptr, &m_timeout) == -1) { LogError("LCDproc, error on select"); return; } @@ -798,7 +798,7 @@ int CLCDproc::socketPrintf(int fd, const char *format, ...) m_timeout.tv_sec = 0; m_timeout.tv_usec = 0; - if (select(int(m_socketfd) + 1, NULL, &m_writefds, NULL, &m_timeout) == -1) + if (select(int(m_socketfd) + 1, nullptr, &m_writefds, nullptr, &m_timeout) == -1) LogError("LCDproc, error on select"); if (FD_ISSET(m_socketfd, &m_writefds)) { diff --git a/Log.cpp b/Log.cpp index 6a444d7..9aa2f96 100644 --- a/Log.cpp +++ b/Log.cpp @@ -37,7 +37,7 @@ static std::string m_filePath; static std::string m_fileRoot; static bool m_fileRotate = true; -static FILE* m_fpLog = NULL; +static FILE* m_fpLog = nullptr; static bool m_daemon = false; static unsigned int m_displayLevel = 2U; @@ -59,10 +59,10 @@ static bool logOpenRotate() struct tm* tm = ::gmtime(&now); if (tm->tm_mday == m_tm.tm_mday && tm->tm_mon == m_tm.tm_mon && tm->tm_year == m_tm.tm_year) { - if (m_fpLog != NULL) + if (m_fpLog != nullptr) return true; } else { - if (m_fpLog != NULL) + if (m_fpLog != nullptr) ::fclose(m_fpLog); } @@ -73,7 +73,7 @@ static bool logOpenRotate() ::sprintf(filename, "%s/%s-%04d-%02d-%02d.log", m_filePath.c_str(), m_fileRoot.c_str(), tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday); #endif - if ((m_fpLog = ::fopen(filename, "a+t")) != NULL) { + if ((m_fpLog = ::fopen(filename, "a+t")) != nullptr) { status = true; #if !defined(_WIN32) && !defined(_WIN64) @@ -94,7 +94,7 @@ static bool logOpenNoRotate() if (m_fileLevel == 0U) return true; - if (m_fpLog != NULL) + if (m_fpLog != nullptr) return true; char filename[200U]; @@ -104,7 +104,7 @@ static bool logOpenNoRotate() ::sprintf(filename, "%s/%s.log", m_filePath.c_str(), m_fileRoot.c_str()); #endif - if ((m_fpLog = ::fopen(filename, "a+t")) != NULL) { + if ((m_fpLog = ::fopen(filename, "a+t")) != nullptr) { status = true; #if !defined(_WIN32) && !defined(_WIN64) @@ -141,13 +141,13 @@ bool LogInitialise(bool daemon, const std::string& filePath, const std::string& void LogFinalise() { - if (m_fpLog != NULL) + if (m_fpLog != nullptr) ::fclose(m_fpLog); } void Log(unsigned int level, const char* fmt, ...) { - assert(fmt != NULL); + assert(fmt != nullptr); char buffer[501U]; #if defined(_WIN32) || defined(_WIN64) @@ -157,7 +157,7 @@ void Log(unsigned int level, const char* fmt, ...) ::sprintf(buffer, "%c: %04u-%02u-%02u %02u:%02u:%02u.%03u ", LEVELS[level], st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute, st.wSecond, st.wMilliseconds); #else struct timeval now; - ::gettimeofday(&now, NULL); + ::gettimeofday(&now, nullptr); struct tm* tm = ::gmtime(&now.tv_sec); diff --git a/M17CRC.cpp b/M17CRC.cpp index e65b10c..8bc4814 100644 --- a/M17CRC.cpp +++ b/M17CRC.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020,2021 by Jonathan Naylor G4KLX + * Copyright (C) 2020,2021,2025 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 @@ -48,7 +48,7 @@ const uint16_t CRC16_TABLE[] = {0x0000U, 0x5935U, 0xB26AU, 0xEB5FU, 0x3DE1U, 0x6 bool CM17CRC::checkCRC16(const unsigned char* in, unsigned int nBytes) { - assert(in != NULL); + assert(in != nullptr); assert(nBytes > 2U); uint16_t crc = createCRC16(in, nBytes - 2U); @@ -62,7 +62,7 @@ bool CM17CRC::checkCRC16(const unsigned char* in, unsigned int nBytes) void CM17CRC::encodeCRC16(unsigned char* in, unsigned int nBytes) { - assert(in != NULL); + assert(in != nullptr); assert(nBytes > 2U); uint16_t crc = createCRC16(in, nBytes - 2U); @@ -73,7 +73,7 @@ void CM17CRC::encodeCRC16(unsigned char* in, unsigned int nBytes) uint16_t CM17CRC::createCRC16(const unsigned char* in, unsigned int nBytes) { - assert(in != NULL); + assert(in != nullptr); uint16_t crc = 0xFFFFU; diff --git a/M17Control.cpp b/M17Control.cpp index 5b86f1c..e6d7ea2 100644 --- a/M17Control.cpp +++ b/M17Control.cpp @@ -88,8 +88,8 @@ m_netLSF(), m_netLSFn(0U), m_rfTextBits(0x00U), m_netTextBits(0x00U), -m_rfText(NULL), -m_netText(NULL), +m_rfText(nullptr), +m_netText(nullptr), m_rssiMapper(rssiMapper), m_rssi(0U), m_maxRSSI(0U), @@ -97,10 +97,10 @@ m_minRSSI(0U), m_aveRSSI(0U), m_rssiCount(0U), m_enabled(true), -m_fp(NULL) +m_fp(nullptr) { - assert(display != NULL); - assert(rssiMapper != NULL); + assert(display != nullptr); + assert(rssiMapper != nullptr); m_rfText = new char[4U * M17_META_LENGTH_BYTES]; m_netText = new char[4U * M17_META_LENGTH_BYTES]; @@ -114,7 +114,7 @@ CM17Control::~CM17Control() bool CM17Control::writeModem(unsigned char* data, unsigned int len) { - assert(data != NULL); + assert(data != nullptr); if (!m_enabled) return false; @@ -395,7 +395,7 @@ bool CM17Control::writeModem(unsigned char* data, unsigned int len) writeQueueRF(rfData); } - if (m_network != NULL && m_rfTimeoutTimer.isRunning() && !m_rfTimeoutTimer.hasExpired()) { + if (m_network != nullptr && m_rfTimeoutTimer.isRunning() && !m_rfTimeoutTimer.hasExpired()) { unsigned char netData[M17_LSF_LENGTH_BYTES + M17_FN_LENGTH_BYTES + M17_PAYLOAD_LENGTH_BYTES + M17_CRC_LENGTH_BYTES]; m_rfCurrentNetLSF.getNetwork(netData + 0U); @@ -436,7 +436,7 @@ bool CM17Control::writeModem(unsigned char* data, unsigned int len) writeQueueRF(rfData); } - if (m_network != NULL && m_rfTimeoutTimer.isRunning() && !m_rfTimeoutTimer.hasExpired()) { + if (m_network != nullptr && m_rfTimeoutTimer.isRunning() && !m_rfTimeoutTimer.hasExpired()) { unsigned char netData[M17_LSF_LENGTH_BYTES + M17_FN_LENGTH_BYTES + M17_PAYLOAD_LENGTH_BYTES + M17_CRC_LENGTH_BYTES]; m_rfCurrentNetLSF.getNetwork(netData + 0U); @@ -475,7 +475,7 @@ bool CM17Control::writeModem(unsigned char* data, unsigned int len) unsigned int CM17Control::readModem(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); if (m_queue.isEmpty()) return 0U; @@ -505,7 +505,7 @@ void CM17Control::writeEndRF() if (m_netState == RPT_NET_STATE::IDLE) { m_display->clearM17(); - if (m_network != NULL) + if (m_network != nullptr) m_network->reset(); } @@ -528,7 +528,7 @@ void CM17Control::writeEndNet() m_display->clearM17(); - if (m_network != NULL) + if (m_network != nullptr) m_network->reset(); } @@ -835,7 +835,7 @@ void CM17Control::createRFLSF(bool addCallsign) void CM17Control::clock(unsigned int ms) { - if (m_network != NULL) + if (m_network != nullptr) writeNetwork(); m_rfTimeoutTimer.clock(ms); @@ -853,7 +853,7 @@ void CM17Control::clock(unsigned int ms) void CM17Control::writeQueueRF(const unsigned char *data) { - assert(data != NULL); + assert(data != nullptr); if (m_netState != RPT_NET_STATE::IDLE) return; @@ -876,7 +876,7 @@ void CM17Control::writeQueueRF(const unsigned char *data) void CM17Control::writeQueueNet(const unsigned char *data) { - assert(data != NULL); + assert(data != nullptr); if (m_netTimeoutTimer.isRunning() && m_netTimeoutTimer.hasExpired()) return; @@ -896,8 +896,8 @@ void CM17Control::writeQueueNet(const unsigned char *data) void CM17Control::interleaver(const unsigned char* in, unsigned char* out) const { - assert(in != NULL); - assert(out != NULL); + assert(in != nullptr); + assert(out != nullptr); for (unsigned int i = 0U; i < (M17_FRAME_LENGTH_BITS - M17_SYNC_LENGTH_BITS); i++) { unsigned int n1 = i + M17_SYNC_LENGTH_BITS; @@ -909,8 +909,8 @@ void CM17Control::interleaver(const unsigned char* in, unsigned char* out) const void CM17Control::decorrelator(const unsigned char* in, unsigned char* out) const { - assert(in != NULL); - assert(out != NULL); + assert(in != nullptr); + assert(out != nullptr); for (unsigned int i = M17_SYNC_LENGTH_BYTES; i < M17_FRAME_LENGTH_BYTES; i++) { out[i] = in[i] ^ SCRAMBLER[i]; @@ -926,7 +926,7 @@ bool CM17Control::checkCallsign(const std::string& callsign) const bool CM17Control::openFile() { - if (m_fp != NULL) + if (m_fp != nullptr) return true; time_t t; @@ -938,7 +938,7 @@ bool CM17Control::openFile() ::sprintf(name, "M17_%04d%02d%02d_%02d%02d%02d.ambe", tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec); m_fp = ::fopen(name, "wb"); - if (m_fp == NULL) + if (m_fp == nullptr) return false; ::fwrite("M17", 1U, 3U, m_fp); @@ -948,7 +948,7 @@ bool CM17Control::openFile() bool CM17Control::writeFile(const unsigned char* data) { - if (m_fp == NULL) + if (m_fp == nullptr) return false; ::fwrite(data, 1U, M17_FRAME_LENGTH_BYTES, m_fp); @@ -958,9 +958,9 @@ bool CM17Control::writeFile(const unsigned char* data) void CM17Control::closeFile() { - if (m_fp != NULL) { + if (m_fp != nullptr) { ::fclose(m_fp); - m_fp = NULL; + m_fp = nullptr; } } diff --git a/M17Convolution.cpp b/M17Convolution.cpp index 56e689d..fecd152 100644 --- a/M17Convolution.cpp +++ b/M17Convolution.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020,2021 by Jonathan Naylor G4KLX + * Copyright (C) 2020,2021,2025 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 @@ -53,12 +53,12 @@ const uint32_t M = 4U; const unsigned int K = 5U; CM17Convolution::CM17Convolution() : -m_metrics1(NULL), -m_metrics2(NULL), -m_oldMetrics(NULL), -m_newMetrics(NULL), -m_decisions(NULL), -m_dp(NULL) +m_metrics1(nullptr), +m_metrics2(nullptr), +m_oldMetrics(nullptr), +m_newMetrics(nullptr), +m_decisions(nullptr), +m_dp(nullptr) { m_metrics1 = new uint16_t[20U]; m_metrics2 = new uint16_t[20U]; @@ -74,8 +74,8 @@ CM17Convolution::~CM17Convolution() void CM17Convolution::encodeLinkSetup(const unsigned char* in, unsigned char* out) const { - assert(in != NULL); - assert(out != NULL); + assert(in != nullptr); + assert(out != nullptr); unsigned char temp1[31U]; ::memset(temp1, 0x00U, 31U); @@ -99,8 +99,8 @@ void CM17Convolution::encodeLinkSetup(const unsigned char* in, unsigned char* ou void CM17Convolution::encodeData(const unsigned char* in, unsigned char* out) const { - assert(in != NULL); - assert(out != NULL); + assert(in != nullptr); + assert(out != nullptr); unsigned char temp1[19U]; ::memset(temp1, 0x00U, 19U); @@ -124,8 +124,8 @@ void CM17Convolution::encodeData(const unsigned char* in, unsigned char* out) co unsigned int CM17Convolution::decodeLinkSetup(const unsigned char* in, unsigned char* out) { - assert(in != NULL); - assert(out != NULL); + assert(in != nullptr); + assert(out != nullptr); uint8_t temp[500U]; ::memset(temp, 0x00U, 500U); @@ -157,8 +157,8 @@ unsigned int CM17Convolution::decodeLinkSetup(const unsigned char* in, unsigned unsigned int CM17Convolution::decodeData(const unsigned char* in, unsigned char* out) { - assert(in != NULL); - assert(out != NULL); + assert(in != nullptr); + assert(out != nullptr); uint8_t temp[300U]; ::memset(temp, 0x00U, 300U); @@ -231,7 +231,7 @@ void CM17Convolution::decode(uint8_t s0, uint8_t s1) unsigned int CM17Convolution::chainback(unsigned char* out, unsigned int nBits) { - assert(out != NULL); + assert(out != nullptr); uint32_t state = 0U; @@ -257,8 +257,8 @@ unsigned int CM17Convolution::chainback(unsigned char* out, unsigned int nBits) void CM17Convolution::encode(const unsigned char* in, unsigned char* out, unsigned int nBits) const { - assert(in != NULL); - assert(out != NULL); + assert(in != nullptr); + assert(out != nullptr); assert(nBits > 0U); uint8_t d1 = 0U, d2 = 0U, d3 = 0U, d4 = 0U; diff --git a/M17Defines.h b/M17Defines.h index 0543d8e..e96bd36 100644 --- a/M17Defines.h +++ b/M17Defines.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020,2021 by Jonathan Naylor G4KLX + * Copyright (C) 2020,2021,2025 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 @@ -49,7 +49,7 @@ const unsigned int M17_LICH_FRAGMENT_FEC_LENGTH_BYTES = M17_LICH_FRAGMENT_FEC_LE const unsigned int M17_PAYLOAD_LENGTH_BITS = 128U; const unsigned int M17_PAYLOAD_LENGTH_BYTES = M17_PAYLOAD_LENGTH_BITS / 8U; -const unsigned char M17_NULL_NONCE[] = {0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U}; +const unsigned char M17_nullptr_NONCE[] = {0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U}; const unsigned int M17_META_LENGTH_BITS = 112U; const unsigned int M17_META_LENGTH_BYTES = M17_META_LENGTH_BITS / 8U; diff --git a/M17LSF.cpp b/M17LSF.cpp index 843bae2..f80e88f 100644 --- a/M17LSF.cpp +++ b/M17LSF.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020,2021,2023 by Jonathan Naylor G4KLX + * Copyright (C) 2020,2021,2023,2025 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 @@ -25,7 +25,7 @@ #include CM17LSF::CM17LSF(const CM17LSF& lsf) : -m_lsf(NULL), +m_lsf(nullptr), m_valid(lsf.m_valid) { m_lsf = new unsigned char[M17_LSF_LENGTH_BYTES]; @@ -34,7 +34,7 @@ m_valid(lsf.m_valid) } CM17LSF::CM17LSF() : -m_lsf(NULL), +m_lsf(nullptr), m_valid(false) { m_lsf = new unsigned char[M17_LSF_LENGTH_BYTES]; @@ -49,14 +49,14 @@ CM17LSF::~CM17LSF() void CM17LSF::getNetwork(unsigned char* data) const { - assert(data != NULL); + assert(data != nullptr); ::memcpy(data, m_lsf, M17_LSF_LENGTH_BYTES); } void CM17LSF::setNetwork(const unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); ::memcpy(m_lsf, data, M17_LSF_LENGTH_BYTES); @@ -149,14 +149,14 @@ void CM17LSF::setCAN(unsigned char can) void CM17LSF::getMeta(unsigned char* data) const { - assert(data != NULL); + assert(data != nullptr); ::memcpy(data, m_lsf + 14U, M17_META_LENGTH_BYTES); } void CM17LSF::setMeta(const unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); ::memcpy(m_lsf + 14U, data, M17_META_LENGTH_BYTES); } @@ -175,7 +175,7 @@ bool CM17LSF::isValid() const void CM17LSF::getLinkSetup(unsigned char* data) const { - assert(data != NULL); + assert(data != nullptr); ::memcpy(data, m_lsf, M17_LSF_LENGTH_BYTES); @@ -184,7 +184,7 @@ void CM17LSF::getLinkSetup(unsigned char* data) const void CM17LSF::setLinkSetup(const unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); ::memcpy(m_lsf, data, M17_LSF_LENGTH_BYTES); @@ -193,7 +193,7 @@ void CM17LSF::setLinkSetup(const unsigned char* data) void CM17LSF::getFragment(unsigned char* data, unsigned int n) const { - assert(data != NULL); + assert(data != nullptr); CM17CRC::encodeCRC16(m_lsf, M17_LSF_LENGTH_BYTES); @@ -202,7 +202,7 @@ void CM17LSF::getFragment(unsigned char* data, unsigned int n) const void CM17LSF::setFragment(const unsigned char* data, unsigned int n) { - assert(data != NULL); + assert(data != nullptr); ::memcpy(m_lsf + (n * M17_LSF_FRAGMENT_LENGTH_BYTES), data, M17_LSF_FRAGMENT_LENGTH_BYTES); diff --git a/M17Network.cpp b/M17Network.cpp index 268f069..d731bb5 100644 --- a/M17Network.cpp +++ b/M17Network.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020,2021,2023 by Jonathan Naylor G4KLX + * Copyright (C) 2020,2021,2023,2025 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 @@ -79,7 +79,7 @@ bool CM17Network::write(const unsigned char* data) if (m_addrLen == 0U) return false; - assert(data != NULL); + assert(data != nullptr); unsigned char buffer[100U]; @@ -160,7 +160,7 @@ void CM17Network::clock(unsigned int ms) bool CM17Network::read(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); if (m_buffer.isEmpty()) return false; diff --git a/M17Utils.cpp b/M17Utils.cpp index 845a738..cc31564 100644 --- a/M17Utils.cpp +++ b/M17Utils.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020,2021,2024 by Jonathan Naylor G4KLX + * Copyright (C) 2020,2021,2024,2025 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 @@ -31,7 +31,7 @@ const unsigned char BIT_MASK_TABLE[] = { 0x80U, 0x40U, 0x20U, 0x10U, 0x08U, 0x04 void CM17Utils::encodeCallsign(const std::string& callsign, unsigned char* encoded) { - assert(encoded != NULL); + assert(encoded != nullptr); if (callsign == "ALL" || callsign == "ALL ") { encoded[0U] = 0xFFU; @@ -71,7 +71,7 @@ void CM17Utils::encodeCallsign(const std::string& callsign, unsigned char* encod void CM17Utils::decodeCallsign(const unsigned char* encoded, std::string& callsign) { - assert(encoded != NULL); + assert(encoded != nullptr); callsign.clear(); @@ -105,7 +105,7 @@ void CM17Utils::decodeCallsign(const unsigned char* encoded, std::string& callsi void CM17Utils::splitFragmentLICH(const unsigned char* data, unsigned int& frag1, unsigned int& frag2, unsigned int& frag3, unsigned int& frag4) { - assert(data != NULL); + assert(data != nullptr); frag1 = frag2 = frag3 = frag4 = 0x00U; @@ -141,7 +141,7 @@ void CM17Utils::splitFragmentLICH(const unsigned char* data, unsigned int& frag1 void CM17Utils::splitFragmentLICHFEC(const unsigned char* data, unsigned int& frag1, unsigned int& frag2, unsigned int& frag3, unsigned int& frag4) { - assert(data != NULL); + assert(data != nullptr); frag1 = frag2 = frag3 = frag4 = 0x00U; @@ -177,7 +177,7 @@ void CM17Utils::splitFragmentLICHFEC(const unsigned char* data, unsigned int& fr void CM17Utils::combineFragmentLICH(unsigned int frag1, unsigned int frag2, unsigned int frag3, unsigned int frag4, unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); unsigned int offset = 0U; unsigned int MASK = 0x800U; @@ -207,7 +207,7 @@ void CM17Utils::combineFragmentLICH(unsigned int frag1, unsigned int frag2, unsi void CM17Utils::combineFragmentLICHFEC(unsigned int frag1, unsigned int frag2, unsigned int frag3, unsigned int frag4, unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); unsigned int offset = 0U; unsigned int MASK = 0x800000U; diff --git a/MMDVMHost.cpp b/MMDVMHost.cpp index a952cfc..fc12585 100644 --- a/MMDVMHost.cpp +++ b/MMDVMHost.cpp @@ -133,26 +133,26 @@ int main(int argc, char** argv) CMMDVMHost::CMMDVMHost(const std::string& confFile) : m_conf(confFile), -m_modem(NULL), -m_dstar(NULL), -m_dmr(NULL), -m_ysf(NULL), -m_p25(NULL), -m_nxdn(NULL), -m_m17(NULL), -m_pocsag(NULL), -m_fm(NULL), -m_ax25(NULL), -m_dstarNetwork(NULL), -m_dmrNetwork(NULL), -m_ysfNetwork(NULL), -m_p25Network(NULL), -m_nxdnNetwork(NULL), -m_m17Network(NULL), -m_pocsagNetwork(NULL), -m_fmNetwork(NULL), -m_ax25Network(NULL), -m_display(NULL), +m_modem(nullptr), +m_dstar(nullptr), +m_dmr(nullptr), +m_ysf(nullptr), +m_p25(nullptr), +m_nxdn(nullptr), +m_m17(nullptr), +m_pocsag(nullptr), +m_fm(nullptr), +m_ax25(nullptr), +m_dstarNetwork(nullptr), +m_dmrNetwork(nullptr), +m_ysfNetwork(nullptr), +m_p25Network(nullptr), +m_nxdnNetwork(nullptr), +m_m17Network(nullptr), +m_pocsagNetwork(nullptr), +m_fmNetwork(nullptr), +m_ax25Network(nullptr), +m_display(nullptr), m_mode(MODE_IDLE), m_dstarRFModeHang(10U), m_dmrRFModeHang(10U), @@ -184,14 +184,14 @@ m_pocsagEnabled(false), m_fmEnabled(false), m_ax25Enabled(false), m_cwIdTime(0U), -m_dmrLookup(NULL), -m_nxdnLookup(NULL), +m_dmrLookup(nullptr), +m_nxdnLookup(nullptr), m_callsign(), m_id(0U), m_cwCallsign(), m_lockFileEnabled(false), m_lockFileName(), -m_remoteControl(NULL), +m_remoteControl(nullptr), m_fixedMode(false) { CUDPSocket::startup(); @@ -238,7 +238,7 @@ int CMMDVMHost::run() // If we are currently root... if (getuid() == 0) { struct passwd* user = ::getpwnam("mmdvm"); - if (user == NULL) { + if (user == nullptr) { ::fprintf(stderr, "Could not get the mmdvm user, exiting\n"); return -1; } @@ -406,7 +406,7 @@ int CMMDVMHost::run() sockaddr_storage transparentAddress; unsigned int transparentAddrLen; - CUDPSocket* transparentSocket = NULL; + CUDPSocket* transparentSocket = nullptr; unsigned int sendFrameType = 0U; if (m_conf.getTransparentEnabled()) { @@ -431,7 +431,7 @@ int CMMDVMHost::run() if (!ret) { LogWarning("Could not open the Transparent data socket, disabling"); delete transparentSocket; - transparentSocket = NULL; + transparentSocket = nullptr; sendFrameType=0; } m_modem->setTransparentDataParams(sendFrameType); @@ -717,7 +717,7 @@ int CMMDVMHost::run() m_pocsag = new CPOCSAGControl(m_pocsagNetwork, m_display); - if (m_pocsagNetwork != NULL) + if (m_pocsagNetwork != nullptr) pocsagTimer.start(); } @@ -762,7 +762,7 @@ int CMMDVMHost::run() ret = m_remoteControl->open(); if (!ret) { delete m_remoteControl; - m_remoteControl = NULL; + m_remoteControl = nullptr; } } @@ -789,7 +789,7 @@ int CMMDVMHost::run() bool ret; len = m_modem->readDStarData(data); - if (m_dstar != NULL && len > 0U) { + if (m_dstar != nullptr && len > 0U) { if (m_mode == MODE_IDLE) { bool ret = m_dstar->writeModem(data, len); if (ret) { @@ -806,7 +806,7 @@ int CMMDVMHost::run() } len = m_modem->readDMRData1(data); - if (m_dmr != NULL && len > 0U) { + if (m_dmr != nullptr && len > 0U) { if (m_mode == MODE_IDLE) { if (m_duplex) { bool ret = m_dmr->processWakeup(data); @@ -843,7 +843,7 @@ int CMMDVMHost::run() } len = m_modem->readDMRData2(data); - if (m_dmr != NULL && len > 0U) { + if (m_dmr != nullptr && len > 0U) { if (m_mode == MODE_IDLE) { if (m_duplex) { bool ret = m_dmr->processWakeup(data); @@ -880,7 +880,7 @@ int CMMDVMHost::run() } len = m_modem->readYSFData(data); - if (m_ysf != NULL && len > 0U) { + if (m_ysf != nullptr && len > 0U) { if (m_mode == MODE_IDLE) { bool ret = m_ysf->writeModem(data, len); if (ret) { @@ -897,7 +897,7 @@ int CMMDVMHost::run() } len = m_modem->readP25Data(data); - if (m_p25 != NULL && len > 0U) { + if (m_p25 != nullptr && len > 0U) { if (m_mode == MODE_IDLE) { bool ret = m_p25->writeModem(data, len); if (ret) { @@ -914,7 +914,7 @@ int CMMDVMHost::run() } len = m_modem->readNXDNData(data); - if (m_nxdn != NULL && len > 0U) { + if (m_nxdn != nullptr && len > 0U) { if (m_mode == MODE_IDLE) { bool ret = m_nxdn->writeModem(data, len); if (ret) { @@ -931,7 +931,7 @@ int CMMDVMHost::run() } len = m_modem->readM17Data(data); - if (m_m17 != NULL && len > 0U) { + if (m_m17 != nullptr && len > 0U) { if (m_mode == MODE_IDLE) { bool ret = m_m17->writeModem(data, len); if (ret) { @@ -948,7 +948,7 @@ int CMMDVMHost::run() } len = m_modem->readFMData(data); - if (m_fm != NULL && len > 0U) { + if (m_fm != nullptr && len > 0U) { if (m_mode == MODE_IDLE) { bool ret = m_fm->writeModem(data, len); if (ret) { @@ -965,7 +965,7 @@ int CMMDVMHost::run() } len = m_modem->readAX25Data(data); - if (m_ax25 != NULL && len > 0U) { + if (m_ax25 != nullptr && len > 0U) { if (m_mode == MODE_IDLE || m_mode == MODE_FM) { m_ax25->writeModem(data, len); } else if (m_mode != MODE_LOCKOUT) { @@ -974,7 +974,7 @@ int CMMDVMHost::run() } len = m_modem->readTransparentData(data); - if (transparentSocket != NULL && len > 0U) + if (transparentSocket != nullptr && len > 0U) transparentSocket->write(data, len, transparentAddress, transparentAddrLen); if (!m_fixedMode) { @@ -982,7 +982,7 @@ int CMMDVMHost::run() setMode(MODE_IDLE); } - if (m_dstar != NULL) { + if (m_dstar != nullptr) { ret = m_modem->hasDStarSpace(); if (ret) { len = m_dstar->readModem(data); @@ -1001,7 +1001,7 @@ int CMMDVMHost::run() } } - if (m_dmr != NULL) { + if (m_dmr != nullptr) { ret = m_modem->hasDMRSpace1(); if (ret) { len = m_dmr->readModemSlot1(data); @@ -1047,7 +1047,7 @@ int CMMDVMHost::run() } } - if (m_ysf != NULL) { + if (m_ysf != nullptr) { ret = m_modem->hasYSFSpace(); if (ret) { len = m_ysf->readModem(data); @@ -1066,7 +1066,7 @@ int CMMDVMHost::run() } } - if (m_p25 != NULL) { + if (m_p25 != nullptr) { ret = m_modem->hasP25Space(); if (ret) { len = m_p25->readModem(data); @@ -1085,7 +1085,7 @@ int CMMDVMHost::run() } } - if (m_nxdn != NULL) { + if (m_nxdn != nullptr) { ret = m_modem->hasNXDNSpace(); if (ret) { len = m_nxdn->readModem(data); @@ -1104,7 +1104,7 @@ int CMMDVMHost::run() } } - if (m_m17 != NULL) { + if (m_m17 != nullptr) { ret = m_modem->hasM17Space(); if (ret) { len = m_m17->readModem(data); @@ -1123,7 +1123,7 @@ int CMMDVMHost::run() } } - if (m_pocsag != NULL) { + if (m_pocsag != nullptr) { ret = m_modem->hasPOCSAGSpace(); if (ret) { len = m_pocsag->readModem(data); @@ -1142,7 +1142,7 @@ int CMMDVMHost::run() } } - if (m_fm != NULL) { + if (m_fm != nullptr) { unsigned int space = m_modem->getFMSpace(); if (space > 0U) { len = m_fm->readModem(data, space); @@ -1161,7 +1161,7 @@ int CMMDVMHost::run() } } - if (m_ax25 != NULL) { + if (m_ax25 != nullptr) { ret = m_modem->hasAX25Space(); if (ret) { len = m_ax25->readModem(data); @@ -1176,7 +1176,7 @@ int CMMDVMHost::run() } } - if (transparentSocket != NULL) { + if (transparentSocket != nullptr) { sockaddr_storage address; unsigned int addrlen; len = transparentSocket->read(data, 200U, address, addrlen); @@ -1197,47 +1197,47 @@ int CMMDVMHost::run() m_modeTimer.clock(ms); if (m_reload) { - if (m_dmrLookup != NULL) + if (m_dmrLookup != nullptr) m_dmrLookup->reload(); - if (m_nxdnLookup != NULL) + if (m_nxdnLookup != nullptr) m_nxdnLookup->reload(); m_reload = false; } - if (m_dstar != NULL) + if (m_dstar != nullptr) m_dstar->clock(); - if (m_dmr != NULL) + if (m_dmr != nullptr) m_dmr->clock(); - if (m_ysf != NULL) + if (m_ysf != nullptr) m_ysf->clock(ms); - if (m_p25 != NULL) + if (m_p25 != nullptr) m_p25->clock(ms); - if (m_nxdn != NULL) + if (m_nxdn != nullptr) m_nxdn->clock(ms); - if (m_m17 != NULL) + if (m_m17 != nullptr) m_m17->clock(ms); - if (m_pocsag != NULL) + if (m_pocsag != nullptr) m_pocsag->clock(ms); - if (m_fm != NULL) + if (m_fm != nullptr) m_fm->clock(ms); - if (m_dstarNetwork != NULL) + if (m_dstarNetwork != nullptr) m_dstarNetwork->clock(ms); - if (m_dmrNetwork != NULL) + if (m_dmrNetwork != nullptr) m_dmrNetwork->clock(ms); - if (m_ysfNetwork != NULL) + if (m_ysfNetwork != nullptr) m_ysfNetwork->clock(ms); - if (m_p25Network != NULL) + if (m_p25Network != nullptr) m_p25Network->clock(ms); - if (m_nxdnNetwork != NULL) + if (m_nxdnNetwork != nullptr) m_nxdnNetwork->clock(ms); - if (m_m17Network != NULL) + if (m_m17Network != nullptr) m_m17Network->clock(ms); - if (m_pocsagNetwork != NULL) + if (m_pocsagNetwork != nullptr) m_pocsagNetwork->clock(ms); - if (m_fmNetwork != NULL) + if (m_fmNetwork != nullptr) m_fmNetwork->clock(ms); m_cwIdTimer.clock(ms); @@ -1267,7 +1267,7 @@ int CMMDVMHost::run() } break; case DMR_BEACONS::NETWORK: - if (m_dmrNetwork != NULL) { + if (m_dmrNetwork != nullptr) { bool beacon = m_dmrNetwork->wantsBeacon(); if (beacon) { if ((m_mode == MODE_IDLE || m_mode == MODE_DMR) && !m_modem->hasTX()) { @@ -1299,7 +1299,7 @@ int CMMDVMHost::run() pocsagTimer.clock(ms); if (pocsagTimer.isRunning() && pocsagTimer.hasExpired()) { - assert(m_pocsagNetwork != NULL); + assert(m_pocsagNetwork != nullptr); m_pocsagNetwork->enable(m_mode == MODE_IDLE || m_mode == MODE_POCSAG); pocsagTimer.start(); } @@ -1310,65 +1310,65 @@ int CMMDVMHost::run() setMode(MODE_QUIT); - if (m_dmrLookup != NULL) + if (m_dmrLookup != nullptr) m_dmrLookup->stop(); - if (m_nxdnLookup != NULL) + if (m_nxdnLookup != nullptr) m_nxdnLookup->stop(); LogInfo("Closing network connections"); - if (m_dstarNetwork != NULL) { + if (m_dstarNetwork != nullptr) { m_dstarNetwork->close(); delete m_dstarNetwork; } - if (m_dmrNetwork != NULL) { + if (m_dmrNetwork != nullptr) { m_dmrNetwork->close(true); delete m_dmrNetwork; } - if (m_ysfNetwork != NULL) { + if (m_ysfNetwork != nullptr) { m_ysfNetwork->close(); delete m_ysfNetwork; } - if (m_p25Network != NULL) { + if (m_p25Network != nullptr) { m_p25Network->close(); delete m_p25Network; } - if (m_nxdnNetwork != NULL) { + if (m_nxdnNetwork != nullptr) { m_nxdnNetwork->close(); delete m_nxdnNetwork; } - if (m_m17Network != NULL) { + if (m_m17Network != nullptr) { m_m17Network->close(); delete m_m17Network; } - if (m_pocsagNetwork != NULL) { + if (m_pocsagNetwork != nullptr) { m_pocsagNetwork->close(); delete m_pocsagNetwork; } - if (m_fmNetwork != NULL) { + if (m_fmNetwork != nullptr) { m_fmNetwork->close(); delete m_fmNetwork; } - if (m_ax25Network != NULL) { + if (m_ax25Network != nullptr) { m_ax25Network->close(); delete m_ax25Network; } - if (transparentSocket != NULL) { + if (transparentSocket != nullptr) { transparentSocket->close(); delete transparentSocket; } - if (m_remoteControl != NULL) { + if (m_remoteControl != nullptr) { m_remoteControl->close(); delete m_remoteControl; } @@ -1490,7 +1490,7 @@ bool CMMDVMHost::createModem() m_modem = new CModem(m_duplex, rxInvert, txInvert, pttInvert, txDelay, dmrDelay, useCOSAsLockout, trace, debug); - IModemPort* port = NULL; + IModemPort* port = nullptr; if (protocol == "uart") port = new CUARTController(uartPort, uartSpeed, true); else if (protocol == "udp") @@ -1607,7 +1607,7 @@ bool CMMDVMHost::createModem() bool ret = m_modem->open(); if (!ret) { delete m_modem; - m_modem = NULL; + m_modem = nullptr; return false; } @@ -1635,7 +1635,7 @@ bool CMMDVMHost::createDStarNetwork() bool ret = m_dstarNetwork->open(); if (!ret) { delete m_dstarNetwork; - m_dstarNetwork = NULL; + m_dstarNetwork = nullptr; return false; } @@ -1718,7 +1718,7 @@ bool CMMDVMHost::createDMRNetwork() bool ret = m_dmrNetwork->open(); if (!ret) { delete m_dmrNetwork; - m_dmrNetwork = NULL; + m_dmrNetwork = nullptr; return false; } @@ -1748,7 +1748,7 @@ bool CMMDVMHost::createYSFNetwork() bool ret = m_ysfNetwork->open(); if (!ret) { delete m_ysfNetwork; - m_ysfNetwork = NULL; + m_ysfNetwork = nullptr; return false; } @@ -1778,7 +1778,7 @@ bool CMMDVMHost::createP25Network() bool ret = m_p25Network->open(); if (!ret) { delete m_p25Network; - m_p25Network = NULL; + m_p25Network = nullptr; return false; } @@ -1813,7 +1813,7 @@ bool CMMDVMHost::createNXDNNetwork() bool ret = m_nxdnNetwork->open(); if (!ret) { delete m_nxdnNetwork; - m_nxdnNetwork = NULL; + m_nxdnNetwork = nullptr; return false; } @@ -1842,7 +1842,7 @@ bool CMMDVMHost::createM17Network() bool ret = m_m17Network->open(); if (!ret) { delete m_m17Network; - m_m17Network = NULL; + m_m17Network = nullptr; return false; } @@ -1872,7 +1872,7 @@ bool CMMDVMHost::createPOCSAGNetwork() bool ret = m_pocsagNetwork->open(); if (!ret) { delete m_pocsagNetwork; - m_pocsagNetwork = NULL; + m_pocsagNetwork = nullptr; return false; } @@ -1919,7 +1919,7 @@ bool CMMDVMHost::createFMNetwork() bool ret = m_fmNetwork->open(); if (!ret) { delete m_fmNetwork; - m_fmNetwork = NULL; + m_fmNetwork = nullptr; return false; } @@ -1943,7 +1943,7 @@ bool CMMDVMHost::createAX25Network() bool ret = m_ax25Network->open(); if (!ret) { delete m_ax25Network; - m_ax25Network = NULL; + m_ax25Network = nullptr; return false; } @@ -1986,46 +1986,46 @@ void CMMDVMHost::readParams() void CMMDVMHost::setMode(unsigned char mode) { - assert(m_modem != NULL); - assert(m_display != NULL); + assert(m_modem != nullptr); + assert(m_display != nullptr); switch (mode) { case MODE_DSTAR: - if (m_dstarNetwork != NULL) + if (m_dstarNetwork != nullptr) m_dstarNetwork->enable(true); - if (m_dmrNetwork != NULL) + if (m_dmrNetwork != nullptr) m_dmrNetwork->enable(false); - if (m_ysfNetwork != NULL) + if (m_ysfNetwork != nullptr) m_ysfNetwork->enable(false); - if (m_p25Network != NULL) + if (m_p25Network != nullptr) m_p25Network->enable(false); - if (m_nxdnNetwork != NULL) + if (m_nxdnNetwork != nullptr) m_nxdnNetwork->enable(false); - if (m_m17Network != NULL) + if (m_m17Network != nullptr) m_m17Network->enable(false); - if (m_pocsagNetwork != NULL) + if (m_pocsagNetwork != nullptr) m_pocsagNetwork->enable(false); - if (m_fmNetwork != NULL) + if (m_fmNetwork != nullptr) m_fmNetwork->enable(false); - if (m_ax25Network != NULL) + if (m_ax25Network != nullptr) m_ax25Network->enable(false); - if (m_dstar != NULL) + if (m_dstar != nullptr) m_dstar->enable(true); - if (m_dmr != NULL) + if (m_dmr != nullptr) m_dmr->enable(false); - if (m_ysf != NULL) + if (m_ysf != nullptr) m_ysf->enable(false); - if (m_p25 != NULL) + if (m_p25 != nullptr) m_p25->enable(false); - if (m_nxdn != NULL) + if (m_nxdn != nullptr) m_nxdn->enable(false); - if (m_m17 != NULL) + if (m_m17 != nullptr) m_m17->enable(false); - if (m_pocsag != NULL) + if (m_pocsag != nullptr) m_pocsag->enable(false); - if (m_fm != NULL) + if (m_fm != nullptr) m_fm->enable(false); - if (m_ax25 != NULL) + if (m_ax25 != nullptr) m_ax25->enable(false); m_modem->setMode(MODE_DSTAR); m_mode = MODE_DSTAR; @@ -2036,41 +2036,41 @@ void CMMDVMHost::setMode(unsigned char mode) break; case MODE_DMR: - if (m_dstarNetwork != NULL) + if (m_dstarNetwork != nullptr) m_dstarNetwork->enable(false); - if (m_dmrNetwork != NULL) + if (m_dmrNetwork != nullptr) m_dmrNetwork->enable(true); - if (m_ysfNetwork != NULL) + if (m_ysfNetwork != nullptr) m_ysfNetwork->enable(false); - if (m_p25Network != NULL) + if (m_p25Network != nullptr) m_p25Network->enable(false); - if (m_nxdnNetwork != NULL) + if (m_nxdnNetwork != nullptr) m_nxdnNetwork->enable(false); - if (m_m17Network != NULL) + if (m_m17Network != nullptr) m_m17Network->enable(false); - if (m_pocsagNetwork != NULL) + if (m_pocsagNetwork != nullptr) m_pocsagNetwork->enable(false); - if (m_fmNetwork != NULL) + if (m_fmNetwork != nullptr) m_fmNetwork->enable(false); - if (m_ax25Network != NULL) + if (m_ax25Network != nullptr) m_ax25Network->enable(false); - if (m_dstar != NULL) + if (m_dstar != nullptr) m_dstar->enable(false); - if (m_dmr != NULL) + if (m_dmr != nullptr) m_dmr->enable(true); - if (m_ysf != NULL) + if (m_ysf != nullptr) m_ysf->enable(false); - if (m_p25 != NULL) + if (m_p25 != nullptr) m_p25->enable(false); - if (m_nxdn != NULL) + if (m_nxdn != nullptr) m_nxdn->enable(false); - if (m_m17 != NULL) + if (m_m17 != nullptr) m_m17->enable(false); - if (m_pocsag != NULL) + if (m_pocsag != nullptr) m_pocsag->enable(false); - if (m_fm != NULL) + if (m_fm != nullptr) m_fm->enable(false); - if (m_ax25 != NULL) + if (m_ax25 != nullptr) m_ax25->enable(false); m_modem->setMode(MODE_DMR); if (m_duplex) { @@ -2085,41 +2085,41 @@ void CMMDVMHost::setMode(unsigned char mode) break; case MODE_YSF: - if (m_dstarNetwork != NULL) + if (m_dstarNetwork != nullptr) m_dstarNetwork->enable(false); - if (m_dmrNetwork != NULL) + if (m_dmrNetwork != nullptr) m_dmrNetwork->enable(false); - if (m_ysfNetwork != NULL) + if (m_ysfNetwork != nullptr) m_ysfNetwork->enable(true); - if (m_p25Network != NULL) + if (m_p25Network != nullptr) m_p25Network->enable(false); - if (m_nxdnNetwork != NULL) + if (m_nxdnNetwork != nullptr) m_nxdnNetwork->enable(false); - if (m_m17Network != NULL) + if (m_m17Network != nullptr) m_m17Network->enable(false); - if (m_pocsagNetwork != NULL) + if (m_pocsagNetwork != nullptr) m_pocsagNetwork->enable(false); - if (m_fmNetwork != NULL) + if (m_fmNetwork != nullptr) m_fmNetwork->enable(false); - if (m_ax25Network != NULL) + if (m_ax25Network != nullptr) m_ax25Network->enable(false); - if (m_dstar != NULL) + if (m_dstar != nullptr) m_dstar->enable(false); - if (m_dmr != NULL) + if (m_dmr != nullptr) m_dmr->enable(false); - if (m_ysf != NULL) + if (m_ysf != nullptr) m_ysf->enable(true); - if (m_p25 != NULL) + if (m_p25 != nullptr) m_p25->enable(false); - if (m_nxdn != NULL) + if (m_nxdn != nullptr) m_nxdn->enable(false); - if (m_m17 != NULL) + if (m_m17 != nullptr) m_m17->enable(false); - if (m_pocsag != NULL) + if (m_pocsag != nullptr) m_pocsag->enable(false); - if (m_fm != NULL) + if (m_fm != nullptr) m_fm->enable(false); - if (m_ax25 != NULL) + if (m_ax25 != nullptr) m_ax25->enable(false); m_modem->setMode(MODE_YSF); m_mode = MODE_YSF; @@ -2130,41 +2130,41 @@ void CMMDVMHost::setMode(unsigned char mode) break; case MODE_P25: - if (m_dstarNetwork != NULL) + if (m_dstarNetwork != nullptr) m_dstarNetwork->enable(false); - if (m_dmrNetwork != NULL) + if (m_dmrNetwork != nullptr) m_dmrNetwork->enable(false); - if (m_ysfNetwork != NULL) + if (m_ysfNetwork != nullptr) m_ysfNetwork->enable(false); - if (m_p25Network != NULL) + if (m_p25Network != nullptr) m_p25Network->enable(true); - if (m_nxdnNetwork != NULL) + if (m_nxdnNetwork != nullptr) m_nxdnNetwork->enable(false); - if (m_m17Network != NULL) + if (m_m17Network != nullptr) m_m17Network->enable(false); - if (m_pocsagNetwork != NULL) + if (m_pocsagNetwork != nullptr) m_pocsagNetwork->enable(false); - if (m_fmNetwork != NULL) + if (m_fmNetwork != nullptr) m_fmNetwork->enable(false); - if (m_ax25Network != NULL) + if (m_ax25Network != nullptr) m_ax25Network->enable(false); - if (m_dstar != NULL) + if (m_dstar != nullptr) m_dstar->enable(false); - if (m_dmr != NULL) + if (m_dmr != nullptr) m_dmr->enable(false); - if (m_ysf != NULL) + if (m_ysf != nullptr) m_ysf->enable(false); - if (m_p25 != NULL) + if (m_p25 != nullptr) m_p25->enable(true); - if (m_nxdn != NULL) + if (m_nxdn != nullptr) m_nxdn->enable(false); - if (m_m17 != NULL) + if (m_m17 != nullptr) m_m17->enable(false); - if (m_pocsag != NULL) + if (m_pocsag != nullptr) m_pocsag->enable(false); - if (m_fm != NULL) + if (m_fm != nullptr) m_fm->enable(false); - if (m_ax25 != NULL) + if (m_ax25 != nullptr) m_ax25->enable(false); m_modem->setMode(MODE_P25); m_mode = MODE_P25; @@ -2175,41 +2175,41 @@ void CMMDVMHost::setMode(unsigned char mode) break; case MODE_NXDN: - if (m_dstarNetwork != NULL) + if (m_dstarNetwork != nullptr) m_dstarNetwork->enable(false); - if (m_dmrNetwork != NULL) + if (m_dmrNetwork != nullptr) m_dmrNetwork->enable(false); - if (m_ysfNetwork != NULL) + if (m_ysfNetwork != nullptr) m_ysfNetwork->enable(false); - if (m_p25Network != NULL) + if (m_p25Network != nullptr) m_p25Network->enable(false); - if (m_nxdnNetwork != NULL) + if (m_nxdnNetwork != nullptr) m_nxdnNetwork->enable(true); - if (m_m17Network != NULL) + if (m_m17Network != nullptr) m_m17Network->enable(false); - if (m_pocsagNetwork != NULL) + if (m_pocsagNetwork != nullptr) m_pocsagNetwork->enable(false); - if (m_fmNetwork != NULL) + if (m_fmNetwork != nullptr) m_fmNetwork->enable(false); - if (m_ax25Network != NULL) + if (m_ax25Network != nullptr) m_ax25Network->enable(false); - if (m_dstar != NULL) + if (m_dstar != nullptr) m_dstar->enable(false); - if (m_dmr != NULL) + if (m_dmr != nullptr) m_dmr->enable(false); - if (m_ysf != NULL) + if (m_ysf != nullptr) m_ysf->enable(false); - if (m_p25 != NULL) + if (m_p25 != nullptr) m_p25->enable(false); - if (m_nxdn != NULL) + if (m_nxdn != nullptr) m_nxdn->enable(true); - if (m_m17 != NULL) + if (m_m17 != nullptr) m_m17->enable(false); - if (m_pocsag != NULL) + if (m_pocsag != nullptr) m_pocsag->enable(false); - if (m_fm != NULL) + if (m_fm != nullptr) m_fm->enable(false); - if (m_ax25 != NULL) + if (m_ax25 != nullptr) m_ax25->enable(false); m_modem->setMode(MODE_NXDN); m_mode = MODE_NXDN; @@ -2220,41 +2220,41 @@ void CMMDVMHost::setMode(unsigned char mode) break; case MODE_M17: - if (m_dstarNetwork != NULL) + if (m_dstarNetwork != nullptr) m_dstarNetwork->enable(false); - if (m_dmrNetwork != NULL) + if (m_dmrNetwork != nullptr) m_dmrNetwork->enable(false); - if (m_ysfNetwork != NULL) + if (m_ysfNetwork != nullptr) m_ysfNetwork->enable(false); - if (m_p25Network != NULL) + if (m_p25Network != nullptr) m_p25Network->enable(false); - if (m_nxdnNetwork != NULL) + if (m_nxdnNetwork != nullptr) m_nxdnNetwork->enable(false); - if (m_m17Network != NULL) + if (m_m17Network != nullptr) m_m17Network->enable(true); - if (m_pocsagNetwork != NULL) + if (m_pocsagNetwork != nullptr) m_pocsagNetwork->enable(false); - if (m_fmNetwork != NULL) + if (m_fmNetwork != nullptr) m_fmNetwork->enable(false); - if (m_ax25Network != NULL) + if (m_ax25Network != nullptr) m_ax25Network->enable(false); - if (m_dstar != NULL) + if (m_dstar != nullptr) m_dstar->enable(false); - if (m_dmr != NULL) + if (m_dmr != nullptr) m_dmr->enable(false); - if (m_ysf != NULL) + if (m_ysf != nullptr) m_ysf->enable(false); - if (m_p25 != NULL) + if (m_p25 != nullptr) m_p25->enable(false); - if (m_nxdn != NULL) + if (m_nxdn != nullptr) m_nxdn->enable(false); - if (m_m17 != NULL) + if (m_m17 != nullptr) m_m17->enable(true); - if (m_pocsag != NULL) + if (m_pocsag != nullptr) m_pocsag->enable(false); - if (m_fm != NULL) + if (m_fm != nullptr) m_fm->enable(false); - if (m_ax25 != NULL) + if (m_ax25 != nullptr) m_ax25->enable(false); m_modem->setMode(MODE_M17); m_mode = MODE_M17; @@ -2265,41 +2265,41 @@ void CMMDVMHost::setMode(unsigned char mode) break; case MODE_POCSAG: - if (m_dstarNetwork != NULL) + if (m_dstarNetwork != nullptr) m_dstarNetwork->enable(false); - if (m_dmrNetwork != NULL) + if (m_dmrNetwork != nullptr) m_dmrNetwork->enable(false); - if (m_ysfNetwork != NULL) + if (m_ysfNetwork != nullptr) m_ysfNetwork->enable(false); - if (m_p25Network != NULL) + if (m_p25Network != nullptr) m_p25Network->enable(false); - if (m_nxdnNetwork != NULL) + if (m_nxdnNetwork != nullptr) m_nxdnNetwork->enable(false); - if (m_m17Network != NULL) + if (m_m17Network != nullptr) m_m17Network->enable(false); - if (m_pocsagNetwork != NULL) + if (m_pocsagNetwork != nullptr) m_pocsagNetwork->enable(true); - if (m_fmNetwork != NULL) + if (m_fmNetwork != nullptr) m_fmNetwork->enable(false); - if (m_ax25Network != NULL) + if (m_ax25Network != nullptr) m_ax25Network->enable(false); - if (m_dstar != NULL) + if (m_dstar != nullptr) m_dstar->enable(false); - if (m_dmr != NULL) + if (m_dmr != nullptr) m_dmr->enable(false); - if (m_ysf != NULL) + if (m_ysf != nullptr) m_ysf->enable(false); - if (m_p25 != NULL) + if (m_p25 != nullptr) m_p25->enable(false); - if (m_nxdn != NULL) + if (m_nxdn != nullptr) m_nxdn->enable(false); - if (m_m17 != NULL) + if (m_m17 != nullptr) m_m17->enable(false); - if (m_pocsag != NULL) + if (m_pocsag != nullptr) m_pocsag->enable(true); - if (m_fm != NULL) + if (m_fm != nullptr) m_fm->enable(false); - if (m_ax25 != NULL) + if (m_ax25 != nullptr) m_ax25->enable(false); m_modem->setMode(MODE_POCSAG); m_mode = MODE_POCSAG; @@ -2310,41 +2310,41 @@ void CMMDVMHost::setMode(unsigned char mode) break; case MODE_FM: - if (m_dstarNetwork != NULL) + if (m_dstarNetwork != nullptr) m_dstarNetwork->enable(false); - if (m_dmrNetwork != NULL) + if (m_dmrNetwork != nullptr) m_dmrNetwork->enable(false); - if (m_ysfNetwork != NULL) + if (m_ysfNetwork != nullptr) m_ysfNetwork->enable(false); - if (m_p25Network != NULL) + if (m_p25Network != nullptr) m_p25Network->enable(false); - if (m_nxdnNetwork != NULL) + if (m_nxdnNetwork != nullptr) m_nxdnNetwork->enable(false); - if (m_m17Network != NULL) + if (m_m17Network != nullptr) m_m17Network->enable(false); - if (m_pocsagNetwork != NULL) + if (m_pocsagNetwork != nullptr) m_pocsagNetwork->enable(false); - if (m_fmNetwork != NULL) + if (m_fmNetwork != nullptr) m_fmNetwork->enable(true); - if (m_ax25Network != NULL) + if (m_ax25Network != nullptr) m_ax25Network->enable(true); - if (m_dstar != NULL) + if (m_dstar != nullptr) m_dstar->enable(false); - if (m_dmr != NULL) + if (m_dmr != nullptr) m_dmr->enable(false); - if (m_ysf != NULL) + if (m_ysf != nullptr) m_ysf->enable(false); - if (m_p25 != NULL) + if (m_p25 != nullptr) m_p25->enable(false); - if (m_nxdn != NULL) + if (m_nxdn != nullptr) m_nxdn->enable(false); - if (m_m17 != NULL) + if (m_m17 != nullptr) m_m17->enable(false); - if (m_pocsag != NULL) + if (m_pocsag != nullptr) m_pocsag->enable(false); - if (m_fm != NULL) + if (m_fm != nullptr) m_fm->enable(true); - if (m_ax25 != NULL) + if (m_ax25 != nullptr) m_ax25->enable(true); if (m_mode == MODE_DMR && m_duplex && m_modem->hasTX()) { m_modem->writeDMRStart(false); @@ -2360,41 +2360,41 @@ void CMMDVMHost::setMode(unsigned char mode) break; case MODE_LOCKOUT: - if (m_dstarNetwork != NULL) + if (m_dstarNetwork != nullptr) m_dstarNetwork->enable(false); - if (m_dmrNetwork != NULL) + if (m_dmrNetwork != nullptr) m_dmrNetwork->enable(false); - if (m_ysfNetwork != NULL) + if (m_ysfNetwork != nullptr) m_ysfNetwork->enable(false); - if (m_p25Network != NULL) + if (m_p25Network != nullptr) m_p25Network->enable(false); - if (m_nxdnNetwork != NULL) + if (m_nxdnNetwork != nullptr) m_nxdnNetwork->enable(false); - if (m_m17Network != NULL) + if (m_m17Network != nullptr) m_m17Network->enable(false); - if (m_pocsagNetwork != NULL) + if (m_pocsagNetwork != nullptr) m_pocsagNetwork->enable(false); - if (m_fmNetwork != NULL) + if (m_fmNetwork != nullptr) m_fmNetwork->enable(false); - if (m_ax25Network != NULL) + if (m_ax25Network != nullptr) m_ax25Network->enable(false); - if (m_dstar != NULL) + if (m_dstar != nullptr) m_dstar->enable(false); - if (m_dmr != NULL) + if (m_dmr != nullptr) m_dmr->enable(false); - if (m_ysf != NULL) + if (m_ysf != nullptr) m_ysf->enable(false); - if (m_p25 != NULL) + if (m_p25 != nullptr) m_p25->enable(false); - if (m_nxdn != NULL) + if (m_nxdn != nullptr) m_nxdn->enable(false); - if (m_m17 != NULL) + if (m_m17 != nullptr) m_m17->enable(false); - if (m_pocsag != NULL) + if (m_pocsag != nullptr) m_pocsag->enable(false); - if (m_fm != NULL) + if (m_fm != nullptr) m_fm->enable(false); - if (m_ax25 != NULL) + if (m_ax25 != nullptr) m_ax25->enable(false); if (m_mode == MODE_DMR && m_duplex && m_modem->hasTX()) { m_modem->writeDMRStart(false); @@ -2411,41 +2411,41 @@ void CMMDVMHost::setMode(unsigned char mode) case MODE_ERROR: LogMessage("Mode set to Error"); - if (m_dstarNetwork != NULL) + if (m_dstarNetwork != nullptr) m_dstarNetwork->enable(false); - if (m_dmrNetwork != NULL) + if (m_dmrNetwork != nullptr) m_dmrNetwork->enable(false); - if (m_ysfNetwork != NULL) + if (m_ysfNetwork != nullptr) m_ysfNetwork->enable(false); - if (m_p25Network != NULL) + if (m_p25Network != nullptr) m_p25Network->enable(false); - if (m_nxdnNetwork != NULL) + if (m_nxdnNetwork != nullptr) m_nxdnNetwork->enable(false); - if (m_m17Network != NULL) + if (m_m17Network != nullptr) m_m17Network->enable(false); - if (m_pocsagNetwork != NULL) + if (m_pocsagNetwork != nullptr) m_pocsagNetwork->enable(false); - if (m_fmNetwork != NULL) + if (m_fmNetwork != nullptr) m_fmNetwork->enable(false); - if (m_ax25Network != NULL) + if (m_ax25Network != nullptr) m_ax25Network->enable(false); - if (m_dstar != NULL) + if (m_dstar != nullptr) m_dstar->enable(false); - if (m_dmr != NULL) + if (m_dmr != nullptr) m_dmr->enable(false); - if (m_ysf != NULL) + if (m_ysf != nullptr) m_ysf->enable(false); - if (m_p25 != NULL) + if (m_p25 != nullptr) m_p25->enable(false); - if (m_nxdn != NULL) + if (m_nxdn != nullptr) m_nxdn->enable(false); - if (m_m17 != NULL) + if (m_m17 != nullptr) m_m17->enable(false); - if (m_pocsag != NULL) + if (m_pocsag != nullptr) m_pocsag->enable(false); - if (m_fm != NULL) + if (m_fm != nullptr) m_fm->enable(false); - if (m_ax25 != NULL) + if (m_ax25 != nullptr) m_ax25->enable(false); if (m_mode == MODE_DMR && m_duplex && m_modem->hasTX()) { m_modem->writeDMRStart(false); @@ -2460,41 +2460,41 @@ void CMMDVMHost::setMode(unsigned char mode) break; default: - if (m_dstarNetwork != NULL) + if (m_dstarNetwork != nullptr) m_dstarNetwork->enable(true); - if (m_dmrNetwork != NULL) + if (m_dmrNetwork != nullptr) m_dmrNetwork->enable(true); - if (m_ysfNetwork != NULL) + if (m_ysfNetwork != nullptr) m_ysfNetwork->enable(true); - if (m_p25Network != NULL) + if (m_p25Network != nullptr) m_p25Network->enable(true); - if (m_nxdnNetwork != NULL) + if (m_nxdnNetwork != nullptr) m_nxdnNetwork->enable(true); - if (m_m17Network != NULL) + if (m_m17Network != nullptr) m_m17Network->enable(true); - if (m_pocsagNetwork != NULL) + if (m_pocsagNetwork != nullptr) m_pocsagNetwork->enable(true); - if (m_fmNetwork != NULL) + if (m_fmNetwork != nullptr) m_fmNetwork->enable(true); - if (m_ax25Network != NULL) + if (m_ax25Network != nullptr) m_ax25Network->enable(true); - if (m_dstar != NULL) + if (m_dstar != nullptr) m_dstar->enable(true); - if (m_dmr != NULL) + if (m_dmr != nullptr) m_dmr->enable(true); - if (m_ysf != NULL) + if (m_ysf != nullptr) m_ysf->enable(true); - if (m_p25 != NULL) + if (m_p25 != nullptr) m_p25->enable(true); - if (m_nxdn != NULL) + if (m_nxdn != nullptr) m_nxdn->enable(true); - if (m_m17 != NULL) + if (m_m17 != nullptr) m_m17->enable(true); - if (m_pocsag != NULL) + if (m_pocsag != nullptr) m_pocsag->enable(true); - if (m_fm != NULL) + if (m_fm != nullptr) m_fm->enable(true); - if (m_ax25 != NULL) + if (m_ax25 != nullptr) m_ax25->enable(true); if (m_mode == MODE_DMR && m_duplex && m_modem->hasTX()) { m_modem->writeDMRStart(false); @@ -2524,7 +2524,7 @@ void CMMDVMHost::createLockFile(const char* mode) const { if (m_lockFileEnabled) { FILE* fp = ::fopen(m_lockFileName.c_str(), "wt"); - if (fp != NULL) { + if (fp != nullptr) { ::fprintf(fp, "%s\n", mode); ::fclose(fp); } @@ -2539,7 +2539,7 @@ void CMMDVMHost::removeLockFile() const void CMMDVMHost::remoteControl() { - if (m_remoteControl == NULL) + if (m_remoteControl == nullptr) return; REMOTE_COMMAND command = m_remoteControl->getCommand(); @@ -2553,27 +2553,27 @@ void CMMDVMHost::remoteControl() setMode(MODE_LOCKOUT); break; case REMOTE_COMMAND::MODE_DSTAR: - if (m_dstar != NULL) + if (m_dstar != nullptr) processModeCommand(MODE_DSTAR, m_dstarRFModeHang); break; case REMOTE_COMMAND::MODE_DMR: - if (m_dmr != NULL) + if (m_dmr != nullptr) processModeCommand(MODE_DMR, m_dmrRFModeHang); break; case REMOTE_COMMAND::MODE_YSF: - if (m_ysf != NULL) + if (m_ysf != nullptr) processModeCommand(MODE_YSF, m_ysfRFModeHang); break; case REMOTE_COMMAND::MODE_P25: - if (m_p25 != NULL) + if (m_p25 != nullptr) processModeCommand(MODE_P25, m_p25RFModeHang); break; case REMOTE_COMMAND::MODE_NXDN: - if (m_nxdn != NULL) + if (m_nxdn != nullptr) processModeCommand(MODE_NXDN, m_nxdnRFModeHang); break; case REMOTE_COMMAND::MODE_M17: - if (m_m17 != NULL) + if (m_m17 != nullptr) processModeCommand(MODE_M17, m_m17RFModeHang); break; case REMOTE_COMMAND::MODE_FM: @@ -2581,39 +2581,39 @@ void CMMDVMHost::remoteControl() processModeCommand(MODE_FM, 0); break; case REMOTE_COMMAND::ENABLE_DSTAR: - if (m_dstar != NULL && !m_dstarEnabled) + if (m_dstar != nullptr && !m_dstarEnabled) processEnableCommand(m_dstarEnabled, true); - if (m_dstarNetwork != NULL) + if (m_dstarNetwork != nullptr) m_dstarNetwork->enable(true); break; case REMOTE_COMMAND::ENABLE_DMR: - if (m_dmr != NULL && !m_dmrEnabled) + if (m_dmr != nullptr && !m_dmrEnabled) processEnableCommand(m_dmrEnabled, true); - if (m_dmrNetwork != NULL) + if (m_dmrNetwork != nullptr) m_dmrNetwork->enable(true); break; case REMOTE_COMMAND::ENABLE_YSF: - if (m_ysf != NULL && !m_ysfEnabled) + if (m_ysf != nullptr && !m_ysfEnabled) processEnableCommand(m_ysfEnabled, true); - if (m_ysfNetwork != NULL) + if (m_ysfNetwork != nullptr) m_ysfNetwork->enable(true); break; case REMOTE_COMMAND::ENABLE_P25: - if (m_p25 != NULL && !m_p25Enabled) + if (m_p25 != nullptr && !m_p25Enabled) processEnableCommand(m_p25Enabled, true); - if (m_p25Network != NULL) + if (m_p25Network != nullptr) m_p25Network->enable(true); break; case REMOTE_COMMAND::ENABLE_NXDN: - if (m_nxdn != NULL && !m_nxdnEnabled) + if (m_nxdn != nullptr && !m_nxdnEnabled) processEnableCommand(m_nxdnEnabled, true); - if (m_nxdnNetwork != NULL) + if (m_nxdnNetwork != nullptr) m_nxdnNetwork->enable(true); break; case REMOTE_COMMAND::ENABLE_M17: - if (m_m17 != NULL && !m_m17Enabled) + if (m_m17 != nullptr && !m_m17Enabled) processEnableCommand(m_m17Enabled, true); - if (m_m17Network != NULL) + if (m_m17Network != nullptr) m_m17Network->enable(true); break; case REMOTE_COMMAND::ENABLE_FM: @@ -2625,39 +2625,39 @@ void CMMDVMHost::remoteControl() processEnableCommand(m_ax25Enabled, true); break; case REMOTE_COMMAND::DISABLE_DSTAR: - if (m_dstar != NULL && m_dstarEnabled) + if (m_dstar != nullptr && m_dstarEnabled) processEnableCommand(m_dstarEnabled, false); - if (m_dstarNetwork != NULL) + if (m_dstarNetwork != nullptr) m_dstarNetwork->enable(false); break; case REMOTE_COMMAND::DISABLE_DMR: - if (m_dmr != NULL && m_dmrEnabled) + if (m_dmr != nullptr && m_dmrEnabled) processEnableCommand(m_dmrEnabled, false); - if (m_dmrNetwork != NULL) + if (m_dmrNetwork != nullptr) m_dmrNetwork->enable(false); break; case REMOTE_COMMAND::DISABLE_YSF: - if (m_ysf != NULL && m_ysfEnabled) + if (m_ysf != nullptr && m_ysfEnabled) processEnableCommand(m_ysfEnabled, false); - if (m_ysfNetwork != NULL) + if (m_ysfNetwork != nullptr) m_ysfNetwork->enable(false); break; case REMOTE_COMMAND::DISABLE_P25: - if (m_p25 != NULL && m_p25Enabled) + if (m_p25 != nullptr && m_p25Enabled) processEnableCommand(m_p25Enabled, false); - if (m_p25Network != NULL) + if (m_p25Network != nullptr) m_p25Network->enable(false); break; case REMOTE_COMMAND::DISABLE_NXDN: - if (m_nxdn != NULL && m_nxdnEnabled) + if (m_nxdn != nullptr && m_nxdnEnabled) processEnableCommand(m_nxdnEnabled, false); - if (m_nxdnNetwork != NULL) + if (m_nxdnNetwork != nullptr) m_nxdnNetwork->enable(false); break; case REMOTE_COMMAND::DISABLE_M17: - if (m_m17 != NULL && m_m17Enabled) + if (m_m17 != nullptr && m_m17Enabled) processEnableCommand(m_m17Enabled, false); - if (m_m17Network != NULL) + if (m_m17Network != nullptr) m_m17Network->enable(false); break; case REMOTE_COMMAND::DISABLE_FM: @@ -2669,7 +2669,7 @@ void CMMDVMHost::remoteControl() processEnableCommand(m_ax25Enabled, false); break; case REMOTE_COMMAND::PAGE: - if (m_pocsag != NULL) { + if (m_pocsag != nullptr) { unsigned int ric = m_remoteControl->getArgUInt(0U); std::string text; for (unsigned int i = 1U; i < m_remoteControl->getArgCount(); i++) { @@ -2681,7 +2681,7 @@ void CMMDVMHost::remoteControl() } break; case REMOTE_COMMAND::PAGE_BCD: - if (m_pocsag != NULL) { + if (m_pocsag != nullptr) { unsigned int ric = m_remoteControl->getArgUInt(0U); std::string text; for (unsigned int i = 1U; i < m_remoteControl->getArgCount(); i++) { @@ -2693,13 +2693,13 @@ void CMMDVMHost::remoteControl() } break; case REMOTE_COMMAND::PAGE_A1: - if (m_pocsag != NULL) { + if (m_pocsag != nullptr) { unsigned int ric = m_remoteControl->getArgUInt(0U); m_pocsag->sendPageAlert1(ric); } break; case REMOTE_COMMAND::PAGE_A2: - if (m_pocsag != NULL) { + if (m_pocsag != nullptr) { unsigned int ric = m_remoteControl->getArgUInt(0U); std::string text; for (unsigned int i = 1U; i < m_remoteControl->getArgCount(); i++) { @@ -2763,12 +2763,12 @@ void CMMDVMHost::processEnableCommand(bool& mode, bool enabled) void CMMDVMHost::buildNetworkStatusString(std::string &str) { str = ""; - str += std::string("dstar:") + (((m_dstarNetwork == NULL) || (m_dstarEnabled == false)) ? "n/a" : (m_dstarNetwork->isConnected() ? "conn" : "disc")); - str += std::string(" dmr:") + (((m_dmrNetwork == NULL) || (m_dmrEnabled == false)) ? "n/a" : (m_dmrNetwork->isConnected() ? "conn" : "disc")); - str += std::string(" ysf:") + (((m_ysfNetwork == NULL) || (m_ysfEnabled == false)) ? "n/a" : (m_ysfNetwork->isConnected() ? "conn" : "disc")); - str += std::string(" p25:") + (((m_p25Network == NULL) || (m_p25Enabled == false)) ? "n/a" : (m_p25Network->isConnected() ? "conn" : "disc")); - str += std::string(" nxdn:") + (((m_nxdnNetwork == NULL) || (m_nxdnEnabled == false)) ? "n/a" : (m_nxdnNetwork->isConnected() ? "conn" : "disc")); - str += std::string(" m17:") + (((m_m17Network == NULL) || (m_m17Enabled == false)) ? "n/a" : (m_m17Network->isConnected() ? "conn" : "disc")); + str += std::string("dstar:") + (((m_dstarNetwork == nullptr) || (m_dstarEnabled == false)) ? "n/a" : (m_dstarNetwork->isConnected() ? "conn" : "disc")); + str += std::string(" dmr:") + (((m_dmrNetwork == nullptr) || (m_dmrEnabled == false)) ? "n/a" : (m_dmrNetwork->isConnected() ? "conn" : "disc")); + str += std::string(" ysf:") + (((m_ysfNetwork == nullptr) || (m_ysfEnabled == false)) ? "n/a" : (m_ysfNetwork->isConnected() ? "conn" : "disc")); + str += std::string(" p25:") + (((m_p25Network == nullptr) || (m_p25Enabled == false)) ? "n/a" : (m_p25Network->isConnected() ? "conn" : "disc")); + str += std::string(" nxdn:") + (((m_nxdnNetwork == nullptr) || (m_nxdnEnabled == false)) ? "n/a" : (m_nxdnNetwork->isConnected() ? "conn" : "disc")); + str += std::string(" m17:") + (((m_m17Network == nullptr) || (m_m17Enabled == false)) ? "n/a" : (m_m17Network->isConnected() ? "conn" : "disc")); str += std::string(" fm:") + (m_fmEnabled ? "conn" : "n/a"); } @@ -2777,7 +2777,7 @@ void CMMDVMHost::buildNetworkHostsString(std::string &str) str = ""; std::string dstarReflector; - if (m_dstarEnabled && (m_dstarNetwork != NULL)) { + if (m_dstarEnabled && (m_dstarNetwork != nullptr)) { unsigned char ref[DSTAR_LONG_CALLSIGN_LENGTH + 1]; LINK_STATUS status; @@ -2798,10 +2798,10 @@ void CMMDVMHost::buildNetworkHostsString(std::string &str) } } str += std::string("dstar:\"") + ((dstarReflector.length() == 0) ? "NONE" : dstarReflector) + "\""; - str += std::string(" dmr:\"") + ((m_dmrEnabled && (m_dmrNetwork != NULL)) ? m_conf.getDMRNetworkRemoteAddress() : "NONE") + "\""; - str += std::string(" ysf:\"") + ((m_ysfEnabled && (m_ysfNetwork != NULL)) ? m_conf.getFusionNetworkGatewayAddress() : "NONE") + "\""; - str += std::string(" p25:\"") + ((m_p25Enabled && (m_p25Network != NULL)) ? m_conf.getP25GatewayAddress() : "NONE") + "\""; - str += std::string(" nxdn:\"") + ((m_nxdnEnabled && (m_nxdnNetwork != NULL)) ? m_conf.getNXDNGatewayAddress() : "NONE") + "\""; - str += std::string(" m17:\"") + ((m_m17Enabled && (m_m17Network != NULL)) ? m_conf.getM17GatewayAddress() : "NONE") + "\""; - str += std::string(" fm:\"") + ((m_fmEnabled && (m_fmNetwork != NULL)) ? m_conf.getFMGatewayAddress() : "NONE") + "\""; + str += std::string(" dmr:\"") + ((m_dmrEnabled && (m_dmrNetwork != nullptr)) ? m_conf.getDMRNetworkRemoteAddress() : "NONE") + "\""; + str += std::string(" ysf:\"") + ((m_ysfEnabled && (m_ysfNetwork != nullptr)) ? m_conf.getFusionNetworkGatewayAddress() : "NONE") + "\""; + str += std::string(" p25:\"") + ((m_p25Enabled && (m_p25Network != nullptr)) ? m_conf.getP25GatewayAddress() : "NONE") + "\""; + str += std::string(" nxdn:\"") + ((m_nxdnEnabled && (m_nxdnNetwork != nullptr)) ? m_conf.getNXDNGatewayAddress() : "NONE") + "\""; + str += std::string(" m17:\"") + ((m_m17Enabled && (m_m17Network != nullptr)) ? m_conf.getM17GatewayAddress() : "NONE") + "\""; + str += std::string(" fm:\"") + ((m_fmEnabled && (m_fmNetwork != nullptr)) ? m_conf.getFMGatewayAddress() : "NONE") + "\""; } diff --git a/Modem.cpp b/Modem.cpp index e16054d..9269e20 100644 --- a/Modem.cpp +++ b/Modem.cpp @@ -165,8 +165,8 @@ m_fmEnabled(false), m_ax25Enabled(false), m_rxDCOffset(0), m_txDCOffset(0), -m_port(NULL), -m_buffer(NULL), +m_port(nullptr), +m_buffer(nullptr), m_length(0U), m_offset(0U), m_state(SERIAL_STATE::START), @@ -267,7 +267,7 @@ CModem::~CModem() void CModem::setPort(IModemPort* port) { - assert(port != NULL); + assert(port != nullptr); m_port = port; } @@ -363,7 +363,7 @@ bool CModem::open() if (!ret) { m_port->close(); delete m_port; - m_port = NULL; + m_port = nullptr; return false; } else { /* Stopping the inactivity timer here when a firmware version has been @@ -375,7 +375,7 @@ bool CModem::open() if (!ret) { m_port->close(); delete m_port; - m_port = NULL; + m_port = nullptr; return false; } @@ -383,7 +383,7 @@ bool CModem::open() if (!ret) { m_port->close(); delete m_port; - m_port = NULL; + m_port = nullptr; return false; } @@ -392,7 +392,7 @@ bool CModem::open() if (!ret) { m_port->close(); delete m_port; - m_port = NULL; + m_port = nullptr; return false; } @@ -400,7 +400,7 @@ bool CModem::open() if (!ret) { m_port->close(); delete m_port; - m_port = NULL; + m_port = nullptr; return false; } @@ -408,7 +408,7 @@ bool CModem::open() if (!ret) { m_port->close(); delete m_port; - m_port = NULL; + m_port = nullptr; return false; } @@ -417,7 +417,7 @@ bool CModem::open() if (!ret) { m_port->close(); delete m_port; - m_port = NULL; + m_port = nullptr; return false; } } @@ -433,7 +433,7 @@ bool CModem::open() void CModem::clock(unsigned int ms) { - assert(m_port != NULL); + assert(m_port != nullptr); // Poll the modem status every 250ms m_statusTimer.clock(ms); @@ -1154,7 +1154,7 @@ void CModem::clock(unsigned int ms) void CModem::close() { - assert(m_port != NULL); + assert(m_port != nullptr); ::LogMessage("Closing the MMDVM"); @@ -1163,7 +1163,7 @@ void CModem::close() unsigned int CModem::readDStarData(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); if (m_rxDStarData.isEmpty()) return 0U; @@ -1177,7 +1177,7 @@ unsigned int CModem::readDStarData(unsigned char* data) unsigned int CModem::readDMRData1(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); if (m_rxDMRData1.isEmpty()) return 0U; @@ -1191,7 +1191,7 @@ unsigned int CModem::readDMRData1(unsigned char* data) unsigned int CModem::readDMRData2(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); if (m_rxDMRData2.isEmpty()) return 0U; @@ -1205,7 +1205,7 @@ unsigned int CModem::readDMRData2(unsigned char* data) unsigned int CModem::readYSFData(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); if (m_rxYSFData.isEmpty()) return 0U; @@ -1219,7 +1219,7 @@ unsigned int CModem::readYSFData(unsigned char* data) unsigned int CModem::readP25Data(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); if (m_rxP25Data.isEmpty()) return 0U; @@ -1233,7 +1233,7 @@ unsigned int CModem::readP25Data(unsigned char* data) unsigned int CModem::readNXDNData(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); if (m_rxNXDNData.isEmpty()) return 0U; @@ -1247,7 +1247,7 @@ unsigned int CModem::readNXDNData(unsigned char* data) unsigned int CModem::readM17Data(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); if (m_rxM17Data.isEmpty()) return 0U; @@ -1261,7 +1261,7 @@ unsigned int CModem::readM17Data(unsigned char* data) unsigned int CModem::readFMData(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); if (m_rxFMData.isEmpty()) return 0U; @@ -1275,7 +1275,7 @@ unsigned int CModem::readFMData(unsigned char* data) unsigned int CModem::readAX25Data(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); if (m_rxAX25Data.isEmpty()) return 0U; @@ -1289,7 +1289,7 @@ unsigned int CModem::readAX25Data(unsigned char* data) unsigned int CModem::readTransparentData(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); if (m_rxTransparentData.isEmpty()) return 0U; @@ -1303,7 +1303,7 @@ unsigned int CModem::readTransparentData(unsigned char* data) unsigned int CModem::readSerial(unsigned char* data, unsigned int length) { - assert(data != NULL); + assert(data != nullptr); assert(length > 0U); unsigned int n = 0U; @@ -1324,7 +1324,7 @@ bool CModem::hasDStarSpace() const bool CModem::writeDStarData(const unsigned char* data, unsigned int length) { - assert(data != NULL); + assert(data != nullptr); assert(length > 0U); unsigned char buffer[50U]; @@ -1372,7 +1372,7 @@ bool CModem::hasDMRSpace2() const bool CModem::writeDMRData1(const unsigned char* data, unsigned int length) { - assert(data != NULL); + assert(data != nullptr); assert(length > 0U); if (data[0U] != TAG_DATA && data[0U] != TAG_EOT) @@ -1395,7 +1395,7 @@ bool CModem::writeDMRData1(const unsigned char* data, unsigned int length) bool CModem::writeDMRData2(const unsigned char* data, unsigned int length) { - assert(data != NULL); + assert(data != nullptr); assert(length > 0U); if (data[0U] != TAG_DATA && data[0U] != TAG_EOT) @@ -1425,7 +1425,7 @@ bool CModem::hasYSFSpace() const bool CModem::writeYSFData(const unsigned char* data, unsigned int length) { - assert(data != NULL); + assert(data != nullptr); assert(length > 0U); if (data[0U] != TAG_DATA && data[0U] != TAG_EOT) @@ -1455,7 +1455,7 @@ bool CModem::hasP25Space() const bool CModem::writeP25Data(const unsigned char* data, unsigned int length) { - assert(data != NULL); + assert(data != nullptr); assert(length > 0U); if (data[0U] != TAG_HEADER && data[0U] != TAG_DATA && data[0U] != TAG_EOT) @@ -1485,7 +1485,7 @@ bool CModem::hasNXDNSpace() const bool CModem::writeNXDNData(const unsigned char* data, unsigned int length) { - assert(data != NULL); + assert(data != nullptr); assert(length > 0U); if (data[0U] != TAG_DATA && data[0U] != TAG_EOT) @@ -1515,7 +1515,7 @@ bool CModem::hasM17Space() const bool CModem::writeM17Data(const unsigned char* data, unsigned int length) { - assert(data != NULL); + assert(data != nullptr); assert(length > 0U); unsigned char buffer[130U]; @@ -1556,7 +1556,7 @@ bool CModem::hasPOCSAGSpace() const bool CModem::writePOCSAGData(const unsigned char* data, unsigned int length) { - assert(data != NULL); + assert(data != nullptr); assert(length > 0U); unsigned char buffer[130U]; @@ -1581,7 +1581,7 @@ unsigned int CModem::getFMSpace() const bool CModem::writeFMData(const unsigned char* data, unsigned int length) { - assert(data != NULL); + assert(data != nullptr); assert(length > 0U); unsigned char buffer[500U]; @@ -1617,7 +1617,7 @@ bool CModem::hasAX25Space() const bool CModem::writeAX25Data(const unsigned char* data, unsigned int length) { - assert(data != NULL); + assert(data != nullptr); assert(length > 0U); unsigned char buffer[500U]; @@ -1646,7 +1646,7 @@ bool CModem::writeAX25Data(const unsigned char* data, unsigned int length) bool CModem::writeTransparentData(const unsigned char* data, unsigned int length) { - assert(data != NULL); + assert(data != nullptr); assert(length > 0U); unsigned char buffer[250U]; @@ -1680,12 +1680,12 @@ bool CModem::writeTransparentData(const unsigned char* data, unsigned int length bool CModem::writeDStarInfo(const char* my1, const char* my2, const char* your, const char* type, const char* reflector) { - assert(m_port != NULL); - assert(my1 != NULL); - assert(my2 != NULL); - assert(your != NULL); - assert(type != NULL); - assert(reflector != NULL); + assert(m_port != nullptr); + assert(my1 != nullptr); + assert(my2 != nullptr); + assert(your != nullptr); + assert(type != nullptr); + assert(reflector != nullptr); unsigned char buffer[50U]; @@ -1709,8 +1709,8 @@ bool CModem::writeDStarInfo(const char* my1, const char* my2, const char* your, bool CModem::writeDMRInfo(unsigned int slotNo, const std::string& src, bool group, const std::string& dest, const char* type) { - assert(m_port != NULL); - assert(type != NULL); + assert(m_port != nullptr); + assert(type != nullptr); unsigned char buffer[50U]; @@ -1735,11 +1735,11 @@ bool CModem::writeDMRInfo(unsigned int slotNo, const std::string& src, bool grou bool CModem::writeYSFInfo(const char* source, const char* dest, unsigned char dgid, const char* type, const char* origin) { - assert(m_port != NULL); - assert(source != NULL); - assert(dest != NULL); - assert(type != NULL); - assert(origin != NULL); + assert(m_port != nullptr); + assert(source != nullptr); + assert(dest != nullptr); + assert(type != nullptr); + assert(origin != nullptr); unsigned char buffer[40U]; @@ -1763,9 +1763,9 @@ bool CModem::writeYSFInfo(const char* source, const char* dest, unsigned char dg bool CModem::writeP25Info(const char* source, bool group, unsigned int dest, const char* type) { - assert(m_port != NULL); - assert(source != NULL); - assert(type != NULL); + assert(m_port != nullptr); + assert(source != nullptr); + assert(type != nullptr); unsigned char buffer[40U]; @@ -1788,9 +1788,9 @@ bool CModem::writeP25Info(const char* source, bool group, unsigned int dest, con bool CModem::writeNXDNInfo(const char* source, bool group, unsigned int dest, const char* type) { - assert(m_port != NULL); - assert(source != NULL); - assert(type != NULL); + assert(m_port != nullptr); + assert(source != nullptr); + assert(type != nullptr); unsigned char buffer[40U]; @@ -1813,10 +1813,10 @@ bool CModem::writeNXDNInfo(const char* source, bool group, unsigned int dest, co bool CModem::writeM17Info(const char* source, const char* dest, const char* type) { - assert(m_port != NULL); - assert(source != NULL); - assert(dest != NULL); - assert(type != NULL); + assert(m_port != nullptr); + assert(source != nullptr); + assert(dest != nullptr); + assert(type != nullptr); unsigned char buffer[40U]; @@ -1837,7 +1837,7 @@ bool CModem::writeM17Info(const char* source, const char* dest, const char* type bool CModem::writePOCSAGInfo(unsigned int ric, const std::string& message) { - assert(m_port != NULL); + assert(m_port != nullptr); size_t length = message.size(); @@ -1860,7 +1860,7 @@ bool CModem::writePOCSAGInfo(unsigned int ric, const std::string& message) bool CModem::writeIPInfo(const std::string& address) { - assert(m_port != NULL); + assert(m_port != nullptr); size_t length = address.size(); @@ -1881,8 +1881,8 @@ bool CModem::writeIPInfo(const std::string& address) bool CModem::writeSerial(const unsigned char* data, unsigned int length) { - assert(m_port != NULL); - assert(data != NULL); + assert(m_port != nullptr); + assert(data != nullptr); assert(length > 0U); unsigned char buffer[255U]; @@ -1972,7 +1972,7 @@ unsigned int CModem::getVersion() const bool CModem::readVersion() { - assert(m_port != NULL); + assert(m_port != nullptr); CThread::sleep(2000U); // 2s @@ -2091,7 +2091,7 @@ bool CModem::readVersion() bool CModem::readStatus() { - assert(m_port != NULL); + assert(m_port != nullptr); unsigned char buffer[3U]; @@ -2118,7 +2118,7 @@ bool CModem::writeConfig() bool CModem::setConfig1() { - assert(m_port != NULL); + assert(m_port != nullptr); unsigned char buffer[30U]; @@ -2233,7 +2233,7 @@ bool CModem::setConfig1() bool CModem::setConfig2() { - assert(m_port != NULL); + assert(m_port != nullptr); unsigned char buffer[50U]; @@ -2359,7 +2359,7 @@ bool CModem::setConfig2() bool CModem::setFrequency() { - assert(m_port != NULL); + assert(m_port != nullptr); unsigned char buffer[20U]; unsigned char len; @@ -2432,7 +2432,7 @@ bool CModem::setFrequency() RESP_TYPE_MMDVM CModem::getResponse() { - assert(m_port != NULL); + assert(m_port != nullptr); if (m_state == SERIAL_STATE::START) { // Get the start of the frame or nothing at all @@ -2544,7 +2544,7 @@ unsigned char CModem::getMode() const bool CModem::setMode(unsigned char mode) { - assert(m_port != NULL); + assert(m_port != nullptr); unsigned char buffer[4U]; @@ -2560,7 +2560,7 @@ bool CModem::setMode(unsigned char mode) bool CModem::sendCWId(const std::string& callsign) { - assert(m_port != NULL); + assert(m_port != nullptr); unsigned int length = (unsigned int)callsign.length(); if (length > 200U) @@ -2582,7 +2582,7 @@ bool CModem::sendCWId(const std::string& callsign) bool CModem::writeDMRStart(bool tx) { - assert(m_port != NULL); + assert(m_port != nullptr); if (tx && m_tx) return true; @@ -2603,7 +2603,7 @@ bool CModem::writeDMRStart(bool tx) bool CModem::writeDMRAbort(unsigned int slotNo) { - assert(m_port != NULL); + assert(m_port != nullptr); if (slotNo == 1U) m_txDMRData1.clear(); @@ -2624,8 +2624,8 @@ bool CModem::writeDMRAbort(unsigned int slotNo) bool CModem::writeDMRShortLC(const unsigned char* lc) { - assert(m_port != NULL); - assert(lc != NULL); + assert(m_port != nullptr); + assert(lc != nullptr); unsigned char buffer[12U]; @@ -2706,7 +2706,7 @@ void CModem::setFMExtParams(const std::string& ack, unsigned int audioBoost) bool CModem::setFMCallsignParams() { - assert(m_port != NULL); + assert(m_port != nullptr); unsigned char buffer[80U]; unsigned char len = 10U + (unsigned char)m_fmCallsign.size(); @@ -2767,7 +2767,7 @@ bool CModem::setFMCallsignParams() bool CModem::setFMAckParams() { - assert(m_port != NULL); + assert(m_port != nullptr); unsigned char buffer[80U]; unsigned char len = 8U + (unsigned char)m_fmRfAck.size(); @@ -2819,7 +2819,7 @@ bool CModem::setFMAckParams() bool CModem::setFMMiscParams() { - assert(m_port != NULL); + assert(m_port != nullptr); unsigned char buffer[20U]; @@ -2888,7 +2888,7 @@ bool CModem::setFMMiscParams() bool CModem::setFMExtParams() { - assert(m_port != NULL); + assert(m_port != nullptr); unsigned char buffer[80U]; unsigned char len = 7U + (unsigned char)m_fmExtAck.size(); diff --git a/ModemSerialPort.cpp b/ModemSerialPort.cpp index aa0a194..4399774 100644 --- a/ModemSerialPort.cpp +++ b/ModemSerialPort.cpp @@ -1,5 +1,5 @@ /* -* Copyright (C) 2016,2020,2021 by Jonathan Naylor G4KLX +* Copyright (C) 2016,2020,2021,2025 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 @@ -24,7 +24,7 @@ IModemSerialPort::IModemSerialPort(CModem* modem) : m_modem(modem) { - assert(modem != NULL); + assert(modem != nullptr); } IModemSerialPort::~IModemSerialPort() @@ -38,7 +38,7 @@ bool IModemSerialPort::open() int IModemSerialPort::write(const unsigned char* data, unsigned int length) { - assert(data != NULL); + assert(data != nullptr); assert(length > 0U); bool ret = m_modem->writeSerial(data, length); @@ -48,7 +48,7 @@ int IModemSerialPort::write(const unsigned char* data, unsigned int length) int IModemSerialPort::read(unsigned char* data, unsigned int length) { - assert(data != NULL); + assert(data != nullptr); assert(length > 0U); return m_modem->readSerial(data, length); diff --git a/Mutex.cpp b/Mutex.cpp index 837e340..1d631c6 100644 --- a/Mutex.cpp +++ b/Mutex.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015,2016 by Jonathan Naylor G4KLX + * Copyright (C) 2015,2016,2025 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 @@ -23,7 +23,7 @@ CMutex::CMutex() : m_handle() { - m_handle = ::CreateMutex(NULL, FALSE, NULL); + m_handle = ::CreateMutex(nullptr, FALSE, nullptr); } CMutex::~CMutex() diff --git a/NXDNAudio.cpp b/NXDNAudio.cpp index a56316c..742e43c 100644 --- a/NXDNAudio.cpp +++ b/NXDNAudio.cpp @@ -1,5 +1,5 @@ /* -* Copyright (C) 2018 by Jonathan Naylor G4KLX +* Copyright (C) 2018,2025 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 @@ -457,8 +457,8 @@ CNXDNAudio::~CNXDNAudio() void CNXDNAudio::decode(const unsigned char* in, unsigned char* out) const { - assert(in != NULL); - assert(out != NULL); + assert(in != nullptr); + assert(out != nullptr); decode(in + 0U, out, 0U); decode(in + 9U, out, 49U); @@ -466,8 +466,8 @@ void CNXDNAudio::decode(const unsigned char* in, unsigned char* out) const void CNXDNAudio::encode(const unsigned char* in, unsigned char* out) const { - assert(in != NULL); - assert(out != NULL); + assert(in != nullptr); + assert(out != nullptr); encode(in, out + 0U, 0U); encode(in, out + 9U, 49U); @@ -475,8 +475,8 @@ void CNXDNAudio::encode(const unsigned char* in, unsigned char* out) const void CNXDNAudio::decode(const unsigned char* in, unsigned char* out, unsigned int offset) const { - assert(in != NULL); - assert(out != NULL); + assert(in != nullptr); + assert(out != nullptr); unsigned int a = 0U; unsigned int MASK = 0x800000U; @@ -525,8 +525,8 @@ void CNXDNAudio::decode(const unsigned char* in, unsigned char* out, unsigned in void CNXDNAudio::encode(const unsigned char* in, unsigned char* out, unsigned int offset) const { - assert(in != NULL); - assert(out != NULL); + assert(in != nullptr); + assert(out != nullptr); unsigned int aOrig = 0U; unsigned int bOrig = 0U; diff --git a/NXDNCRC.cpp b/NXDNCRC.cpp index 60278ae..132855d 100644 --- a/NXDNCRC.cpp +++ b/NXDNCRC.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 by Jonathan Naylor G4KLX + * Copyright (C) 2018,2025 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 @@ -28,7 +28,7 @@ const uint8_t BIT_MASK_TABLE1[] = { 0x80U, 0x40U, 0x20U, 0x10U, 0x08U, 0x04U, 0 bool CNXDNCRC::checkCRC6(const unsigned char* in, unsigned int length) { - assert(in != NULL); + assert(in != nullptr); uint8_t crc = createCRC6(in, length); @@ -45,7 +45,7 @@ bool CNXDNCRC::checkCRC6(const unsigned char* in, unsigned int length) void CNXDNCRC::encodeCRC6(unsigned char* in, unsigned int length) { - assert(in != NULL); + assert(in != nullptr); uint8_t crc[1U]; crc[0U] = createCRC6(in, length); @@ -59,7 +59,7 @@ void CNXDNCRC::encodeCRC6(unsigned char* in, unsigned int length) bool CNXDNCRC::checkCRC12(const unsigned char* in, unsigned int length) { - assert(in != NULL); + assert(in != nullptr); uint16_t crc = createCRC12(in, length); uint8_t temp1[2U]; @@ -80,7 +80,7 @@ bool CNXDNCRC::checkCRC12(const unsigned char* in, unsigned int length) void CNXDNCRC::encodeCRC12(unsigned char* in, unsigned int length) { - assert(in != NULL); + assert(in != nullptr); uint16_t crc = createCRC12(in, length); @@ -97,7 +97,7 @@ void CNXDNCRC::encodeCRC12(unsigned char* in, unsigned int length) bool CNXDNCRC::checkCRC15(const unsigned char* in, unsigned int length) { - assert(in != NULL); + assert(in != nullptr); uint16_t crc = createCRC15(in, length); uint8_t temp1[2U]; @@ -118,7 +118,7 @@ bool CNXDNCRC::checkCRC15(const unsigned char* in, unsigned int length) void CNXDNCRC::encodeCRC15(unsigned char* in, unsigned int length) { - assert(in != NULL); + assert(in != nullptr); uint16_t crc = createCRC15(in, length); diff --git a/NXDNControl.cpp b/NXDNControl.cpp index 0b01a6e..b909d43 100644 --- a/NXDNControl.cpp +++ b/NXDNControl.cpp @@ -72,11 +72,11 @@ m_minRSSI(0U), m_aveRSSI(0U), m_rssiCount(0U), m_enabled(true), -m_fp(NULL) +m_fp(nullptr) { - assert(display != NULL); - assert(lookup != NULL); - assert(rssiMapper != NULL); + assert(display != nullptr); + assert(lookup != nullptr); + assert(rssiMapper != nullptr); } CNXDNControl::~CNXDNControl() @@ -85,7 +85,7 @@ CNXDNControl::~CNXDNControl() bool CNXDNControl::writeModem(unsigned char *data, unsigned int len) { - assert(data != NULL); + assert(data != nullptr); if (!m_enabled) return false; @@ -684,7 +684,7 @@ bool CNXDNControl::processData(unsigned char option, unsigned char *data) unsigned int CNXDNControl::readModem(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); if (m_queue.isEmpty()) return 0U; @@ -709,7 +709,7 @@ void CNXDNControl::writeEndRF() if (m_netState == RPT_NET_STATE::IDLE) { m_display->clearNXDN(); - if (m_network != NULL) + if (m_network != nullptr) m_network->reset(); } @@ -731,7 +731,7 @@ void CNXDNControl::writeEndNet() m_display->clearNXDN(); - if (m_network != NULL) + if (m_network != nullptr) m_network->reset(); } @@ -986,7 +986,7 @@ void CNXDNControl::writeNetwork() void CNXDNControl::clock(unsigned int ms) { - if (m_network != NULL) + if (m_network != nullptr) writeNetwork(); m_rfTimeoutTimer.clock(ms); @@ -1004,7 +1004,7 @@ void CNXDNControl::clock(unsigned int ms) void CNXDNControl::writeQueueRF(const unsigned char *data) { - assert(data != NULL); + assert(data != nullptr); if (m_netState != RPT_NET_STATE::IDLE) return; @@ -1027,7 +1027,7 @@ void CNXDNControl::writeQueueRF(const unsigned char *data) void CNXDNControl::writeQueueNet(const unsigned char *data) { - assert(data != NULL); + assert(data != nullptr); if (m_netTimeoutTimer.isRunning() && m_netTimeoutTimer.hasExpired()) return; @@ -1047,9 +1047,9 @@ void CNXDNControl::writeQueueNet(const unsigned char *data) void CNXDNControl::writeNetwork(const unsigned char *data, NXDN_NETWORK_MESSAGE_TYPE type) { - assert(data != NULL); + assert(data != nullptr); - if (m_network == NULL) + if (m_network == nullptr) return; if (m_rfTimeoutTimer.isRunning() && m_rfTimeoutTimer.hasExpired()) @@ -1060,7 +1060,7 @@ void CNXDNControl::writeNetwork(const unsigned char *data, NXDN_NETWORK_MESSAGE_ void CNXDNControl::scrambler(unsigned char* data) const { - assert(data != NULL); + assert(data != nullptr); for (unsigned int i = 0U; i < NXDN_FRAME_LENGTH_BYTES; i++) data[i] ^= SCRAMBLER[i]; @@ -1068,7 +1068,7 @@ void CNXDNControl::scrambler(unsigned char* data) const bool CNXDNControl::openFile() { - if (m_fp != NULL) + if (m_fp != nullptr) return true; time_t t; @@ -1080,7 +1080,7 @@ bool CNXDNControl::openFile() ::sprintf(name, "NXDN_%04d%02d%02d_%02d%02d%02d.ambe", tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec); m_fp = ::fopen(name, "wb"); - if (m_fp == NULL) + if (m_fp == nullptr) return false; ::fwrite("NXDN", 1U, 4U, m_fp); @@ -1090,7 +1090,7 @@ bool CNXDNControl::openFile() bool CNXDNControl::writeFile(const unsigned char* data) { - if (m_fp == NULL) + if (m_fp == nullptr) return false; ::fwrite(data, 1U, NXDN_FRAME_LENGTH_BYTES, m_fp); @@ -1100,9 +1100,9 @@ bool CNXDNControl::writeFile(const unsigned char* data) void CNXDNControl::closeFile() { - if (m_fp != NULL) { + if (m_fp != nullptr) { ::fclose(m_fp); - m_fp = NULL; + m_fp = nullptr; } } diff --git a/NXDNConvolution.cpp b/NXDNConvolution.cpp index 875752e..9da4bb2 100644 --- a/NXDNConvolution.cpp +++ b/NXDNConvolution.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2016,2018,2021 by Jonathan Naylor G4KLX + * Copyright (C) 2009-2016,2018,2021,2025 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 @@ -37,12 +37,12 @@ const uint32_t M = 4U; const unsigned int K = 5U; CNXDNConvolution::CNXDNConvolution() : -m_metrics1(NULL), -m_metrics2(NULL), -m_oldMetrics(NULL), -m_newMetrics(NULL), -m_decisions(NULL), -m_dp(NULL) +m_metrics1(nullptr), +m_metrics2(nullptr), +m_oldMetrics(nullptr), +m_newMetrics(nullptr), +m_decisions(nullptr), +m_dp(nullptr) { m_metrics1 = new uint16_t[20U]; m_metrics2 = new uint16_t[20U]; @@ -99,7 +99,7 @@ void CNXDNConvolution::decode(uint8_t s0, uint8_t s1) unsigned int CNXDNConvolution::chainback(unsigned char* out, unsigned int nBits) { - assert(out != NULL); + assert(out != nullptr); uint32_t state = 0U; @@ -125,8 +125,8 @@ unsigned int CNXDNConvolution::chainback(unsigned char* out, unsigned int nBits) void CNXDNConvolution::encode(const unsigned char* in, unsigned char* out, unsigned int nBits) const { - assert(in != NULL); - assert(out != NULL); + assert(in != nullptr); + assert(out != nullptr); assert(nBits > 0U); uint8_t d1 = 0U, d2 = 0U, d3 = 0U, d4 = 0U; diff --git a/NXDNFACCH1.cpp b/NXDNFACCH1.cpp index e8e04bc..e35024a 100644 --- a/NXDNFACCH1.cpp +++ b/NXDNFACCH1.cpp @@ -1,5 +1,5 @@ /* -* Copyright (C) 2018 by Jonathan Naylor G4KLX +* Copyright (C) 2018,2025 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 @@ -49,14 +49,14 @@ const unsigned char BIT_MASK_TABLE[] = { 0x80U, 0x40U, 0x20U, 0x10U, 0x08U, 0x04 #define READ_BIT1(p,i) (p[(i)>>3] & BIT_MASK_TABLE[(i)&7]) CNXDNFACCH1::CNXDNFACCH1(const CNXDNFACCH1& facch1) : -m_data(NULL) +m_data(nullptr) { m_data = new unsigned char[10U + 2U]; ::memcpy(m_data, facch1.m_data, 10U + 2U); } CNXDNFACCH1::CNXDNFACCH1() : -m_data(NULL) +m_data(nullptr) { m_data = new unsigned char[10U + 2U]; } @@ -68,7 +68,7 @@ CNXDNFACCH1::~CNXDNFACCH1() bool CNXDNFACCH1::decode(const unsigned char* data, unsigned int offset) { - assert(data != NULL); + assert(data != nullptr); unsigned char temp1[18U]; @@ -114,7 +114,7 @@ bool CNXDNFACCH1::decode(const unsigned char* data, unsigned int offset) void CNXDNFACCH1::encode(unsigned char* data, unsigned int offset) const { - assert(data != NULL); + assert(data != nullptr); unsigned char temp1[12U]; ::memset(temp1, 0x00U, 12U); @@ -150,14 +150,14 @@ void CNXDNFACCH1::encode(unsigned char* data, unsigned int offset) const void CNXDNFACCH1::getData(unsigned char* data) const { - assert(data != NULL); + assert(data != nullptr); ::memcpy(data, m_data, 10U); } void CNXDNFACCH1::getRaw(unsigned char* data) const { - assert(data != NULL); + assert(data != nullptr); ::memset(data, 0x00U, 12U); ::memcpy(data, m_data, 10U); @@ -167,14 +167,14 @@ void CNXDNFACCH1::getRaw(unsigned char* data) const void CNXDNFACCH1::setData(const unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); ::memcpy(m_data, data, 10U); } void CNXDNFACCH1::setRaw(const unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); ::memcpy(m_data, data, 12U); } diff --git a/NXDNIcomNetwork.cpp b/NXDNIcomNetwork.cpp index c86509b..ec37e04 100644 --- a/NXDNIcomNetwork.cpp +++ b/NXDNIcomNetwork.cpp @@ -61,7 +61,7 @@ bool CNXDNIcomNetwork::open() bool CNXDNIcomNetwork::write(const unsigned char* data, NXDN_NETWORK_MESSAGE_TYPE type) { - assert(data != NULL); + assert(data != nullptr); unsigned char buffer[110U]; ::memset(buffer, 0x00U, 110U); @@ -139,7 +139,7 @@ void CNXDNIcomNetwork::clock(unsigned int ms) bool CNXDNIcomNetwork::read(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); if (m_buffer.isEmpty()) return false; diff --git a/NXDNKenwoodNetwork.cpp b/NXDNKenwoodNetwork.cpp index 88dc43b..ca01e04 100644 --- a/NXDNKenwoodNetwork.cpp +++ b/NXDNKenwoodNetwork.cpp @@ -46,7 +46,7 @@ m_seen1(false), m_seen2(false), m_seen3(false), m_seen4(false), -m_sacch(NULL), +m_sacch(nullptr), m_sessionId(1U), m_seqNo(0U), m_ssrc(0U), @@ -107,7 +107,7 @@ bool CNXDNKenwoodNetwork::open() bool CNXDNKenwoodNetwork::write(const unsigned char* data, NXDN_NETWORK_MESSAGE_TYPE type) { - assert(data != NULL); + assert(data != nullptr); switch (type) { case NXDN_NETWORK_MESSAGE_TYPE::VOICE_HEADER: // Voice header or trailer @@ -127,7 +127,7 @@ bool CNXDNKenwoodNetwork::write(const unsigned char* data, NXDN_NETWORK_MESSAGE_ bool CNXDNKenwoodNetwork::processIcomVoiceHeader(const unsigned char* inData) { - assert(inData != NULL); + assert(inData != nullptr); unsigned char outData[30U]; ::memset(outData, 0x00U, 30U); @@ -171,7 +171,7 @@ bool CNXDNKenwoodNetwork::processIcomVoiceHeader(const unsigned char* inData) bool CNXDNKenwoodNetwork::processIcomVoiceData(const unsigned char* inData) { - assert(inData != NULL); + assert(inData != nullptr); unsigned char outData[40U], temp[10U]; ::memset(outData, 0x00U, 40U); @@ -251,7 +251,7 @@ bool CNXDNKenwoodNetwork::processIcomVoiceData(const unsigned char* inData) bool CNXDNKenwoodNetwork::processIcomDataHeader(const unsigned char* inData) { - assert(inData != NULL); + assert(inData != nullptr); unsigned char outData[30U]; ::memset(outData, 0x00U, 30U); @@ -295,7 +295,7 @@ bool CNXDNKenwoodNetwork::processIcomDataHeader(const unsigned char* inData) bool CNXDNKenwoodNetwork::processIcomDataData(const unsigned char* inData) { - assert(inData != NULL); + assert(inData != nullptr); unsigned char outData[40U]; ::memset(outData, 0x00U, 40U); @@ -328,7 +328,7 @@ bool CNXDNKenwoodNetwork::processIcomDataData(const unsigned char* inData) bool CNXDNKenwoodNetwork::writeRTPVoiceHeader(const unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); unsigned char buffer[50U]; ::memset(buffer, 0x00U, 50U); @@ -375,7 +375,7 @@ bool CNXDNKenwoodNetwork::writeRTPVoiceHeader(const unsigned char* data) bool CNXDNKenwoodNetwork::writeRTPVoiceTrailer(const unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); unsigned char buffer[50U]; ::memset(buffer, 0x00U, 50U); @@ -421,7 +421,7 @@ bool CNXDNKenwoodNetwork::writeRTPVoiceTrailer(const unsigned char* data) bool CNXDNKenwoodNetwork::writeRTPVoiceData(const unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); unsigned char buffer[60U]; ::memset(buffer, 0x00U, 60U); @@ -467,7 +467,7 @@ bool CNXDNKenwoodNetwork::writeRTPVoiceData(const unsigned char* data) bool CNXDNKenwoodNetwork::writeRTPDataHeader(const unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); unsigned char buffer[50U]; ::memset(buffer, 0x00U, 50U); @@ -509,7 +509,7 @@ bool CNXDNKenwoodNetwork::writeRTPDataHeader(const unsigned char* data) bool CNXDNKenwoodNetwork::writeRTPDataTrailer(const unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); unsigned char buffer[50U]; ::memset(buffer, 0x00U, 50U); @@ -551,7 +551,7 @@ bool CNXDNKenwoodNetwork::writeRTPDataTrailer(const unsigned char* data) bool CNXDNKenwoodNetwork::writeRTPDataData(const unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); unsigned char buffer[50U]; ::memset(buffer, 0x00U, 50U); @@ -605,7 +605,7 @@ bool CNXDNKenwoodNetwork::writeRTCPStart() m_startUSecs = st.wMilliseconds * 1000U; #else struct timeval tod; - ::gettimeofday(&tod, NULL); + ::gettimeofday(&tod, nullptr); m_startSecs = tod.tv_sec; m_startUSecs = tod.tv_usec; @@ -738,7 +738,7 @@ bool CNXDNKenwoodNetwork::writeRTCPHang() bool CNXDNKenwoodNetwork::read(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); unsigned char dummy[BUFFER_LENGTH]; readRTCP(dummy); @@ -764,7 +764,7 @@ bool CNXDNKenwoodNetwork::read(unsigned char* data) unsigned int CNXDNKenwoodNetwork::readRTP(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); unsigned char buffer[BUFFER_LENGTH]; @@ -792,7 +792,7 @@ unsigned int CNXDNKenwoodNetwork::readRTP(unsigned char* data) unsigned int CNXDNKenwoodNetwork::readRTCP(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); unsigned char buffer[BUFFER_LENGTH]; @@ -868,7 +868,7 @@ void CNXDNKenwoodNetwork::clock(unsigned int ms) bool CNXDNKenwoodNetwork::processKenwoodVoiceHeader(unsigned char* inData) { - assert(inData != NULL); + assert(inData != nullptr); unsigned char outData[50U], temp[20U]; ::memset(outData, 0x00U, 50U); @@ -925,7 +925,7 @@ bool CNXDNKenwoodNetwork::processKenwoodVoiceHeader(unsigned char* inData) bool CNXDNKenwoodNetwork::processKenwoodVoiceData(unsigned char* inData) { - assert(inData != NULL); + assert(inData != nullptr); unsigned char outData[50U], temp[20U]; ::memset(outData, 0x00U, 50U); @@ -1088,7 +1088,7 @@ unsigned long CNXDNKenwoodNetwork::getTimeStamp() const timeStamp += ms * 80U; #else struct timeval tod; - ::gettimeofday(&tod, NULL); + ::gettimeofday(&tod, nullptr); unsigned int ss = tod.tv_sec; unsigned int ms = tod.tv_usec / 1000U; @@ -1102,7 +1102,7 @@ unsigned long CNXDNKenwoodNetwork::getTimeStamp() const bool CNXDNKenwoodNetwork::processKenwoodVoiceLateEntry(unsigned char* inData) { - assert(inData != NULL); + assert(inData != nullptr); unsigned char sacch[4U]; sacch[0U] = inData[12U]; diff --git a/NXDNLICH.cpp b/NXDNLICH.cpp index a456103..c2b962e 100644 --- a/NXDNLICH.cpp +++ b/NXDNLICH.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 by Jonathan Naylor G4KLX + * Copyright (C) 2018,2025 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 @@ -29,14 +29,14 @@ const unsigned char BIT_MASK_TABLE[] = {0x80U, 0x40U, 0x20U, 0x10U, 0x08U, 0x04U #define READ_BIT1(p,i) (p[(i)>>3] & BIT_MASK_TABLE[(i)&7]) CNXDNLICH::CNXDNLICH(const CNXDNLICH& lich) : -m_lich(NULL) +m_lich(nullptr) { m_lich = new unsigned char[1U]; m_lich[0U] = lich.m_lich[0U]; } CNXDNLICH::CNXDNLICH() : -m_lich(NULL) +m_lich(nullptr) { m_lich = new unsigned char[1U]; } @@ -48,7 +48,7 @@ CNXDNLICH::~CNXDNLICH() bool CNXDNLICH::decode(const unsigned char* bytes) { - assert(bytes != NULL); + assert(bytes != nullptr); unsigned int offset = NXDN_FSW_LENGTH_BITS; for (unsigned int i = 0U; i < (NXDN_LICH_LENGTH_BITS / 2U); i++, offset += 2U) { @@ -64,7 +64,7 @@ bool CNXDNLICH::decode(const unsigned char* bytes) void CNXDNLICH::encode(unsigned char* bytes) { - assert(bytes != NULL); + assert(bytes != nullptr); bool parity = getParity(); if (parity) diff --git a/NXDNLayer3.cpp b/NXDNLayer3.cpp index e6e731a..d3c45d0 100644 --- a/NXDNLayer3.cpp +++ b/NXDNLayer3.cpp @@ -1,5 +1,5 @@ /* -* Copyright (C) 2018 by Jonathan Naylor G4KLX +* Copyright (C) 2018,2025 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 @@ -29,14 +29,14 @@ const unsigned char BIT_MASK_TABLE[] = { 0x80U, 0x40U, 0x20U, 0x10U, 0x08U, 0x04 #define READ_BIT1(p,i) (p[(i)>>3] & BIT_MASK_TABLE[(i)&7]) CNXDNLayer3::CNXDNLayer3(const CNXDNLayer3& layer3) : -m_data(NULL) +m_data(nullptr) { m_data = new unsigned char[22U]; ::memcpy(m_data, layer3.m_data, 22U); } CNXDNLayer3::CNXDNLayer3() : -m_data(NULL) +m_data(nullptr) { m_data = new unsigned char[22U]; ::memset(m_data, 0x00U, 22U); @@ -49,7 +49,7 @@ CNXDNLayer3::~CNXDNLayer3() void CNXDNLayer3::decode(const unsigned char* bytes, unsigned int length, unsigned int offset) { - assert(bytes != NULL); + assert(bytes != nullptr); for (unsigned int i = 0U; i < length; i++, offset++) { bool b = READ_BIT1(bytes, i); @@ -59,7 +59,7 @@ void CNXDNLayer3::decode(const unsigned char* bytes, unsigned int length, unsign void CNXDNLayer3::encode(unsigned char* bytes, unsigned int length, unsigned int offset) { - assert(bytes != NULL); + assert(bytes != nullptr); for (unsigned int i = 0U; i < length; i++, offset++) { bool b = READ_BIT1(m_data, offset); diff --git a/NXDNLookup.cpp b/NXDNLookup.cpp index fb1299b..472f106 100644 --- a/NXDNLookup.cpp +++ b/NXDNLookup.cpp @@ -1,5 +1,5 @@ /* -* Copyright (C) 2016,2017,2018,2021 by Jonathan Naylor G4KLX +* Copyright (C) 2016,2017,2018,2021,2025 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 @@ -132,5 +132,5 @@ std::string CNXDNLookup::find(unsigned int id) bool CNXDNLookup::exists(unsigned int id) { - return m_table.lookup(id, NULL); + return m_table.lookup(id, nullptr); } diff --git a/NXDNSACCH.cpp b/NXDNSACCH.cpp index 69795c3..1038dc2 100644 --- a/NXDNSACCH.cpp +++ b/NXDNSACCH.cpp @@ -1,5 +1,5 @@ /* -* Copyright (C) 2018 by Jonathan Naylor G4KLX +* Copyright (C) 2018,2025 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 @@ -42,14 +42,14 @@ const unsigned char BIT_MASK_TABLE[] = { 0x80U, 0x40U, 0x20U, 0x10U, 0x08U, 0x04 #define READ_BIT1(p,i) (p[(i)>>3] & BIT_MASK_TABLE[(i)&7]) CNXDNSACCH::CNXDNSACCH(const CNXDNSACCH& sacch) : -m_data(NULL) +m_data(nullptr) { m_data = new unsigned char[5U]; ::memcpy(m_data, sacch.m_data, 5U); } CNXDNSACCH::CNXDNSACCH() : -m_data(NULL) +m_data(nullptr) { m_data = new unsigned char[5U]; } @@ -61,7 +61,7 @@ CNXDNSACCH::~CNXDNSACCH() bool CNXDNSACCH::decode(const unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); unsigned char temp1[8U]; @@ -107,7 +107,7 @@ bool CNXDNSACCH::decode(const unsigned char* data) void CNXDNSACCH::encode(unsigned char* data) const { - assert(data != NULL); + assert(data != nullptr); unsigned char temp1[5U]; ::memset(temp1, 0x00U, 5U); @@ -157,7 +157,7 @@ unsigned char CNXDNSACCH::getStructure() const void CNXDNSACCH::getData(unsigned char* data) const { - assert(data != NULL); + assert(data != nullptr); unsigned int offset = 8U; for (unsigned int i = 0U; i < 18U; i++, offset++) { @@ -168,7 +168,7 @@ void CNXDNSACCH::getData(unsigned char* data) const void CNXDNSACCH::getRaw(unsigned char* data) const { - assert(data != NULL); + assert(data != nullptr); ::memcpy(data, m_data, 4U); @@ -189,7 +189,7 @@ void CNXDNSACCH::setStructure(unsigned char structure) void CNXDNSACCH::setData(const unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); unsigned int offset = 8U; for (unsigned int i = 0U; i < 18U; i++, offset++) { @@ -200,7 +200,7 @@ void CNXDNSACCH::setData(const unsigned char* data) void CNXDNSACCH::setRaw(const unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); ::memcpy(m_data, data, 4U); } diff --git a/NXDNUDCH.cpp b/NXDNUDCH.cpp index bdba864..fdc402b 100644 --- a/NXDNUDCH.cpp +++ b/NXDNUDCH.cpp @@ -1,5 +1,5 @@ /* -* Copyright (C) 2018 by Jonathan Naylor G4KLX +* Copyright (C) 2018,2025 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 @@ -70,14 +70,14 @@ const unsigned char BIT_MASK_TABLE[] = { 0x80U, 0x40U, 0x20U, 0x10U, 0x08U, 0x04 #define READ_BIT1(p,i) (p[(i)>>3] & BIT_MASK_TABLE[(i)&7]) CNXDNUDCH::CNXDNUDCH(const CNXDNUDCH& udch) : -m_data(NULL) +m_data(nullptr) { m_data = new unsigned char[23U + 3U]; ::memcpy(m_data, udch.m_data, 23U + 3U); } CNXDNUDCH::CNXDNUDCH() : -m_data(NULL) +m_data(nullptr) { m_data = new unsigned char[23U + 3U]; } @@ -89,7 +89,7 @@ CNXDNUDCH::~CNXDNUDCH() bool CNXDNUDCH::decode(const unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); unsigned char temp1[44U]; @@ -135,7 +135,7 @@ bool CNXDNUDCH::decode(const unsigned char* data) void CNXDNUDCH::encode(unsigned char* data) const { - assert(data != NULL); + assert(data != nullptr); unsigned char temp1[25U]; ::memset(temp1, 0x00U, 25U); @@ -176,14 +176,14 @@ unsigned char CNXDNUDCH::getRAN() const void CNXDNUDCH::getData(unsigned char* data) const { - assert(data != NULL); + assert(data != nullptr); ::memcpy(data, m_data + 1U, 22U); } void CNXDNUDCH::getRaw(unsigned char* data) const { - assert(data != NULL); + assert(data != nullptr); ::memset(data, 0x00U, 25U); ::memcpy(data, m_data, 23U); @@ -196,14 +196,14 @@ void CNXDNUDCH::setRAN(unsigned char ran) void CNXDNUDCH::setData(const unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); ::memcpy(m_data + 1U, data, 22U); } void CNXDNUDCH::setRaw(const unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); ::memcpy(m_data, data, 25U); } diff --git a/NetworkInfo.cpp b/NetworkInfo.cpp index b840530..2073f05 100644 --- a/NetworkInfo.cpp +++ b/NetworkInfo.cpp @@ -69,11 +69,11 @@ void CNetworkInfo::getNetworkInterface(unsigned char* info) ::strcpy((char*)info, "(address unknown)"); #if defined(__linux__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__APPLE__) - char* dflt = NULL; + char* dflt = nullptr; #if defined(__linux__) FILE* fp = ::fopen("/proc/net/route" , "r"); // IPv4 routing - if (fp == NULL) { + if (fp == nullptr) { LogError("Unabled to open /proc/route"); return; } @@ -81,9 +81,9 @@ void CNetworkInfo::getNetworkInterface(unsigned char* info) char line[100U]; while (::fgets(line, 100U, fp)) { char* p1 = strtok(line , " \t"); - char* p2 = strtok(NULL , " \t"); + char* p2 = strtok(nullptr , " \t"); - if (p1 != NULL && p2 != NULL) { + if (p1 != nullptr && p2 != nullptr) { if (::strcmp(p2, "00000000") == 0) { dflt = p1; break; @@ -109,13 +109,13 @@ void CNetworkInfo::getNetworkInterface(unsigned char* info) size_t size; char ifname[IF_NAMESIZE] = {}; - if (::sysctl(mib, cnt, NULL, &size, NULL, 0) == -1 || size <= 0) { + if (::sysctl(mib, cnt, nullptr, &size, nullptr, 0) == -1 || size <= 0) { LogError("Unable to estimate routing table size"); return; } char *buf = new char[size]; - if (::sysctl(mib, cnt, buf, &size, NULL, 0) == -1) { + if (::sysctl(mib, cnt, buf, &size, nullptr, 0) == -1) { LogError("Unable to get routing table"); delete[] buf; return; @@ -141,7 +141,7 @@ void CNetworkInfo::getNetworkInterface(unsigned char* info) if (::strlen(ifname)) dflt = ifname; #endif - if (dflt == NULL) { + if (dflt == nullptr) { LogError("Unable to find the default route"); return; } @@ -158,14 +158,14 @@ void CNetworkInfo::getNetworkInterface(unsigned char* info) } unsigned int ifnr = 0U; - for (struct ifaddrs* ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) { - if (ifa->ifa_addr == NULL) + for (struct ifaddrs* ifa = ifaddr; ifa != nullptr; ifa = ifa->ifa_next) { + if (ifa->ifa_addr == nullptr) continue; int family = ifa->ifa_addr->sa_family; if (family == AF_INET || family == AF_INET6) { char host[NI_MAXHOST]; - int s = ::getnameinfo(ifa->ifa_addr, family == AF_INET ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6), host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST); + int s = ::getnameinfo(ifa->ifa_addr, family == AF_INET ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6), host, NI_MAXHOST, nullptr, 0, NI_NUMERICHOST); if (s != 0) { LogError("getnameinfo() failed: %s\n", gai_strerror(s)); continue; @@ -190,7 +190,7 @@ void CNetworkInfo::getNetworkInterface(unsigned char* info) for (unsigned int n = 0U; n < ifnr; n++) { char* p = ::strchr(interfacelist[n], '%'); - if (p != NULL) + if (p != nullptr) *p = 0; if (::strstr(interfacelist[n], dflt) != 0) { @@ -202,7 +202,7 @@ void CNetworkInfo::getNetworkInterface(unsigned char* info) LogInfo(" IP to show: %s", info); #elif defined(_WIN32) || defined(_WIN64) PMIB_IPFORWARDTABLE pIpForwardTable = (MIB_IPFORWARDTABLE *)::malloc(sizeof(MIB_IPFORWARDTABLE)); - if (pIpForwardTable == NULL) { + if (pIpForwardTable == nullptr) { LogError("Error allocating memory"); return; } @@ -211,7 +211,7 @@ void CNetworkInfo::getNetworkInterface(unsigned char* info) if (::GetIpForwardTable(pIpForwardTable, &dwSize, 0) == ERROR_INSUFFICIENT_BUFFER) { ::free(pIpForwardTable); pIpForwardTable = (MIB_IPFORWARDTABLE *)::malloc(dwSize); - if (pIpForwardTable == NULL) { + if (pIpForwardTable == nullptr) { LogError("Error allocating memory"); return; } @@ -242,7 +242,7 @@ void CNetworkInfo::getNetworkInterface(unsigned char* info) ::free(pIpForwardTable); PIP_ADAPTER_INFO pAdapterInfo = (IP_ADAPTER_INFO *)::malloc(sizeof(IP_ADAPTER_INFO)); - if (pAdapterInfo == NULL) { + if (pAdapterInfo == nullptr) { LogError("Error allocating memory"); return; } @@ -251,7 +251,7 @@ void CNetworkInfo::getNetworkInterface(unsigned char* info) if (::GetAdaptersInfo(pAdapterInfo, &buflen) == ERROR_BUFFER_OVERFLOW) { ::free(pAdapterInfo); pAdapterInfo = (IP_ADAPTER_INFO *)::malloc(buflen); - if (pAdapterInfo == NULL) { + if (pAdapterInfo == nullptr) { LogError("Error allocating memory"); return; } @@ -264,7 +264,7 @@ void CNetworkInfo::getNetworkInterface(unsigned char* info) } PIP_ADAPTER_INFO pAdapter = pAdapterInfo; - while (pAdapter != NULL) { + while (pAdapter != nullptr) { LogInfo(" IP : %s", pAdapter->IpAddressList.IpAddress.String); if (pAdapter->Index == ifnr) ::strcpy((char*)info, pAdapter->IpAddressList.IpAddress.String); diff --git a/Nextion.cpp b/Nextion.cpp index 8956304..adfe8e2 100644 --- a/Nextion.cpp +++ b/Nextion.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016,2017,2018,2020,2023,2024 by Jonathan Naylor G4KLX + * Copyright (C) 2016,2017,2018,2020,2023,2024,2025 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 @@ -79,9 +79,9 @@ m_socket(socket), m_addr(addr), m_addrLength(addrLength) { - assert(serial != NULL); + assert(serial != nullptr); assert(brightness >= 0U && brightness <= 100U); - assert(socket != NULL); + assert(socket != nullptr); assert(addrLength > 0U); static const unsigned int feature_set[] = { @@ -128,11 +128,11 @@ m_rxFrequency(rxFrequency), m_fl_txFrequency(0.0F), m_fl_rxFrequency(0.0F), m_displayTempInF(displayTempInF), -m_socket(NULL), +m_socket(nullptr), m_addr(), m_addrLength(0U) { - assert(serial != NULL); + assert(serial != nullptr); assert(brightness >= 0U && brightness <= 100U); static const unsigned int feature_set[] = { @@ -218,7 +218,7 @@ void CNextion::setIdleInt() // CPU temperature FILE* fp = ::fopen("/sys/class/thermal/thermal_zone0/temp", "rt"); - if (fp != NULL) { + if (fp != nullptr) { double val = 0.0; int n = ::fscanf(fp, "%lf", &val); ::fclose(fp); @@ -253,7 +253,7 @@ void CNextion::setIdleInt() void CNextion::setErrorInt(const char* text) { - assert(text != NULL); + assert(text != nullptr); sendCommand("page MMDVM"); sendCommandAction(1U); @@ -339,11 +339,11 @@ void CNextion::setFMInt() void CNextion::writeDStarInt(const char* my1, const char* my2, const char* your, const char* type, const char* reflector) { - assert(my1 != NULL); - assert(my2 != NULL); - assert(your != NULL); - assert(type != NULL); - assert(reflector != NULL); + assert(my1 != nullptr); + assert(my2 != nullptr); + assert(your != nullptr); + assert(type != nullptr); + assert(reflector != nullptr); if (m_mode != MODE_DSTAR) { sendCommand("page DStar"); @@ -421,7 +421,7 @@ void CNextion::clearDStarInt() void CNextion::writeDMRInt(unsigned int slotNo, const std::string& src, bool group, const std::string& dst, const char* type) { - assert(type != NULL); + assert(type != nullptr); if (m_mode != MODE_DMR) { sendCommand("page DMR"); @@ -658,10 +658,10 @@ void CNextion::clearDMRInt(unsigned int slotNo) void CNextion::writeFusionInt(const char* source, const char* dest, unsigned char dgid, const char* type, const char* origin) { - assert(source != NULL); - assert(dest != NULL); - assert(type != NULL); - assert(origin != NULL); + assert(source != nullptr); + assert(dest != nullptr); + assert(type != nullptr); + assert(origin != nullptr); if (m_mode != MODE_YSF) { sendCommand("page YSF"); @@ -740,8 +740,8 @@ void CNextion::clearFusionInt() void CNextion::writeP25Int(const char* source, bool group, unsigned int dest, const char* type) { - assert(source != NULL); - assert(type != NULL); + assert(source != nullptr); + assert(type != nullptr); if (m_mode != MODE_P25) { sendCommand("page P25"); @@ -812,8 +812,8 @@ void CNextion::clearP25Int() void CNextion::writeNXDNInt(const char* source, bool group, unsigned int dest, const char* type) { - assert(source != NULL); - assert(type != NULL); + assert(source != nullptr); + assert(type != nullptr); if (m_mode != MODE_NXDN) { sendCommand("page NXDN"); @@ -884,9 +884,9 @@ void CNextion::clearNXDNInt() void CNextion::writeM17Int(const char* source, const char* dest, const char* type) { - assert(source != NULL); - assert(dest != NULL); - assert(type != NULL); + assert(source != nullptr); + assert(dest != nullptr); + assert(type != nullptr); if (m_mode != MODE_M17) { sendCommand("page M17"); @@ -1025,7 +1025,7 @@ void CNextion::clockInt(unsigned int ms) m_clockDisplayTimer.start(); // restart the clock display timer } - if (m_socket != NULL) { + if (m_socket != nullptr) { unsigned char buffer[200U]; int len = m_serial->read(buffer, 200U); @@ -1039,7 +1039,7 @@ void CNextion::close() m_serial->close(); delete m_serial; - if (m_socket != NULL) { + if (m_socket != nullptr) { m_socket->close(); delete m_socket; } @@ -1059,7 +1059,7 @@ void CNextion::sendCommandAction(unsigned int status) void CNextion::sendCommand(const char* command) { - assert(command != NULL); + assert(command != nullptr); m_serial->write((unsigned char*)command, (unsigned int)::strlen(command)); m_serial->write((unsigned char*)"\xFF\xFF\xFF", 3U); diff --git a/NullDisplay.h b/NullDisplay.h index e49eac3..55e5114 100644 --- a/NullDisplay.h +++ b/NullDisplay.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016,2018,2020 by Jonathan Naylor G4KLX + * Copyright (C) 2016,2018,2020,2025 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 @@ -16,8 +16,8 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#if !defined(NULLDISPLAY_H) -#define NULLDISPLAY_H +#if !defined(nullptrDISPLAY_H) +#define nullptrDISPLAY_H #include "Display.h" diff --git a/P25Audio.cpp b/P25Audio.cpp index 80bf492..ce5b37b 100644 --- a/P25Audio.cpp +++ b/P25Audio.cpp @@ -1,5 +1,5 @@ /* -* Copyright (C) 2016 by Jonathan Naylor G4KLX +* Copyright (C) 2016,2025 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 @@ -48,7 +48,7 @@ CP25Audio::~CP25Audio() unsigned int CP25Audio::process(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); unsigned int errs = 0U; @@ -95,8 +95,8 @@ unsigned int CP25Audio::process(unsigned char* data) void CP25Audio::decode(const unsigned char* data, unsigned char* imbe, unsigned int n) { - assert(data != NULL); - assert(imbe != NULL); + assert(data != nullptr); + assert(imbe != nullptr); unsigned char temp[18U]; @@ -204,8 +204,8 @@ void CP25Audio::decode(const unsigned char* data, unsigned char* imbe, unsigned void CP25Audio::encode(unsigned char* data, const unsigned char* imbe, unsigned int n) { - assert(data != NULL); - assert(imbe != NULL); + assert(data != nullptr); + assert(imbe != nullptr); bool bTemp[144U]; bool* bit = bTemp; diff --git a/P25Control.cpp b/P25Control.cpp index 3968651..986333b 100644 --- a/P25Control.cpp +++ b/P25Control.cpp @@ -70,11 +70,11 @@ m_rfData(), m_netData(), m_rfLSD(), m_netLSD(), -m_netLDU1(NULL), -m_netLDU2(NULL), -m_lastIMBE(NULL), -m_rfLDU(NULL), -m_rfPDU(NULL), +m_netLDU1(nullptr), +m_netLDU2(nullptr), +m_lastIMBE(nullptr), +m_rfLDU(nullptr), +m_rfPDU(nullptr), m_rfPDUCount(0U), m_rfPDUBits(0U), m_rssiMapper(rssiMapper), @@ -84,11 +84,11 @@ m_minRSSI(0U), m_aveRSSI(0U), m_rssiCount(0U), m_enabled(true), -m_fp(NULL) +m_fp(nullptr) { - assert(display != NULL); - assert(lookup != NULL); - assert(rssiMapper != NULL); + assert(display != nullptr); + assert(lookup != nullptr); + assert(rssiMapper != nullptr); m_netLDU1 = new unsigned char[9U * 25U]; m_netLDU2 = new unsigned char[9U * 25U]; @@ -97,7 +97,7 @@ m_fp(NULL) ::memset(m_netLDU2, 0x00U, 9U * 25U); m_lastIMBE = new unsigned char[11U]; - ::memcpy(m_lastIMBE, P25_NULL_IMBE, 11U); + ::memcpy(m_lastIMBE, P25_nullptr_IMBE, 11U); m_rfLDU = new unsigned char[P25_LDU_FRAME_LENGTH_BYTES]; ::memset(m_rfLDU, 0x00U, P25_LDU_FRAME_LENGTH_BYTES); @@ -117,7 +117,7 @@ CP25Control::~CP25Control() bool CP25Control::writeModem(unsigned char* data, unsigned int len) { - assert(data != NULL); + assert(data != nullptr); if (!m_enabled) return false; @@ -633,7 +633,7 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len) unsigned int CP25Control::readModem(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); if (m_queue.isEmpty()) return 0U; @@ -650,7 +650,7 @@ void CP25Control::writeNetwork() { unsigned char data[100U]; - if (m_network == NULL) + if (m_network == nullptr) return; unsigned int length = m_network->read(data, 100U); @@ -756,7 +756,7 @@ void CP25Control::writeNetwork() void CP25Control::clock(unsigned int ms) { - if (m_network != NULL) + if (m_network != nullptr) writeNetwork(); m_rfTimeout.clock(ms); @@ -778,7 +778,7 @@ void CP25Control::clock(unsigned int ms) void CP25Control::writeQueueRF(const unsigned char* data, unsigned int length) { - assert(data != NULL); + assert(data != nullptr); if (m_rfTimeout.isRunning() && m_rfTimeout.hasExpired()) return; @@ -797,7 +797,7 @@ void CP25Control::writeQueueRF(const unsigned char* data, unsigned int length) void CP25Control::writeQueueNet(const unsigned char* data, unsigned int length) { - assert(data != NULL); + assert(data != nullptr); if (m_netTimeout.isRunning() && m_netTimeout.hasExpired()) return; @@ -816,9 +816,9 @@ void CP25Control::writeQueueNet(const unsigned char* data, unsigned int length) void CP25Control::writeNetwork(const unsigned char *data, unsigned char type, bool end) { - assert(data != NULL); + assert(data != nullptr); - if (m_network == NULL) + if (m_network == nullptr) return; if (m_rfTimeout.isRunning() && m_rfTimeout.hasExpired()) @@ -839,7 +839,7 @@ void CP25Control::writeNetwork(const unsigned char *data, unsigned char type, bo void CP25Control::setBusyBits(unsigned char* data, unsigned int ssOffset, bool b1, bool b2) { - assert(data != NULL); + assert(data != nullptr); WRITE_BIT(data, ssOffset, b1); WRITE_BIT(data, ssOffset + 1U, b2); @@ -847,7 +847,7 @@ void CP25Control::setBusyBits(unsigned char* data, unsigned int ssOffset, bool b void CP25Control::addBusyBits(unsigned char* data, unsigned int length, bool b1, bool b2) { - assert(data != NULL); + assert(data != nullptr); for (unsigned int ss0Pos = P25_SS0_START; ss0Pos < length; ss0Pos += P25_INCREMENT) { unsigned int ss1Pos = ss0Pos + 1U; @@ -1198,7 +1198,7 @@ void CP25Control::createNetTerminator() bool CP25Control::openFile() { - if (m_fp != NULL) + if (m_fp != nullptr) return true; time_t t; @@ -1210,7 +1210,7 @@ bool CP25Control::openFile() ::sprintf(name, "P25_%04d%02d%02d_%02d%02d%02d.ambe", tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec); m_fp = ::fopen(name, "wb"); - if (m_fp == NULL) + if (m_fp == nullptr) return false; ::fwrite("P25", 1U, 3U, m_fp); @@ -1220,7 +1220,7 @@ bool CP25Control::openFile() bool CP25Control::writeFile(const unsigned char* data, unsigned char length) { - if (m_fp == NULL) + if (m_fp == nullptr) return false; ::fwrite(&length, 1U, 1U, m_fp); @@ -1232,9 +1232,9 @@ bool CP25Control::writeFile(const unsigned char* data, unsigned char length) void CP25Control::closeFile() { - if (m_fp != NULL) { + if (m_fp != nullptr) { ::fclose(m_fp); - m_fp = NULL; + m_fp = nullptr; } } diff --git a/P25Data.cpp b/P25Data.cpp index 21e71cc..de461b2 100644 --- a/P25Data.cpp +++ b/P25Data.cpp @@ -1,5 +1,5 @@ /* -* Copyright (C) 2016,2017,2023,2024 by Jonathan Naylor G4KLX +* Copyright (C) 2016,2017,2023,2024,2025 by Jonathan Naylor G4KLX * Copyright (C) 2018 by Bryan Biedenkapp N2PLL * * This program is free software; you can redistribute it and/or modify @@ -36,7 +36,7 @@ const unsigned char BIT_MASK_TABLE[] = { 0x80U, 0x40U, 0x20U, 0x10U, 0x08U, 0x04 #define READ_BIT(p,i) (p[(i)>>3] & BIT_MASK_TABLE[(i)&7]) CP25Data::CP25Data() : -m_mi(NULL), +m_mi(nullptr), m_mfId(0U), m_algId(P25_ALGO_UNENCRYPT), m_kId(0U), @@ -77,7 +77,7 @@ CP25Data& CP25Data::operator=(const CP25Data& data) bool CP25Data::decodeHeader(const unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); // deinterleave unsigned char rs[81U]; @@ -116,8 +116,8 @@ bool CP25Data::decodeHeader(const unsigned char* data) void CP25Data::encodeHeader(unsigned char* data) { - assert(data != NULL); - assert(m_mi != NULL); + assert(data != nullptr); + assert(m_mi != nullptr); unsigned char rs[81U]; ::memset(rs, 0x00U, 81U); @@ -147,7 +147,7 @@ void CP25Data::encodeHeader(unsigned char* data) bool CP25Data::decodeLDU1(const unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); unsigned char rs[18U]; @@ -204,7 +204,7 @@ bool CP25Data::decodeLDU1(const unsigned char* data) void CP25Data::encodeLDU1(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); unsigned char rs[18U]; ::memset(rs, 0x00U, 18U); @@ -258,7 +258,7 @@ void CP25Data::encodeLDU1(unsigned char* data) bool CP25Data::decodeLDU2(const unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); unsigned char rs[18U]; @@ -310,8 +310,8 @@ bool CP25Data::decodeLDU2(const unsigned char* data) void CP25Data::encodeLDU2(unsigned char* data) { - assert(data != NULL); - assert(m_mi != NULL); + assert(data != nullptr); + assert(m_mi != nullptr); unsigned char rs[18U]; ::memset(rs, 0x00U, 18U); @@ -349,7 +349,7 @@ void CP25Data::encodeLDU2(unsigned char* data) bool CP25Data::decodeTSDU(const unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); // deinterleave unsigned char tsbk[12U]; @@ -404,7 +404,7 @@ bool CP25Data::decodeTSDU(const unsigned char* data) void CP25Data::encodeTSDU(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); unsigned char tsbk[12U]; ::memset(tsbk, 0x00U, 12U); @@ -459,14 +459,14 @@ void CP25Data::encodeTSDU(unsigned char* data) void CP25Data::setMI(const unsigned char* mi) { - assert(mi != NULL); + assert(mi != nullptr); ::memcpy(m_mi, mi, P25_MI_LENGTH_BYTES); } void CP25Data::getMI(unsigned char* mi) const { - assert(mi != NULL); + assert(mi != nullptr); ::memcpy(mi, m_mi, P25_MI_LENGTH_BYTES); } diff --git a/P25Defines.h b/P25Defines.h index 7824751..b4377b9 100644 --- a/P25Defines.h +++ b/P25Defines.h @@ -75,6 +75,6 @@ const unsigned char P25_DUID_LDU2 = 0x0AU; const unsigned char P25_DUID_PDU = 0x0CU; const unsigned char P25_DUID_TERM_LC = 0x0FU; -const unsigned char P25_NULL_IMBE[] = {0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U}; +const unsigned char P25_nullptr_IMBE[] = {0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U}; #endif diff --git a/P25LowSpeedData.cpp b/P25LowSpeedData.cpp index 8b05368..a9f0191 100644 --- a/P25LowSpeedData.cpp +++ b/P25LowSpeedData.cpp @@ -1,5 +1,5 @@ /* -* Copyright (C) 2016 by Jonathan Naylor G4KLX +* Copyright (C) 2016,2025 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 @@ -54,7 +54,7 @@ CP25LowSpeedData::~CP25LowSpeedData() void CP25LowSpeedData::process(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); unsigned char lsd[4U]; CP25Utils::decode(data, lsd, 1546U, 1578U); @@ -93,7 +93,7 @@ void CP25LowSpeedData::process(unsigned char* data) void CP25LowSpeedData::encode(unsigned char* data) const { - assert(data != NULL); + assert(data != nullptr); unsigned char lsd[4U]; lsd[0U] = m_lsd1; diff --git a/P25NID.cpp b/P25NID.cpp index 5e057c5..0d9b4b8 100644 --- a/P25NID.cpp +++ b/P25NID.cpp @@ -1,5 +1,5 @@ /* -* Copyright (C) 2016,2018 by Jonathan Naylor G4KLX +* Copyright (C) 2016,2018,2025 by Jonathan Naylor G4KLX * Copyright (C) 2018 by Bryan Biedenkapp * * This program is free software; you can redistribute it and/or modify @@ -29,13 +29,13 @@ const unsigned int MAX_NID_ERRS = 5U; CP25NID::CP25NID(unsigned int nac) : m_duid(0U), -m_hdr(NULL), -m_ldu1(NULL), -m_ldu2(NULL), -m_termlc(NULL), -m_term(NULL), -m_tsdu(NULL), -m_pdu(NULL) +m_hdr(nullptr), +m_ldu1(nullptr), +m_ldu2(nullptr), +m_termlc(nullptr), +m_term(nullptr), +m_tsdu(nullptr), +m_pdu(nullptr) { CBCH bch; @@ -102,7 +102,7 @@ CP25NID::~CP25NID() bool CP25NID::decode(const unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); unsigned char nid[P25_NID_LENGTH_BYTES]; CP25Utils::decode(data, nid, 48U, 114U); @@ -154,7 +154,7 @@ bool CP25NID::decode(const unsigned char* data) void CP25NID::encode(unsigned char* data, unsigned char duid) const { - assert(data != NULL); + assert(data != nullptr); switch (duid) { case P25_DUID_HEADER: diff --git a/P25Network.cpp b/P25Network.cpp index b63b522..818ddc2 100644 --- a/P25Network.cpp +++ b/P25Network.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2014,2016,2019,2020,2021 by Jonathan Naylor G4KLX + * Copyright (C) 2009-2014,2016,2019,2020,2021,2025 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 @@ -118,7 +118,7 @@ bool CP25Network::open() bool CP25Network::writeLDU1(const unsigned char* ldu1, const CP25Data& control, const CP25LowSpeedData& lsd, bool end) { - assert(ldu1 != NULL); + assert(ldu1 != nullptr); unsigned char buffer[22U]; @@ -247,7 +247,7 @@ bool CP25Network::writeLDU1(const unsigned char* ldu1, const CP25Data& control, bool CP25Network::writeLDU2(const unsigned char* ldu2, const CP25Data& control, const CP25LowSpeedData& lsd, bool end) { - assert(ldu2 != NULL); + assert(ldu2 != nullptr); unsigned char buffer[22U]; @@ -409,7 +409,7 @@ void CP25Network::clock(unsigned int ms) unsigned int CP25Network::read(unsigned char* data, unsigned int length) { - assert(data != NULL); + assert(data != nullptr); if (m_buffer.isEmpty()) return 0U; diff --git a/P25Trellis.cpp b/P25Trellis.cpp index 9b92ce7..50cea5c 100644 --- a/P25Trellis.cpp +++ b/P25Trellis.cpp @@ -1,5 +1,5 @@ /* -* Copyright (C) 2016,2018,2024 by Jonathan Naylor, G4KLX +* Copyright (C) 2016,2018,2024,2025 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 @@ -54,8 +54,8 @@ CP25Trellis::~CP25Trellis() bool CP25Trellis::decode34(const unsigned char* data, unsigned char* payload) { - assert(data != NULL); - assert(payload != NULL); + assert(data != nullptr); + assert(payload != nullptr); signed char dibits[98U]; deinterleave(data, dibits); @@ -88,8 +88,8 @@ bool CP25Trellis::decode34(const unsigned char* data, unsigned char* payload) void CP25Trellis::encode34(const unsigned char* payload, unsigned char* data) { - assert(payload != NULL); - assert(data != NULL); + assert(payload != nullptr); + assert(data != nullptr); unsigned char tribits[49U]; bitsToTribits(payload, tribits); @@ -113,8 +113,8 @@ void CP25Trellis::encode34(const unsigned char* payload, unsigned char* data) bool CP25Trellis::decode12(const unsigned char* data, unsigned char* payload) { - assert(data != NULL); - assert(payload != NULL); + assert(data != nullptr); + assert(payload != nullptr); signed char dibits[98U]; deinterleave(data, dibits); @@ -147,8 +147,8 @@ bool CP25Trellis::decode12(const unsigned char* data, unsigned char* payload) void CP25Trellis::encode12(const unsigned char* payload, unsigned char* data) { - assert(payload != NULL); - assert(data != NULL); + assert(payload != nullptr); + assert(data != nullptr); unsigned char bits[49U]; bitsToDibits(payload, bits); diff --git a/P25Utils.cpp b/P25Utils.cpp index 3c00410..9361456 100644 --- a/P25Utils.cpp +++ b/P25Utils.cpp @@ -29,8 +29,8 @@ const unsigned char BIT_MASK_TABLE[] = { 0x80U, 0x40U, 0x20U, 0x10U, 0x08U, 0x04 unsigned int CP25Utils::decode(const unsigned char* in, unsigned char* out, unsigned int start, unsigned int stop) { - assert(in != NULL); - assert(out != NULL); + assert(in != nullptr); + assert(out != nullptr); // Move the SSx positions to the range needed unsigned int ss0Pos = P25_SS0_START; @@ -59,8 +59,8 @@ unsigned int CP25Utils::decode(const unsigned char* in, unsigned char* out, unsi unsigned int CP25Utils::encode(const unsigned char* in, unsigned char* out, unsigned int start, unsigned int stop) { - assert(in != NULL); - assert(out != NULL); + assert(in != nullptr); + assert(out != nullptr); // Move the SSx positions to the range needed unsigned int ss0Pos = P25_SS0_START; @@ -89,8 +89,8 @@ unsigned int CP25Utils::encode(const unsigned char* in, unsigned char* out, unsi unsigned int CP25Utils::encode(const unsigned char* in, unsigned char* out, unsigned int length) { - assert(in != NULL); - assert(out != NULL); + assert(in != nullptr); + assert(out != nullptr); // Move the SSx positions to the range needed unsigned int ss0Pos = P25_SS0_START; @@ -116,8 +116,8 @@ unsigned int CP25Utils::encode(const unsigned char* in, unsigned char* out, unsi unsigned int CP25Utils::compare(const unsigned char* data1, const unsigned char* data2, unsigned int length) { - assert(data1 != NULL); - assert(data2 != NULL); + assert(data1 != nullptr); + assert(data2 != nullptr); unsigned int errs = 0U; for (unsigned int i = 0U; i < length; i++) { diff --git a/POCSAGControl.cpp b/POCSAGControl.cpp index 69e5df5..be300ba 100644 --- a/POCSAGControl.cpp +++ b/POCSAGControl.cpp @@ -70,9 +70,9 @@ m_ric(0U), m_data(), m_state(POCSAG_STATE::NONE), m_enabled(true), -m_fp(NULL) +m_fp(nullptr) { - assert(display != NULL); + assert(display != nullptr); } CPOCSAGControl::~CPOCSAGControl() @@ -87,7 +87,7 @@ CPOCSAGControl::~CPOCSAGControl() unsigned int CPOCSAGControl::readModem(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); if (m_queue.isEmpty()) return 0U; @@ -194,7 +194,7 @@ void CPOCSAGControl::sendPageAlert2(unsigned int ric, const std::string& text) bool CPOCSAGControl::readNetwork() { - if (m_network == NULL) + if (m_network == nullptr) return true; unsigned char data[300U]; @@ -431,7 +431,7 @@ void CPOCSAGControl::packNumeric(const std::string& text, std::deque& for (std::string::const_iterator it = text.cbegin(); it != text.cend(); ++it) { char c = *it; - const BCD* bcd = NULL; + const BCD* bcd = nullptr; for (unsigned int i = 0U; BCD_VALUES[i].m_c != 0; i++) { if (BCD_VALUES[i].m_c == c) { bcd = BCD_VALUES + i; @@ -439,7 +439,7 @@ void CPOCSAGControl::packNumeric(const std::string& text, std::deque& } } - if (bcd != NULL) { + if (bcd != nullptr) { word |= bcd->m_bcd[n]; n++; @@ -520,7 +520,7 @@ void CPOCSAGControl::writeQueue() bool CPOCSAGControl::openFile() { - if (m_fp != NULL) + if (m_fp != nullptr) return true; time_t t; @@ -532,7 +532,7 @@ bool CPOCSAGControl::openFile() ::sprintf(name, "POCSAG_%04d%02d%02d_%02d%02d%02d.dat", tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec); m_fp = ::fopen(name, "wb"); - if (m_fp == NULL) + if (m_fp == nullptr) return false; ::fwrite("POCSAG", 1U, 6U, m_fp); @@ -542,7 +542,7 @@ bool CPOCSAGControl::openFile() bool CPOCSAGControl::writeFile(const unsigned char* data) { - if (m_fp == NULL) + if (m_fp == nullptr) return false; ::fwrite(data, 1U, POCSAG_FRAME_LENGTH_BYTES, m_fp); @@ -552,9 +552,9 @@ bool CPOCSAGControl::writeFile(const unsigned char* data) void CPOCSAGControl::closeFile() { - if (m_fp != NULL) { + if (m_fp != nullptr) { ::fclose(m_fp); - m_fp = NULL; + m_fp = nullptr; } } diff --git a/POCSAGNetwork.cpp b/POCSAGNetwork.cpp index f8bd073..8801f29 100644 --- a/POCSAGNetwork.cpp +++ b/POCSAGNetwork.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018,2019,2020,2021 by Jonathan Naylor G4KLX + * Copyright (C) 2018,2019,2020,2021,2025 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 @@ -88,7 +88,7 @@ void CPOCSAGNetwork::clock(unsigned int ms) unsigned int CPOCSAGNetwork::read(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); if (m_buffer.isEmpty()) return 0U; diff --git a/PseudoTTYController.cpp b/PseudoTTYController.cpp index 97062eb..d4c606a 100644 --- a/PseudoTTYController.cpp +++ b/PseudoTTYController.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020,2021 by Jonathan Naylor G4KLX + * Copyright (C) 2020,2021,2025 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 @@ -55,7 +55,7 @@ bool CPseudoTTYController::open() int slavefd; char slave[300]; - int result = ::openpty(&m_fd, &slavefd, slave, NULL, NULL); + int result = ::openpty(&m_fd, &slavefd, slave, nullptr, nullptr); if (result < 0) { LogError("Cannot open the pseudo tty - errno : %d", errno); return false; diff --git a/QR1676.cpp b/QR1676.cpp index 1548fc5..7da9c4b 100644 --- a/QR1676.cpp +++ b/QR1676.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015,2016 by Jonathan Naylor G4KLX + * Copyright (C) 2015,2016,2025 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 @@ -92,7 +92,7 @@ unsigned int CQR1676::getSyndrome1576(unsigned int pattern) // Compute the EMB against a precomputed list of correct words void CQR1676::encode(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); unsigned int value = (data[0U] >> 1) & 0x7FU; unsigned int cksum = ENCODING_TABLE_1676[value]; @@ -103,7 +103,7 @@ void CQR1676::encode(unsigned char* data) unsigned char CQR1676::decode(const unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); unsigned int code = (data[0U] << 7) + (data[1U] >> 1); unsigned int syndrome = getSyndrome1576(code); diff --git a/RS.h b/RS.h index 16cc53f..2ff4d2e 100644 --- a/RS.h +++ b/RS.h @@ -1,7 +1,7 @@ /* * Copyright (C) 2014 Hard Consulting Corporation * Copyright (C) 2023 Bryan Biedenkapp, N2PLL - * Copyright (C) 2024 Jonathan Naylor, G4KLX + * Copyright (C) 2024,2025 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 @@ -1044,16 +1044,16 @@ TYP cor = alpha_to[modnn(index_of[num1] + index_of[num2] + NN - index_of[den])]; // Store the error correction pattern, if a correction buffer is available - if (corr != NULL) + if (corr != nullptr) corr[j] = cor; // If a data/parity buffer is given and the error is inside the message or // parity data, correct it if (loc[j] < (NN - NROOTS)) { - if (data != NULL) + if (data != nullptr) data[loc[j] - pad] ^= cor; } else if (loc[j] < NN) { - if (parity != NULL) + if (parity != nullptr) parity[loc[j] - (NN - NROOTS)] ^= cor; } } @@ -1082,7 +1082,7 @@ LogDebug(LOG_HOST, "%s", ss.str().c_str()); } #endif - if (eras_pos != NULL) { + if (eras_pos != nullptr) { for (int i = 0; i < count; i++) eras_pos[i] = loc[i] - pad; } diff --git a/RS129.cpp b/RS129.cpp index 8cad52c..f27face 100644 --- a/RS129.cpp +++ b/RS129.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 by Jonathan Naylor G4KLX + * Copyright (C) 2015,2025 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 @@ -101,8 +101,8 @@ static unsigned char gmult(unsigned char a, unsigned char b) */ void CRS129::encode(const unsigned char* msg, unsigned int nbytes, unsigned char* parity) { - assert(msg != NULL); - assert(parity != NULL); + assert(msg != nullptr); + assert(parity != nullptr); for (unsigned int i = 0U; i < NPAR + 1U; i++) parity[i] = 0x00U; @@ -120,7 +120,7 @@ void CRS129::encode(const unsigned char* msg, unsigned int nbytes, unsigned char // Reed-Solomon (12,9) check bool CRS129::check(const unsigned char* in) { - assert(in != NULL); + assert(in != nullptr); unsigned char parity[4U]; encode(in, 9U, parity); diff --git a/RS634717.cpp b/RS634717.cpp index 372598d..6c8d607 100644 --- a/RS634717.cpp +++ b/RS634717.cpp @@ -1,5 +1,5 @@ /* -* Copyright (C) 2016,2024 by Jonathan Naylor G4KLX +* Copyright (C) 2016,2024,2025 by Jonathan Naylor G4KLX * Copyright (C) 2018,2023 by Bryan Biedenkapp N2PLL * * This program is free software; you can redistribute it and/or modify @@ -163,7 +163,7 @@ CRS634717::~CRS634717() bool CRS634717::decode241213(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); std::vector codeword(63, 0); @@ -185,7 +185,7 @@ bool CRS634717::decode241213(unsigned char* data) void CRS634717::encode241213(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); unsigned char codeword[24U]; @@ -206,7 +206,7 @@ void CRS634717::encode241213(unsigned char* data) bool CRS634717::decode24169(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); std::vector codeword(63, 0); @@ -228,7 +228,7 @@ bool CRS634717::decode24169(unsigned char* data) void CRS634717::encode24169(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); unsigned char codeword[24U]; @@ -249,7 +249,7 @@ void CRS634717::encode24169(unsigned char* data) bool CRS634717::decode362017(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); std::vector codeword(63, 0); @@ -271,7 +271,7 @@ bool CRS634717::decode362017(unsigned char* data) void CRS634717::encode362017(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); unsigned char codeword[36U]; diff --git a/RSSIInterpolator.cpp b/RSSIInterpolator.cpp index b277fbc..25a04f0 100644 --- a/RSSIInterpolator.cpp +++ b/RSSIInterpolator.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 by Jonathan Naylor G4KLX + * Copyright (C) 2016,2025 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 @@ -38,20 +38,20 @@ CRSSIInterpolator::~CRSSIInterpolator() bool CRSSIInterpolator::load(const std::string& filename) { FILE* fp = ::fopen(filename.c_str(), "rt"); - if (fp == NULL) { + if (fp == nullptr) { LogWarning("Cannot open the RSSI data file - %s", filename.c_str()); return false; } char buffer[100U]; - while (::fgets(buffer, 100, fp) != NULL) { + while (::fgets(buffer, 100, fp) != nullptr) { if (buffer[0U] == '#') continue; char* p1 = ::strtok(buffer, " \t\r\n"); - char* p2 = ::strtok(NULL, " \t\r\n"); + char* p2 = ::strtok(nullptr, " \t\r\n"); - if (p1 != NULL && p2 != NULL) { + if (p1 != nullptr && p2 != nullptr) { uint16_t raw = uint16_t(::atoi(p1)); int rssi = ::atoi(p2); m_map.insert(std::pair(raw, rssi)); diff --git a/RemoteControl.cpp b/RemoteControl.cpp index 8e23fbf..f7d527d 100644 --- a/RemoteControl.cpp +++ b/RemoteControl.cpp @@ -80,9 +80,9 @@ REMOTE_COMMAND CRemoteControl::getCommand() // Parse the original command into a vector of strings. char* b = buffer; - char* p = NULL; - while ((p = ::strtok(b, " ")) != NULL) { - b = NULL; + char* p = nullptr; + while ((p = ::strtok(b, " ")) != nullptr) { + b = nullptr; m_args.push_back(std::string(p)); } @@ -163,7 +163,7 @@ REMOTE_COMMAND CRemoteControl::getCommand() // Reload command is in the form of "reload" m_command = REMOTE_COMMAND::RELOAD; } else if (m_args.at(0U) == "status") { - if (m_host != NULL) { + if (m_host != nullptr) { m_host->buildNetworkStatusString(replyStr); } else { replyStr = "KO"; @@ -171,7 +171,7 @@ REMOTE_COMMAND CRemoteControl::getCommand() m_command = REMOTE_COMMAND::CONNECTION_STATUS; } else if (m_args.at(0U) == "hosts") { - if (m_host != NULL) { + if (m_host != nullptr) { m_host->buildNetworkHostsString(replyStr); } else { replyStr = "KO"; diff --git a/RingBuffer.h b/RingBuffer.h index 707de1c..c9496ac 100644 --- a/RingBuffer.h +++ b/RingBuffer.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2009,2012,2013,2015,2016 by Jonathan Naylor G4KLX + * Copyright (C) 2006-2009,2012,2013,2015,2016,2025 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 @@ -30,12 +30,12 @@ public: CRingBuffer(unsigned int length, const char* name) : m_length(length), m_name(name), - m_buffer(NULL), + m_buffer(nullptr), m_iPtr(0U), m_oPtr(0U) { assert(length > 0U); - assert(name != NULL); + assert(name != nullptr); m_buffer = new T[length]; diff --git a/SHA256.cpp b/SHA256.cpp index b3366e0..5f81805 100644 --- a/SHA256.cpp +++ b/SHA256.cpp @@ -1,6 +1,6 @@ /* - * Copyright (C) 2005, 2006, 2008 Free Software Foundation, Inc. - * Copyright (C) 2011,2015 by Jonathan Naylor G4KLX + * Copyright (C) 2005,2006,2008 Free Software Foundation, Inc. + * Copyright (C) 2011,2015,2025 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 @@ -46,10 +46,10 @@ static const unsigned char fillbuf[64] = { 0x80, 0 /* , 0, 0, ... */ }; must be called before using hash in the call to sha256_hash */ CSHA256::CSHA256() : -m_state(NULL), -m_total(NULL), +m_state(nullptr), +m_total(nullptr), m_buflen(0U), -m_buffer(NULL) +m_buffer(nullptr) { m_state = new uint32_t[8U]; m_total = new uint32_t[2U]; @@ -85,7 +85,7 @@ void CSHA256::init() * (uint32_t *) cp = v */ static inline void set_uint32(unsigned char* cp, uint32_t v) { - assert(cp != NULL); + assert(cp != nullptr); ::memcpy(cp, &v, sizeof v); } @@ -94,7 +94,7 @@ static inline void set_uint32(unsigned char* cp, uint32_t v) must be in little endian byte order. */ unsigned char* CSHA256::read(unsigned char* resbuf) { - assert(resbuf != NULL); + assert(resbuf != nullptr); for (unsigned int i = 0U; i < 8U; i++) set_uint32(resbuf + i * sizeof(m_state[0]), SWAP(m_state[i])); @@ -129,7 +129,7 @@ void CSHA256::conclude() unsigned char* CSHA256::finish(unsigned char* resbuf) { - assert(resbuf != NULL); + assert(resbuf != nullptr); conclude(); @@ -142,8 +142,8 @@ unsigned char* CSHA256::finish(unsigned char* resbuf) digest. */ unsigned char* CSHA256::buffer(const unsigned char* buffer, unsigned int len, unsigned char* resblock) { - assert(buffer != NULL); - assert(resblock != NULL); + assert(buffer != nullptr); + assert(resblock != nullptr); /* Initialize the computation context. */ init(); @@ -157,7 +157,7 @@ unsigned char* CSHA256::buffer(const unsigned char* buffer, unsigned int len, un void CSHA256::processBytes(const unsigned char* buffer, unsigned int len) { - assert(buffer != NULL); + assert(buffer != nullptr); /* When we already have some bits in our internal buffer concatenate both inputs first. */ @@ -252,7 +252,7 @@ static const uint32_t roundConstants[64] = { void CSHA256::processBlock(const unsigned char* buffer, unsigned int len) { - assert(buffer != NULL); + assert(buffer != nullptr); const uint32_t* words = (uint32_t*)buffer; unsigned int nwords = len / sizeof(uint32_t); diff --git a/StopWatch.cpp b/StopWatch.cpp index 481241b..3d59e12 100644 --- a/StopWatch.cpp +++ b/StopWatch.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015,2016,2018 by Jonathan Naylor G4KLX + * Copyright (C) 2015,2016,2018,2025 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 @@ -77,7 +77,7 @@ CStopWatch::~CStopWatch() unsigned long long CStopWatch::time() const { struct timeval now; - ::gettimeofday(&now, NULL); + ::gettimeofday(&now, nullptr); return now.tv_sec * 1000ULL + now.tv_usec / 1000ULL; } diff --git a/Sync.cpp b/Sync.cpp index 1fcb2c4..bb0f338 100644 --- a/Sync.cpp +++ b/Sync.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015,2016,2018,2020,2021 by Jonathan Naylor G4KLX + * Copyright (C) 2015,2016,2018,2020,2021,2025 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 @@ -32,14 +32,14 @@ void CSync::addDStarSync(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); ::memcpy(data + DSTAR_VOICE_FRAME_LENGTH_BYTES, DSTAR_SYNC_BYTES, DSTAR_DATA_FRAME_LENGTH_BYTES); } void CSync::addDMRDataSync(unsigned char* data, bool duplex) { - assert(data != NULL); + assert(data != nullptr); if (duplex) { for (unsigned int i = 0U; i < 7U; i++) @@ -52,7 +52,7 @@ void CSync::addDMRDataSync(unsigned char* data, bool duplex) void CSync::addDMRAudioSync(unsigned char* data, bool duplex) { - assert(data != NULL); + assert(data != nullptr); if (duplex) { for (unsigned int i = 0U; i < 7U; i++) @@ -65,21 +65,21 @@ void CSync::addDMRAudioSync(unsigned char* data, bool duplex) void CSync::addYSFSync(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); ::memcpy(data, YSF_SYNC_BYTES, YSF_SYNC_LENGTH_BYTES); } void CSync::addP25Sync(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); ::memcpy(data, P25_SYNC_BYTES, P25_SYNC_LENGTH_BYTES); } void CSync::addNXDNSync(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); for (unsigned int i = 0U; i < NXDN_FSW_BYTES_LENGTH; i++) data[i] = (data[i] & ~NXDN_FSW_BYTES_MASK[i]) | NXDN_FSW_BYTES[i]; @@ -87,21 +87,21 @@ void CSync::addNXDNSync(unsigned char* data) void CSync::addM17LinkSetupSync(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); ::memcpy(data, M17_LINK_SETUP_SYNC_BYTES, M17_SYNC_LENGTH_BYTES); } void CSync::addM17StreamSync(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); ::memcpy(data, M17_STREAM_SYNC_BYTES, M17_SYNC_LENGTH_BYTES); } void CSync::addM17EOTSync(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); ::memcpy(data, M17_EOT_SYNC_BYTES, M17_SYNC_LENGTH_BYTES); } diff --git a/TFTSurenoo.cpp b/TFTSurenoo.cpp index 899eac3..7233c94 100644 --- a/TFTSurenoo.cpp +++ b/TFTSurenoo.cpp @@ -116,11 +116,11 @@ m_duplex(duplex), //m_duplex(true), // uncomment to force duplex display for testing! m_refresh(false), m_refreshTimer(1000U, 0U, REFRESH_PERIOD), -m_lineBuf(NULL), +m_lineBuf(nullptr), m_temp(), m_screenLayout(screenLayout) { - assert(serial != NULL); + assert(serial != nullptr); assert(brightness >= 0U && brightness <= 255U); } @@ -161,7 +161,7 @@ void CTFTSurenoo::setIdleInt() void CTFTSurenoo::setErrorInt(const char* text) { - assert(text != NULL); + assert(text != nullptr); setModeLine(STR_MMDVM); setStatusLine(statusLineNo(0), text); @@ -201,11 +201,11 @@ void CTFTSurenoo::setFMInt() void CTFTSurenoo::writeDStarInt(const char* my1, const char* my2, const char* your, const char* type, const char* reflector) { - assert(my1 != NULL); - assert(my2 != NULL); - assert(your != NULL); - assert(type != NULL); - assert(reflector != NULL); + assert(my1 != nullptr); + assert(my2 != nullptr); + assert(your != nullptr); + assert(type != nullptr); + assert(reflector != nullptr); setModeLine(STR_MMDVM); @@ -233,7 +233,7 @@ void CTFTSurenoo::clearDStarInt() void CTFTSurenoo::writeDMRInt(unsigned int slotNo, const std::string& src, bool group, const std::string& dst, const char* type) { - assert(type != NULL); + assert(type != nullptr); if (m_mode != MODE_DMR) { setModeLine(STR_DMR); @@ -257,7 +257,7 @@ void CTFTSurenoo::writeDMRInt(unsigned int slotNo, const std::string& src, bool int CTFTSurenoo::writeDMRIntEx(unsigned int slotNo, const CUserDBentry& src, bool group, const std::string& dst, const char* type) { - assert(type != NULL); + assert(type != nullptr); // duplex mode is not supported if (m_duplex) @@ -290,10 +290,10 @@ void CTFTSurenoo::clearDMRInt(unsigned int slotNo) void CTFTSurenoo::writeFusionInt(const char* source, const char* dest, unsigned char dgid, const char* type, const char* origin) { - assert(source != NULL); - assert(dest != NULL); - assert(type != NULL); - assert(origin != NULL); + assert(source != nullptr); + assert(dest != nullptr); + assert(type != nullptr); + assert(origin != nullptr); setModeLine(STR_YSF); @@ -319,8 +319,8 @@ void CTFTSurenoo::clearFusionInt() void CTFTSurenoo::writeP25Int(const char* source, bool group, unsigned int dest, const char* type) { - assert(source != NULL); - assert(type != NULL); + assert(source != nullptr); + assert(type != nullptr); setModeLine(STR_P25); @@ -340,8 +340,8 @@ void CTFTSurenoo::clearP25Int() void CTFTSurenoo::writeNXDNInt(const char* source, bool group, unsigned int dest, const char* type) { - assert(source != NULL); - assert(type != NULL); + assert(source != nullptr); + assert(type != nullptr); if (m_mode != MODE_NXDN) setModeLine(STR_NXDN); @@ -357,7 +357,7 @@ void CTFTSurenoo::writeNXDNInt(const char* source, bool group, unsigned int dest int CTFTSurenoo::writeNXDNIntEx(const CUserDBentry& source, bool group, unsigned int dest, const char* type) { - assert(type != NULL); + assert(type != nullptr); setModeLine(STR_NXDN); setStatusLine(statusLineNo(2), (source.get(keyFIRST_NAME) + " " + source.get(keyLAST_NAME)).c_str()); @@ -377,9 +377,9 @@ void CTFTSurenoo::clearNXDNInt() void CTFTSurenoo::writeM17Int(const char* source, const char* dest, const char* type) { - assert(source != NULL); - assert(dest != NULL); - assert(type != NULL); + assert(source != nullptr); + assert(dest != nullptr); + assert(type != nullptr); if (m_mode != MODE_M17) setModeLine(STR_M17); diff --git a/Thread.cpp b/Thread.cpp index 6f76f5b..86b8967 100644 --- a/Thread.cpp +++ b/Thread.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015,2016,2020 by Jonathan Naylor G4KLX + * Copyright (C) 2015,2016,2020,2025 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 @@ -31,9 +31,9 @@ CThread::~CThread() bool CThread::run() { - m_handle = ::CreateThread(NULL, 0, &helper, this, 0, NULL); + m_handle = ::CreateThread(nullptr, 0, &helper, this, 0, nullptr); - return m_handle != NULL; + return m_handle != nullptr; } @@ -74,13 +74,13 @@ CThread::~CThread() bool CThread::run() { - return ::pthread_create(&m_thread, NULL, helper, this) == 0; + return ::pthread_create(&m_thread, nullptr, helper, this) == 0; } void CThread::wait() { - ::pthread_join(m_thread, NULL); + ::pthread_join(m_thread, nullptr); } @@ -90,7 +90,7 @@ void* CThread::helper(void* arg) p->entry(); - return NULL; + return nullptr; } void CThread::sleep(unsigned int ms) @@ -100,7 +100,7 @@ void CThread::sleep(unsigned int ms) ts.tv_sec = ms / 1000U; ts.tv_nsec = (ms % 1000U) * 1000000U; - ::nanosleep(&ts, NULL); + ::nanosleep(&ts, nullptr); } #endif diff --git a/UARTController.cpp b/UARTController.cpp index 2400c33..a34f067 100644 --- a/UARTController.cpp +++ b/UARTController.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2002-2004,2007-2011,2013,2014-2017,2019,2020,2021 by Jonathan Naylor G4KLX + * Copyright (C) 2002-2004,2007-2011,2013,2014-2017,2019,2020,2021,2025 by Jonathan Naylor G4KLX * Copyright (C) 1999-2001 by Thomas Sailor HB9JNX * * This program is free software; you can redistribute it and/or modify @@ -68,7 +68,7 @@ bool CUARTController::open() std::string baseName = m_device.substr(4U); // Convert "\\.\COM10" to "COM10" - m_handle = ::CreateFileA(m_device.c_str(), GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + m_handle = ::CreateFileA(m_device.c_str(), GENERIC_READ | GENERIC_WRITE, 0, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr); if (m_handle == INVALID_HANDLE_VALUE) { LogError("Cannot open device - %s, err=%04lx", m_device.c_str(), ::GetLastError()); return false; @@ -77,7 +77,7 @@ bool CUARTController::open() DCB dcb; if (::GetCommState(m_handle, &dcb) == 0) { LogError("Cannot get the attributes for %s, err=%04lx", m_device.c_str(), ::GetLastError()); - ::ClearCommError(m_handle, &errCode, NULL); + ::ClearCommError(m_handle, &errCode, nullptr); ::CloseHandle(m_handle); return false; } @@ -97,7 +97,7 @@ bool CUARTController::open() if (::SetCommState(m_handle, &dcb) == 0) { LogError("Cannot set the attributes for %s, err=%04lx", m_device.c_str(), ::GetLastError()); - ::ClearCommError(m_handle, &errCode, NULL); + ::ClearCommError(m_handle, &errCode, nullptr); ::CloseHandle(m_handle); return false; } @@ -105,7 +105,7 @@ bool CUARTController::open() COMMTIMEOUTS timeouts; if (!::GetCommTimeouts(m_handle, &timeouts)) { LogError("Cannot get the timeouts for %s, err=%04lx", m_device.c_str(), ::GetLastError()); - ::ClearCommError(m_handle, &errCode, NULL); + ::ClearCommError(m_handle, &errCode, nullptr); ::CloseHandle(m_handle); return false; } @@ -116,26 +116,26 @@ bool CUARTController::open() if (!::SetCommTimeouts(m_handle, &timeouts)) { LogError("Cannot set the timeouts for %s, err=%04lx", m_device.c_str(), ::GetLastError()); - ::ClearCommError(m_handle, &errCode, NULL); + ::ClearCommError(m_handle, &errCode, nullptr); ::CloseHandle(m_handle); return false; } if (::EscapeCommFunction(m_handle, CLRDTR) == 0) { LogError("Cannot clear DTR for %s, err=%04lx", m_device.c_str(), ::GetLastError()); - ::ClearCommError(m_handle, &errCode, NULL); + ::ClearCommError(m_handle, &errCode, nullptr); ::CloseHandle(m_handle); return false; } if (::EscapeCommFunction(m_handle, m_assertRTS ? SETRTS : CLRRTS) == 0) { LogError("Cannot set/clear RTS for %s, err=%04lx", m_device.c_str(), ::GetLastError()); - ::ClearCommError(m_handle, &errCode, NULL); + ::ClearCommError(m_handle, &errCode, nullptr); ::CloseHandle(m_handle); return false; } - ::ClearCommError(m_handle, &errCode, NULL); + ::ClearCommError(m_handle, &errCode, nullptr); return true; } @@ -143,7 +143,7 @@ bool CUARTController::open() int CUARTController::read(unsigned char* buffer, unsigned int length) { assert(m_handle != INVALID_HANDLE_VALUE); - assert(buffer != NULL); + assert(buffer != nullptr); unsigned int ptr = 0U; @@ -165,7 +165,7 @@ int CUARTController::read(unsigned char* buffer, unsigned int length) int CUARTController::readNonblock(unsigned char* buffer, unsigned int length) { assert(m_handle != INVALID_HANDLE_VALUE); - assert(buffer != NULL); + assert(buffer != nullptr); if (length == 0U) return 0; @@ -185,7 +185,7 @@ int CUARTController::readNonblock(unsigned char* buffer, unsigned int length) readLength = length; DWORD bytes = 0UL; - BOOL ret = ::ReadFile(m_handle, buffer, readLength, &bytes, NULL); + BOOL ret = ::ReadFile(m_handle, buffer, readLength, &bytes, nullptr); if (!ret) { LogError("Error from ReadFile for %s: %04lx", m_device.c_str(), ::GetLastError()); return -1; @@ -197,7 +197,7 @@ int CUARTController::readNonblock(unsigned char* buffer, unsigned int length) int CUARTController::write(const unsigned char* buffer, unsigned int length) { assert(m_handle != INVALID_HANDLE_VALUE); - assert(buffer != NULL); + assert(buffer != nullptr); if (length == 0U) return 0; @@ -206,7 +206,7 @@ int CUARTController::write(const unsigned char* buffer, unsigned int length) while (ptr < length) { DWORD bytes = 0UL; - BOOL ret = ::WriteFile(m_handle, buffer + ptr, length - ptr, &bytes, NULL); + BOOL ret = ::WriteFile(m_handle, buffer + ptr, length - ptr, &bytes, nullptr); if (!ret) { LogError("Error from WriteFile for %s: %04lx", m_device.c_str(), ::GetLastError()); return -1; @@ -414,7 +414,7 @@ int CUARTController::setNonblock(bool nonblock) int CUARTController::read(unsigned char* buffer, unsigned int length) { - assert(buffer != NULL); + assert(buffer != nullptr); assert(m_fd != -1); if (length == 0U) @@ -431,11 +431,11 @@ int CUARTController::read(unsigned char* buffer, unsigned int length) struct timeval tv; tv.tv_sec = 0; tv.tv_usec = 0; - n = ::select(m_fd + 1, &fds, NULL, NULL, &tv); + n = ::select(m_fd + 1, &fds, nullptr, nullptr, &tv); if (n == 0) return 0; } else { - n = ::select(m_fd + 1, &fds, NULL, NULL, NULL); + n = ::select(m_fd + 1, &fds, nullptr, nullptr, nullptr); } if (n < 0) { @@ -470,7 +470,7 @@ bool CUARTController::canWrite(){ timeo.tv_sec = 0; timeo.tv_usec = 0; - int rc = ::select(m_fd + 1, NULL, &wset, NULL, &timeo); + int rc = ::select(m_fd + 1, nullptr, &wset, nullptr, &timeo); if (rc > 0 && FD_ISSET(m_fd, &wset)) return true; @@ -482,7 +482,7 @@ bool CUARTController::canWrite(){ int CUARTController::write(const unsigned char* buffer, unsigned int length) { - assert(buffer != NULL); + assert(buffer != nullptr); assert(m_fd != -1); if (length == 0U) diff --git a/UDPController.cpp b/UDPController.cpp index 3996d32..9b0ace1 100644 --- a/UDPController.cpp +++ b/UDPController.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 by Jonathan Naylor G4KLX + * Copyright (C) 2021,2025 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 @@ -54,7 +54,7 @@ bool CUDPController::open() int CUDPController::read(unsigned char* buffer, unsigned int length) { - assert(buffer != NULL); + assert(buffer != nullptr); assert(length > 0U); unsigned char data[BUFFER_LENGTH]; @@ -85,7 +85,7 @@ int CUDPController::read(unsigned char* buffer, unsigned int length) int CUDPController::write(const unsigned char* buffer, unsigned int length) { - assert(buffer != NULL); + assert(buffer != nullptr); assert(length > 0U); return m_socket.write(buffer, length, m_addr, m_addrLen) ? int(length) : -1; diff --git a/UDPSocket.cpp b/UDPSocket.cpp index 6697670..f81b4ff 100644 --- a/UDPSocket.cpp +++ b/UDPSocket.cpp @@ -94,7 +94,7 @@ int CUDPSocket::lookup(const std::string& hostname, unsigned short port, sockadd /* Port is always digits, no needs to lookup service */ hints.ai_flags |= AI_NUMERICSERV; - int err = ::getaddrinfo(hostname.empty() ? NULL : hostname.c_str(), portstr.c_str(), &hints, &res); + int err = ::getaddrinfo(hostname.empty() ? nullptr : hostname.c_str(), portstr.c_str(), &hints, &res); if (err != 0) { sockaddr_in* paddr = (sockaddr_in*)&addr; ::memset(paddr, 0x00U, address_length = sizeof(sockaddr_in)); @@ -233,7 +233,7 @@ bool CUDPSocket::open() int CUDPSocket::read(unsigned char* buffer, unsigned int length, sockaddr_storage& address, unsigned int &addressLength) { - assert(buffer != NULL); + assert(buffer != nullptr); assert(length > 0U); #if defined(_WIN32) || defined(_WIN64) @@ -301,7 +301,7 @@ int CUDPSocket::read(unsigned char* buffer, unsigned int length, sockaddr_storag bool CUDPSocket::write(const unsigned char* buffer, unsigned int length, const sockaddr_storage& address, unsigned int addressLength) { - assert(buffer != NULL); + assert(buffer != nullptr); assert(length > 0U); #if defined(_WIN32) || defined(_WIN64) assert(m_fd != INVALID_SOCKET); diff --git a/UserDB.cpp b/UserDB.cpp index f6c7e1a..455e307 100644 --- a/UserDB.cpp +++ b/UserDB.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 by SASANO Takayoshi JG1UAA + * Copyright (C) 2020,2025 by SASANO Takayoshi JG1UAA * * 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 @@ -39,7 +39,7 @@ bool CUserDB::lookup(unsigned int id, class CUserDBentry *entry) m_mutex.lock(); try { - if (entry != NULL) + if (entry != nullptr) *entry = m_table.at(id); else (void)m_table.at(id); @@ -59,7 +59,7 @@ bool CUserDB::load(std::string const& filename) LogInfo("Loading ID lookup table from %s", filename.c_str()); FILE* fp = ::fopen(filename.c_str(), "rt"); - if (fp == NULL) { + if (fp == nullptr) { LogWarning("Cannot open ID lookup file - %s", filename.c_str()); return false; } @@ -71,7 +71,7 @@ bool CUserDB::load(std::string const& filename) // set index for entries char buffer[256U]; - if (::fgets(buffer, sizeof(buffer), fp) == NULL) { + if (::fgets(buffer, sizeof(buffer), fp) == nullptr) { LogWarning("ID lookup file has no entry - %s", filename.c_str()); m_mutex.unlock(); ::fclose(fp); @@ -86,7 +86,7 @@ bool CUserDB::load(std::string const& filename) ::rewind(fp); } - while (::fgets(buffer, sizeof(buffer), fp) != NULL) { + while (::fgets(buffer, sizeof(buffer), fp) != nullptr) { if (buffer[0U] != '#') parse(buffer, index); } @@ -109,7 +109,7 @@ bool CUserDB::makeindex(char* buf, std::unordered_map& index) // Remove the old index index.clear(); - for (i = 0, p1 = tokenize(buf, &p2); p1 != NULL; + for (i = 0, p1 = tokenize(buf, &p2); p1 != nullptr; i++, p1 = tokenize(p2, &p2)) { // create [column keyword] - [column number] table @@ -133,7 +133,7 @@ void CUserDB::parse(char* buf, std::unordered_map& index) std::unordered_map ptr; unsigned int id; - for (i = 0, p1 = tokenize(buf, &p2); p1 != NULL; + for (i = 0, p1 = tokenize(buf, &p2); p1 != nullptr; i++, p1 = tokenize(p2, &p2)) { for (auto it = index.begin(); it != index.end(); it++) { @@ -175,10 +175,10 @@ void CUserDB::toupper_string(char* str) char* CUserDB::tokenize(char* str, char** next) { if (*str == '\0') - return NULL; + return nullptr; char* p = ::strpbrk(str, ",\t\r\n"); - if (p == NULL) { + if (p == nullptr) { *next = str + ::strlen(str); } else { *p = '\0'; diff --git a/Utils.cpp b/Utils.cpp index 091ebf8..cf24ac6 100644 --- a/Utils.cpp +++ b/Utils.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009,2014,2015,2016,2021 Jonathan Naylor, G4KLX + * Copyright (C) 2009,2014,2015,2016,2021,2025 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 @@ -19,14 +19,14 @@ void CUtils::dump(const std::string& title, const unsigned char* data, unsigned int length) { - assert(data != NULL); + assert(data != nullptr); dump(2U, title, data, length); } void CUtils::dump(int level, const std::string& title, const unsigned char* data, unsigned int length) { - assert(data != NULL); + assert(data != nullptr); ::Log(level, "%s", title.c_str()); @@ -72,14 +72,14 @@ void CUtils::dump(int level, const std::string& title, const unsigned char* data void CUtils::dump(const std::string& title, const bool* bits, unsigned int length) { - assert(bits != NULL); + assert(bits != nullptr); dump(2U, title, bits, length); } void CUtils::dump(int level, const std::string& title, const bool* bits, unsigned int length) { - assert(bits != NULL); + assert(bits != nullptr); unsigned char bytes[100U]; unsigned int nBytes = 0U; @@ -91,7 +91,7 @@ void CUtils::dump(int level, const std::string& title, const bool* bits, unsigne void CUtils::byteToBitsBE(unsigned char byte, bool* bits) { - assert(bits != NULL); + assert(bits != nullptr); bits[0U] = (byte & 0x80U) == 0x80U; bits[1U] = (byte & 0x40U) == 0x40U; @@ -105,7 +105,7 @@ void CUtils::byteToBitsBE(unsigned char byte, bool* bits) void CUtils::byteToBitsLE(unsigned char byte, bool* bits) { - assert(bits != NULL); + assert(bits != nullptr); bits[0U] = (byte & 0x01U) == 0x01U; bits[1U] = (byte & 0x02U) == 0x02U; @@ -119,7 +119,7 @@ void CUtils::byteToBitsLE(unsigned char byte, bool* bits) void CUtils::bitsToByteBE(const bool* bits, unsigned char& byte) { - assert(bits != NULL); + assert(bits != nullptr); byte = bits[0U] ? 0x80U : 0x00U; byte |= bits[1U] ? 0x40U : 0x00U; @@ -133,7 +133,7 @@ void CUtils::bitsToByteBE(const bool* bits, unsigned char& byte) void CUtils::bitsToByteLE(const bool* bits, unsigned char& byte) { - assert(bits != NULL); + assert(bits != nullptr); byte = bits[0U] ? 0x01U : 0x00U; byte |= bits[1U] ? 0x02U : 0x00U; diff --git a/Version.h b/Version.h index 382c3a4..40c3f4e 100644 --- a/Version.h +++ b/Version.h @@ -19,6 +19,6 @@ #if !defined(VERSION_H) #define VERSION_H -const char* VERSION = "20250313"; +const char* VERSION = "20250314"; #endif diff --git a/YSFControl.cpp b/YSFControl.cpp index 56773c0..c233487 100644 --- a/YSFControl.cpp +++ b/YSFControl.cpp @@ -24,8 +24,8 @@ // #define DUMP_YSF CYSFControl::CYSFControl(const std::string& callsign, bool selfOnly, CYSFNetwork* network, CDisplay* display, unsigned int timeout, bool duplex, bool lowDeviation, bool remoteGateway, CRSSIInterpolator* rssiMapper) : -m_callsign(NULL), -m_selfCallsign(NULL), +m_callsign(nullptr), +m_selfCallsign(nullptr), m_selfOnly(selfOnly), m_network(network), m_display(display), @@ -47,10 +47,10 @@ m_rfErrs(0U), m_rfBits(1U), m_netErrs(0U), m_netBits(1U), -m_rfSource(NULL), -m_rfDest(NULL), -m_netSource(NULL), -m_netDest(NULL), +m_rfSource(nullptr), +m_rfDest(nullptr), +m_netSource(nullptr), +m_netDest(nullptr), m_lastFICH(), m_netN(0U), m_rfPayload(), @@ -62,10 +62,10 @@ m_minRSSI(0U), m_aveRSSI(0U), m_rssiCount(0U), m_enabled(true), -m_fp(NULL) +m_fp(nullptr) { - assert(display != NULL); - assert(rssiMapper != NULL); + assert(display != nullptr); + assert(rssiMapper != nullptr); m_rfPayload.setUplink(callsign); m_rfPayload.setDownlink(callsign); @@ -100,7 +100,7 @@ CYSFControl::~CYSFControl() bool CYSFControl::writeModem(unsigned char *data, unsigned int len) { - assert(data != NULL); + assert(data != nullptr); if (!m_enabled) return false; @@ -118,8 +118,8 @@ bool CYSFControl::writeModem(unsigned char *data, unsigned int len) if ((type == TAG_LOST) && (m_rfState == RPT_RF_STATE::REJECTED)) { m_rfPayload.reset(); - m_rfSource = NULL; - m_rfDest = NULL; + m_rfSource = nullptr; + m_rfDest = nullptr; m_rfState = RPT_RF_STATE::LISTENING; return false; } @@ -289,8 +289,8 @@ bool CYSFControl::processVWData(bool valid, unsigned char *data) } else if (valid && (fi == YSF_FI_TERMINATOR)) { if (m_rfState == RPT_RF_STATE::REJECTED) { m_rfPayload.reset(); - m_rfSource = NULL; - m_rfDest = NULL; + m_rfSource = nullptr; + m_rfDest = nullptr; m_rfState = RPT_RF_STATE::LISTENING; } else if (m_rfState == RPT_RF_STATE::AUDIO) { m_rfPayload.processHeaderData(data + 2U); @@ -458,8 +458,8 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data) } else if (valid && (fi == YSF_FI_TERMINATOR)) { if (m_rfState == RPT_RF_STATE::REJECTED) { m_rfPayload.reset(); - m_rfSource = NULL; - m_rfDest = NULL; + m_rfSource = nullptr; + m_rfDest = nullptr; m_rfState = RPT_RF_STATE::LISTENING; } else if (m_rfState == RPT_RF_STATE::AUDIO) { m_rfPayload.processHeaderData(data + 2U); @@ -590,7 +590,7 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data) m_rfSource = m_rfPayload.getSource(); - if (m_rfSource == NULL || m_rfDest == NULL) + if (m_rfSource == nullptr || m_rfDest == nullptr) return false; if (m_selfOnly) { @@ -756,8 +756,8 @@ bool CYSFControl::processFRData(bool valid, unsigned char *data) } else if (valid && fi == YSF_FI_TERMINATOR) { if (m_rfState == RPT_RF_STATE::REJECTED) { m_rfPayload.reset(); - m_rfSource = NULL; - m_rfDest = NULL; + m_rfSource = nullptr; + m_rfDest = nullptr; m_rfState = RPT_RF_STATE::LISTENING; } else if (m_rfState == RPT_RF_STATE::DATA) { m_rfPayload.processHeaderData(data + 2U); @@ -842,7 +842,7 @@ bool CYSFControl::processFRData(bool valid, unsigned char *data) unsigned int CYSFControl::readModem(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); if (m_queue.isEmpty()) return 0U; @@ -863,13 +863,13 @@ void CYSFControl::writeEndRF() m_rfPayload.reset(); // These variables are free'd by YSFPayload - m_rfSource = NULL; - m_rfDest = NULL; + m_rfSource = nullptr; + m_rfDest = nullptr; if (m_netState == RPT_NET_STATE::IDLE) { m_display->clearFusion(); - if (m_network != NULL) + if (m_network != nullptr) m_network->reset(); } @@ -890,7 +890,7 @@ void CYSFControl::writeEndNet() m_display->clearFusion(); - if (m_network != NULL) + if (m_network != nullptr) m_network->reset(); } @@ -1054,7 +1054,7 @@ void CYSFControl::writeNetwork() void CYSFControl::clock(unsigned int ms) { - if (m_network != NULL) + if (m_network != nullptr) writeNetwork(); m_rfTimeoutTimer.clock(ms); @@ -1072,7 +1072,7 @@ void CYSFControl::clock(unsigned int ms) void CYSFControl::writeQueueRF(const unsigned char *data) { - assert(data != NULL); + assert(data != nullptr); if (m_netState != RPT_NET_STATE::IDLE) return; @@ -1095,7 +1095,7 @@ void CYSFControl::writeQueueRF(const unsigned char *data) void CYSFControl::writeQueueNet(const unsigned char *data) { - assert(data != NULL); + assert(data != nullptr); if (m_netTimeoutTimer.isRunning() && m_netTimeoutTimer.hasExpired()) return; @@ -1115,9 +1115,9 @@ void CYSFControl::writeQueueNet(const unsigned char *data) void CYSFControl::writeNetwork(const unsigned char *data, unsigned int count) { - assert(data != NULL); + assert(data != nullptr); - if (m_network == NULL) + if (m_network == nullptr) return; if (m_rfTimeoutTimer.isRunning() && m_rfTimeoutTimer.hasExpired()) @@ -1128,7 +1128,7 @@ void CYSFControl::writeNetwork(const unsigned char *data, unsigned int count) bool CYSFControl::openFile() { - if (m_fp != NULL) + if (m_fp != nullptr) return true; time_t t; @@ -1140,7 +1140,7 @@ bool CYSFControl::openFile() ::sprintf(name, "YSF_%04d%02d%02d_%02d%02d%02d.ambe", tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec); m_fp = ::fopen(name, "wb"); - if (m_fp == NULL) + if (m_fp == nullptr) return false; ::fwrite("YSF", 1U, 3U, m_fp); @@ -1150,7 +1150,7 @@ bool CYSFControl::openFile() bool CYSFControl::writeFile(const unsigned char* data) { - if (m_fp == NULL) + if (m_fp == nullptr) return false; ::fwrite(data, 1U, YSF_FRAME_LENGTH_BYTES, m_fp); @@ -1160,9 +1160,9 @@ bool CYSFControl::writeFile(const unsigned char* data) void CYSFControl::closeFile() { - if (m_fp != NULL) { + if (m_fp != nullptr) { ::fclose(m_fp); - m_fp = NULL; + m_fp = nullptr; } } @@ -1173,18 +1173,18 @@ bool CYSFControl::checkCallsign(const unsigned char* callsign) const void CYSFControl::processNetCallsigns(const unsigned char* data, unsigned char dgid) { - assert(data != NULL); + assert(data != nullptr); if (::memcmp(m_netSource, " ", 10U) == 0 || ::memcmp(m_netDest, " ", 10U) == 0) { if (::memcmp(m_netSource, " ", YSF_CALLSIGN_LENGTH) == 0) { unsigned char* source = m_netPayload.getSource(); - if (source != NULL) + if (source != nullptr) ::memcpy(m_netSource, source, YSF_CALLSIGN_LENGTH); } if (::memcmp(m_netDest, " ", YSF_CALLSIGN_LENGTH) == 0) { unsigned char* dest = m_netPayload.getDest(); - if (dest != NULL) + if (dest != nullptr) ::memcpy(m_netDest, dest, YSF_CALLSIGN_LENGTH); } @@ -1212,8 +1212,8 @@ void CYSFControl::enable(bool enabled) m_rfPayload.reset(); // These variables are free'd by YSFPayload - m_rfSource = NULL; - m_rfDest = NULL; + m_rfSource = nullptr; + m_rfDest = nullptr; // Reset the networking section m_netState = RPT_NET_STATE::IDLE; diff --git a/YSFConvolution.cpp b/YSFConvolution.cpp index c79bf2a..9b2afd0 100644 --- a/YSFConvolution.cpp +++ b/YSFConvolution.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2016,2021 by Jonathan Naylor G4KLX + * Copyright (C) 2009-2016,2021,2025 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 @@ -36,12 +36,12 @@ const uint32_t M = 2U; const unsigned int K = 5U; CYSFConvolution::CYSFConvolution() : -m_metrics1(NULL), -m_metrics2(NULL), -m_oldMetrics(NULL), -m_newMetrics(NULL), -m_decisions(NULL), -m_dp(NULL) +m_metrics1(nullptr), +m_metrics2(nullptr), +m_oldMetrics(nullptr), +m_newMetrics(nullptr), +m_decisions(nullptr), +m_dp(nullptr) { m_metrics1 = new uint16_t[20U]; m_metrics2 = new uint16_t[20U]; @@ -98,7 +98,7 @@ void CYSFConvolution::decode(uint8_t s0, uint8_t s1) unsigned int CYSFConvolution::chainback(unsigned char* out, unsigned int nBits) { - assert(out != NULL); + assert(out != nullptr); uint32_t state = 0U; @@ -124,8 +124,8 @@ unsigned int CYSFConvolution::chainback(unsigned char* out, unsigned int nBits) void CYSFConvolution::encode(const unsigned char* in, unsigned char* out, unsigned int nBits) const { - assert(in != NULL); - assert(out != NULL); + assert(in != nullptr); + assert(out != nullptr); assert(nBits > 0U); uint8_t d1 = 0U, d2 = 0U, d3 = 0U, d4 = 0U; diff --git a/YSFFICH.cpp b/YSFFICH.cpp index cbe3175..13d127d 100644 --- a/YSFFICH.cpp +++ b/YSFFICH.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016,2017,2019,2020,2021 by Jonathan Naylor G4KLX + * Copyright (C) 2016,2017,2019,2020,2021,2025 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 @@ -55,7 +55,7 @@ const unsigned int INTERLEAVE_TABLE[] = { 38U, 78U, 118U, 158U, 198U}; CYSFFICH::CYSFFICH(const CYSFFICH& fich) : -m_fich(NULL) +m_fich(nullptr) { m_fich = new unsigned char[6U]; @@ -63,7 +63,7 @@ m_fich(NULL) } CYSFFICH::CYSFFICH() : -m_fich(NULL) +m_fich(nullptr) { m_fich = new unsigned char[6U]; @@ -77,7 +77,7 @@ CYSFFICH::~CYSFFICH() bool CYSFFICH::decode(const unsigned char* bytes) { - assert(bytes != NULL); + assert(bytes != nullptr); // Skip the sync bytes bytes += YSF_SYNC_LENGTH_BYTES; @@ -120,7 +120,7 @@ bool CYSFFICH::decode(const unsigned char* bytes) void CYSFFICH::encode(unsigned char* bytes) { - assert(bytes != NULL); + assert(bytes != nullptr); // Skip the sync bytes bytes += YSF_SYNC_LENGTH_BYTES; diff --git a/YSFNetwork.cpp b/YSFNetwork.cpp index d41d651..d300415 100644 --- a/YSFNetwork.cpp +++ b/YSFNetwork.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2014,2016,2019,2020,2021 by Jonathan Naylor G4KLX + * Copyright (C) 2009-2014,2016,2019,2020,2021,2025 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 @@ -37,7 +37,7 @@ m_debug(debug), m_enabled(false), m_buffer(1000U, "YSF Network"), m_pollTimer(1000U, 5U), -m_tag(NULL) +m_tag(nullptr) { m_callsign = callsign; m_callsign.resize(YSF_CALLSIGN_LENGTH, ' '); @@ -70,7 +70,7 @@ bool CYSFNetwork::open() bool CYSFNetwork::write(const unsigned char* src, const unsigned char* dest, const unsigned char* data, unsigned int count, bool end) { - assert(data != NULL); + assert(data != nullptr); unsigned char buffer[200U]; @@ -82,12 +82,12 @@ bool CYSFNetwork::write(const unsigned char* src, const unsigned char* dest, con for (unsigned int i = 0U; i < YSF_CALLSIGN_LENGTH; i++) buffer[i + 4U] = m_callsign.at(i); - if (src != NULL) + if (src != nullptr) ::memcpy(buffer + 14U, src, YSF_CALLSIGN_LENGTH); else ::memset(buffer + 14U, ' ', YSF_CALLSIGN_LENGTH); - if (dest != NULL) + if (dest != nullptr) ::memcpy(buffer + 24U, dest, YSF_CALLSIGN_LENGTH); else ::memset(buffer + 24U, ' ', YSF_CALLSIGN_LENGTH); @@ -168,7 +168,7 @@ void CYSFNetwork::clock(unsigned int ms) unsigned int CYSFNetwork::read(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); if (m_buffer.isEmpty()) return 0U; diff --git a/YSFPayload.cpp b/YSFPayload.cpp index f0fa17f..cc9dc9a 100644 --- a/YSFPayload.cpp +++ b/YSFPayload.cpp @@ -1,5 +1,5 @@ /* -* Copyright (C) 2016,2017,2020 Jonathan Naylor, G4KLX +* Copyright (C) 2016,2017,2020,2025 Jonathan Naylor, G4KLX * Copyright (C) 2016 Mathias Weyland, HB9FRV * * This program is free software; you can redistribute it and/or modify @@ -84,10 +84,10 @@ const unsigned char BIT_MASK_TABLE[] = {0x80U, 0x40U, 0x20U, 0x10U, 0x08U, 0x04U #define READ_BIT1(p,i) (p[(i)>>3] & BIT_MASK_TABLE[(i)&7]) CYSFPayload::CYSFPayload() : -m_uplink(NULL), -m_downlink(NULL), -m_source(NULL), -m_dest(NULL), +m_uplink(nullptr), +m_downlink(nullptr), +m_source(nullptr), +m_dest(nullptr), m_fec() { } @@ -102,7 +102,7 @@ CYSFPayload::~CYSFPayload() bool CYSFPayload::processHeaderData(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); data += YSF_SYNC_LENGTH_BYTES + YSF_FICH_LENGTH_BYTES; @@ -136,12 +136,12 @@ bool CYSFPayload::processHeaderData(unsigned char* data) for (unsigned int i = 0U; i < 20U; i++) output[i] ^= WHITENING_DATA[i]; - if (m_dest == NULL) { + if (m_dest == nullptr) { m_dest = new unsigned char[YSF_CALLSIGN_LENGTH]; ::memcpy(m_dest, output + 0U, YSF_CALLSIGN_LENGTH); } - if (m_source == NULL) { + if (m_source == nullptr) { m_source = new unsigned char[YSF_CALLSIGN_LENGTH]; ::memcpy(m_source, output + YSF_CALLSIGN_LENGTH, YSF_CALLSIGN_LENGTH); } @@ -206,10 +206,10 @@ bool CYSFPayload::processHeaderData(unsigned char* data) for (unsigned int i = 0U; i < 20U; i++) output[i] ^= WHITENING_DATA[i]; - if (m_downlink != NULL) + if (m_downlink != nullptr) ::memcpy(output + 0U, m_downlink, YSF_CALLSIGN_LENGTH); - if (m_uplink != NULL) + if (m_uplink != nullptr) ::memcpy(output + YSF_CALLSIGN_LENGTH, m_uplink, YSF_CALLSIGN_LENGTH); for (unsigned int i = 0U; i < 20U; i++) @@ -251,7 +251,7 @@ bool CYSFPayload::processHeaderData(unsigned char* data) unsigned int CYSFPayload::processVDMode1Audio(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); data += YSF_SYNC_LENGTH_BYTES + YSF_FICH_LENGTH_BYTES; @@ -268,7 +268,7 @@ unsigned int CYSFPayload::processVDMode1Audio(unsigned char* data) bool CYSFPayload::processVDMode1Data(unsigned char* data, unsigned char fn, bool gateway) { - assert(data != NULL); + assert(data != nullptr); data += YSF_SYNC_LENGTH_BYTES + YSF_FICH_LENGTH_BYTES; @@ -304,12 +304,12 @@ bool CYSFPayload::processVDMode1Data(unsigned char* data, unsigned char fn, bool switch (fn) { case 0U: - if (m_dest == NULL) { + if (m_dest == nullptr) { m_dest = new unsigned char[YSF_CALLSIGN_LENGTH]; ::memcpy(m_dest, output + 0U, YSF_CALLSIGN_LENGTH); } - if (m_source == NULL) { + if (m_source == nullptr) { m_source = new unsigned char[YSF_CALLSIGN_LENGTH]; ::memcpy(m_source, output + YSF_CALLSIGN_LENGTH, YSF_CALLSIGN_LENGTH); } @@ -317,10 +317,10 @@ bool CYSFPayload::processVDMode1Data(unsigned char* data, unsigned char fn, bool break; case 1U: - if (m_downlink != NULL && !gateway) + if (m_downlink != nullptr && !gateway) ::memcpy(output + 0U, m_downlink, YSF_CALLSIGN_LENGTH); - if (m_uplink != NULL && !gateway) + if (m_uplink != nullptr && !gateway) ::memcpy(output + YSF_CALLSIGN_LENGTH, m_uplink, YSF_CALLSIGN_LENGTH); break; @@ -388,7 +388,7 @@ bool CYSFPayload::processVDMode1Data(unsigned char* data, unsigned char fn, bool unsigned int CYSFPayload::processVDMode2Audio(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); data += YSF_SYNC_LENGTH_BYTES + YSF_FICH_LENGTH_BYTES; @@ -466,7 +466,7 @@ unsigned int CYSFPayload::processVDMode2Audio(unsigned char* data) bool CYSFPayload::processVDMode2Data(unsigned char* data, unsigned char fn, bool gateway) { - assert(data != NULL); + assert(data != nullptr); data += YSF_SYNC_LENGTH_BYTES + YSF_FICH_LENGTH_BYTES; @@ -502,26 +502,26 @@ bool CYSFPayload::processVDMode2Data(unsigned char* data, unsigned char fn, bool switch (fn) { case 0U: - if (m_dest == NULL) { + if (m_dest == nullptr) { m_dest = new unsigned char[YSF_CALLSIGN_LENGTH]; ::memcpy(m_dest, output, YSF_CALLSIGN_LENGTH); } break; case 1U: - if (m_source == NULL) { + if (m_source == nullptr) { m_source = new unsigned char[YSF_CALLSIGN_LENGTH]; ::memcpy(m_source, output, YSF_CALLSIGN_LENGTH); } break; case 2U: - if (m_downlink != NULL && !gateway) + if (m_downlink != nullptr && !gateway) ::memcpy(output, m_downlink, YSF_CALLSIGN_LENGTH); break; case 3U: - if (m_uplink != NULL && !gateway) + if (m_uplink != nullptr && !gateway) ::memcpy(output, m_uplink, YSF_CALLSIGN_LENGTH); break; @@ -576,7 +576,7 @@ bool CYSFPayload::processVDMode2Data(unsigned char* data, unsigned char fn, bool bool CYSFPayload::processDataFRModeData(unsigned char* data, unsigned char fn, bool gateway) { - assert(data != NULL); + assert(data != nullptr); data += YSF_SYNC_LENGTH_BYTES + YSF_FICH_LENGTH_BYTES; @@ -614,12 +614,12 @@ bool CYSFPayload::processDataFRModeData(unsigned char* data, unsigned char fn, b case 0U: // CUtils::dump(1U, "FR Mode Data, CSD1", output, 20U); - if (m_dest == NULL) { + if (m_dest == nullptr) { m_dest = new unsigned char[YSF_CALLSIGN_LENGTH]; ::memcpy(m_dest, output + 0U, YSF_CALLSIGN_LENGTH); } - if (m_source == NULL) { + if (m_source == nullptr) { m_source = new unsigned char[YSF_CALLSIGN_LENGTH]; ::memcpy(m_source, output + YSF_CALLSIGN_LENGTH, YSF_CALLSIGN_LENGTH); } @@ -722,10 +722,10 @@ bool CYSFPayload::processDataFRModeData(unsigned char* data, unsigned char fn, b case 0U: // CUtils::dump(1U, "FR Mode Data, CSD2", output, 20U); - if (m_downlink != NULL && !gateway) + if (m_downlink != nullptr && !gateway) ::memcpy(output + 0U, m_downlink, YSF_CALLSIGN_LENGTH); - if (m_uplink != NULL && !gateway) + if (m_uplink != nullptr && !gateway) ::memcpy(output + YSF_CALLSIGN_LENGTH, m_uplink, YSF_CALLSIGN_LENGTH); break; @@ -801,7 +801,7 @@ bool CYSFPayload::processDataFRModeData(unsigned char* data, unsigned char fn, b unsigned int CYSFPayload::processVoiceFRModeAudio2(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); data += YSF_SYNC_LENGTH_BYTES + YSF_FICH_LENGTH_BYTES; @@ -815,7 +815,7 @@ unsigned int CYSFPayload::processVoiceFRModeAudio2(unsigned char* data) unsigned int CYSFPayload::processVoiceFRModeAudio5(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); data += YSF_SYNC_LENGTH_BYTES + YSF_FICH_LENGTH_BYTES; @@ -832,7 +832,7 @@ unsigned int CYSFPayload::processVoiceFRModeAudio5(unsigned char* data) bool CYSFPayload::processVoiceFRModeData(unsigned char* data) { - assert(data != NULL); + assert(data != nullptr); data += YSF_SYNC_LENGTH_BYTES + YSF_FICH_LENGTH_BYTES; @@ -888,9 +888,9 @@ bool CYSFPayload::processVoiceFRModeData(unsigned char* data) void CYSFPayload::writeHeader(unsigned char* data, const unsigned char* csd1, const unsigned char* csd2) { - assert(data != NULL); - assert(csd1 != NULL); - assert(csd2 != NULL); + assert(data != nullptr); + assert(csd1 != nullptr); + assert(csd2 != nullptr); writeDataFRModeData1(csd1, data); @@ -899,8 +899,8 @@ void CYSFPayload::writeHeader(unsigned char* data, const unsigned char* csd1, co void CYSFPayload::writeDataFRModeData1(const unsigned char* dt, unsigned char* data) { - assert(dt != NULL); - assert(data != NULL); + assert(dt != nullptr); + assert(data != nullptr); data += YSF_SYNC_LENGTH_BYTES + YSF_FICH_LENGTH_BYTES; @@ -943,8 +943,8 @@ void CYSFPayload::writeDataFRModeData1(const unsigned char* dt, unsigned char* d void CYSFPayload::writeDataFRModeData2(const unsigned char* dt, unsigned char* data) { - assert(dt != NULL); - assert(data != NULL); + assert(dt != nullptr); + assert(data != nullptr); data += YSF_SYNC_LENGTH_BYTES + YSF_FICH_LENGTH_BYTES; @@ -1022,6 +1022,6 @@ void CYSFPayload::reset() delete[] m_source; delete[] m_dest; - m_source = NULL; - m_dest = NULL; + m_source = nullptr; + m_dest = nullptr; }