MMDVM/DMRGateway
1
0
Fork 0
mirror of https://github.com/g4klx/DMRGateway synced 2025-12-21 13:35:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Handle TA and Embedded GPS data correctly.

Browse Source
This commit is contained in:
Jonathan Naylor
2017-08-02 19:30:39 +01:00
parent b949533318
commit 8a3f2ca64d
16 changed files with 281 additions and 509 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
RewritePC.cpp
View File

@@ -19,24 +19,20 @@
#include "RewritePC.h"
#include "DMRDefines.h"
#include "DMRFullLC.h"
#include "Log.h"
#include <cstdio>
#include <cassert>
CRewritePC::CRewritePC(const std::string& name, unsigned int fromSlot, unsigned int fromId, unsigned int toSlot, unsigned int toId, unsigned int range) :
CRewrite(),
m_name(name),
m_fromSlot(fromSlot),
m_fromIdStart(fromId),
m_fromIdEnd(fromId + range - 1U),
m_toSlot(toSlot),
m_toIdStart(toId),
m_toIdEnd(toId + range - 1U),
m_lc(FLCO_USER_USER, 0U, 0U),
m_embeddedLC(),
m_dataHeader(),
m_csbk()
m_toIdEnd(toId + range - 1U)
{
assert(fromSlot == 1U || fromSlot == 2U);
assert(toSlot == 1U || toSlot == 2U);
@@ -55,6 +51,7 @@ bool CRewritePC::process(CDMRData& data, bool trace)
if (flco != FLCO_USER_USER || slotNo != m_fromSlot || dstId < m_fromIdStart || dstId > m_fromIdEnd) {
if (trace)
LogDebug("Rule Trace,\tRewritePC from %s Slot=%u Dst=%u-%u: not matched", m_name.c_str(), m_fromSlot, m_fromIdStart, m_fromIdEnd);
return false;
}
@@ -63,35 +60,9 @@ bool CRewritePC::process(CDMRData& data, bool trace)
if (m_fromIdStart != m_toIdStart) {
unsigned int newDstId = dstId + m_toIdStart - m_fromIdStart;
data.setDstId(newDstId);
unsigned char dataType = data.getDataType();
switch (dataType) {
case DT_VOICE_LC_HEADER:
case DT_TERMINATOR_WITH_LC:
processHeader(data, newDstId, dataType);
break;
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;
default:
// Not sure what to do
break;
}
processMessage(data);
}
if (trace) {
@@ -101,71 +72,3 @@ bool CRewritePC::process(CDMRData& data, bool trace)
return true;
}
void CRewritePC::processHeader(CDMRData& data, unsigned int dstId, unsigned char dataType)
{
unsigned int srcId = data.getSrcId();
if (srcId != m_lc.getSrcId() || dstId != m_lc.getDstId()) {
m_lc.setSrcId(srcId);
m_lc.setDstId(dstId);
m_embeddedLC.setLC(m_lc);
}
unsigned char buffer[DMR_FRAME_LENGTH_BYTES];
data.getData(buffer);
CDMRFullLC fullLC;
fullLC.encode(m_lc, buffer, dataType);
data.setData(buffer);
}
void CRewritePC::processVoice(CDMRData& data, unsigned int dstId)
{
unsigned int srcId = data.getSrcId();
if (srcId != m_lc.getSrcId() || dstId != m_lc.getDstId()) {
m_lc.setSrcId(srcId);
m_lc.setDstId(dstId);
m_embeddedLC.setLC(m_lc);
}
unsigned char buffer[DMR_FRAME_LENGTH_BYTES];
data.getData(buffer);
unsigned char n = data.getN();
m_embeddedLC.getData(buffer, n);
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);
}