Increase TA and GPS to message level, and allow it to be controlled from
the ini file.
This commit is contained in:
parent
26010e5b54
commit
1dbaec9331
8
Conf.cpp
8
Conf.cpp
|
@ -107,6 +107,7 @@ m_dmrId(0U),
|
||||||
m_dmrColorCode(2U),
|
m_dmrColorCode(2U),
|
||||||
m_dmrSelfOnly(false),
|
m_dmrSelfOnly(false),
|
||||||
m_dmrEmbeddedLCOnly(false),
|
m_dmrEmbeddedLCOnly(false),
|
||||||
|
m_dmrDumpTAData(true),
|
||||||
m_dmrPrefixes(),
|
m_dmrPrefixes(),
|
||||||
m_dmrBlackList(),
|
m_dmrBlackList(),
|
||||||
m_dmrWhiteList(),
|
m_dmrWhiteList(),
|
||||||
|
@ -378,6 +379,8 @@ bool CConf::read()
|
||||||
m_dmrSelfOnly = ::atoi(value) == 1;
|
m_dmrSelfOnly = ::atoi(value) == 1;
|
||||||
else if (::strcmp(key, "EmbeddedLCOnly") == 0)
|
else if (::strcmp(key, "EmbeddedLCOnly") == 0)
|
||||||
m_dmrEmbeddedLCOnly = ::atoi(value) == 1;
|
m_dmrEmbeddedLCOnly = ::atoi(value) == 1;
|
||||||
|
else if (::strcmp(key, "DumpTAData") == 0)
|
||||||
|
m_dmrDumpTAData = ::atoi(value) == 1;
|
||||||
else if (::strcmp(key, "Prefixes") == 0) {
|
else if (::strcmp(key, "Prefixes") == 0) {
|
||||||
char* p = ::strtok(value, ",\r\n");
|
char* p = ::strtok(value, ",\r\n");
|
||||||
while (p != NULL) {
|
while (p != NULL) {
|
||||||
|
@ -824,6 +827,11 @@ bool CConf::getDMREmbeddedLCOnly() const
|
||||||
return m_dmrEmbeddedLCOnly;
|
return m_dmrEmbeddedLCOnly;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool CConf::getDMRDumpTAData() const
|
||||||
|
{
|
||||||
|
return m_dmrDumpTAData;
|
||||||
|
}
|
||||||
|
|
||||||
std::vector<unsigned int> CConf::getDMRPrefixes() const
|
std::vector<unsigned int> CConf::getDMRPrefixes() const
|
||||||
{
|
{
|
||||||
return m_dmrPrefixes;
|
return m_dmrPrefixes;
|
||||||
|
|
2
Conf.h
2
Conf.h
|
@ -99,6 +99,7 @@ public:
|
||||||
unsigned int getDMRId() const;
|
unsigned int getDMRId() const;
|
||||||
unsigned int getDMRColorCode() const;
|
unsigned int getDMRColorCode() const;
|
||||||
bool getDMREmbeddedLCOnly() const;
|
bool getDMREmbeddedLCOnly() const;
|
||||||
|
bool getDMRDumpTAData() const;
|
||||||
bool getDMRSelfOnly() const;
|
bool getDMRSelfOnly() const;
|
||||||
std::vector<unsigned int> getDMRPrefixes() const;
|
std::vector<unsigned int> getDMRPrefixes() const;
|
||||||
std::vector<unsigned int> getDMRBlackList() const;
|
std::vector<unsigned int> getDMRBlackList() const;
|
||||||
|
@ -249,6 +250,7 @@ private:
|
||||||
unsigned int m_dmrColorCode;
|
unsigned int m_dmrColorCode;
|
||||||
bool m_dmrSelfOnly;
|
bool m_dmrSelfOnly;
|
||||||
bool m_dmrEmbeddedLCOnly;
|
bool m_dmrEmbeddedLCOnly;
|
||||||
|
bool m_dmrDumpTAData;
|
||||||
std::vector<unsigned int> m_dmrPrefixes;
|
std::vector<unsigned int> m_dmrPrefixes;
|
||||||
std::vector<unsigned int> m_dmrBlackList;
|
std::vector<unsigned int> m_dmrBlackList;
|
||||||
std::vector<unsigned int> m_dmrWhiteList;
|
std::vector<unsigned int> m_dmrWhiteList;
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
|
||||||
CDMRControl::CDMRControl(unsigned int id, unsigned int colorCode, unsigned int callHang, bool selfOnly, bool embeddedLCOnly, const std::vector<unsigned int>& prefixes, const std::vector<unsigned int>& blacklist, const std::vector<unsigned int>& whitelist, const std::vector<unsigned int>& slot1TGWhitelist, const std::vector<unsigned int>& slot2TGWhitelist, unsigned int timeout, CModem* modem, CDMRNetwork* network, CDisplay* display, bool duplex, CDMRLookup* lookup, CRSSIInterpolator* rssi, unsigned int jitter) :
|
CDMRControl::CDMRControl(unsigned int id, unsigned int colorCode, unsigned int callHang, bool selfOnly, bool embeddedLCOnly, bool dumpTAData, const std::vector<unsigned int>& prefixes, const std::vector<unsigned int>& blacklist, const std::vector<unsigned int>& whitelist, const std::vector<unsigned int>& slot1TGWhitelist, const std::vector<unsigned int>& slot2TGWhitelist, unsigned int timeout, CModem* modem, CDMRNetwork* network, CDisplay* display, bool duplex, CDMRLookup* lookup, CRSSIInterpolator* rssi, unsigned int jitter) :
|
||||||
m_id(id),
|
m_id(id),
|
||||||
m_colorCode(colorCode),
|
m_colorCode(colorCode),
|
||||||
m_modem(modem),
|
m_modem(modem),
|
||||||
|
@ -39,7 +39,7 @@ m_lookup(lookup)
|
||||||
// Load black and white lists to DMRAccessControl
|
// Load black and white lists to DMRAccessControl
|
||||||
CDMRAccessControl::init(blacklist, whitelist, slot1TGWhitelist, slot2TGWhitelist, selfOnly, prefixes, id);
|
CDMRAccessControl::init(blacklist, whitelist, slot1TGWhitelist, slot2TGWhitelist, selfOnly, prefixes, id);
|
||||||
|
|
||||||
CDMRSlot::init(colorCode, embeddedLCOnly, callHang, modem, network, display, duplex, m_lookup, rssi, jitter);
|
CDMRSlot::init(colorCode, embeddedLCOnly, dumpTAData, callHang, modem, network, display, duplex, m_lookup, rssi, jitter);
|
||||||
}
|
}
|
||||||
|
|
||||||
CDMRControl::~CDMRControl()
|
CDMRControl::~CDMRControl()
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
|
|
||||||
class CDMRControl {
|
class CDMRControl {
|
||||||
public:
|
public:
|
||||||
CDMRControl(unsigned int id, unsigned int colorCode, unsigned int callHang, bool selfOnly, bool embeddedLCOnly, const std::vector<unsigned int>& prefixes, const std::vector<unsigned int>& blacklist, const std::vector<unsigned int>& whitelist, const std::vector<unsigned int>& slot1TGWhitelist, const std::vector<unsigned int>& slot2TGWhitelist, unsigned int timeout, CModem* modem, CDMRNetwork* network, CDisplay* display, bool duplex, CDMRLookup* lookup, CRSSIInterpolator* rssi, unsigned int jitter);
|
CDMRControl(unsigned int id, unsigned int colorCode, unsigned int callHang, bool selfOnly, bool embeddedLCOnly, bool dumpTAData, const std::vector<unsigned int>& prefixes, const std::vector<unsigned int>& blacklist, const std::vector<unsigned int>& whitelist, const std::vector<unsigned int>& slot1TGWhitelist, const std::vector<unsigned int>& slot2TGWhitelist, unsigned int timeout, CModem* modem, CDMRNetwork* network, CDisplay* display, bool duplex, CDMRLookup* lookup, CRSSIInterpolator* rssi, unsigned int jitter);
|
||||||
~CDMRControl();
|
~CDMRControl();
|
||||||
|
|
||||||
bool processWakeup(const unsigned char* data);
|
bool processWakeup(const unsigned char* data);
|
||||||
|
|
80
DMRSlot.cpp
80
DMRSlot.cpp
|
@ -32,6 +32,7 @@
|
||||||
unsigned int CDMRSlot::m_colorCode = 0U;
|
unsigned int CDMRSlot::m_colorCode = 0U;
|
||||||
|
|
||||||
bool CDMRSlot::m_embeddedLCOnly = false;
|
bool CDMRSlot::m_embeddedLCOnly = false;
|
||||||
|
bool CDMRSlot::m_dumpTAData = true;
|
||||||
|
|
||||||
CModem* CDMRSlot::m_modem = NULL;
|
CModem* CDMRSlot::m_modem = NULL;
|
||||||
CDMRNetwork* CDMRSlot::m_network = NULL;
|
CDMRNetwork* CDMRSlot::m_network = NULL;
|
||||||
|
@ -558,35 +559,45 @@ void CDMRSlot::writeModem(unsigned char *data, unsigned int len)
|
||||||
// CUtils::dump(1U, text, data, 9U);
|
// CUtils::dump(1U, text, data, 9U);
|
||||||
break;
|
break;
|
||||||
case FLCO_GPS_INFO:
|
case FLCO_GPS_INFO:
|
||||||
::sprintf(text, "DMR Slot %u, Embedded GPS Info", m_slotNo);
|
if (m_dumpTAData) {
|
||||||
CUtils::dump(1U, text, data, 9U);
|
::sprintf(text, "DMR Slot %u, Embedded GPS Info", m_slotNo);
|
||||||
|
CUtils::dump(2U, text, data, 9U);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case FLCO_TALKER_ALIAS_HEADER:
|
case FLCO_TALKER_ALIAS_HEADER:
|
||||||
if (!(m_rfTalkerId & TALKER_ID_HEADER)) {
|
if (!(m_rfTalkerId & TALKER_ID_HEADER)) {
|
||||||
::sprintf(text, "DMR Slot %u, Embedded Talker Alias Header", m_slotNo);
|
if (m_dumpTAData) {
|
||||||
CUtils::dump(1U, text, data, 9U);
|
::sprintf(text, "DMR Slot %u, Embedded Talker Alias Header", m_slotNo);
|
||||||
m_rfTalkerId |= TALKER_ID_HEADER;
|
CUtils::dump(2U, text, data, 9U);
|
||||||
|
m_rfTalkerId |= TALKER_ID_HEADER;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case FLCO_TALKER_ALIAS_BLOCK1:
|
case FLCO_TALKER_ALIAS_BLOCK1:
|
||||||
if (!(m_rfTalkerId & TALKER_ID_BLOCK1)) {
|
if (!(m_rfTalkerId & TALKER_ID_BLOCK1)) {
|
||||||
::sprintf(text, "DMR Slot %u, Embedded Talker Alias Block 1", m_slotNo);
|
if (m_dumpTAData) {
|
||||||
CUtils::dump(1U, text, data, 9U);
|
::sprintf(text, "DMR Slot %u, Embedded Talker Alias Block 1", m_slotNo);
|
||||||
m_rfTalkerId |= TALKER_ID_BLOCK1;
|
CUtils::dump(2U, text, data, 9U);
|
||||||
|
m_rfTalkerId |= TALKER_ID_BLOCK1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case FLCO_TALKER_ALIAS_BLOCK2:
|
case FLCO_TALKER_ALIAS_BLOCK2:
|
||||||
if (!(m_rfTalkerId & TALKER_ID_BLOCK2)) {
|
if (!(m_rfTalkerId & TALKER_ID_BLOCK2)) {
|
||||||
::sprintf(text, "DMR Slot %u, Embedded Talker Alias Block 2", m_slotNo);
|
if (m_dumpTAData) {
|
||||||
CUtils::dump(1U, text, data, 9U);
|
::sprintf(text, "DMR Slot %u, Embedded Talker Alias Block 2", m_slotNo);
|
||||||
m_rfTalkerId |= TALKER_ID_BLOCK2;
|
CUtils::dump(2U, text, data, 9U);
|
||||||
|
m_rfTalkerId |= TALKER_ID_BLOCK2;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case FLCO_TALKER_ALIAS_BLOCK3:
|
case FLCO_TALKER_ALIAS_BLOCK3:
|
||||||
if (!(m_rfTalkerId & TALKER_ID_BLOCK3)) {
|
if (!(m_rfTalkerId & TALKER_ID_BLOCK3)) {
|
||||||
::sprintf(text, "DMR Slot %u, Embedded Talker Alias Block 3", m_slotNo);
|
if (m_dumpTAData) {
|
||||||
CUtils::dump(1U, text, data, 9U);
|
::sprintf(text, "DMR Slot %u, Embedded Talker Alias Block 3", m_slotNo);
|
||||||
m_rfTalkerId |= TALKER_ID_BLOCK3;
|
CUtils::dump(2U, text, data, 9U);
|
||||||
|
m_rfTalkerId |= TALKER_ID_BLOCK3;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
@ -1314,35 +1325,45 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
|
||||||
// CUtils::dump(1U, text, data, 9U);
|
// CUtils::dump(1U, text, data, 9U);
|
||||||
break;
|
break;
|
||||||
case FLCO_GPS_INFO:
|
case FLCO_GPS_INFO:
|
||||||
::sprintf(text, "DMR Slot %u, Embedded GPS Info", m_slotNo);
|
if (m_dumpTAData) {
|
||||||
CUtils::dump(1U, text, data, 9U);
|
::sprintf(text, "DMR Slot %u, Embedded GPS Info", m_slotNo);
|
||||||
|
CUtils::dump(2U, text, data, 9U);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case FLCO_TALKER_ALIAS_HEADER:
|
case FLCO_TALKER_ALIAS_HEADER:
|
||||||
if (!(m_netTalkerId & TALKER_ID_HEADER)) {
|
if (!(m_netTalkerId & TALKER_ID_HEADER)) {
|
||||||
::sprintf(text, "DMR Slot %u, Embedded Talker Alias Header", m_slotNo);
|
if (m_dumpTAData) {
|
||||||
CUtils::dump(1U, text, data, 9U);
|
::sprintf(text, "DMR Slot %u, Embedded Talker Alias Header", m_slotNo);
|
||||||
m_netTalkerId |= TALKER_ID_HEADER;
|
CUtils::dump(2U, text, data, 9U);
|
||||||
|
m_netTalkerId |= TALKER_ID_HEADER;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case FLCO_TALKER_ALIAS_BLOCK1:
|
case FLCO_TALKER_ALIAS_BLOCK1:
|
||||||
if (!(m_netTalkerId & TALKER_ID_BLOCK1)) {
|
if (!(m_netTalkerId & TALKER_ID_BLOCK1)) {
|
||||||
::sprintf(text, "DMR Slot %u, Embedded Talker Alias Block 1", m_slotNo);
|
if (m_dumpTAData) {
|
||||||
CUtils::dump(1U, text, data, 9U);
|
::sprintf(text, "DMR Slot %u, Embedded Talker Alias Block 1", m_slotNo);
|
||||||
m_netTalkerId |= TALKER_ID_BLOCK1;
|
CUtils::dump(2U, text, data, 9U);
|
||||||
|
m_netTalkerId |= TALKER_ID_BLOCK1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case FLCO_TALKER_ALIAS_BLOCK2:
|
case FLCO_TALKER_ALIAS_BLOCK2:
|
||||||
if (!(m_netTalkerId & TALKER_ID_BLOCK2)) {
|
if (!(m_netTalkerId & TALKER_ID_BLOCK2)) {
|
||||||
::sprintf(text, "DMR Slot %u, Embedded Talker Alias Block 2", m_slotNo);
|
if (m_dumpTAData) {
|
||||||
CUtils::dump(1U, text, data, 9U);
|
::sprintf(text, "DMR Slot %u, Embedded Talker Alias Block 2", m_slotNo);
|
||||||
m_netTalkerId |= TALKER_ID_BLOCK2;
|
CUtils::dump(2U, text, data, 9U);
|
||||||
|
m_netTalkerId |= TALKER_ID_BLOCK2;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case FLCO_TALKER_ALIAS_BLOCK3:
|
case FLCO_TALKER_ALIAS_BLOCK3:
|
||||||
if (!(m_netTalkerId & TALKER_ID_BLOCK3)) {
|
if (!(m_netTalkerId & TALKER_ID_BLOCK3)) {
|
||||||
::sprintf(text, "DMR Slot %u, Embedded Talker Alias Block 3", m_slotNo);
|
if (m_dumpTAData) {
|
||||||
CUtils::dump(1U, text, data, 9U);
|
::sprintf(text, "DMR Slot %u, Embedded Talker Alias Block 3", m_slotNo);
|
||||||
m_netTalkerId |= TALKER_ID_BLOCK3;
|
CUtils::dump(2U, text, data, 9U);
|
||||||
|
m_netTalkerId |= TALKER_ID_BLOCK3;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
@ -1635,7 +1656,7 @@ void CDMRSlot::writeQueueNet(const unsigned char *data)
|
||||||
m_queue.addData(data, len);
|
m_queue.addData(data, len);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CDMRSlot::init(unsigned int colorCode, bool embeddedLCOnly, 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)
|
||||||
{
|
{
|
||||||
assert(modem != NULL);
|
assert(modem != NULL);
|
||||||
assert(display != NULL);
|
assert(display != NULL);
|
||||||
|
@ -1644,6 +1665,7 @@ void CDMRSlot::init(unsigned int colorCode, bool embeddedLCOnly, unsigned int ca
|
||||||
|
|
||||||
m_colorCode = colorCode;
|
m_colorCode = colorCode;
|
||||||
m_embeddedLCOnly = embeddedLCOnly;
|
m_embeddedLCOnly = embeddedLCOnly;
|
||||||
|
m_dumpTAData = dumpTAData;
|
||||||
m_modem = modem;
|
m_modem = modem;
|
||||||
m_network = network;
|
m_network = network;
|
||||||
m_display = display;
|
m_display = display;
|
||||||
|
|
|
@ -50,7 +50,7 @@ public:
|
||||||
|
|
||||||
void clock();
|
void clock();
|
||||||
|
|
||||||
static void init(unsigned int colorCode, bool embeddedLCOnly, unsigned int callHang, CModem* modem, CDMRNetwork* network, CDisplay* display, bool duplex, CDMRLookup* lookup, CRSSIInterpolator* rssiMapper, unsigned int jitter);
|
static void 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);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
unsigned int m_slotNo;
|
unsigned int m_slotNo;
|
||||||
|
@ -101,6 +101,7 @@ private:
|
||||||
static unsigned int m_colorCode;
|
static unsigned int m_colorCode;
|
||||||
|
|
||||||
static bool m_embeddedLCOnly;
|
static bool m_embeddedLCOnly;
|
||||||
|
static bool m_dumpTAData;
|
||||||
|
|
||||||
static CModem* m_modem;
|
static CModem* m_modem;
|
||||||
static CDMRNetwork* m_network;
|
static CDMRNetwork* m_network;
|
||||||
|
|
|
@ -72,6 +72,7 @@ Id=123456
|
||||||
ColorCode=1
|
ColorCode=1
|
||||||
SelfOnly=0
|
SelfOnly=0
|
||||||
EmbeddedLCOnly=0
|
EmbeddedLCOnly=0
|
||||||
|
DumpTAData=1
|
||||||
# Prefixes=234,235
|
# Prefixes=234,235
|
||||||
# Slot1TGWhiteList=
|
# Slot1TGWhiteList=
|
||||||
# Slot2TGWhiteList=
|
# Slot2TGWhiteList=
|
||||||
|
|
|
@ -347,13 +347,14 @@ int CMMDVMHost::run()
|
||||||
unsigned int id = m_conf.getDMRId();
|
unsigned int id = m_conf.getDMRId();
|
||||||
unsigned int colorCode = m_conf.getDMRColorCode();
|
unsigned int colorCode = m_conf.getDMRColorCode();
|
||||||
bool selfOnly = m_conf.getDMRSelfOnly();
|
bool selfOnly = m_conf.getDMRSelfOnly();
|
||||||
bool embeddedLCOnly = m_conf.getDMREmbeddedLCOnly();
|
bool embeddedLCOnly = m_conf.getDMREmbeddedLCOnly();
|
||||||
|
bool dumpTAData = m_conf.getDMRDumpTAData();
|
||||||
std::vector<unsigned int> prefixes = m_conf.getDMRPrefixes();
|
std::vector<unsigned int> prefixes = m_conf.getDMRPrefixes();
|
||||||
std::vector<unsigned int> blackList = m_conf.getDMRBlackList();
|
std::vector<unsigned int> blackList = m_conf.getDMRBlackList();
|
||||||
std::vector<unsigned int> whiteList = m_conf.getDMRWhiteList();
|
std::vector<unsigned int> whiteList = m_conf.getDMRWhiteList();
|
||||||
std::vector<unsigned int> slot1TGWhiteList = m_conf.getDMRSlot1TGWhiteList();
|
std::vector<unsigned int> slot1TGWhiteList = m_conf.getDMRSlot1TGWhiteList();
|
||||||
std::vector<unsigned int> slot2TGWhiteList = m_conf.getDMRSlot2TGWhiteList();
|
std::vector<unsigned int> slot2TGWhiteList = m_conf.getDMRSlot2TGWhiteList();
|
||||||
unsigned int callHang = m_conf.getDMRCallHang();
|
unsigned int callHang = m_conf.getDMRCallHang();
|
||||||
unsigned int txHang = m_conf.getDMRTXHang();
|
unsigned int txHang = m_conf.getDMRTXHang();
|
||||||
unsigned int jitter = m_conf.getDMRNetworkJitter();
|
unsigned int jitter = m_conf.getDMRNetworkJitter();
|
||||||
|
|
||||||
|
@ -370,6 +371,7 @@ int CMMDVMHost::run()
|
||||||
LogInfo(" Color Code: %u", colorCode);
|
LogInfo(" Color Code: %u", colorCode);
|
||||||
LogInfo(" Self Only: %s", selfOnly ? "yes" : "no");
|
LogInfo(" Self Only: %s", selfOnly ? "yes" : "no");
|
||||||
LogInfo(" Embedded LC Only: %s", embeddedLCOnly ? "yes" : "no");
|
LogInfo(" Embedded LC Only: %s", embeddedLCOnly ? "yes" : "no");
|
||||||
|
LogInfo(" Dump Talker Alias Data: %s", dumpTAData ? "yes" : "no");
|
||||||
LogInfo(" Prefixes: %u", prefixes.size());
|
LogInfo(" Prefixes: %u", prefixes.size());
|
||||||
|
|
||||||
if (blackList.size() > 0U)
|
if (blackList.size() > 0U)
|
||||||
|
@ -384,7 +386,7 @@ int CMMDVMHost::run()
|
||||||
LogInfo(" Call Hang: %us", callHang);
|
LogInfo(" Call Hang: %us", callHang);
|
||||||
LogInfo(" TX Hang: %us", txHang);
|
LogInfo(" TX Hang: %us", txHang);
|
||||||
|
|
||||||
dmr = new CDMRControl(id, colorCode, callHang, selfOnly, embeddedLCOnly, prefixes, blackList, whiteList, slot1TGWhiteList, slot2TGWhiteList, m_timeout, m_modem, m_dmrNetwork, m_display, m_duplex, m_lookup, rssi, jitter);
|
dmr = new CDMRControl(id, colorCode, callHang, selfOnly, embeddedLCOnly, dumpTAData, prefixes, blackList, whiteList, slot1TGWhiteList, slot2TGWhiteList, m_timeout, m_modem, m_dmrNetwork, m_display, m_duplex, m_lookup, rssi, jitter);
|
||||||
|
|
||||||
m_dmrTXTimer.setTimeout(txHang);
|
m_dmrTXTimer.setTimeout(txHang);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue