MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-23 08:45:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Separate the config if OVCM should be supported in sending and receiving direction

Browse Source
This commit is contained in:
Patrick Maier
2019-11-09 17:22:39 +01:00
parent 8d88d8e5ed
commit 6caffb2bc0
7 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
DMRSlot.cpp
View File

@@ -44,6 +44,7 @@ bool CDMRSlot::m_duplex = true;
CDMRLookup* CDMRSlot::m_lookup = NULL;
unsigned int CDMRSlot::m_hangCount = 3U * 17U;
bool CDMRSlot::m_ovcm = false;
bool CDMRSlot::m_ovcmRX = false;
CRSSIInterpolator* CDMRSlot::m_rssiMapper = NULL;
@@ -1045,7 +1046,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
dmrData.getSrcId(), dmrData.getFLCO() == FLCO_GROUP ? "TG" : "", dmrData.getDstId(),
srcId, flco == FLCO_GROUP ? "TG" : "", dstId);
lc->setOVCM(m_ovcm);
lc->setOVCM(m_ovcmRX);
m_netLC = lc;
// The standby LC data
@@ -1119,7 +1120,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
unsigned int dstId = lc->getDstId();
unsigned int srcId = lc->getSrcId();
lc->setOVCM(m_ovcm);
lc->setOVCM(m_ovcmRX);
m_netLC = lc;
m_lastFrameValid = false;
@@ -1305,7 +1306,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
unsigned int dstId = lc->getDstId();
unsigned int srcId = lc->getSrcId();
lc->setOVCM(m_ovcm);
lc->setOVCM(m_ovcmRX);
m_netLC = lc;
// The standby LC data
@@ -1575,7 +1576,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
return;
// set the OVCM bit for the supported csbk
csbk.setOVCM(m_ovcm);
csbk.setOVCM(m_ovcmRX);
bool gi = csbk.getGI();
unsigned int srcId = csbk.getSrcId();
@@ -1881,7 +1882,7 @@ void CDMRSlot::writeQueueNet(const unsigned char *data)
m_queue.addData(data, len);
}
void CDMRSlot::init(unsigned int colorCode, bool embeddedLCOnly, bool dumpTAData, unsigned int callHang, CModem* modem, CDMRNetwork* network, CDisplay* display, bool duplex, CDMRLookup* lookup, CRSSIInterpolator* rssiMapper, unsigned int jitter, bool ovcm)
void CDMRSlot::init(unsigned int colorCode, bool embeddedLCOnly, bool dumpTAData, unsigned int callHang, CModem* modem, CDMRNetwork* network, CDisplay* display, bool duplex, CDMRLookup* lookup, CRSSIInterpolator* rssiMapper, unsigned int jitter, bool ovcm, bool ovcmRX)
{
assert(modem != NULL);
assert(display != NULL);
@@ -1898,6 +1899,7 @@ void CDMRSlot::init(unsigned int colorCode, bool embeddedLCOnly, bool dumpTAData
m_lookup = lookup;
m_hangCount = callHang * 17U;
m_ovcm = ovcm;
m_ovcmRX = ovcmRX;
m_rssiMapper = rssiMapper;