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

Alter rewrite ranges so they appear correctly in tracing

Browse Source
This commit is contained in:
Tony Corbett G0WFV
2017-06-07 10:38:53 +01:00
parent 7cd557de8a
commit 2d670d330b
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
RewritePC.cpp
View File

@@ -29,7 +29,7 @@ CRewritePC::CRewritePC(const char* name, unsigned int fromSlot, unsigned int fro
m_name(name), m_name(name),
m_fromSlot(fromSlot), m_fromSlot(fromSlot),
m_fromIdStart(fromId), m_fromIdStart(fromId),
m_fromIdEnd(fromId + range), m_fromIdEnd(fromId + range - 1U),
m_toSlot(toSlot), m_toSlot(toSlot),
m_toIdStart(toId), m_toIdStart(toId),
m_trace(trace), m_trace(trace),
@@ -70,7 +70,7 @@ bool CRewritePC::process(CDMRData& data)
unsigned int dstId = data.getDstId(); unsigned int dstId = data.getDstId();
unsigned int slotNo = data.getSlotNo(); unsigned int slotNo = data.getSlotNo();
if (flco != FLCO_USER_USER || slotNo != m_fromSlot || dstId < m_fromIdStart || dstId >= m_fromIdEnd) if (flco != FLCO_USER_USER || slotNo != m_fromSlot || dstId < m_fromIdStart || dstId > m_fromIdEnd)
return false; return false;
if (m_fromSlot != m_toSlot) if (m_fromSlot != m_toSlot)

4
RewriteSrc.cpp
View File

@@ -29,7 +29,7 @@ CRewriteSrc::CRewriteSrc(const char* name, unsigned int fromSlot, unsigned int f
m_name(name), m_name(name),
m_fromSlot(fromSlot), m_fromSlot(fromSlot),
m_fromIdStart(fromId), m_fromIdStart(fromId),
m_fromIdEnd(fromId + range), m_fromIdEnd(fromId + range - 1U),
m_toSlot(toSlot), m_toSlot(toSlot),
m_toTG(toTG), m_toTG(toTG),
m_trace(trace), m_trace(trace),
@@ -72,7 +72,7 @@ bool CRewriteSrc::process(CDMRData& data)
unsigned int srcId = data.getSrcId(); unsigned int srcId = data.getSrcId();
unsigned int slotNo = data.getSlotNo(); unsigned int slotNo = data.getSlotNo();
if (flco != FLCO_USER_USER || slotNo != m_fromSlot || srcId < m_fromIdStart || srcId >= m_fromIdEnd) if (flco != FLCO_USER_USER || slotNo != m_fromSlot || srcId < m_fromIdStart || srcId > m_fromIdEnd)
return false; return false;
if (m_fromSlot != m_toSlot) if (m_fromSlot != m_toSlot)

4
RewriteTG.cpp
View File

@@ -29,7 +29,7 @@ CRewriteTG::CRewriteTG(const char* name, unsigned int fromSlot, unsigned int fro
m_name(name), m_name(name),
m_fromSlot(fromSlot), m_fromSlot(fromSlot),
m_fromTGStart(fromTG), m_fromTGStart(fromTG),
m_fromTGEnd(fromTG + range), m_fromTGEnd(fromTG + range - 1U),
m_toSlot(toSlot), m_toSlot(toSlot),
m_toTGStart(toTG), m_toTGStart(toTG),
m_trace(trace), m_trace(trace),
@@ -70,7 +70,7 @@ bool CRewriteTG::process(CDMRData& data)
unsigned int dstId = data.getDstId(); unsigned int dstId = data.getDstId();
unsigned int slotNo = data.getSlotNo(); unsigned int slotNo = data.getSlotNo();
if (flco != FLCO_GROUP || slotNo != m_fromSlot || dstId < m_fromTGStart || dstId >= m_fromTGEnd) if (flco != FLCO_GROUP || slotNo != m_fromSlot || dstId < m_fromTGStart || dstId > m_fromTGEnd)
return false; return false;
if (m_fromSlot != m_toSlot) if (m_fromSlot != m_toSlot)