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

Remove the holdoff timers.

Browse Source
This commit is contained in:
Jonathan Naylor
2016-07-05 18:21:18 +01:00
parent ca636338d9
commit 7d67055fff
4 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
DStarControl.cpp
View File

@@ -54,7 +54,6 @@ m_slowData(),
m_rfN(0U), m_rfN(0U),
m_netN(0U), m_netN(0U),
m_networkWatchdog(1000U, 0U, 1500U), m_networkWatchdog(1000U, 0U, 1500U),
m_holdoffTimer(1000U, 0U, 500U),
m_rfTimeoutTimer(1000U, timeout), m_rfTimeoutTimer(1000U, timeout),
m_netTimeoutTimer(1000U, timeout), m_netTimeoutTimer(1000U, timeout),
m_packetTimer(1000U, 0U, 200U), m_packetTimer(1000U, 0U, 200U),
@@ -171,7 +170,6 @@ bool CDStarControl::writeModem(unsigned char *data)
m_rfHeader = header; m_rfHeader = header;
m_holdoffTimer.stop();
m_ackTimer.stop(); m_ackTimer.stop();
m_rfBits = 1U; m_rfBits = 1U;
@@ -388,10 +386,6 @@ unsigned int CDStarControl::readModem(unsigned char* data)
if (m_queue.isEmpty()) if (m_queue.isEmpty())
return 0U; return 0U;
// Don't relay data until the timer has stopped.
if (m_holdoffTimer.isRunning())
return 0U;
unsigned char len = 0U; unsigned char len = 0U;
m_queue.getData(&len, 1U); m_queue.getData(&len, 1U);
@@ -564,10 +558,6 @@ void CDStarControl::clock()
m_ackTimer.stop(); m_ackTimer.stop();
} }
m_holdoffTimer.clock(ms);
if (m_holdoffTimer.isRunning() && m_holdoffTimer.hasExpired())
m_holdoffTimer.stop();
m_rfTimeoutTimer.clock(ms); m_rfTimeoutTimer.clock(ms);
m_netTimeoutTimer.clock(ms); m_netTimeoutTimer.clock(ms);

1
DStarControl.h
View File

@@ -63,7 +63,6 @@ private:
unsigned char m_rfN; unsigned char m_rfN;
unsigned char m_netN; unsigned char m_netN;
CTimer m_networkWatchdog; CTimer m_networkWatchdog;
CTimer m_holdoffTimer;
CTimer m_rfTimeoutTimer; CTimer m_rfTimeoutTimer;
CTimer m_netTimeoutTimer; CTimer m_netTimeoutTimer;
CTimer m_packetTimer; CTimer m_packetTimer;

11
YSFControl.cpp
View File

@@ -34,7 +34,6 @@ m_netState(RS_NET_IDLE),
m_rfTimeoutTimer(1000U, timeout), m_rfTimeoutTimer(1000U, timeout),
m_netTimeoutTimer(1000U, timeout), m_netTimeoutTimer(1000U, timeout),
m_networkWatchdog(1000U, 0U, 1500U), m_networkWatchdog(1000U, 0U, 1500U),
m_holdoffTimer(1000U, 0U, 500U),
m_rfFrames(0U), m_rfFrames(0U),
m_netFrames(0U), m_netFrames(0U),
m_rfErrs(0U), m_rfErrs(0U),
@@ -90,8 +89,6 @@ bool CYSFControl::writeModem(unsigned char *data)
if (fi == YSF_FI_TERMINATOR) if (fi == YSF_FI_TERMINATOR)
return false; return false;
m_holdoffTimer.stop();
m_rfFrames = 0U; m_rfFrames = 0U;
m_rfErrs = 0U; m_rfErrs = 0U;
m_rfBits = 1U; m_rfBits = 1U;
@@ -311,10 +308,6 @@ unsigned int CYSFControl::readModem(unsigned char* data)
if (m_queue.isEmpty()) if (m_queue.isEmpty())
return 0U; return 0U;
// Don't relay data until the timer has stopped.
if (m_holdoffTimer.isRunning())
return 0U;
unsigned char len = 0U; unsigned char len = 0U;
m_queue.getData(&len, 1U); m_queue.getData(&len, 1U);
@@ -509,10 +502,6 @@ void CYSFControl::clock(unsigned int ms)
if (m_network != NULL) if (m_network != NULL)
writeNetwork(); writeNetwork();
m_holdoffTimer.clock(ms);
if (m_holdoffTimer.isRunning() && m_holdoffTimer.hasExpired())
m_holdoffTimer.stop();
m_rfTimeoutTimer.clock(ms); m_rfTimeoutTimer.clock(ms);
m_netTimeoutTimer.clock(ms); m_netTimeoutTimer.clock(ms);

1
YSFControl.h
View File

@@ -51,7 +51,6 @@ private:
CTimer m_rfTimeoutTimer; CTimer m_rfTimeoutTimer;
CTimer m_netTimeoutTimer; CTimer m_netTimeoutTimer;
CTimer m_networkWatchdog; CTimer m_networkWatchdog;
CTimer m_holdoffTimer;
unsigned int m_rfFrames; unsigned int m_rfFrames;
unsigned int m_netFrames; unsigned int m_netFrames;
unsigned int m_rfErrs; unsigned int m_rfErrs;