From feff1ee2c7e91b91c489b2fd4ae986ac86225467 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Fri, 8 May 2020 09:04:28 +0200 Subject: [PATCH] remove emphasis --- FM.cpp | 7 +------ FM.h | 2 -- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/FM.cpp b/FM.cpp index ca09af9..c79a822 100644 --- a/FM.cpp +++ b/FM.cpp @@ -40,8 +40,6 @@ m_hangTimer(), m_filterStage1( 724, 1448, 724, 32768, -37895, 21352),//3rd order Cheby Filter 300 to 2700Hz, 0.2dB passband ripple, sampling rate 24kHz m_filterStage2(32768, 0,-32768, 32768, -50339, 19052), m_filterStage3(32768, -65536, 32768, 32768, -64075, 31460), -m_preemphasis(32768, 13967, 0, 32768, -18801, 0),//75µS 24kHz sampling rate -m_deemphasis (32768, -18801, 0, 32768, 13967, 0),//75µS 24kHz sampling rate m_blanking(), m_useCOS(true), m_cosInvert(false), @@ -92,8 +90,7 @@ 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); + if (m_state == FS_RELAYING || m_state == FS_KERCHUNK) { // m_downsampler.addSample(currentSample); currentSample = m_blanking.process(currentSample); currentSample *= m_rfAudioBoost; @@ -116,8 +113,6 @@ 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_ctcssTX.getAudio(); samples[i] = currentSample; diff --git a/FM.h b/FM.h index fc528af..ef0f419 100644 --- a/FM.h +++ b/FM.h @@ -77,8 +77,6 @@ private: CFMDirectFormI m_filterStage1; CFMDirectFormI m_filterStage2; CFMDirectFormI m_filterStage3; - CFMDirectFormI m_preemphasis; - CFMDirectFormI m_deemphasis; CFMBlanking m_blanking; bool m_useCOS; bool m_cosInvert;