mirror of https://github.com/g4klx/MMDVM.git
Fix Callsignatend and simplify Samples
This commit is contained in:
parent
489853f200
commit
3f960f9fc5
8
FM.cpp
8
FM.cpp
|
@ -97,10 +97,8 @@ void CFM::samples(bool cos, q15_t* samples, uint8_t length)
|
|||
//we had enough samples for CTCSS and we are in some other mode than FM
|
||||
bool validCTCSS = CTCSS_VALID(ctcssState);
|
||||
stateMachine(validCTCSS && cos, inputExt);
|
||||
} else if ((inputExt || CTCSS_READY(ctcssState)) && m_modemState == STATE_FM) {
|
||||
//We had enough samples for CTCSS and we are in FM mode, trigger the state machine
|
||||
bool validCTCSS = CTCSS_VALID(ctcssState);
|
||||
stateMachine(validCTCSS && cos, inputExt);
|
||||
if (m_modemState != STATE_FM)
|
||||
continue;
|
||||
} else if ((inputExt || CTCSS_NOT_READY(ctcssState)) && m_modemState == STATE_FM && i == length - 1) {
|
||||
//Not enough samples for CTCSS but we already are in FM, trigger the state machine
|
||||
//but do not trigger the state machine on every single sample, save CPU!
|
||||
|
@ -318,7 +316,7 @@ void CFM::stateMachine(bool validRFSignal, bool validExtSignal)
|
|||
break;
|
||||
}
|
||||
|
||||
if (m_state == FS_LISTENING) {
|
||||
if (m_state == FS_LISTENING && !m_callsign.isRunning()) {
|
||||
m_outputRFRB.reset();
|
||||
m_downsampler.reset();
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue