Superminaren
/
MMDVM
mirror of https://github.com/g4klx/MMDVM.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Run the holdoff timer permamnently.

This commit is contained in:
Jonathan Naylor 2020-04-24 12:15:58 +01:00
parent 103d937152
commit 33f88344c3
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
FM.cpp
View File

@ -114,14 +114,15 @@ uint8_t CFM::setCallsign(const char* callsign, uint8_t speed, uint16_t frequency
m_callsignAtStart = callsignAtStart; m_callsignAtStart = callsignAtStart;
m_callsignAtEnd = callsignAtEnd; m_callsignAtEnd = callsignAtEnd;
uint16_t holdoffTime = 0U; uint16_t holdoffTime = holdoff * 60U;
uint16_t callsignTime = time * 60U; uint16_t callsignTime = time * 60U;
if (holdoff > 0U)
holdoffTime = callsignTime / holdoff;
m_holdoffTimer.setTimeout(holdoffTime, 0U); m_holdoffTimer.setTimeout(holdoffTime, 0U);
m_callsignTimer.setTimeout(callsignTime, 0U); m_callsignTimer.setTimeout(callsignTime, 0U);
if (holdoffTime > 0U)
m_holdoffTimer.start();
return m_callsign.setParams(callsign, speed, frequency, highLevel, lowLevel); return m_callsign.setParams(callsign, speed, frequency, highLevel, lowLevel);
} }
@ -190,7 +191,6 @@ void CFM::stateMachine(bool validSignal, uint8_t length)
m_modemState = STATE_IDLE; m_modemState = STATE_IDLE;
m_callsignTimer.stop(); m_callsignTimer.stop();
m_timeoutTimer.stop(); m_timeoutTimer.stop();
m_holdoffTimer.stop();
m_kerchunkTimer.stop(); m_kerchunkTimer.stop();
m_ackMinTimer.stop(); m_ackMinTimer.stop();
m_ackDelayTimer.stop(); m_ackDelayTimer.stop();
@ -237,7 +237,6 @@ void CFM::kerchunkState(bool validSignal)
m_timeoutTimer.stop(); m_timeoutTimer.stop();
m_ackMinTimer.stop(); m_ackMinTimer.stop();
m_callsignTimer.stop(); m_callsignTimer.stop();
m_holdoffTimer.stop();
} }
} }
@ -316,7 +315,6 @@ void CFM::hangState(bool validSignal)
sendCallsign(); sendCallsign();
m_callsignTimer.stop(); m_callsignTimer.stop();
m_holdoffTimer.stop();
} }
} }