MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-20 14:15:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Amalgamate the two Trellis implementations and small cleanups."

Browse Source 
This reverts commit ec9f7d7496.
This commit is contained in:
Jonathan Naylor
2024-10-04 17:14:36 +01:00
parent ec9f7d7496
commit ebea3eddb2
20 changed files with 538 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
P25Control.cpp
View File

@@ -19,8 +19,8 @@
#include "P25Control.h"
#include "P25Defines.h"
#include "P25Trellis.h"
#include "P25Utils.h"
#include "Trellis.h"
#include "Utils.h"
#include "Sync.h"
#include "CRC.h"
@@ -541,7 +541,7 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len)
}
if (m_rfPDUCount == 0U) {
CTrellis trellis;
CP25Trellis trellis;
unsigned char header[P25_PDU_HEADER_LENGTH_BYTES];
bool valid = trellis.decode12(m_rfPDU + P25_SYNC_LENGTH_BYTES + P25_NID_LENGTH_BYTES, header);
if (valid)
@@ -570,7 +570,7 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len)
unsigned int offset = P25_SYNC_LENGTH_BYTES + P25_NID_LENGTH_BYTES;
// Regenerate the PDU header
CTrellis trellis;
CP25Trellis trellis;
unsigned char header[P25_PDU_HEADER_LENGTH_BYTES];
trellis.decode12(m_rfPDU + offset, header);
trellis.encode12(header, m_rfPDU + offset);