diff --git a/Conf.h b/Conf.h index cccac5d..a6813d8 100644 --- a/Conf.h +++ b/Conf.h @@ -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 #include +#include + class CConf { public: diff --git a/DStarControl.cpp b/DStarControl.cpp index 4534f06..945b541 100644 --- a/DStarControl.cpp +++ b/DStarControl.cpp @@ -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); } } diff --git a/DStarSlowData.cpp b/DStarSlowData.cpp index c2c2003..138e583 100644 --- a/DStarSlowData.cpp +++ b/DStarSlowData.cpp @@ -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 - diff --git a/Version.h b/Version.h index 84d01b1..81eb006 100644 --- a/Version.h +++ b/Version.h @@ -19,6 +19,6 @@ #if !defined(VERSION_H) #define VERSION_H -const char* VERSION = "20260407"; +const char* VERSION = "20260416"; #endif