Merge branch 'master' into mqtt

This commit is contained in:
Jonathan Naylor
2025-03-14 13:39:49 +00:00
102 changed files with 1621 additions and 1489 deletions

View File

@@ -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
@@ -27,7 +27,7 @@
#include <cstring>
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];
@@ -36,7 +36,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];
@@ -51,14 +51,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);
@@ -151,14 +151,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);
}
@@ -177,7 +177,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);
@@ -186,7 +186,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);
@@ -195,7 +195,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);
@@ -204,7 +204,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);