g4klx/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost.git synced 2026-04-21 06:13:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Mostly fixes for D-Star logging.

Browse source
This commit is contained in:
Jonathan Naylor 2026-04-16 13:48:18 +01:00
parent be804801ac
commit 47467bd880
4 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Conf.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2015-2025 by Jonathan Naylor G4KLX
* Copyright (C) 2015-2026 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
@ -22,6 +22,8 @@
#include <string>
#include <vector>
#include <cstdint>
class CConf
{
public:

4
DStarControl.cpp
View file

@ -846,7 +846,7 @@ void CDStarControl::writeNetworkData(unsigned char* data, unsigned int length)
if (m_netState == RPT_NET_STATE::AUDIO) {
unsigned char type = m_netSlowData.getType(false);
LogMessage("A D-Star, slow data type: 0x%02X 0x%02X %i", type, type & DSTAR_SLOW_DATA_TYPE_FASTDATA_MASK, m_netN);
// LogMessage("D-Star, slow data type: 0x%02X 0x%02X %i", type, type & DSTAR_SLOW_DATA_TYPE_FASTDATA_MASK, m_netN);
// as per specs chapter 6.1.3, this could be any value bewtween 0x81 and 0x9C as one fast data block can only contain 28 bytes 0x80 + 28d = 0x9C
if ((type & DSTAR_SLOW_DATA_TYPE_FASTDATA_MASK) == DSTAR_SLOW_DATA_TYPE_FASTDATA){
LogMessage("D-Star, starting fast data mode (Net)");
@ -918,8 +918,6 @@ void CDStarControl::writeNetworkData(unsigned char* data, unsigned int length)
m_netFrames++;
writeQueueDataNet(data + 1U);
} else {
CUtils::dump("D-Star, unknown data from network", data, DSTAR_FRAME_LENGTH_BYTES + 1U);
}
}

3
DStarSlowData.cpp
View file

@ -69,7 +69,7 @@ void CDStarSlowData::add(const unsigned char* data)
m_buffer[5U] = data[11U] ^ DSTAR_SCRAMBLER_BYTES[2U];
m_state = SDD_STATE::FIRST;
m_complete = true;
////CUtils::dump(1U, "D-Star slow data element", m_buffer, 6U);
//CUtils::dump(1U, "D-Star slow data element", m_buffer, 6U);
loadHeader();
loadText();
break;
@ -250,4 +250,3 @@ bool CDStarSlowData::isComplete() const
}
#endif

2
Version.h
View file

@ -19,6 +19,6 @@
#if !defined(VERSION_H)
#define VERSION_H
const char* VERSION = "20260407";
const char* VERSION = "20260416";
#endif