MMDVM/DMRGateway
1
0
Fork 0
mirror of https://github.com/g4klx/DMRGateway synced 2026-02-05 13:55:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use the new CSBK and Data Header rewrite blocks.

Browse Source
This commit is contained in:
Jonathan Naylor
2017-08-01 21:59:19 +01:00
parent cd19de377e
commit b949533318
8 changed files with 204 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
RewriteType.cpp
View File

@@ -32,7 +32,9 @@ m_fromTG(fromTG),
m_toSlot(toSlot),
m_toId(toId),
m_lc(FLCO_USER_USER, 0U, toId),
m_embeddedLC()
m_embeddedLC(),
m_dataHeader(),
m_csbk()
{
assert(fromSlot == 1U || fromSlot == 2U);
assert(toSlot == 1U || toSlot == 2U);
@@ -70,6 +72,15 @@ bool CRewriteType::process(CDMRData& data, bool trace)
case DT_VOICE:
processVoice(data);
break;
case DT_CSBK:
processCSBK(data);
break;
case DT_DATA_HEADER:
processDataHeader(data);
break;
case DT_RATE_12_DATA:
case DT_RATE_34_DATA:
case DT_RATE_1_DATA:
case DT_VOICE_SYNC:
// Nothing to do
break;
@@ -117,3 +128,37 @@ void CRewriteType::processVoice(CDMRData& data)
data.setData(buffer);
}
void CRewriteType::processDataHeader(CDMRData& data)
{
unsigned char buffer[DMR_FRAME_LENGTH_BYTES];
data.getData(buffer);
bool ret = m_dataHeader.put(buffer);
if (!ret)
return;
m_dataHeader.setGI(false);
m_dataHeader.setDstId(m_toId);
m_dataHeader.get(buffer);
data.setData(buffer);
}
void CRewriteType::processCSBK(CDMRData& data)
{
unsigned char buffer[DMR_FRAME_LENGTH_BYTES];
data.getData(buffer);
bool ret = m_csbk.put(buffer);
if (!ret)
return;
m_csbk.setGI(false);
m_csbk.setDstId(m_toId);
m_csbk.get(buffer);
data.setData(buffer);
}