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

Merge pull request #258 from F4FXL/FM_Ext 

Fix repeater stuck on transmit
This commit is contained in:
Jonathan Naylor 2020-05-10 17:06:57 +01:00 committed by GitHub
parent aaa72e769f 0f51ddd0bd
commit da16ee277c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
FM.cpp
View File

@ -152,25 +152,8 @@ void CFM::samples(bool cos, const q15_t* samples, uint8_t length)
void CFM::process() void CFM::process()
{ {
if (m_modemState != STATE_FM)
return;
uint16_t length = m_outputRFRB.getData();
if (length == 0U)
return;
uint16_t space = io.getSpace();
if (space < 3U)
return;
space -= 2U;
if (space < length)
length = space;
for (uint16_t i = 0U; i < length; i++) {
q15_t sample; q15_t sample;
m_outputRFRB.get(sample); while(io.getSpace() >= 3U && m_outputRFRB.get(sample)) {
io.write(STATE_FM, &sample, 1U); io.write(STATE_FM, &sample, 1U);
} }
} }
@ -302,7 +285,7 @@ void CFM::stateMachine(bool validRFSignal, bool validExtSignal)
} }
if (m_state == FS_LISTENING && m_modemState == STATE_FM) { if (m_state == FS_LISTENING && m_modemState == STATE_FM) {
if (!m_callsign.isRunning() && !m_rfAck.isRunning() && !m_extAck.isRunning() && m_outputRFRB.getData() == 0U) { if (!m_callsign.isRunning() && !m_rfAck.isRunning() && !m_extAck.isRunning()) {
DEBUG1("Change to STATE_IDLE"); DEBUG1("Change to STATE_IDLE");
m_modemState = STATE_IDLE; m_modemState = STATE_IDLE;
m_callsignTimer.stop(); m_callsignTimer.stop();
@ -721,3 +704,4 @@ void CFM::insertSilence(uint16_t ms)
for (uint32_t i = 0U; i < nSamples; i++) for (uint32_t i = 0U; i < nSamples; i++)
m_outputRFRB.put(0); m_outputRFRB.put(0);
} }