MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-21 06:55:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add more P25 status symbol values.

Browse Source
This commit is contained in:
Jonathan Naylor
2024-01-25 18:53:43 +00:00
parent 9a350c77a6
commit 9471e322ff
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
P25Control.cpp
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2016-2019,2021 by Jonathan Naylor G4KLX * Copyright (C) 2016-2019,2021,2024 by Jonathan Naylor G4KLX
* Copyright (C) 2018 by Bryan Biedenkapp <gatekeep@gmail.com> * Copyright (C) 2018 by Bryan Biedenkapp <gatekeep@gmail.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@@ -998,9 +998,12 @@ void CP25Control::createNetHeader()
if (m_remoteGateway) if (m_remoteGateway)
// Add busy bits, inbound/outbound // Add busy bits, inbound/outbound
addBusyBits(buffer + 2U, P25_HDR_FRAME_LENGTH_BITS, true, false); addBusyBits(buffer + 2U, P25_HDR_FRAME_LENGTH_BITS, true, false);
else else if (m_duplex)
// Add busy bits, inbound idle // Add busy bits, inbound idle
addBusyBits(buffer + 2U, P25_HDR_FRAME_LENGTH_BITS, true, true); 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); writeQueueNet(buffer, P25_HDR_FRAME_LENGTH_BYTES + 2U);
} }
@@ -1044,9 +1047,12 @@ void CP25Control::createNetLDU1()
if (m_remoteGateway) if (m_remoteGateway)
// Add busy bits, inbound/outbound // Add busy bits, inbound/outbound
addBusyBits(buffer + 2U, P25_LDU_FRAME_LENGTH_BITS, true, false); addBusyBits(buffer + 2U, P25_LDU_FRAME_LENGTH_BITS, true, false);
else else if (m_duplex)
// Add busy bits, inbound idle // Add busy bits, inbound idle
addBusyBits(buffer + 2U, P25_LDU_FRAME_LENGTH_BITS, true, true); 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); writeQueueNet(buffer, P25_LDU_FRAME_LENGTH_BYTES + 2U);
@@ -1094,9 +1100,12 @@ void CP25Control::createNetLDU2()
if (m_remoteGateway) if (m_remoteGateway)
// Add busy bits, inbound/outbound // Add busy bits, inbound/outbound
addBusyBits(buffer + 2U, P25_LDU_FRAME_LENGTH_BITS, true, false); addBusyBits(buffer + 2U, P25_LDU_FRAME_LENGTH_BITS, true, false);
else else if (m_duplex)
// Add busy bits, inbound idle // Add busy bits, inbound idle
addBusyBits(buffer + 2U, P25_LDU_FRAME_LENGTH_BITS, true, true); 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); writeQueueNet(buffer, P25_LDU_FRAME_LENGTH_BYTES + 2U);
@@ -1123,9 +1132,12 @@ void CP25Control::createNetTerminator()
if (m_remoteGateway) if (m_remoteGateway)
// Add busy bits, inbound/outbound // Add busy bits, inbound/outbound
addBusyBits(buffer + 2U, P25_TERM_FRAME_LENGTH_BITS, true, false); addBusyBits(buffer + 2U, P25_TERM_FRAME_LENGTH_BITS, true, false);
else else if (m_duplex)
// Add busy bits, inbound idle // Add busy bits, inbound idle
addBusyBits(buffer + 2U, P25_TERM_FRAME_LENGTH_BITS, true, true); 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); writeQueueNet(buffer, P25_TERM_FRAME_LENGTH_BYTES + 2U);