MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-23 08:45:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into mqtt

Browse Source
This commit is contained in:
Jonathan Naylor
2025-03-14 13:39:49 +00:00
parent 088a62789f cf15f42a0f
commit 62c33086ca
102 changed files with 1621 additions and 1489 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
DMRControl.cpp
View File

@@ -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
@@ -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))
@@ -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();
@@ -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) {