From 09f2c80578e2d36aeb47aec83599bcbadd90d666 Mon Sep 17 00:00:00 2001 From: Andy CA6JAU Date: Mon, 4 Feb 2019 10:43:21 -0300 Subject: [PATCH] Removing busyTimer, no needed for YSF2XX --- YSF2DMR/WiresX.cpp | 19 ------------------- YSF2DMR/WiresX.h | 3 --- YSF2NXDN/WiresX.cpp | 19 ------------------- YSF2NXDN/WiresX.h | 3 --- YSF2P25/WiresX.cpp | 19 ------------------- YSF2P25/WiresX.h | 3 --- 6 files changed, 66 deletions(-) diff --git a/YSF2DMR/WiresX.cpp b/YSF2DMR/WiresX.cpp index b9e11d2..8d6e8d9 100644 --- a/YSF2DMR/WiresX.cpp +++ b/YSF2DMR/WiresX.cpp @@ -70,8 +70,6 @@ m_start(0U), m_search(), m_category(), m_makeUpper(makeUpper), -m_busy(false), -m_busyTimer(3000U, 1U), m_bufferTX(10000U, "YSF Wires-X TX Buffer") { assert(network != NULL); @@ -382,9 +380,6 @@ WX_STATUS CWiresX::processConnect(const unsigned char* source, const unsigned ch { //::LogDebug("Received Connect to %6.6s from %10.10s", data, source); - m_busy = true; - m_busyTimer.start(); - std::string id = std::string((char*)data, 6U); m_dstID = atoi(id.c_str()); @@ -399,9 +394,6 @@ WX_STATUS CWiresX::processConnect(const unsigned char* source, const unsigned ch void CWiresX::processConnect(int dstID) { - m_busy = true; - m_busyTimer.start(); - m_dstID = dstID; m_status = WXSI_CONNECT; @@ -460,12 +452,6 @@ void CWiresX::clock(unsigned int ms) } m_txWatch.start(); } - - m_busyTimer.clock(ms); - if (m_busyTimer.isRunning() && m_busyTimer.hasExpired()) { - m_busy = false; - m_busyTimer.stop(); - } } void CWiresX::createReply(const unsigned char* data, unsigned int length) @@ -1125,8 +1111,3 @@ void CWiresX::sendCategoryReply() m_seqNo++; } - -bool CWiresX::isBusy() const -{ - return m_busy; -} diff --git a/YSF2DMR/WiresX.h b/YSF2DMR/WiresX.h index b9a2c55..e8f8156 100644 --- a/YSF2DMR/WiresX.h +++ b/YSF2DMR/WiresX.h @@ -72,7 +72,6 @@ public: ~CWiresX(); bool start(); - bool isBusy() const; WX_STATUS process(const unsigned char* data, const unsigned char* source, unsigned char fi, unsigned char dt, unsigned char fn, unsigned char ft); @@ -114,8 +113,6 @@ private: std::vector m_TGSearch; std::vector m_category; bool m_makeUpper; - bool m_busy; - CTimer m_busyTimer; CStopWatch m_txWatch; CRingBuffer m_bufferTX; diff --git a/YSF2NXDN/WiresX.cpp b/YSF2NXDN/WiresX.cpp index 1963fb2..1a4b1ba 100644 --- a/YSF2NXDN/WiresX.cpp +++ b/YSF2NXDN/WiresX.cpp @@ -70,8 +70,6 @@ m_start(0U), m_search(), m_category(), m_makeUpper(makeUpper), -m_busy(false), -m_busyTimer(3000U, 1U), m_bufferTX(10000U, "YSF Wires-X TX Buffer") { assert(network != NULL); @@ -353,9 +351,6 @@ WX_STATUS CWiresX::processConnect(const unsigned char* source, const unsigned ch { //::LogDebug("Received Connect to %6.6s from %10.10s", data, source); - m_busy = true; - m_busyTimer.start(); - std::string id = std::string((char*)data, 6U); m_dstID = atoi(id.c_str()); @@ -370,9 +365,6 @@ WX_STATUS CWiresX::processConnect(const unsigned char* source, const unsigned ch void CWiresX::processConnect(int dstID) { - m_busy = true; - m_busyTimer.start(); - m_dstID = dstID; m_status = WXSI_CONNECT; @@ -432,12 +424,6 @@ void CWiresX::clock(unsigned int ms) } m_txWatch.start(); } - - m_busyTimer.clock(ms); - if (m_busyTimer.isRunning() && m_busyTimer.hasExpired()) { - m_busy = false; - m_busyTimer.stop(); - } } void CWiresX::createReply(const unsigned char* data, unsigned int length) @@ -1076,8 +1062,3 @@ void CWiresX::sendCategoryReply() m_seqNo++; } - -bool CWiresX::isBusy() const -{ - return m_busy; -} diff --git a/YSF2NXDN/WiresX.h b/YSF2NXDN/WiresX.h index 3a80b8d..050eda3 100644 --- a/YSF2NXDN/WiresX.h +++ b/YSF2NXDN/WiresX.h @@ -69,7 +69,6 @@ public: ~CWiresX(); bool start(); - bool isBusy() const; WX_STATUS process(const unsigned char* data, const unsigned char* source, unsigned char fi, unsigned char dt, unsigned char fn, unsigned char ft); @@ -108,8 +107,6 @@ private: std::vector m_TGSearch; std::vector m_category; bool m_makeUpper; - bool m_busy; - CTimer m_busyTimer; CStopWatch m_txWatch; CRingBuffer m_bufferTX; diff --git a/YSF2P25/WiresX.cpp b/YSF2P25/WiresX.cpp index 1963fb2..1a4b1ba 100644 --- a/YSF2P25/WiresX.cpp +++ b/YSF2P25/WiresX.cpp @@ -70,8 +70,6 @@ m_start(0U), m_search(), m_category(), m_makeUpper(makeUpper), -m_busy(false), -m_busyTimer(3000U, 1U), m_bufferTX(10000U, "YSF Wires-X TX Buffer") { assert(network != NULL); @@ -353,9 +351,6 @@ WX_STATUS CWiresX::processConnect(const unsigned char* source, const unsigned ch { //::LogDebug("Received Connect to %6.6s from %10.10s", data, source); - m_busy = true; - m_busyTimer.start(); - std::string id = std::string((char*)data, 6U); m_dstID = atoi(id.c_str()); @@ -370,9 +365,6 @@ WX_STATUS CWiresX::processConnect(const unsigned char* source, const unsigned ch void CWiresX::processConnect(int dstID) { - m_busy = true; - m_busyTimer.start(); - m_dstID = dstID; m_status = WXSI_CONNECT; @@ -432,12 +424,6 @@ void CWiresX::clock(unsigned int ms) } m_txWatch.start(); } - - m_busyTimer.clock(ms); - if (m_busyTimer.isRunning() && m_busyTimer.hasExpired()) { - m_busy = false; - m_busyTimer.stop(); - } } void CWiresX::createReply(const unsigned char* data, unsigned int length) @@ -1076,8 +1062,3 @@ void CWiresX::sendCategoryReply() m_seqNo++; } - -bool CWiresX::isBusy() const -{ - return m_busy; -} diff --git a/YSF2P25/WiresX.h b/YSF2P25/WiresX.h index 3a80b8d..050eda3 100644 --- a/YSF2P25/WiresX.h +++ b/YSF2P25/WiresX.h @@ -69,7 +69,6 @@ public: ~CWiresX(); bool start(); - bool isBusy() const; WX_STATUS process(const unsigned char* data, const unsigned char* source, unsigned char fi, unsigned char dt, unsigned char fn, unsigned char ft); @@ -108,8 +107,6 @@ private: std::vector m_TGSearch; std::vector m_category; bool m_makeUpper; - bool m_busy; - CTimer m_busyTimer; CStopWatch m_txWatch; CRingBuffer m_bufferTX;