From d12ac3ecb4d7463d666f8bd65b0b59666116b21e Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Thu, 25 May 2017 18:19:47 +0100 Subject: [PATCH] Revert "Make PC Rewrite bi-directional." This reverts commit f3c95d661888d99f9f92a759dadfd53073b0ffe9. --- DMRGateway.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/DMRGateway.cpp b/DMRGateway.cpp index 7bacb8d..e6d5aea 100644 --- a/DMRGateway.cpp +++ b/DMRGateway.cpp @@ -648,13 +648,10 @@ bool CDMRGateway::createDMRNetwork1() std::vector pcRewrites = m_conf.getDMRNetwork1PCRewrites(); for (std::vector::const_iterator it = pcRewrites.begin(); it != pcRewrites.end(); ++it) { LogInfo(" Rewrite RF: %u:%u-%u -> %u:%u-%u", (*it).m_fromSlot, (*it).m_fromId, (*it).m_fromId + (*it).m_range - 1U, (*it).m_toSlot, (*it).m_toId, (*it).m_toId + (*it).m_range - 1U); - LogInfo(" Rewrite Net: %u:%u-%u -> %u:%u-%u", (*it).m_toSlot, (*it).m_toId, (*it).m_toId + (*it).m_range - 1U, (*it).m_fromSlot, (*it).m_fromId, (*it).m_fromId + (*it).m_range - 1U); - CRewritePC* rfRewrite = new CRewritePC("DMR-1", (*it).m_fromSlot, (*it).m_fromId, (*it).m_toSlot, (*it).m_toId, (*it).m_range); - CRewriteTG* netRewrite = new CRewriteTG("DMR-1", (*it).m_toSlot, (*it).m_toId, (*it).m_fromSlot, (*it).m_fromId, (*it).m_range); + CRewritePC* rewrite = new CRewritePC("DMR-1", (*it).m_fromSlot, (*it).m_fromId, (*it).m_toSlot, (*it).m_toId, (*it).m_range); - m_dmr1RFRewrites.push_back(rfRewrite); - m_dmr1NetRewrites.push_back(netRewrite); + m_dmr1RFRewrites.push_back(rewrite); } std::vector typeRewrites = m_conf.getDMRNetwork1TypeRewrites(); @@ -737,13 +734,10 @@ bool CDMRGateway::createDMRNetwork2() std::vector pcRewrites = m_conf.getDMRNetwork2PCRewrites(); for (std::vector::const_iterator it = pcRewrites.begin(); it != pcRewrites.end(); ++it) { LogInfo(" Rewrite RF: %u:%u-%u -> %u:%u-%u", (*it).m_fromSlot, (*it).m_fromId, (*it).m_fromId + (*it).m_range - 1U, (*it).m_toSlot, (*it).m_toId, (*it).m_toId + (*it).m_range - 1U); - LogInfo(" Rewrite Net: %u:%u-%u -> %u:%u-%u", (*it).m_toSlot, (*it).m_toId, (*it).m_toId + (*it).m_range - 1U, (*it).m_fromSlot, (*it).m_fromId, (*it).m_fromId + (*it).m_range - 1U); - CRewritePC* rfRewrite = new CRewritePC("DMR-2", (*it).m_fromSlot, (*it).m_fromId, (*it).m_toSlot, (*it).m_toId, (*it).m_range); - CRewritePC* netRewrite = new CRewritePC("DMR-2", (*it).m_toSlot, (*it).m_toId, (*it).m_fromSlot, (*it).m_fromId, (*it).m_range); + CRewritePC* rewrite = new CRewritePC("DMR-2", (*it).m_fromSlot, (*it).m_fromId, (*it).m_toSlot, (*it).m_toId, (*it).m_range); - m_dmr2RFRewrites.push_back(rfRewrite); - m_dmr2NetRewrites.push_back(netRewrite); + m_dmr2RFRewrites.push_back(rewrite); } std::vector typeRewrites = m_conf.getDMRNetwork2TypeRewrites();