Merge branch 'FM' into boxcar_fm

This commit is contained in:
Jonathan Naylor 2020-04-29 21:51:44 +01:00
commit bcd71edd90
2 changed files with 2 additions and 2 deletions

2
FM.cpp
View File

@ -88,7 +88,7 @@ void CFM::samples(bool cos, q15_t* samples, uint8_t length)
currentSample = m_blanking.process(currentSample); currentSample = m_blanking.process(currentSample);
currentSample *= m_rfAudioBoost; currentSample *= m_rfAudioBoost;
} else { } else {
currentSample = 0U; currentSample = 0;
} }
if (!m_callsign.isRunning()) if (!m_callsign.isRunning())

View File

@ -101,7 +101,7 @@ const uint8_t MMDVM_DEBUG5 = 0xF5U;
#define HW_TYPE "MMDVM" #define HW_TYPE "MMDVM"
#endif #endif
#define DESCRIPTION "20200428 (D-Star/DMR/System Fusion/P25/NXDN/POCSAG/FM)" #define DESCRIPTION "20200429 (D-Star/DMR/System Fusion/P25/NXDN/POCSAG/FM)"
#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 ""