Merge branch 'master' into nxdn

Author: g4klx

Conf.cpp

@@ -165,7 +165,6 @@ m_dmrNetworkLocal(0U),
 m_dmrNetworkPassword(),
 m_dmrNetworkOptions(),
 m_dmrNetworkDebug(false),
-m_dmrNetworkJitterEnabled(false),
 m_dmrNetworkJitter(300U),
 m_dmrNetworkSlot1(true),
 m_dmrNetworkSlot2(true),
@@ -596,8 +595,6 @@ bool CConf::read()
 			m_dmrNetworkOptions = value;
 		else if (::strcmp(key, "Debug") == 0)
 			m_dmrNetworkDebug = ::atoi(value) == 1;
-		else if (::strcmp(key, "JitterEnabled") == 0)
-			m_dmrNetworkJitterEnabled = ::atoi(value) == 1;
 		else if (::strcmp(key, "Jitter") == 0)
 			m_dmrNetworkJitter = (unsigned int)::atoi(value);
 		else if (::strcmp(key, "Slot1") == 0)
@@ -1269,11 +1266,6 @@ bool CConf::getDMRNetworkDebug() const
 	return m_dmrNetworkDebug;
 }
 
-bool CConf::getDMRNetworkJitterEnabled() const
-{
-	return m_dmrNetworkJitterEnabled;
-}
-
 unsigned int CConf::getDMRNetworkJitter() const
 {
 	return m_dmrNetworkJitter;

Conf.h

@@ -167,7 +167,6 @@ class CConf
   std::string  getDMRNetworkPassword() const;
   std::string  getDMRNetworkOptions() const;
   bool         getDMRNetworkDebug() const;
-  bool         getDMRNetworkJitterEnabled() const;
   unsigned int getDMRNetworkJitter() const;
   bool         getDMRNetworkSlot1() const;
   bool         getDMRNetworkSlot2() const;
@@ -361,7 +360,6 @@ class CConf
   std::string  m_dmrNetworkPassword;
   std::string  m_dmrNetworkOptions;
   bool         m_dmrNetworkDebug;
-  bool         m_dmrNetworkJitterEnabled;
   unsigned int m_dmrNetworkJitter;
   bool         m_dmrNetworkSlot1;
   bool         m_dmrNetworkSlot2;

DMRControl.cpp

@@ -21,7 +21,7 @@
 #include <cassert>
 #include <algorithm>
 
-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) :
+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_colorCode(colorCode),
 m_modem(modem),
 m_network(network),
@@ -38,7 +38,7 @@ m_lookup(lookup)
 	// Load black and white lists to DMRAccessControl
 	CDMRAccessControl::init(blacklist, whitelist, slot1TGWhitelist, slot2TGWhitelist, selfOnly, prefixes, id);
 
-	CDMRSlot::init(colorCode, embeddedLCOnly, dumpTAData, callHang, modem, network, display, duplex, m_lookup, rssi);
+	CDMRSlot::init(colorCode, embeddedLCOnly, dumpTAData, callHang, modem, network, display, duplex, m_lookup, rssi, jitter);
 }
 
 CDMRControl::~CDMRControl()

DMRControl.h

@@ -31,7 +31,7 @@
 
 class CDMRControl {
 public:
-	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);
+	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();
 
 	bool processWakeup(const unsigned char* data);

DMRData.cpp

@@ -29,7 +29,6 @@ m_dstId(data.m_dstId),
 m_flco(data.m_flco),
 m_dataType(data.m_dataType),
 m_seqNo(data.m_seqNo),
-m_missing(data.m_missing),
 m_n(data.m_n),
 m_ber(data.m_ber),
 m_rssi(data.m_rssi)
@@ -46,7 +45,6 @@ m_dstId(0U),
 m_flco(FLCO_GROUP),
 m_dataType(0U),
 m_seqNo(0U),
-m_missing(false),
 m_n(0U),
 m_ber(0U),
 m_rssi(0U)
@@ -70,7 +68,6 @@ CDMRData& CDMRData::operator=(const CDMRData& data)
 		m_flco     = data.m_flco;
 		m_dataType = data.m_dataType;
 		m_seqNo    = data.m_seqNo;
-		m_missing  = data.m_missing;
 		m_n        = data.m_n;
 		m_ber      = data.m_ber;
 		m_rssi     = data.m_rssi;
@@ -141,16 +138,6 @@ void CDMRData::setSeqNo(unsigned char seqNo)
 	m_seqNo = seqNo;
 }
 
-bool CDMRData::isMissing() const
-{
-	return m_missing;
-}
-
-void CDMRData::setMissing(bool missing)
-{
-	m_missing = missing;
-}
-
 unsigned char CDMRData::getN() const
 {
 	return m_n;

DMRData.h

@@ -45,9 +45,6 @@ class CDMRData {
 	unsigned char getDataType() const;
 	void setDataType(unsigned char dataType);
 
-	bool isMissing() const;
-	void setMissing(bool missing);
-
 	unsigned char getBER() const;
 	void setBER(unsigned char ber);
 
@@ -65,7 +62,6 @@ class CDMRData {
 	FLCO           m_flco;
 	unsigned char  m_dataType;
 	unsigned char  m_seqNo;
-	bool           m_missing;
 	unsigned char  m_n;
 	unsigned char  m_ber;
 	unsigned char  m_rssi;