Digital_Voice_Modem_Project
/
dvmhost
mirror of https://github.com/DVMProject/dvmhost.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

continue implementing DFSI; remove some header information (it was included incorrectly some cases);

Browse Source
Bryan Biedenkapp 4 years ago
parent af56a3562b
commit dd5bfa235b
23 changed files with 309 additions and 119 deletions
Show Stats Download Patch File Download Diff File

4
dmr/lc/PrivacyLC.cpp
Unescape View File

@ -6,10 +6,6 @@
* @package DVM / Host Software
*
*/
//
// Based on code from the MMDVMHost project. (https://github.com/g4klx/MMDVMHost)
// Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0)
//
/*
* Copyright (C) 2021 by Bryan Biedenkapp N2PLL
*

4
dmr/lc/PrivacyLC.h
Unescape View File

@ -6,10 +6,6 @@
* @package DVM / Host Software
*
*/
//
// Based on code from the MMDVMHost project. (https://github.com/g4klx/MMDVMHost)
// Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0)
//
/*
* Copyright (C) 2021 Bryan Biedenkapp N2PLL <gatekeep@gmail.com>
* Copyright (C) 2020-2021 by Bryan Biedenkapp N2PLL

4
host/setup/HostSetup.cpp
Unescape View File

@ -6,10 +6,6 @@
* @package DVM / Host Software
*
*/
//
// Based on code from the MMDVMCal project. (https://github.com/g4klx/MMDVMCal)
// Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0)
//
/*
* Copyright (C) 2021 by Bryan Biedenkapp N2PLL
*

4
host/setup/HostSetup.h
Unescape View File

@ -6,10 +6,6 @@
* @package DVM / Host Software
*
*/
//
// Based on code from the MMDVMCal project. (https://github.com/g4klx/MMDVMCal)
// Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0)
//
/*
* Copyright (C) 2021 by Bryan Biedenkapp N2PLL
*

4
lookups/IdenTableLookup.cpp
Unescape View File

@ -6,10 +6,6 @@
* @package DVM / Host Software
*
*/
//
// Based on code from the MMDVMHost project. (https://github.com/g4klx/MMDVMHost)
// Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0)
//
/*
* Copyright (C) 2018-2019 by Bryan Biedenkapp N2PLL
*

4
lookups/IdenTableLookup.h
Unescape View File

@ -6,10 +6,6 @@
* @package DVM / Host Software
*
*/
//
// Based on code from the MMDVMHost project. (https://github.com/g4klx/MMDVMHost)
// Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0)
//
/*
* Copyright (C) 2018-2019 by Bryan Biedenkapp N2PLL
*

4
lookups/LookupTable.h
Unescape View File

@ -6,10 +6,6 @@
* @package DVM / Host Software
*
*/
//
// Based on code from the MMDVMHost project. (https://github.com/g4klx/MMDVMHost)
// Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0)
//
/*
* Copyright (C) 2018-2019,2021 by Bryan Biedenkapp N2PLL
*

4
p25/SiteData.h
Unescape View File

@ -6,10 +6,6 @@
* @package DVM / Host Server
*
*/
//
// Based on code from the MMDVMHost project. (https://github.com/g4klx/MMDVMHost)
// Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0)
//
/*
* Copyright (C) 2018 by Bryan Biedenkapp N2PLL
*

4
p25/TrunkPacket.cpp
Unescape View File

@ -6,10 +6,6 @@
* @package DVM / Host Software
*
*/
//
// Based on code from the MMDVMHost project. (https://github.com/g4klx/MMDVMHost)
// Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0)
//
/*
* Copyright (C) 2017-2020 by Bryan Biedenkapp N2PLL
*

4
p25/TrunkPacket.h
Unescape View File

@ -6,10 +6,6 @@
* @package DVM / Host Software
*
*/
//
// Based on code from the MMDVMHost project. (https://github.com/g4klx/MMDVMHost)
// Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0)
//
/*
* Copyright (C) 2017-2019 by Bryan Biedenkapp N2PLL
*

4
p25/data/DataBlock.cpp
Unescape View File

@ -6,10 +6,6 @@
* @package DVM / Host Software
*
*/
//
// Based on code from the MMDVMHost project. (https://github.com/g4klx/MMDVMHost)
// Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0)
//
/*
* Copyright (C) 2018-2021 by Bryan Biedenkapp N2PLL
*

4
p25/data/DataBlock.h
Unescape View File

@ -6,10 +6,6 @@
* @package DVM / Host Software
*
*/
//
// Based on code from the MMDVMHost project. (https://github.com/g4klx/MMDVMHost)
// Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0)
//
/*
* Copyright (C) 2018-2021 by Bryan Biedenkapp N2PLL
*

4
p25/data/DataHeader.cpp
Unescape View File

@ -6,10 +6,6 @@
* @package DVM / Host Software
*
*/
//
// Based on code from the MMDVMHost project. (https://github.com/g4klx/MMDVMHost)
// Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0)
//
/*
* Copyright (C) 2018-2019 by Bryan Biedenkapp N2PLL
*

4
p25/data/DataHeader.h
Unescape View File

@ -6,10 +6,6 @@
* @package DVM / Host Software
*
*/
//
// Based on code from the MMDVMHost project. (https://github.com/g4klx/MMDVMHost)
// Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0)
//
/*
* Copyright (C) 2018 by Bryan Biedenkapp N2PLL
*

4
p25/data/DataRspHeader.cpp
Unescape View File

@ -6,10 +6,6 @@
* @package DVM / Host Software
*
*/
//
// Based on code from the MMDVMHost project. (https://github.com/g4klx/MMDVMHost)
// Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0)
//
/*
* Copyright (C) 2020 by Bryan Biedenkapp N2PLL
*

4
p25/data/DataRspHeader.h
Unescape View File

@ -6,10 +6,6 @@
* @package DVM / Host Software
*
*/
//
// Based on code from the MMDVMHost project. (https://github.com/g4klx/MMDVMHost)
// Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0)
//
/*
* Copyright (C) 2020 by Bryan Biedenkapp N2PLL
*

3
p25/dfsi/DFSIDefines.h
Unescape View File

@ -82,7 +82,8 @@ namespace p25
const uint8_t P25_DFSI_TYPE_VOICE = 0x0BU; //
const uint8_t P25_DFSI_TYPE_TSBK = 0x0FU; //
const uint8_t P25_DFSI_ICW_SOURCE = 0x00U; // Infrastructure Source - Default Source
const uint8_t P25_DFSI_DEF_ICW_SOURCE = 0x00U; // Infrastructure Source - Default Source
const uint8_t P25_DFSI_DEF_SOURCE = 0x00U; //
// Frame Type(s)
const uint8_t P25_DFSI_START_STOP = 0x00U; // Start/Stop

296
p25/dfsi/LC.cpp
Unescape View File

@ -6,13 +6,8 @@
* @package DVM / Host Software
*
*/
//
// Based on code from the MMDVMHost project. (https://github.com/g4klx/MMDVMHost)
// Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0)
//
/*
* Copyright (C) 2016,2017 by Jonathan Naylor G4KLX
* Copyright (C) 2017-2019 by Bryan Biedenkapp N2PLL
* Copyright (C) 2022 by Bryan Biedenkapp N2PLL
*
* 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
@ -54,7 +49,11 @@ LC::LC() :
m_rtModeFlag(P25_DFSI_RT_ENABLED),
m_startStopFlag(P25_DFSI_START_FLAG),
m_typeFlag(P25_DFSI_TYPE_VOICE),
m_icwFlag(P25_DFSI_DEF_ICW_SOURCE),
m_rssi(0U),
m_source(P25_DFSI_DEF_SOURCE),
m_control(),
m_tsbk(),
m_lsd()
{
/* stub */
@ -80,8 +79,13 @@ LC& LC::operator=(const LC& data)
m_rtModeFlag = data.m_rtModeFlag;
m_startStopFlag = data.m_startStopFlag;
m_typeFlag = data.m_typeFlag;
m_icwFlag = data.m_icwFlag;
m_rssi = data.m_rssi;
m_source = data.m_source;
m_control = data.m_control;
m_tsbk = data.m_tsbk;
m_lsd = data.m_lsd;
}
@ -99,7 +103,7 @@ bool LC::decodeNID(const uint8_t* data)
m_frameType = data[0U]; // Frame Type
return decodeStart(data);
return decodeStart(data + 1U);
}
/// <summary>
@ -110,11 +114,15 @@ void LC::encodeNID(uint8_t* data)
{
assert(data != NULL);
uint8_t raw[P25_DFSI_SS_FRAME_LENGTH_BYTES];
::memset(raw, 0x00U, P25_DFSI_SS_FRAME_LENGTH_BYTES);
uint8_t rawFrame[P25_DFSI_SS_FRAME_LENGTH_BYTES];
::memset(rawFrame, 0x00U, P25_DFSI_SS_FRAME_LENGTH_BYTES);
rawFrame[0U] = m_frameType; // Frame Type
// encode start record
encodeStart(rawFrame + 1U);
raw[0U] = m_frameType; // Frame Type
encodeStart(raw + 1U);
::memcpy(data, rawFrame, P25_DFSI_SS_FRAME_LENGTH_BYTES);
}
/// <summary>
@ -124,7 +132,17 @@ void LC::encodeNID(uint8_t* data)
/// <returns>True, if decoded, otherwise false.</returns>
bool LC::decodeVHDR1(const uint8_t* data)
{
// TODO TODO TODO
assert(data != NULL);
m_frameType = data[0U]; // Frame Type
if (!decodeStart(data + 1U)) {
LogError(LOG_P25, "LC::decodeVHDR1(), failed to decode start record");
return false;
}
m_icwFlag = data[5U]; // ICW Flag
m_rssi = data[6U]; // RSSI
return true;
}
@ -134,7 +152,20 @@ bool LC::decodeVHDR1(const uint8_t* data)
/// <param name="data"></param>
void LC::encodeVHDR1(uint8_t* data)
{
// TODO TODO TODO
assert(data != NULL);
uint8_t rawFrame[P25_DFSI_VHDR1_FRAME_LENGTH_BYTES];
::memset(rawFrame, 0x00U, P25_DFSI_VHDR1_FRAME_LENGTH_BYTES);
rawFrame[0U] = m_frameType; // Frame Type
// encode start record
encodeStart(rawFrame + 1U);
rawFrame[5U] = m_icwFlag; // ICW Flag
rawFrame[6U] = m_rssi; // RSSI
::memcpy(data, rawFrame, P25_DFSI_VHDR1_FRAME_LENGTH_BYTES);
}
/// <summary>
@ -144,7 +175,14 @@ void LC::encodeVHDR1(uint8_t* data)
/// <returns>True, if decoded, otherwise false.</returns>
bool LC::decodeVHDR2(const uint8_t* data)
{
// TODO TODO TODO
assert(data != NULL);
m_control = lc::LC();
m_frameType = data[0U]; // Frame Type
uint32_t dstId = (data[1U] << 16) | (data[2U] << 8) | (data[3U] << 0);
m_control.setDstId(dstId); // Talkgroup Address
return true;
}
@ -154,15 +192,27 @@ bool LC::decodeVHDR2(const uint8_t* data)
/// <param name="data"></param>
void LC::encodeVHDR2(uint8_t* data)
{
// TODO TODO TODO
assert(data != NULL);
uint8_t rawFrame[P25_DFSI_VHDR2_FRAME_LENGTH_BYTES];
::memset(rawFrame, 0x00U, P25_DFSI_VHDR2_FRAME_LENGTH_BYTES);
rawFrame[0U] = m_frameType; // Frame Type
rawFrame[1U] = (m_control.getDstId() >> 16) & 0xFFU; // Talkgroup Address
rawFrame[2U] = (m_control.getDstId() >> 8) & 0xFFU;
rawFrame[3U] = (m_control.getDstId() >> 0) & 0xFFU;
::memcpy(data, rawFrame, P25_DFSI_VHDR2_FRAME_LENGTH_BYTES);
}
/// <summary>
/// Decode a logical link data unit 1.
/// </summary>
/// <param name="data"></param>
/// <param name="imbe"></param>
/// <returns>True, if decoded, otherwise false.</returns>
bool LC::decodeLDU1(const uint8_t* data)
bool LC::decodeLDU1(const uint8_t* data, uint8_t* imbe)
{
// TODO TODO TODO
return true;
@ -172,17 +222,103 @@ bool LC::decodeLDU1(const uint8_t* data)
/// Encode a logical link data unit 1.
/// </summary>
/// <param name="data"></param>
void LC::encodeLDU1(uint8_t* data)
/// <param name="imbe"></param>
void LC::encodeLDU1(uint8_t* data, const uint8_t* imbe)
{
// TODO TODO TODO
assert(data != NULL);
// determine the LDU1 DFSI frame length, its variable
uint32_t frameLength = P25_DFSI_LDU1_VOICE1_FRAME_LENGTH_BYTES;
switch (m_frameType)
{
case P25_DFSI_LDU1_VOICE2:
frameLength = P25_DFSI_LDU1_VOICE2_FRAME_LENGTH_BYTES;
break;
case P25_DFSI_LDU1_VOICE3:
frameLength = P25_DFSI_LDU1_VOICE3_FRAME_LENGTH_BYTES;
break;
case P25_DFSI_LDU1_VOICE4:
frameLength = P25_DFSI_LDU1_VOICE4_FRAME_LENGTH_BYTES;
break;
case P25_DFSI_LDU1_VOICE5:
frameLength = P25_DFSI_LDU1_VOICE5_FRAME_LENGTH_BYTES;
break;
case P25_DFSI_LDU1_VOICE6:
frameLength = P25_DFSI_LDU1_VOICE6_FRAME_LENGTH_BYTES;
break;
case P25_DFSI_LDU1_VOICE7:
frameLength = P25_DFSI_LDU1_VOICE7_FRAME_LENGTH_BYTES;
break;
case P25_DFSI_LDU1_VOICE8:
frameLength = P25_DFSI_LDU1_VOICE8_FRAME_LENGTH_BYTES;
break;
case P25_DFSI_LDU1_VOICE9:
frameLength = P25_DFSI_LDU1_VOICE9_FRAME_LENGTH_BYTES;
break;
case P25_DFSI_LDU1_VOICE1:
default:
frameLength = P25_DFSI_LDU1_VOICE1_FRAME_LENGTH_BYTES;
break;
}
uint8_t rawFrame[frameLength];
::memset(rawFrame, 0x00U, frameLength);
rawFrame[0U] = m_frameType; // Frame Type
// different frame types mean different things
switch (m_frameType)
{
case P25_DFSI_LDU1_VOICE2:
// TODO TODO TODO
break;
case P25_DFSI_LDU1_VOICE3:
// TODO TODO TODO
break;
case P25_DFSI_LDU1_VOICE4:
// TODO TODO TODO
break;
case P25_DFSI_LDU1_VOICE5:
// TODO TODO TODO
break;
case P25_DFSI_LDU1_VOICE6:
// TODO TODO TODO
break;
case P25_DFSI_LDU1_VOICE7:
// TODO TODO TODO
break;
case P25_DFSI_LDU1_VOICE8:
// TODO TODO TODO
break;
case P25_DFSI_LDU1_VOICE9:
// TODO TODO TODO
break;
case P25_DFSI_LDU1_VOICE1:
default:
{
// encode start record
encodeStart(rawFrame + 1U);
rawFrame[5U] = m_icwFlag; // ICW Flag
rawFrame[6U] = m_rssi; // RSSI
// TODO TODO TODO
}
break;
}
::memcpy(data, rawFrame, frameLength);
}
/// <summary>
/// Decode a logical link data unit 2.
/// </summary>
/// <param name="data"></param>
/// <param name="imbe"></param>
/// <returns>True, if decoded, otherwise false.</returns>
bool LC::decodeLDU2(const uint8_t* data)
bool LC::decodeLDU2(const uint8_t* data, uint8_t* imbe)
{
// TODO TODO TODO
return true;
@ -192,16 +328,116 @@ bool LC::decodeLDU2(const uint8_t* data)
/// Encode a logical link data unit 2.
/// </summary>
/// <param name="data"></param>
void LC::encodeLDU2(uint8_t* data)
/// <param name="imbe"></param>
void LC::encodeLDU2(uint8_t* data, const uint8_t* imbe)
{
// TODO TODO TODO
assert(data != NULL);
// determine the LDU2 DFSI frame length, its variable
uint32_t frameLength = P25_DFSI_LDU2_VOICE10_FRAME_LENGTH_BYTES;
switch (m_frameType)
{
case P25_DFSI_LDU2_VOICE11:
frameLength = P25_DFSI_LDU2_VOICE11_FRAME_LENGTH_BYTES;
break;
case P25_DFSI_LDU2_VOICE12:
frameLength = P25_DFSI_LDU2_VOICE12_FRAME_LENGTH_BYTES;
break;
case P25_DFSI_LDU2_VOICE13:
frameLength = P25_DFSI_LDU2_VOICE13_FRAME_LENGTH_BYTES;
break;
case P25_DFSI_LDU2_VOICE14:
frameLength = P25_DFSI_LDU2_VOICE14_FRAME_LENGTH_BYTES;
break;
case P25_DFSI_LDU2_VOICE15:
frameLength = P25_DFSI_LDU2_VOICE15_FRAME_LENGTH_BYTES;
break;
case P25_DFSI_LDU2_VOICE16:
frameLength = P25_DFSI_LDU2_VOICE16_FRAME_LENGTH_BYTES;
break;
case P25_DFSI_LDU2_VOICE17:
frameLength = P25_DFSI_LDU2_VOICE17_FRAME_LENGTH_BYTES;
break;
case P25_DFSI_LDU2_VOICE18:
frameLength = P25_DFSI_LDU2_VOICE18_FRAME_LENGTH_BYTES;
break;
case P25_DFSI_LDU2_VOICE10:
default:
frameLength = P25_DFSI_LDU2_VOICE10_FRAME_LENGTH_BYTES;
break;
}
uint8_t rawFrame[frameLength];
::memset(rawFrame, 0x00U, frameLength);
rawFrame[0U] = m_frameType; // Frame Type
// different frame types mean different things
switch (m_frameType)
{
case P25_DFSI_LDU2_VOICE11:
// TODO TODO TODO
break;
case P25_DFSI_LDU2_VOICE12:
// TODO TODO TODO
break;
case P25_DFSI_LDU2_VOICE13:
// TODO TODO TODO
break;
case P25_DFSI_LDU2_VOICE14:
// TODO TODO TODO
break;
case P25_DFSI_LDU2_VOICE15:
// TODO TODO TODO
break;
case P25_DFSI_LDU2_VOICE16:
// TODO TODO TODO
break;
case P25_DFSI_LDU2_VOICE17:
// TODO TODO TODO
break;
case P25_DFSI_LDU2_VOICE18:
// TODO TODO TODO
break;
case P25_DFSI_LDU2_VOICE10:
default:
// TODO TODO TODO
break;
}
::memcpy(data, rawFrame, frameLength);
}
/// <summary>
/// Decode a logical link data unit 2.
/// </summary>
/// <param name="data"></param>
/// <param name="tsbk"></param>
/// <returns>True, if decoded, otherwise false.</returns>
bool LC::decodeTSBK(const uint8_t* data)
{
// TODO TODO TODO
return true;
}
/// <summary>
/// Encode a TSBK.
/// </summary>
/// <param name="data"></param>
/// <param name="tsbk"></param>
void LC::encodeTSBK(uint8_t* data, const uint8_t* tsbk)
{
// TODO TODO TODO
}
// ---------------------------------------------------------------------------
// Private Class Members
// ---------------------------------------------------------------------------
/// <summary>
/// Decode start data.
/// Decode start record data.
/// </summary>
/// <param name="data"></param>
/// <returns>True, if decoded, otherwise false.</returns>
@ -217,20 +453,20 @@ bool LC::decodeStart(const uint8_t* data)
}
/// <summary>
/// Encode start data.
/// Encode start record data.
/// </summary>
/// <param name="data"></param>
void LC::encodeStart(uint8_t* data)
{
assert(data != NULL);
uint8_t raw[P25_DFSI_START_LENGTH_BYTES];
::memset(raw, 0x00U, P25_DFSI_START_LENGTH_BYTES);
uint8_t rawFrame[P25_DFSI_START_LENGTH_BYTES];
::memset(rawFrame, 0x00U, P25_DFSI_START_LENGTH_BYTES);
raw[0U] = 0x02U;
raw[1U] = m_rtModeFlag; // RT Mode Flag
raw[2U] = m_startStopFlag; // Start/Stop Flag
raw[3U] = m_typeFlag; // Type flag
rawFrame[0U] = 0x02U;
rawFrame[1U] = m_rtModeFlag; // RT Mode Flag
rawFrame[2U] = m_startStopFlag; // Start/Stop Flag
rawFrame[3U] = m_typeFlag; // Type flag
::memcpy(data, raw, P25_DFSI_START_LENGTH_BYTES);
::memcpy(data, rawFrame, P25_DFSI_START_LENGTH_BYTES);
}

28
p25/dfsi/LC.h
Unescape View File

@ -29,6 +29,7 @@
#include "Defines.h"
#include "p25/data/LowSpeedData.h"
#include "p25/lc/LC.h"
#include "p25/lc/TSBK.h"
#include <string>
@ -67,14 +68,19 @@ namespace p25
void encodeVHDR2(uint8_t* data);
/// <summary>Decode a logical link data unit 1.</summary>
bool decodeLDU1(const uint8_t* data);
bool decodeLDU1(const uint8_t* data, uint8_t* imbe);
/// <summary>Encode a logical link data unit 1.</summary>
void encodeLDU1(uint8_t* data);
void encodeLDU1(uint8_t* data, const uint8_t* imbe);
/// <summary>Decode a logical link data unit 2.</summary>
bool decodeLDU2(const uint8_t* data);
bool decodeLDU2(const uint8_t* data, uint8_t* imbe);
/// <summary>Encode a logical link data unit 2.</summary>
void encodeLDU2(uint8_t* data);
void encodeLDU2(uint8_t* data, const uint8_t* imbe);
/// <summary>Decode a TSBK.</summary>
bool decodeTSBK(const uint8_t* data);
/// <summary>Encode a TSBK.</summary>
void encodeTSBK(uint8_t* data, const uint8_t* tsbk);
public:
/** Common Data */
@ -86,16 +92,26 @@ namespace p25
__PROPERTY(uint8_t, startStopFlag, StartStop);
/// <summary>Type Flag.</summary>
__PROPERTY(uint8_t, typeFlag, Type);
/// <summary>ICW Flag.</summary>
__PROPERTY(uint8_t, icwFlag, ICW);
/// <summary>RSSI.</summary>
__PROPERTY(uint8_t, rssi, RSSI);
/// <summary>Source.</summary>
__PROPERTY(uint8_t, source, Source);
/// <summary>Link control data.</summary>
__PROPERTY(p25::lc::LC, control, Control);
/// <summary>TSBK.</summary>
__PROPERTY(p25::lc::TSBK, tsbk, TSBK);
/// <summary>Low speed data.</summary>
__PROPERTY(p25::data::LowSpeedData, lsd, LSD);
private:
/// <summary>Decode start data.</summary>
/// <summary>Decode start record data.</summary>
bool decodeStart(const uint8_t* data);
/// <summary>Encode start data.</summary>
/// <summary>Encode start record data.</summary>
void encodeStart(uint8_t* data);
};
} // namespace dfsi

