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

Add regeneration of Embedded LCs.

Browse Source
This commit is contained in:
Jonathan Naylor
2016-02-29 07:27:10 +00:00
parent 8846123afb
commit 4b77e3fa96
4 changed files with 38 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
DMRSlot.cpp
View File

@@ -48,6 +48,7 @@ m_rfQueue(1000U, "DMR Slot"),
m_rfState(RS_RF_LISTENING),
m_netState(RS_NET_IDLE),
m_rfEmbeddedLC(),
m_netEmbeddedLC(),
m_rfLC(NULL),
m_netLC(NULL),
m_rfDataHeader(),
@@ -121,6 +122,9 @@ void CDMRSlot::writeModem(unsigned char *data)
return;
}
// Store the LC for the embedded LC
m_rfEmbeddedLC.setData(*m_rfLC);
// Regenerate the LC data
fullLC.encode(*m_rfLC, data + 2U, DT_VOICE_LC_HEADER);
@@ -385,11 +389,15 @@ void CDMRSlot::writeModem(unsigned char *data)
if (m_rfState == RS_RF_AUDIO) {
m_rfN = data[1U] & 0x0FU;
// Regenerate the embedded LC
unsigned char lcss = m_rfEmbeddedLC.getData(data + 2U, m_rfN);
CDMREMB emb;
emb.putData(data + 2U);
// Regenerate the EMB
emb.setColorCode(m_colorCode);
emb.setLCSS(lcss);
emb.getData(data + 2U);
unsigned char fid = m_rfLC->getFID();
@@ -419,6 +427,9 @@ void CDMRSlot::writeModem(unsigned char *data)
m_rfLC = m_rfEmbeddedLC.addData(data + 2U, emb.getLCSS());
if (m_rfLC != NULL) {
// Store the LC for the embedded LC
m_rfEmbeddedLC.setData(*m_rfLC);
// Create a dummy start frame to replace the received frame
unsigned char start[DMR_FRAME_LENGTH_BYTES + 2U];
@@ -451,7 +462,11 @@ void CDMRSlot::writeModem(unsigned char *data)
m_rfN = data[1U] & 0x0FU;
// Regenerate the embedded LC
unsigned char lcss = m_rfEmbeddedLC.getData(data + 2U, m_rfN);
// Regenerate the EMB
emb.setLCSS(lcss);
emb.getData(data + 2U);
// Send the original audio frame out
@@ -612,6 +627,9 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
return;
}
// Store the LC for the embedded LC
m_netEmbeddedLC.setData(*m_netLC);
// Regenerate the LC data
fullLC.encode(*m_netLC, data + 2U, DT_VOICE_LC_HEADER);
@@ -844,9 +862,13 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
m_netBits += 141U;
// Regenerate the embedded LC
unsigned char lcss = m_netEmbeddedLC.getData(data + 2U, dmrData.getN());
// Change the color code in the EMB
m_lastEMB.putData(data + 2U);
m_lastEMB.setColorCode(m_colorCode);
m_lastEMB.setLCSS(lcss);
m_lastEMB.getData(data + 2U);
data[0U] = TAG_DATA;