Put the scaffolding in for DMR DMO mode.

This commit is contained in:
Jonathan Naylor 2016-08-23 08:16:49 +01:00
parent a866d04078
commit 69f02f6649
5 changed files with 56 additions and 17 deletions

22
IO.cpp
View file

@ -358,8 +358,12 @@ void CIO::process()
q15_t C4FSKVals[RX_BLOCK_SIZE + 1U];
::arm_fir_fast_q15(&m_C4FSKFilter, samples, C4FSKVals, blockSize);
if (m_dmrEnable)
dmrIdleRX.samples(C4FSKVals, blockSize);
if (m_dmrEnable) {
if (m_duplex)
dmrIdleRX.samples(C4FSKVals, blockSize);
else
dmrDMORX.samples(C4FSKVals, blockSize);
}
if (m_ysfEnable)
ysfRX.samples(C4FSKVals, blockSize);
@ -376,11 +380,15 @@ void CIO::process()
q15_t C4FSKVals[RX_BLOCK_SIZE + 1U];
::arm_fir_fast_q15(&m_C4FSKFilter, samples, C4FSKVals, blockSize);
// If the transmitter isn't on, use the DMR idle RX to detect the wakeup CSBKs
if (m_tx)
dmrRX.samples(C4FSKVals, control, blockSize);
else
dmrIdleRX.samples(C4FSKVals, blockSize);
if (m_duplex) {
// If the transmitter isn't on, use the DMR idle RX to detect the wakeup CSBKs
if (m_tx)
dmrRX.samples(C4FSKVals, control, blockSize);
else
dmrIdleRX.samples(C4FSKVals, blockSize);
} else {
dmrDMORX.samples(c4FSKVals, blockSize);
}
}
} else if (m_modemState == STATE_YSF) {
if (m_ysfEnable) {