diff --git a/DStarControl.cpp b/DStarControl.cpp index 9706cbb..9f39fee 100644 --- a/DStarControl.cpp +++ b/DStarControl.cpp @@ -54,7 +54,6 @@ m_slowData(), m_rfN(0U), m_netN(0U), m_networkWatchdog(1000U, 0U, 1500U), -m_holdoffTimer(1000U, 0U, 500U), m_rfTimeoutTimer(1000U, timeout), m_netTimeoutTimer(1000U, timeout), m_packetTimer(1000U, 0U, 200U), @@ -171,7 +170,6 @@ bool CDStarControl::writeModem(unsigned char *data) m_rfHeader = header; - m_holdoffTimer.stop(); m_ackTimer.stop(); m_rfBits = 1U; @@ -388,10 +386,6 @@ unsigned int CDStarControl::readModem(unsigned char* data) if (m_queue.isEmpty()) return 0U; - // Don't relay data until the timer has stopped. - if (m_holdoffTimer.isRunning()) - return 0U; - unsigned char len = 0U; m_queue.getData(&len, 1U); @@ -564,10 +558,6 @@ void CDStarControl::clock() m_ackTimer.stop(); } - m_holdoffTimer.clock(ms); - if (m_holdoffTimer.isRunning() && m_holdoffTimer.hasExpired()) - m_holdoffTimer.stop(); - m_rfTimeoutTimer.clock(ms); m_netTimeoutTimer.clock(ms); diff --git a/DStarControl.h b/DStarControl.h index 856e247..192f1b2 100644 --- a/DStarControl.h +++ b/DStarControl.h @@ -63,7 +63,6 @@ private: unsigned char m_rfN; unsigned char m_netN; CTimer m_networkWatchdog; - CTimer m_holdoffTimer; CTimer m_rfTimeoutTimer; CTimer m_netTimeoutTimer; CTimer m_packetTimer; diff --git a/YSFControl.cpp b/YSFControl.cpp index 8b5cb78..bd22a65 100644 --- a/YSFControl.cpp +++ b/YSFControl.cpp @@ -34,7 +34,6 @@ m_netState(RS_NET_IDLE), m_rfTimeoutTimer(1000U, timeout), m_netTimeoutTimer(1000U, timeout), m_networkWatchdog(1000U, 0U, 1500U), -m_holdoffTimer(1000U, 0U, 500U), m_rfFrames(0U), m_netFrames(0U), m_rfErrs(0U), @@ -90,8 +89,6 @@ bool CYSFControl::writeModem(unsigned char *data) if (fi == YSF_FI_TERMINATOR) return false; - m_holdoffTimer.stop(); - m_rfFrames = 0U; m_rfErrs = 0U; m_rfBits = 1U; @@ -311,10 +308,6 @@ unsigned int CYSFControl::readModem(unsigned char* data) if (m_queue.isEmpty()) return 0U; - // Don't relay data until the timer has stopped. - if (m_holdoffTimer.isRunning()) - return 0U; - unsigned char len = 0U; m_queue.getData(&len, 1U); @@ -509,10 +502,6 @@ void CYSFControl::clock(unsigned int ms) if (m_network != NULL) writeNetwork(); - m_holdoffTimer.clock(ms); - if (m_holdoffTimer.isRunning() && m_holdoffTimer.hasExpired()) - m_holdoffTimer.stop(); - m_rfTimeoutTimer.clock(ms); m_netTimeoutTimer.clock(ms); diff --git a/YSFControl.h b/YSFControl.h index 402ba39..2d7bd82 100644 --- a/YSFControl.h +++ b/YSFControl.h @@ -51,7 +51,6 @@ private: CTimer m_rfTimeoutTimer; CTimer m_netTimeoutTimer; CTimer m_networkWatchdog; - CTimer m_holdoffTimer; unsigned int m_rfFrames; unsigned int m_netFrames; unsigned int m_rfErrs;