4
p25/lc/TDULC.cpp
Unescape View File

@ -6,10 +6,6 @@
* @package DVM / Host Software
*
*/
//
// Based on code from the MMDVMHost project. (https://github.com/g4klx/MMDVMHost)
// Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0)
//
/*
* Copyright (C) 2017-2019 by Bryan Biedenkapp N2PLL
*

5
p25/lc/TDULC.h
Unescape View File

@ -6,12 +6,7 @@
* @package DVM / Host Software
*
*/
//
// Based on code from the MMDVMHost project. (https://github.com/g4klx/MMDVMHost)
// Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0)
//
/*
* Copyright (C) 2016 by Jonathan Naylor G4KLX
* Copyright (C) 2017-2019 by Bryan Biedenkapp N2PLL
*
* This program is free software; you can redistribute it and/or modify

12
p25/lc/TSBK.cpp
Unescape View File

@ -6,10 +6,6 @@
* @package DVM / Host Software
*
*/
//
// Based on code from the MMDVMHost project. (https://github.com/g4klx/MMDVMHost)
// Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0)
//
/*
* Copyright (C) 2017-2020 by Bryan Biedenkapp N2PLL
*
@ -951,6 +947,14 @@ void TSBK::setCallsign(std::string callsign)
/// <summary>
/// Initializes a new instance of the TSBK class.
/// </summary>
/// <remarks>This should never be used.</remarks>
TSBK::TSBK() : TSBK(SiteData())
{
/* stub */
}
/// <summary>
/// Initializes a new instance of the TSBK class.
/// </summary>
/// <param name="siteData"></param>
TSBK::TSBK(SiteData siteData) :
m_verbose(false),

16
p25/lc/TSBK.h
Unescape View File

@ -6,12 +6,7 @@
* @package DVM / Host Software
*
*/
//
// Based on code from the MMDVMHost project. (https://github.com/g4klx/MMDVMHost)
// Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0)
//
/*
* Copyright (C) 2016 by Jonathan Naylor G4KLX
* Copyright (C) 2017-2020 by Bryan Biedenkapp N2PLL
*
* This program is free software; you can redistribute it and/or modify
@ -43,6 +38,14 @@
namespace p25
{
namespace dfsi
{
// ---------------------------------------------------------------------------
// Class Prototypes
// ---------------------------------------------------------------------------
class HOST_SW_API LC;
}
namespace lc
{
// ---------------------------------------------------------------------------
@ -193,9 +196,12 @@ namespace p25
__PROPERTY_PLAIN(lookups::IdenTable, siteIdenEntry, siteIdenEntry);
private:
/// <summary>Initializes a new instance of the TSBK class.</summary>
TSBK();
/// <summary>Initializes a new instance of the TSBK class.</summary>
TSBK(SiteData siteData);
friend class dfsi::LC;
friend class LC;
friend class TDULC;
edac::RS634717 m_rs;

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.