g4klx/DMRGateway
1
0
Fork 0
mirror of https://github.com/g4klx/DMRGateway.git synced 2026-04-07 07:23:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update the C++ code.

Browse source
This commit is contained in:
Jonathan Naylor 2025-03-15 17:03:06 +00:00
parent 29397cf65e
commit ec5c32b57a
63 changed files with 848 additions and 849 deletions
Download patch file Download diff file Expand all files Collapse all files

22
DMRCSBK.cpp
View file

@ -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
@ -25,8 +25,8 @@
#include <cassert>
CDMRCSBK::CDMRCSBK() :
m_data(NULL),
m_CSBKO(CSBKO_NONE)
m_data(nullptr),
m_CSBKO(CSBKO::NONE)
{
m_data = new unsigned char[12U];
}
@ -38,7 +38,7 @@ CDMRCSBK::~CDMRCSBK()
bool CDMRCSBK::put(const unsigned char* bytes)
{
assert(bytes != NULL);
assert(bytes != nullptr);
CBPTC19696 bptc;
bptc.decode(bytes, m_data);
@ -57,7 +57,7 @@ bool CDMRCSBK::put(const unsigned char* bytes)
void CDMRCSBK::get(unsigned char* bytes) const
{
assert(bytes != NULL);
assert(bytes != nullptr);
CCRC::addCCITT162(m_data, 12U);
@ -75,7 +75,7 @@ CSBKO CDMRCSBK::getCSBKO() const
bool CDMRCSBK::getGI() const
{
if (m_CSBKO == CSBKO_PRECCSBK)
if (m_CSBKO == CSBKO::PRECCSBK)
return (m_data[2U] & 0x40U) == 0x40U;
else
return false;
@ -83,7 +83,7 @@ bool CDMRCSBK::getGI() const
unsigned int CDMRCSBK::getSrcId() const
{
if (m_CSBKO == CSBKO_NACKRSP)
if (m_CSBKO == CSBKO::NACKRSP)
return m_data[4U] << 16 | m_data[5U] << 8 | m_data[6U];
else
return m_data[7U] << 16 | m_data[8U] << 8 | m_data[9U];
@ -91,7 +91,7 @@ unsigned int CDMRCSBK::getSrcId() const
unsigned int CDMRCSBK::getDstId() const
{
if (m_CSBKO == CSBKO_NACKRSP)
if (m_CSBKO == CSBKO::NACKRSP)
return m_data[7U] << 16 | m_data[8U] << 8 | m_data[9U];
else
return m_data[4U] << 16 | m_data[5U] << 8 | m_data[6U];
@ -99,7 +99,7 @@ unsigned int CDMRCSBK::getDstId() const
void CDMRCSBK::setGI(bool group)
{
if (m_CSBKO == CSBKO_PRECCSBK) {
if (m_CSBKO == CSBKO::PRECCSBK) {
if (group)
m_data[2U] |= 0x40U;
else
@ -109,7 +109,7 @@ void CDMRCSBK::setGI(bool group)
void CDMRCSBK::setSrcId(unsigned int id)
{
if (m_CSBKO == CSBKO_NACKRSP) {
if (m_CSBKO == CSBKO::NACKRSP) {
m_data[4U] = id >> 16;
m_data[5U] = id >> 8;
m_data[6U] = id >> 0;
@ -122,7 +122,7 @@ void CDMRCSBK::setSrcId(unsigned int id)
void CDMRCSBK::setDstId(unsigned int id)
{
if (m_CSBKO == CSBKO_NACKRSP) {
if (m_CSBKO == CSBKO::NACKRSP) {
m_data[7U] = id >> 16;
m_data[8U] = id >> 8;
m_data[9U] = id >> 0;