MMDVM/DMRGateway
1
0
Fork 0
mirror of https://github.com/g4klx/DMRGateway synced 2025-12-20 21:25:37 +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

45
RewritePC.cpp
View File

@@ -34,7 +34,9 @@ m_toSlot(toSlot),
m_toIdStart(toId),
m_toIdEnd(toId + range - 1U),
m_lc(FLCO_USER_USER, 0U, 0U),
m_embeddedLC()
m_embeddedLC(),
m_dataHeader(),
m_csbk()
{
assert(fromSlot == 1U || fromSlot == 2U);
assert(toSlot == 1U || toSlot == 2U);
@@ -74,6 +76,15 @@ bool CRewritePC::process(CDMRData& data, bool trace)
case DT_VOICE:
processVoice(data, newDstId);
break;
case DT_CSBK:
processCSBK(data, newDstId);
break;
case DT_DATA_HEADER:
processDataHeader(data, newDstId);
break;
case DT_RATE_12_DATA:
case DT_RATE_34_DATA:
case DT_RATE_1_DATA:
case DT_VOICE_SYNC:
// Nothing to do
break;
@@ -126,3 +137,35 @@ void CRewritePC::processVoice(CDMRData& data, unsigned int dstId)
data.setData(buffer);
}
void CRewritePC::processDataHeader(CDMRData& data, unsigned int dstId)
{
unsigned char buffer[DMR_FRAME_LENGTH_BYTES];
data.getData(buffer);
bool ret = m_dataHeader.put(buffer);
if (!ret)
return;
m_dataHeader.setDstId(dstId);
m_dataHeader.get(buffer);
data.setData(buffer);
}
void CRewritePC::processCSBK(CDMRData& data, unsigned int dstId)
{
unsigned char buffer[DMR_FRAME_LENGTH_BYTES];
data.getData(buffer);
bool ret = m_csbk.put(buffer);
if (!ret)
return;
m_csbk.setDstId(dstId);
m_csbk.get(buffer);
data.setData(buffer);
}

6
RewritePC.h
View File

@@ -20,6 +20,8 @@
#define REWRITEPC_H
#include "DMREmbeddedData.h"
#include "DMRDataHeader.h"
#include "DMRCSBK.h"
#include "Rewrite.h"
#include "DMRData.h"
#include "DMRLC.h"
@@ -43,9 +45,13 @@ private:
unsigned int m_toIdEnd;
CDMRLC m_lc;
CDMREmbeddedData m_embeddedLC;
CDMRDataHeader m_dataHeader;
CDMRCSBK m_csbk;
void processHeader(CDMRData& data, unsigned int dstId, unsigned char dataType);
void processVoice(CDMRData& data, unsigned int dstId);
void processDataHeader(CDMRData& data, unsigned int dstId);
void processCSBK(CDMRData& data, unsigned int dstId);
};

47
RewriteSrc.cpp
View File

@@ -33,7 +33,9 @@ m_fromIdEnd(fromId + range - 1U),
m_toSlot(toSlot),
m_toTG(toTG),
m_lc(FLCO_GROUP, 0U, toTG),
m_embeddedLC()
m_embeddedLC(),
m_dataHeader(),
m_csbk()
{
assert(fromSlot == 1U || fromSlot == 2U);
assert(toSlot == 1U || toSlot == 2U);
@@ -73,6 +75,15 @@ bool CRewriteSrc::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;
@@ -122,3 +133,37 @@ void CRewriteSrc::processVoice(CDMRData& data)
data.setData(buffer);
}
void CRewriteSrc::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(true);
m_dataHeader.setDstId(m_toTG);
m_dataHeader.get(buffer);
data.setData(buffer);
}
void CRewriteSrc::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(true);
m_csbk.setDstId(m_toTG);
m_csbk.get(buffer);
data.setData(buffer);
}

6
RewriteSrc.h
View File

