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

Merge branch 'AX25' into AX25_FM

This commit is contained in:
Jonathan Naylor 2020-07-12 15:28:00 +01:00
parent d29a0bc3a6 8f8dc92a14
commit 5960fb97f3
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
FM.cpp
View File

@ -149,11 +149,11 @@ void CFM::samples(bool cos, q15_t* samples, uint8_t length)
currentSample += m_callsign.getLowAudio(); currentSample += m_callsign.getLowAudio();
} }
currentSample = m_filterStage3.filter(m_filterStage2.filter(m_filterStage1.filter(currentSample)));
if (!m_callsign.isRunning() && !m_rfAck.isRunning() && !m_extAck.isRunning()) if (!m_callsign.isRunning() && !m_rfAck.isRunning() && !m_extAck.isRunning())
currentSample += m_timeoutTone.getAudio(); currentSample += m_timeoutTone.getAudio();
currentSample = m_filterStage3.filter(m_filterStage2.filter(m_filterStage1.filter(currentSample)));
currentSample += m_ctcssTX.getAudio(); currentSample += m_ctcssTX.getAudio();
m_outputRFRB.put(currentSample); m_outputRFRB.put(currentSample);

8
FMTimeout.cpp
View File

@ -36,7 +36,7 @@ m_n(0U)
void CFMTimeout::setParams(uint8_t level) void CFMTimeout::setParams(uint8_t level)
{ {
m_level = q15_t(level * 128); m_level = q15_t(level * 5);
} }
q15_t CFMTimeout::getAudio() q15_t CFMTimeout::getAudio()
@ -45,9 +45,9 @@ q15_t CFMTimeout::getAudio()
if (!m_running) if (!m_running)
return sample; return sample;
if (m_pos > 12000U) { if (m_pos >= 12000U) {
q31_t sample = BUSY_AUDIO[m_n] * m_level; q31_t sample31 = BUSY_AUDIO[m_n] * m_level;
sample = q15_t(__SSAT((sample >> 15), 16)); sample = q15_t(__SSAT((sample31 >> 15), 16));
m_n++; m_n++;
if (m_n >= BUSY_AUDIO_LEN) if (m_n >= BUSY_AUDIO_LEN)

2
SerialPort.cpp
View File

@ -109,7 +109,7 @@ const uint8_t MMDVM_DEBUG5 = 0xF5U;
#define HW_TYPE "MMDVM" #define HW_TYPE "MMDVM"
#endif #endif
#define DESCRIPTION "20200707 (D-Star/DMR/System Fusion/P25/NXDN/POCSAG/FM/AX.25)" #define DESCRIPTION "20200712 (D-Star/DMR/System Fusion/P25/NXDN/POCSAG/FM/AX.25)"
#if defined(GITVERSION) #if defined(GITVERSION)
#define concat(h, a, b, c) h " " a " " b " GitID #" c "" #define concat(h, a, b, c) h " " a " " b " GitID #" c ""