MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-23 00:35:53 +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

89
DStarSlowData.cpp
View File

@@ -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
@@ -29,13 +29,14 @@
#include <cstring>
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_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];
@@ -49,31 +50,40 @@ 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);
assert(data != nullptr);
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 != nullptr);
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)
return NULL;
return nullptr;
if (m_ptr >= 45U)
return NULL;
return nullptr;
::memcpy(m_header + m_ptr, m_buffer + 1U, 5U);
m_ptr += 5U;
@@ -91,30 +101,27 @@ CDStarHeader* CDStarSlowData::addHeader(const unsigned char* data)
if (!ret) {
if (m_ptr == 45U)
LogMessage("D-Star, invalid slow data header");
return NULL;
return nullptr;
}
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);
assert(data != nullptr);
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]) {
@@ -156,13 +163,13 @@ const unsigned char* CDStarSlowData::addText(const unsigned char* data)
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);
CUtils::dump(1U, "D-Star slow data text", m_text, 20U);
m_textBits = 0x00U;
@@ -174,20 +181,22 @@ 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;
}
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];
@@ -223,7 +232,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];
@@ -236,5 +245,15 @@ void CDStarSlowData::getSlowData(unsigned char* data)
}
}
unsigned char CDStarSlowData::getType() const
{
return m_type & DSTAR_SLOW_DATA_TYPE_MASK;
}
bool CDStarSlowData::isComplete() const
{
return m_complete;
}
#endif