@@ -20,6 +20,8 @@
#define REWRITESRC_H
#include "DMREmbeddedData.h"
#include "DMRDataHeader.h"
#include "DMRCSBK.h"
#include "Rewrite.h"
#include "DMRData.h"
#include "DMRLC.h"
@@ -42,9 +44,13 @@ private:
unsigned int m_toTG;
CDMRLC m_lc;
CDMREmbeddedData m_embeddedLC;
CDMRDataHeader m_dataHeader;
CDMRCSBK m_csbk;
void processHeader(CDMRData& data, unsigned char dataType);
void processVoice(CDMRData& data);
void processDataHeader(CDMRData& data);
void processCSBK(CDMRData& data);
};

45
RewriteTG.cpp
View File

@@ -34,7 +34,9 @@ m_toSlot(toSlot),
m_toTGStart(toTG),
m_toTGEnd(toTG + range - 1U),
m_lc(FLCO_GROUP, 0U, toTG),
m_embeddedLC()
m_embeddedLC(),
m_dataHeader(),
m_csbk()
{
assert(fromSlot == 1U || fromSlot == 2U);
assert(toSlot == 1U || toSlot == 2U);
@@ -78,6 +80,15 @@ bool CRewriteTG::process(CDMRData& data, bool trace)
case DT_VOICE:
processVoice(data, newTG);
break;
case DT_CSBK:
processCSBK(data, newTG);
break;
case DT_DATA_HEADER:
processDataHeader(data, newTG);
break;
case DT_RATE_12_DATA:
case DT_RATE_34_DATA:
case DT_RATE_1_DATA:
case DT_VOICE_SYNC:
// Nothing to do
break;
@@ -136,3 +147,35 @@ void CRewriteTG::processVoice(CDMRData& data, unsigned int tg)
data.setData(buffer);
}
void CRewriteTG::processDataHeader(CDMRData& data, unsigned int tg)
{
unsigned char buffer[DMR_FRAME_LENGTH_BYTES];
data.getData(buffer);
bool ret = m_dataHeader.put(buffer);
if (!ret)
return;
m_dataHeader.setDstId(tg);
m_dataHeader.get(buffer);
data.setData(buffer);
}
void CRewriteTG::processCSBK(CDMRData& data, unsigned int tg)
{
unsigned char buffer[DMR_FRAME_LENGTH_BYTES];
data.getData(buffer);
bool ret = m_csbk.put(buffer);
if (!ret)
return;
m_csbk.setDstId(tg);
m_csbk.get(buffer);
data.setData(buffer);
}

6
RewriteTG.h
View File

@@ -20,6 +20,8 @@
#define REWRITETG_H
#include "DMREmbeddedData.h"
#include "DMRDataHeader.h"
#include "DMRCSBK.h"
#include "Rewrite.h"
#include "DMRData.h"
#include "DMRLC.h"
@@ -43,9 +45,13 @@ private:
unsigned int m_toTGEnd;
CDMRLC m_lc;
CDMREmbeddedData m_embeddedLC;
CDMRDataHeader m_dataHeader;
CDMRCSBK m_csbk;
void processHeader(CDMRData& data, unsigned int tg, unsigned char dataType);
void processVoice(CDMRData& data, unsigned int tg);
void processDataHeader(CDMRData& data, unsigned int tg);
void processCSBK(CDMRData& data, unsigned int tg);
};

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);
}

6
RewriteType.h
View File

@@ -20,6 +20,8 @@
#define REWRITETYPE_H
#include "DMREmbeddedData.h"
#include "DMRDataHeader.h"
#include "DMRCSBK.h"
#include "Rewrite.h"
#include "DMRData.h"
#include "DMRLC.h"
@@ -41,9 +43,13 @@ private:
unsigned int m_toId;
CDMRLC m_lc;
CDMREmbeddedData m_embeddedLC;
CDMRDataHeader m_dataHeader;
CDMRCSBK m_csbk;
void processHeader(CDMRData& data, unsigned char dataType);
void processVoice(CDMRData& data);
void processDataHeader(CDMRData& data);
void processCSBK(CDMRData& data);
};