mirror of https://github.com/g4klx/MMDVM.git
Handle some extra edge cases.
This commit is contained in:
parent
95e76f387c
commit
bc889f3d26
7
FM.cpp
7
FM.cpp
|
@ -154,6 +154,11 @@ void CFM::stateMachine(bool validSignal, uint8_t length)
|
|||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
if (m_state == FS_LISTENING && m_modemState == STATE_FM) {
|
||||
if (!m_callsign.isRunning() && !m_rfAck.isRunning())
|
||||
m_modemState = STATE_IDLE;
|
||||
}
|
||||
}
|
||||
|
||||
void CFM::listeningState(bool validSignal)
|
||||
|
@ -188,7 +193,6 @@ void CFM::kerchunkState(bool validSignal)
|
|||
m_ackMinTimer.stop();
|
||||
m_callsignTimer.stop();
|
||||
m_holdoffTimer.stop();
|
||||
m_modemState = STATE_IDLE;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -259,7 +263,6 @@ void CFM::hangState(bool validSignal)
|
|||
|
||||
m_callsignTimer.stop();
|
||||
m_holdoffTimer.stop();
|
||||
m_modemState = STATE_IDLE;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -154,6 +154,9 @@ void CFMKeyer::getAudio(q15_t* samples, uint8_t length)
|
|||
|
||||
void CFMKeyer::start()
|
||||
{
|
||||
if (isRunning())
|
||||
return;
|
||||
|
||||
m_wanted = true;
|
||||
m_poPos = 0U;
|
||||
m_dotPos = 0U;
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
#include "FMTimeout.h"
|
||||
|
||||
// 400 Hz sine wave at 24000 Hz sample rate
|
||||
const q15_t BUSY_AUDIO[] = {0, 3426, 6813, 10126, 13328, 16384, 19261, 21926, 24351, 26510, 28378, 29935, 31164, 32052, 32588, 32768, 32588, 32052, 31164, 29935, 28378, 26510, 24351,
|
||||
const q15_t BUSY_AUDIO[] = {0, 3426, 6813, 10126, 13328, 16384, 19261, 21926, 24351, 26510, 28378, 29935, 31164, 32052, 32588, 32767, 32588, 32052, 31164, 29935, 28378, 26510, 24351,
|
||||
21926, 19261, 16384, 13328, 10126, 6813, 3425, 0, -3425, -6813, -10126, -13328, -16384, -19261, -21926, -24351, -26510, -28378, -29935, -31164, -32052,
|
||||
-32588, -32768, -32588, -32052, -31164, -29935, -28378, -26510, -24351, -21926, -19261, -16384, -13328, -10126, -6813, -3425};
|
||||
const uint8_t BUSY_AUDIO_LEN = 60U;
|
||||
|
|
|
@ -101,7 +101,7 @@ const uint8_t MMDVM_DEBUG5 = 0xF5U;
|
|||
#define HW_TYPE "MMDVM"
|
||||
#endif
|
||||
|
||||
#define DESCRIPTION "20200415 (D-Star/DMR/System Fusion/P25/NXDN/POCSAG/FM)"
|
||||
#define DESCRIPTION "20200417 (D-Star/DMR/System Fusion/P25/NXDN/POCSAG/FM)"
|
||||
|
||||
#if defined(GITVERSION)
|
||||
#define concat(h, a, b, c) h " " a " " b " GitID #" c ""
|
||||
|
|
Loading…
Reference in New Issue