g4klx/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost.git synced 2026-04-08 16:03:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Clean ups from merging from master.

Browse source
This commit is contained in:
Jonathan Naylor 2025-03-14 16:11:04 +00:00
parent 62c33086ca
commit 3109cd03ae
31 changed files with 844 additions and 837 deletions
Download patch file Download diff file Expand all files Collapse all files

42
DMRNetwork.cpp
View file

@ -37,7 +37,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),
@ -46,8 +46,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(),
@ -154,7 +154,7 @@ bool CDMRNetwork::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);
@ -217,7 +217,7 @@ bool CDMRNetwork::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;
@ -346,16 +346,16 @@ bool CDMRNetwork::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:
@ -366,37 +366,37 @@ bool CDMRNetwork::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:
@ -431,7 +431,7 @@ bool CDMRNetwork::wantsBeacon()
bool CDMRNetwork::write(const unsigned char* data, unsigned int length)
{
assert(data != NULL);
assert(data != nullptr);
assert(length > 0U);
if (m_debug)