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

Merge branch 'master' into mqtt

Browse Source
This commit is contained in:
Jonathan Naylor
2024-09-30 18:53:33 +01:00
parent 00cae6914d bc43db1e02
commit 052af9ce93
12 changed files with 1249 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
P25Data.cpp
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016,2017,2023 by Jonathan Naylor G4KLX
* Copyright (C) 2016,2017,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
@@ -46,7 +46,7 @@ m_lcf(0x00U),
m_emergency(false),
m_srcId(0U),
m_dstId(0U),
m_rs241213(),
m_rs(),
m_trellis()
{
m_mi = new unsigned char[P25_MI_LENGTH_BYTES];
@@ -91,7 +91,7 @@ bool CP25Data::decodeHeader(const unsigned char* data)
// decode RS (36,20,17) FEC
try {
bool ret = m_rs241213.decode362017(rs);
bool ret = m_rs.decode362017(rs);
if (!ret)
return false;
} catch (...) {
@@ -135,7 +135,7 @@ void CP25Data::encodeHeader(unsigned char* data)
rs[14U] = (m_dstId >> 0) & 0xFFU; // Talkgroup Address LSB
// encode RS (36,20,17) FEC
m_rs241213.encode362017(rs);
m_rs.encode362017(rs);
unsigned char raw[81U];
::memset(raw, 0x00U, 81U);
@@ -173,7 +173,7 @@ bool CP25Data::decodeLDU1(const unsigned char* data)
decodeLDUHamming(raw, rs + 15U);
try {
bool ret = m_rs241213.decode(rs);
bool ret = m_rs.decode241213(rs);
if (!ret)
return false;
} catch (...) {
@@ -236,7 +236,7 @@ void CP25Data::encodeLDU1(unsigned char* data)
break;
}
m_rs241213.encode(rs);
m_rs.encode241213(rs);
unsigned char raw[5U];
encodeLDUHamming(raw, rs + 0U);
@@ -286,7 +286,7 @@ bool CP25Data::decodeLDU2(const unsigned char* data)
// decode RS (24,16,9) FEC
try {
bool ret = m_rs241213.decode24169(rs);
bool ret = m_rs.decode24169(rs);
if (!ret)
return false;
} catch (...) {
@@ -326,7 +326,7 @@ void CP25Data::encodeLDU2(unsigned char* data)
rs[11U] = (m_kId >> 0) & 0xFFU; // Key ID LSB
// encode RS (24,16,9) FEC
m_rs241213.encode24169(rs);
m_rs.encode24169(rs);
// encode Hamming (10,6,3) FEC and interleave for LC data
unsigned char raw[5U];