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

Merge branch 'FM' into dstar_correlator_fm

This commit is contained in:
Jonathan Naylor 2020-05-01 18:48:04 +01:00
parent 45cdd8f799 de3c257f79
commit 783822e401
4 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
FM.cpp
View File

@ -83,8 +83,8 @@ void CFM::samples(bool cos, q15_t* samples, uint8_t length)
// Only let audio through when relaying audio
if (m_state == FS_RELAYING || m_state == FS_KERCHUNK) {
currentSample = m_deemphasis.filter(currentSample);
m_downsampler.addSample(currentSample);
// currentSample = m_deemphasis.filter(currentSample);
// m_downsampler.addSample(currentSample);
currentSample = m_blanking.process(currentSample);
currentSample *= m_rfAudioBoost;
} else {
@ -106,7 +106,7 @@ void CFM::samples(bool cos, q15_t* samples, uint8_t length)
currentSample = m_filterStage3.filter(m_filterStage2.filter(m_filterStage1.filter(currentSample)));
currentSample = m_preemphasis.filter(currentSample);
// currentSample = m_preemphasis.filter(currentSample);
currentSample += m_ctcssTX.getAudio();

16
FMCTCSSRX.cpp
View File

@ -93,7 +93,7 @@ m_rxLevelInverse(1)
uint8_t CFMCTCSSRX::setParams(uint8_t frequency, uint8_t threshold, uint8_t level)
{
m_rxLevelInverse = 511 / q15_t(level);
m_rxLevelInverse = q15Division(65535, q15_t(level * 128));
m_coeffDivTwo = 0;
@ -179,3 +179,17 @@ void CFMCTCSSRX::reset()
m_result = CTS_NONE;
m_count = 0U;
}
//Taken from https://en.wikipedia.org/wiki/Q_(number_format)#Division
q15_t CFMCTCSSRX::q15Division(q15_t a, q15_t divisor)
{
q31_t a31 = q31_t(a) << 16;
if (((a >> 31) & 1) == ((divisor >> 15) & 1))
a31 += divisor >> 1;
else
a31 -= divisor >> 1;
return a31 / divisor;
}

2
FMCTCSSRX.h
View File

@ -62,6 +62,8 @@ public:
void reset();
private:
q15_t q15Division(q15_t a, q15_t divisor);
q63_t m_coeffDivTwo;
q31_t m_threshold;
uint16_t m_count;

2
SerialPort.cpp
View File

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