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

Change ovcm config to int value

Browse Source
This commit is contained in:
Shawn Chain
2019-11-16 23:06:26 +08:00
parent aa7ae2371c
commit 2f9595949a
8 changed files with 28 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
DMRSlot.cpp
View File

@@ -43,8 +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 = false;
bool CDMRSlot::m_ovcmRX = false;
int CDMRSlot::m_ovcm = 0;
CRSSIInterpolator* CDMRSlot::m_rssiMapper = NULL;
@@ -234,7 +233,7 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len)
return false;
}
lc->setOVCM(m_ovcm);
lc->setOVCM(m_ovcm & 0x02);
m_rfLC = lc;
// The standby LC data
@@ -439,7 +438,7 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len)
return false;
// set the OVCM bit for the supported csbk
csbk.setOVCM(m_ovcm);
csbk.setOVCM(m_ovcm & 0x02);
bool gi = csbk.getGI();
unsigned int srcId = csbk.getSrcId();
@@ -790,7 +789,7 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len)
return false;
}
lc->setOVCM(m_ovcm);
lc->setOVCM(m_ovcm & 0x02);
m_rfLC = lc;
// The standby LC data
@@ -1046,7 +1045,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_ovcmRX);
lc->setOVCM(m_ovcm & 0x01);
m_netLC = lc;
// The standby LC data
@@ -1120,7 +1119,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
unsigned int dstId = lc->getDstId();
unsigned int srcId = lc->getSrcId();
lc->setOVCM(m_ovcmRX);
lc->setOVCM(m_ovcm & 0x01);
m_netLC = lc;
m_lastFrameValid = false;
@@ -1306,7 +1305,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
unsigned int dstId = lc->getDstId();
unsigned int srcId = lc->getSrcId();
lc->setOVCM(m_ovcmRX);
lc->setOVCM(m_ovcm & 0x01);
m_netLC = lc;
// The standby LC data
@@ -1576,7 +1575,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
return;
// set the OVCM bit for the supported csbk
csbk.setOVCM(m_ovcmRX);
csbk.setOVCM(m_ovcm & 0x01);
bool gi = csbk.getGI();
unsigned int srcId = csbk.getSrcId();
@@ -1882,7 +1881,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, bool ovcmRX)
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, int ovcm)
{
assert(modem != NULL);
assert(display != NULL);
@@ -1899,7 +1898,6 @@ 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;