mirror of
https://github.com/g4klx/MMDVMHost.git
synced 2026-04-05 14:35:31 +00:00
Merge branch 'mqtt' into mqtt_plus
This commit is contained in:
Jonathan Naylor
commit
b6383c8c18
11 changed files with 691 additions and 341 deletions
156
P25Control.cpp
156
P25Control.cpp
|
|
@ -1,6 +1,6 @@
|
|||
/*
|
||||
* Copyright (C) 2016-2019,2021,2023 by Jonathan Naylor G4KLX
|
||||
* Copyright (C) 2018 by Bryan Biedenkapp <gatekeep@gmail.com>
|
||||
* Copyright (C) 2016-2019,2021,2023,2024 by Jonathan Naylor G4KLX
|
||||
* Copyright (C) 2018 by Bryan Biedenkapp <gatekeep@gmail.com> 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
|
||||
|
|
@ -59,6 +59,7 @@ m_networkWatchdog(1000U, 0U, 1500U),
|
|||
m_rfFrames(0U),
|
||||
m_rfBits(0U),
|
||||
m_rfErrs(0U),
|
||||
// m_rfUndecodableLC(0U),
|
||||
m_netFrames(0U),
|
||||
m_netLost(0U),
|
||||
m_rfDataFrames(0U),
|
||||
|
|
@ -66,6 +67,8 @@ m_nid(nac),
|
|||
m_lastDUID(P25_DUID_TERM),
|
||||
m_audio(),
|
||||
m_rfData(),
|
||||
// m_rfLastLDU1(),
|
||||
// m_rfLastLDU2(),
|
||||
m_netData(),
|
||||
m_rfLSD(),
|
||||
m_netLSD(),
|
||||
|
|
@ -139,6 +142,8 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len)
|
|||
writeJSONRF("lost", float(m_rfFrames) / 5.56F, float(m_rfErrs * 100U) / float(m_rfBits));
|
||||
}
|
||||
|
||||
// LogMessage("P25, total frames: %d, bits: %d, undecodable LC: %d, errors: %d, BER: %.4f%%", m_rfFrames, m_rfBits, m_rfUndecodableLC, m_rfErrs, float(m_rfErrs * 100U) / float(m_rfBits));
|
||||
|
||||
writeNetwork(m_rfLDU, m_lastDUID, true);
|
||||
writeNetwork(data + 2U, P25_DUID_TERM, true);
|
||||
m_rfState = RS_RF_LISTENING;
|
||||
|
|
@ -173,21 +178,21 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len)
|
|||
unsigned char duid = m_nid.getDUID();
|
||||
if (!valid) {
|
||||
switch (m_lastDUID) {
|
||||
case P25_DUID_HEADER:
|
||||
case P25_DUID_LDU2:
|
||||
duid = P25_DUID_LDU1;
|
||||
break;
|
||||
case P25_DUID_LDU1:
|
||||
duid = P25_DUID_LDU2;
|
||||
break;
|
||||
case P25_DUID_PDU:
|
||||
duid = P25_DUID_PDU;
|
||||
break;
|
||||
case P25_DUID_TSDU:
|
||||
duid = P25_DUID_TSDU;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
case P25_DUID_HEADER:
|
||||
case P25_DUID_LDU2:
|
||||
duid = P25_DUID_LDU1;
|
||||
break;
|
||||
case P25_DUID_LDU1:
|
||||
duid = P25_DUID_LDU2;
|
||||
break;
|
||||
case P25_DUID_PDU:
|
||||
duid = P25_DUID_PDU;
|
||||
break;
|
||||
case P25_DUID_TSDU:
|
||||
duid = P25_DUID_TSDU;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -214,7 +219,21 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len)
|
|||
m_rssiCount++;
|
||||
}
|
||||
|
||||
if (duid == P25_DUID_LDU1) {
|
||||
if (duid == P25_DUID_HEADER) {
|
||||
if (m_rfState == RS_RF_LISTENING) {
|
||||
m_rfData.reset();
|
||||
bool ret = m_rfData.decodeHeader(data + 2U);
|
||||
if (!ret) {
|
||||
m_lastDUID = duid;
|
||||
return false;
|
||||
}
|
||||
|
||||
LogMessage("P25, received RF header");
|
||||
|
||||
m_lastDUID = duid;
|
||||
return true;
|
||||
}
|
||||
} else if (duid == P25_DUID_LDU1) {
|
||||
if (m_rfState == RS_RF_LISTENING) {
|
||||
m_rfData.reset();
|
||||
bool ret = m_rfData.decodeLDU1(data + 2U);
|
||||
|
|
@ -274,6 +293,16 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len)
|
|||
}
|
||||
|
||||
if (m_rfState == RS_RF_AUDIO) {
|
||||
/*
|
||||
bool ret = m_rfData.decodeLDU1(data + 2U);
|
||||
if (!ret) {
|
||||
LogWarning("P25, LDU1 undecodable LC, using last LDU1 LC");
|
||||
m_rfData = m_rfLastLDU1;
|
||||
m_rfUndecodableLC++;
|
||||
} else {
|
||||
m_rfLastLDU1 = m_rfData;
|
||||
}
|
||||
*/
|
||||
// Regenerate Sync
|
||||
CSync::addP25Sync(data + 2U);
|
||||
|
||||
|
|
@ -299,7 +328,7 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len)
|
|||
m_bitErrsAccum += errors;
|
||||
writeJSONBER();
|
||||
|
||||
// Add busy bits
|
||||
// Add busy bits, inbound busy
|
||||
addBusyBits(data + 2U, P25_LDU_FRAME_LENGTH_BITS, false, true);
|
||||
|
||||
::memcpy(m_rfLDU, data + 2U, P25_LDU_FRAME_LENGTH_BYTES);
|
||||
|
|
@ -316,6 +345,16 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len)
|
|||
}
|
||||
} else if (duid == P25_DUID_LDU2) {
|
||||
if (m_rfState == RS_RF_AUDIO) {
|
||||
/*
|
||||
bool ret = m_rfData.decodeLDU2(data + 2U);
|
||||
if (!ret) {
|
||||
LogWarning("P25, LDU2 undecodable LC, using last LDU2 LC");
|
||||
m_rfData = m_rfLastLDU2;
|
||||
m_rfUndecodableLC++;
|
||||
} else {
|
||||
m_rfLastLDU2 = m_rfData;
|
||||
}
|
||||
*/
|
||||
writeNetwork(m_rfLDU, m_lastDUID, false);
|
||||
|
||||
// Regenerate Sync
|
||||
|
|
@ -343,7 +382,7 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len)
|
|||
m_bitErrsAccum += errors;
|
||||
writeJSONBER();
|
||||
|
||||
// Add busy bits
|
||||
// Add busy bits, inbound busy
|
||||
addBusyBits(data + 2U, P25_LDU_FRAME_LENGTH_BITS, false, true);
|
||||
|
||||
::memcpy(m_rfLDU, data + 2U, P25_LDU_FRAME_LENGTH_BYTES);
|
||||
|
|
@ -392,8 +431,8 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len)
|
|||
// Regenerate TDULC Data
|
||||
m_rfData.encodeTSDU(data + 2U);
|
||||
|
||||
// Add busy bits
|
||||
addBusyBits(data + 2U, P25_TSDU_FRAME_LENGTH_BITS, true, false);
|
||||
// Add busy bits, inbound busy
|
||||
addBusyBits(data + 2U, P25_TSDU_FRAME_LENGTH_BITS, false, true);
|
||||
|
||||
// Set first busy bits to 1,1
|
||||
setBusyBits(data + 2U, P25_SS0_START, true, true);
|
||||
|
|
@ -418,8 +457,8 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len)
|
|||
// Regenerate TDULC Data
|
||||
m_rfData.encodeTSDU(data + 2U);
|
||||
|
||||
// Add busy bits
|
||||
addBusyBits(data + 2U, P25_TSDU_FRAME_LENGTH_BITS, true, false);
|
||||
// Add busy bits, inbound busy
|
||||
addBusyBits(data + 2U, P25_TSDU_FRAME_LENGTH_BITS, false, true);
|
||||
|
||||
// Set first busy bits to 1,1
|
||||
setBusyBits(data + 2U, P25_SS0_START, true, true);
|
||||
|
|
@ -450,7 +489,7 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len)
|
|||
// Regenerate NID
|
||||
m_nid.encode(data + 2U, P25_DUID_TERM);
|
||||
|
||||
// Add busy bits
|
||||
// Add busy bits, inbound busy
|
||||
addBusyBits(data + 2U, P25_TERM_FRAME_LENGTH_BITS, false, true);
|
||||
|
||||
bool grp = m_rfData.getLCF() == P25_LCF_GROUP;
|
||||
|
|
@ -471,6 +510,8 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len)
|
|||
writeJSONRF("end", float(m_rfFrames) / 5.56F, float(m_rfErrs * 100U) / float(m_rfBits));
|
||||
}
|
||||
|
||||
// LogMessage("P25, total frames: %d, bits: %d, undecodable LC: %d, errors: %d, BER: %.4f%%", m_rfFrames, m_rfBits, m_rfUndecodableLC, m_rfErrs, float(m_rfErrs * 100U) / float(m_rfBits));
|
||||
|
||||
writeNetwork(data + 2U, P25_DUID_TERM, true);
|
||||
|
||||
if (m_duplex) {
|
||||
|
|
@ -563,7 +604,7 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len)
|
|||
// Regenerate NID
|
||||
m_nid.encode(pdu + 2U, P25_DUID_PDU);
|
||||
|
||||
// Add busy bits
|
||||
// Add busy bits, inbound busy
|
||||
addBusyBits(pdu + 2U, newBitLength, false, true);
|
||||
|
||||
if (m_duplex) {
|
||||
|
|
@ -783,23 +824,23 @@ void CP25Control::writeNetwork(const unsigned char *data, unsigned char type, bo
|
|||
|
||||
switch (type)
|
||||
{
|
||||
case P25_DUID_LDU1:
|
||||
m_network->writeLDU1(data, m_rfData, m_rfLSD, end);
|
||||
break;
|
||||
case P25_DUID_LDU2:
|
||||
m_network->writeLDU2(data, m_rfData, m_rfLSD, end);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
case P25_DUID_LDU1:
|
||||
m_network->writeLDU1(data, m_rfData, m_rfLSD, end);
|
||||
break;
|
||||
case P25_DUID_LDU2:
|
||||
m_network->writeLDU2(data, m_rfData, m_rfLSD, end);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void CP25Control::setBusyBits(unsigned char* data, unsigned int ssOffset, bool b1, bool b2)
|
||||
{
|
||||
assert(data != NULL);
|
||||
assert(data != NULL);
|
||||
|
||||
WRITE_BIT(data, ssOffset, b1);
|
||||
WRITE_BIT(data, ssOffset + 1U, b2);
|
||||
WRITE_BIT(data, ssOffset, b1);
|
||||
WRITE_BIT(data, ssOffset + 1U, b2);
|
||||
}
|
||||
|
||||
void CP25Control::addBusyBits(unsigned char* data, unsigned int length, bool b1, bool b2)
|
||||
|
|
@ -820,8 +861,8 @@ void CP25Control::checkNetLDU1()
|
|||
|
||||
// Check for an unflushed LDU1
|
||||
if (m_netLDU1[0U] != 0x00U || m_netLDU1[25U] != 0x00U || m_netLDU1[50U] != 0x00U ||
|
||||
m_netLDU1[75U] != 0x00U || m_netLDU1[100U] != 0x00U || m_netLDU1[125U] != 0x00U ||
|
||||
m_netLDU1[150U] != 0x00U || m_netLDU1[175U] != 0x00U || m_netLDU1[200U] != 0x00U)
|
||||
m_netLDU1[75U] != 0x00U || m_netLDU1[100U] != 0x00U || m_netLDU1[125U] != 0x00U ||
|
||||
m_netLDU1[150U] != 0x00U || m_netLDU1[175U] != 0x00U || m_netLDU1[200U] != 0x00U)
|
||||
createNetLDU1();
|
||||
}
|
||||
|
||||
|
|
@ -832,8 +873,8 @@ void CP25Control::checkNetLDU2()
|
|||
|
||||
// Check for an unflushed LDU1
|
||||
if (m_netLDU2[0U] != 0x00U || m_netLDU2[25U] != 0x00U || m_netLDU2[50U] != 0x00U ||
|
||||
m_netLDU2[75U] != 0x00U || m_netLDU2[100U] != 0x00U || m_netLDU2[125U] != 0x00U ||
|
||||
m_netLDU2[150U] != 0x00U || m_netLDU2[175U] != 0x00U || m_netLDU2[200U] != 0x00U)
|
||||
m_netLDU2[75U] != 0x00U || m_netLDU2[100U] != 0x00U || m_netLDU2[125U] != 0x00U ||
|
||||
m_netLDU2[150U] != 0x00U || m_netLDU2[175U] != 0x00U || m_netLDU2[200U] != 0x00U)
|
||||
createNetLDU2();
|
||||
}
|
||||
|
||||
|
|
@ -920,11 +961,14 @@ void CP25Control::createRFHeader()
|
|||
// Add the dummy header
|
||||
m_rfData.encodeHeader(buffer + 2U);
|
||||
|
||||
// Add busy bits
|
||||
// Add busy bits, inbound busy
|
||||
addBusyBits(buffer + 2U, P25_HDR_FRAME_LENGTH_BITS, false, true);
|
||||
|
||||
m_rfFrames = 0U;
|
||||
m_rfErrs = 0U;
|
||||
// m_rfUndecodableLC = 0U;
|
||||
// m_rfLastLDU1.reset();
|
||||
// m_rfLastLDU2.reset();
|
||||
m_rfBits = 1U;
|
||||
m_rfTimeout.start();
|
||||
m_lastDUID = P25_DUID_HEADER;
|
||||
|
|
@ -988,8 +1032,13 @@ void CP25Control::createNetHeader()
|
|||
|
||||
// Add busy bits
|
||||
if (m_remoteGateway)
|
||||
addBusyBits(buffer + 2U, P25_HDR_FRAME_LENGTH_BITS, false, false);
|
||||
// Add busy bits, inbound/outbound
|
||||
addBusyBits(buffer + 2U, P25_HDR_FRAME_LENGTH_BITS, true, false);
|
||||
else if (m_duplex)
|
||||
// Add busy bits, inbound idle
|
||||
addBusyBits(buffer + 2U, P25_HDR_FRAME_LENGTH_BITS, true, true);
|
||||
else
|
||||
// Add busy bits, inbound busy
|
||||
addBusyBits(buffer + 2U, P25_HDR_FRAME_LENGTH_BITS, false, true);
|
||||
|
||||
writeQueueNet(buffer, P25_HDR_FRAME_LENGTH_BYTES + 2U);
|
||||
|
|
@ -1032,8 +1081,13 @@ void CP25Control::createNetLDU1()
|
|||
|
||||
// Add busy bits
|
||||
if (m_remoteGateway)
|
||||
addBusyBits(buffer + 2U, P25_LDU_FRAME_LENGTH_BITS, false, false);
|
||||
// Add busy bits, inbound/outbound
|
||||
addBusyBits(buffer + 2U, P25_LDU_FRAME_LENGTH_BITS, true, false);
|
||||
else if (m_duplex)
|
||||
// Add busy bits, inbound idle
|
||||
addBusyBits(buffer + 2U, P25_LDU_FRAME_LENGTH_BITS, true, true);
|
||||
else
|
||||
// Add busy bits, inbound busy
|
||||
addBusyBits(buffer + 2U, P25_LDU_FRAME_LENGTH_BITS, false, true);
|
||||
|
||||
writeQueueNet(buffer, P25_LDU_FRAME_LENGTH_BYTES + 2U);
|
||||
|
|
@ -1080,8 +1134,13 @@ void CP25Control::createNetLDU2()
|
|||
|
||||
// Add busy bits
|
||||
if (m_remoteGateway)
|
||||
addBusyBits(buffer + 2U, P25_LDU_FRAME_LENGTH_BITS, false, false);
|
||||
// Add busy bits, inbound/outbound
|
||||
addBusyBits(buffer + 2U, P25_LDU_FRAME_LENGTH_BITS, true, false);
|
||||
else if (m_duplex)
|
||||
// Add busy bits, inbound idle
|
||||
addBusyBits(buffer + 2U, P25_LDU_FRAME_LENGTH_BITS, true, true);
|
||||
else
|
||||
// Add busy bits, inbound busy
|
||||
addBusyBits(buffer + 2U, P25_LDU_FRAME_LENGTH_BITS, false, true);
|
||||
|
||||
writeQueueNet(buffer, P25_LDU_FRAME_LENGTH_BYTES + 2U);
|
||||
|
|
@ -1107,8 +1166,13 @@ void CP25Control::createNetTerminator()
|
|||
|
||||
// Add busy bits
|
||||
if (m_remoteGateway)
|
||||
addBusyBits(buffer + 2U, P25_TERM_FRAME_LENGTH_BITS, false, false);
|
||||
// Add busy bits, inbound/outbound
|
||||
addBusyBits(buffer + 2U, P25_TERM_FRAME_LENGTH_BITS, true, false);
|
||||
else if (m_duplex)
|
||||
// Add busy bits, inbound idle
|
||||
addBusyBits(buffer + 2U, P25_TERM_FRAME_LENGTH_BITS, true, true);
|
||||
else
|
||||
// Add busy bits, inbound busy
|
||||
addBusyBits(buffer + 2U, P25_TERM_FRAME_LENGTH_BITS, false, true);
|
||||
|
||||
writeQueueNet(buffer, P25_TERM_FRAME_LENGTH_BYTES + 2U);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue