g4klx/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost.git synced 2025-12-06 05:32:00 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix the P25 PDU transmit length.

Browse source
This commit is contained in:
Jonathan Naylor 2018-01-17 07:59:40 +00:00
parent 082c2e1b1f
commit 2ffd831c98
3 changed files with 36 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
P25Control.cpp
View file

@ -414,6 +414,8 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len)
m_rfDataFrames = header[6U] & 0x7FU; m_rfDataFrames = header[6U] & 0x7FU;
m_display->writeP25("DATA", false, llId, "R"); m_display->writeP25("DATA", false, llId, "R");
m_display->writeP25RSSI(m_rssi);
LogMessage("P25, received RF data transmission to %u, %u blocks", llId, m_rfDataFrames); LogMessage("P25, received RF data transmission to %u, %u blocks", llId, m_rfDataFrames);
} else { } else {
m_rfPDUCount = 0U; m_rfPDUCount = 0U;
@ -457,7 +459,10 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len)
unsigned char pdu[1024U]; unsigned char pdu[1024U];
// Add the data // Add the data
CP25Utils::encode(m_rfPDU, pdu + 2U, 0U, bitLength); unsigned int newBitLength = CP25Utils::encode(m_rfPDU, pdu + 2U, bitLength);
unsigned int newByteLength = newBitLength / 8U;
if ((newBitLength % 8U) > 0U)
newByteLength++;
// Regenerate Sync // Regenerate Sync
CSync::addP25Sync(pdu + 2U); CSync::addP25Sync(pdu + 2U);
@ -466,16 +471,12 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len)
m_nid.encode(pdu + 2U, P25_DUID_PDU); m_nid.encode(pdu + 2U, P25_DUID_PDU);
// Add busy bits // Add busy bits
addBusyBits(pdu + 2U, bitLength, false, true); addBusyBits(pdu + 2U, newBitLength, false, true);
if (m_duplex) { if (m_duplex) {
unsigned int byteLength = bitLength / 8U;
if ((bitLength % 8U) > 0U)
byteLength++;
pdu[0U] = TAG_DATA; pdu[0U] = TAG_DATA;
pdu[1U] = 0x00U; pdu[1U] = 0x00U;
writeQueueRF(pdu, byteLength + 2U); writeQueueRF(pdu, newByteLength + 2U);
} }
LogMessage("P25, ended RF data transmission"); LogMessage("P25, ended RF data transmission");

27
P25Utils.cpp
View file

@ -87,6 +87,33 @@ unsigned int CP25Utils::encode(const unsigned char* in, unsigned char* out, unsi
return n; return n;
} }
unsigned int CP25Utils::encode(const unsigned char* in, unsigned char* out, unsigned int length)
{
assert(in != NULL);
assert(out != NULL);
// Move the SSx positions to the range needed
unsigned int ss0Pos = P25_SS0_START;
unsigned int ss1Pos = P25_SS1_START;
unsigned int n = 0U;
unsigned int pos = 0U;
while (n < length) {
if (pos == ss0Pos) {
ss0Pos += P25_SS_INCREMENT;
} else if (pos == ss1Pos) {
ss1Pos += P25_SS_INCREMENT;
} else {
bool b = READ_BIT(in, n);
WRITE_BIT(out, pos, b);
n++;
}
pos++;
}
return pos;
}
unsigned int CP25Utils::compare(const unsigned char* data1, const unsigned char* data2, unsigned int length) unsigned int CP25Utils::compare(const unsigned char* data1, const unsigned char* data2, unsigned int length)
{ {
assert(data1 != NULL); assert(data1 != NULL);

1
P25Utils.h
View file

@ -22,6 +22,7 @@
class CP25Utils { class CP25Utils {
public: public:
static unsigned int encode(const unsigned char* in, unsigned char* out, unsigned int start, unsigned int stop); static unsigned int encode(const unsigned char* in, unsigned char* out, unsigned int start, unsigned int stop);
static unsigned int encode(const unsigned char* in, unsigned char* out, unsigned int length);
static unsigned int decode(const unsigned char* in, unsigned char* out, unsigned int start, unsigned int stop); static unsigned int decode(const unsigned char* in, unsigned char* out, unsigned int start, unsigned int stop);