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

Add OVCM support.

Browse Source
This commit is contained in:
Jonathan Naylor
2019-10-11 18:24:25 +01:00
parent 16a8bfd757
commit 6bababeb96
10 changed files with 45 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
DMRSlot.cpp
View File

@@ -43,6 +43,7 @@ CDisplay* CDMRSlot::m_display = NULL;
bool CDMRSlot::m_duplex = true;
CDMRLookup* CDMRSlot::m_lookup = NULL;
unsigned int CDMRSlot::m_hangCount = 3U * 17U;
bool CDMRSlot::m_ovcm = true;
CRSSIInterpolator* CDMRSlot::m_rssiMapper = NULL;
@@ -232,6 +233,7 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len)
return false;
}
lc->setOVCM(m_ovcm);
m_rfLC = lc;
// The standby LC data
@@ -784,6 +786,7 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len)
return false;
}
lc->setOVCM(m_ovcm);
m_rfLC = lc;
// The standby LC data
@@ -1039,6 +1042,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);
m_netLC = lc;
// The standby LC data
@@ -1112,6 +1116,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
unsigned int dstId = lc->getDstId();
unsigned int srcId = lc->getSrcId();
lc->setOVCM(m_ovcm);
m_netLC = lc;
m_lastFrameValid = false;
@@ -1297,6 +1302,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
unsigned int dstId = lc->getDstId();
unsigned int srcId = lc->getSrcId();
lc->setOVCM(m_ovcm);
m_netLC = lc;
// The standby LC data
@@ -1869,7 +1875,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)
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)
{
assert(modem != NULL);
assert(display != NULL);
@@ -1885,6 +1891,7 @@ void CDMRSlot::init(unsigned int colorCode, bool embeddedLCOnly, bool dumpTAData
m_duplex = duplex;
m_lookup = lookup;
m_hangCount = callHang * 17U;
m_ovcm = ovcm;
m_rssiMapper = rssiMapper;