g4klx/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost.git synced 2026-01-16 05:19:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Roll back holdoff timer changes.

Browse source
This commit is contained in:
Jonathan Naylor 2016-05-21 12:32:36 +01:00
parent 90772a2a9b
commit e600cf36bb
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
DStarControl.cpp
View file

@ -171,9 +171,7 @@ bool CDStarControl::writeModem(unsigned char *data)
m_rfHeader = header;
if (m_netState == RS_NET_IDLE)
m_holdoffTimer.stop();
m_holdoffTimer.stop();
m_ackTimer.stop();
m_rfBits = 1U;
@ -468,7 +466,6 @@ void CDStarControl::writeNetwork()
m_netHeader = header;
m_holdoffTimer.start();
m_netTimeoutTimer.start();
m_packetTimer.start();
m_elapsed.start();

4
YSFControl.cpp
View file

@ -84,8 +84,7 @@ bool CYSFControl::writeModem(unsigned char *data)
if (fi == YSF_FI_TERMINATOR)
return false;
if (m_netState == RS_NET_IDLE)
m_holdoffTimer.stop();
m_holdoffTimer.stop();
m_rfFrames = 0U;
m_rfErrs = 0U;
@ -365,7 +364,6 @@ void CYSFControl::writeNetwork()
LogMessage("YSF, received network data from %10.10s to %10.10s at %10.10s", m_netSource, m_netDest, data + 4U);
m_netTimeoutTimer.start();
m_holdoffTimer.start();
m_netState = RS_NET_AUDIO;
m_netFrames = 0U;
} else {