g4klx/MMDVM
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVM.git synced 2026-04-05 22:46:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into boxcar

Browse source
This commit is contained in:
Jonathan Naylor 2017-07-31 21:58:16 +01:00
commit 469be87dc3
8 changed files with 95 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

30
IO.cpp
View file

@ -26,10 +26,6 @@
static q15_t BOXCAR_FILTER[] = {12000, 12000, 12000, 12000, 12000, 0};
const uint16_t BOXCAR_FILTER_LEN = 6U;
// Generated using [b, a] = butter(1, 0.001) in MATLAB
static q31_t DC_FILTER[] = {3367972, 0, 3367972, 0, 2140747704, 0}; // {b0, 0, b1, b2, -a1, -a2}
const uint32_t DC_FILTER_STAGES = 1U; // One Biquad stage
const uint16_t DC_OFFSET = 2048U;
CIO::CIO() :
@ -52,22 +48,14 @@ m_detect(false),
m_adcOverflow(0U),
m_dacOverflow(0U),
m_watchdog(0U),
m_lockout(false),
m_dcFilter(),
m_dcState()
m_lockout(false)
{
::memset(m_boxcarState, 0x00U, 30U * sizeof(q15_t));
::memset(m_dcState, 0x00U, 4U * sizeof(q31_t));
m_boxcarFilter.numTaps = BOXCAR_FILTER_LEN;
m_boxcarFilter.pState = m_boxcarState;
m_boxcarFilter.pCoeffs = BOXCAR_FILTER;
m_dcFilter.numStages = DC_FILTER_STAGES;
m_dcFilter.pState = m_dcState;
m_dcFilter.pCoeffs = DC_FILTER;
m_dcFilter.postShift = 0;
initInt();
}
@ -144,22 +132,6 @@ void CIO::process()
if (m_lockout)
return;
q31_t dcLevel = 0;
q31_t dcVals[20];
q31_t q31Samples[20U];
::arm_q15_to_q31(samples, q31Samples, RX_BLOCK_SIZE);
::arm_biquad_cascade_df1_q31(&m_dcFilter, q31Samples, dcVals, RX_BLOCK_SIZE);
for (uint8_t i = 0U; i < RX_BLOCK_SIZE; i++)
dcLevel += dcVals[i];
dcLevel /= RX_BLOCK_SIZE;
q15_t offset = q15_t(dcLevel >> 16);
for (uint8_t i = 0U; i < RX_BLOCK_SIZE; i++)
samples[i] -= offset;
q15_t vals[RX_BLOCK_SIZE];
::arm_fir_fast_q15(&m_boxcarFilter, samples, vals, RX_BLOCK_SIZE);