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

Merge branch 'master' into boxcar

This commit is contained in:
Jonathan Naylor 2017-07-16 19:01:54 +01:00
parent 68f0fa8132 ba81fa7396
commit 8ce38eec9a
10 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DMRDMORX.cpp
View File

@ -88,7 +88,7 @@ bool CDMRDMORX::processSample(q15_t sample, uint16_t rssi)
m_rssi[m_dataPtr] = rssi; m_rssi[m_dataPtr] = rssi;
m_bitBuffer[m_bitPtr] <<= 1; m_bitBuffer[m_bitPtr] <<= 1;
if (sample < m_dcLevel) if (sample < 0)
m_bitBuffer[m_bitPtr] |= 0x01U; m_bitBuffer[m_bitPtr] |= 0x01U;
if (m_state == DMORXS_NONE) { if (m_state == DMORXS_NONE) {

2
DMRSlotRX.cpp
View File

@ -104,7 +104,7 @@ bool CDMRSlotRX::processSample(q15_t sample, uint16_t rssi)
m_rssi[m_dataPtr] = rssi; m_rssi[m_dataPtr] = rssi;
m_bitBuffer[m_bitPtr] <<= 1; m_bitBuffer[m_bitPtr] <<= 1;
if (sample < m_dcLevel) if (sample < 0)
m_bitBuffer[m_bitPtr] |= 0x01U; m_bitBuffer[m_bitPtr] |= 0x01U;
if (m_state == DMRRXS_NONE) { if (m_state == DMRRXS_NONE) {

2
DStarRX.cpp
View File

@ -279,7 +279,7 @@ void CDStarRX::samples(const q15_t* samples, const uint16_t* rssi, uint8_t lengt
m_rssiAccum += rssi[i]; m_rssiAccum += rssi[i];
m_rssiCount++; m_rssiCount++;
bool bit = samples[i] < m_dcLevel; bool bit = samples[i] < 0;
if (bit != m_prev) { if (bit != m_prev) {
if (m_pll < (PLLMAX / 2U)) if (m_pll < (PLLMAX / 2U))

2
Globals.h
View File

@ -93,8 +93,6 @@ extern bool m_duplex;
extern bool m_tx; extern bool m_tx;
extern bool m_dcd; extern bool m_dcd;
extern q15_t m_dcLevel;
extern CSerialPort serial; extern CSerialPort serial;
extern CIO io; extern CIO io;

18
IO.cpp
View File

@ -57,15 +57,15 @@ m_dcFilter(),
m_dcState() m_dcState()
{ {
::memset(m_boxcarState, 0x00U, 30U * sizeof(q15_t)); ::memset(m_boxcarState, 0x00U, 30U * sizeof(q15_t));
::memset(m_dcState, 0x00U, 4U * sizeof(q31_t)); ::memset(m_dcState, 0x00U, 4U * sizeof(q31_t));
m_boxcarFilter.numTaps = BOXCAR_FILTER_LEN; m_boxcarFilter.numTaps = BOXCAR_FILTER_LEN;
m_boxcarFilter.pState = m_boxcarState; m_boxcarFilter.pState = m_boxcarState;
m_boxcarFilter.pCoeffs = BOXCAR_FILTER; m_boxcarFilter.pCoeffs = BOXCAR_FILTER;
m_dcFilter.numStages = DC_FILTER_STAGES; m_dcFilter.numStages = DC_FILTER_STAGES;
m_dcFilter.pState = m_dcState; m_dcFilter.pState = m_dcState;
m_dcFilter.pCoeffs = DC_FILTER; m_dcFilter.pCoeffs = DC_FILTER;
m_dcFilter.postShift = 0; m_dcFilter.postShift = 0;
initInt(); initInt();
@ -147,17 +147,19 @@ void CIO::process()
q31_t dcLevel = 0; q31_t dcLevel = 0;
q31_t dcVals[20]; q31_t dcVals[20];
q31_t intSamp[20]; q31_t q31Samples[20U];
::arm_q15_to_q31((q15_t*)samples, intSamp, RX_BLOCK_SIZE); ::arm_q15_to_q31(samples, q31Samples, RX_BLOCK_SIZE);
::arm_biquad_cascade_df1_q31(&m_dcFilter, intSamp, dcVals, 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++) for (uint8_t i = 0U; i < RX_BLOCK_SIZE; i++)
dcLevel += dcVals[i]; dcLevel += dcVals[i];
dcLevel /= RX_BLOCK_SIZE; dcLevel /= RX_BLOCK_SIZE;
m_dcLevel = q15_t(dcLevel >> 16); 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]; q15_t vals[RX_BLOCK_SIZE];
::arm_fir_fast_q15(&m_boxcarFilter, samples, vals, RX_BLOCK_SIZE); ::arm_fir_fast_q15(&m_boxcarFilter, samples, vals, RX_BLOCK_SIZE);

4
IO.h
View File

@ -60,8 +60,8 @@ private:
CSampleRB m_txBuffer; CSampleRB m_txBuffer;
CRSSIRB m_rssiBuffer; CRSSIRB m_rssiBuffer;
arm_fir_instance_q15 m_boxcarFilter; arm_fir_instance_q15 m_boxcarFilter;
q15_t m_boxcarState[30U]; // NoTaps + BlockSize - 1, 6 + 20 - 1 plus some spare q15_t m_boxcarState[30U]; // NoTaps + BlockSize - 1, 6 + 20 - 1 plus some spare
arm_biquad_casd_df1_inst_q31 m_dcFilter; arm_biquad_casd_df1_inst_q31 m_dcFilter;
q31_t m_dcState[4]; q31_t m_dcState[4];

2
MMDVM.cpp
View File

@ -36,8 +36,6 @@ bool m_duplex = true;
bool m_tx = false; bool m_tx = false;
bool m_dcd = false; bool m_dcd = false;
q15_t m_dcLevel = 0;
CDStarRX dstarRX; CDStarRX dstarRX;
CDStarTX dstarTX; CDStarTX dstarTX;

2
MMDVM.ino
View File

@ -33,8 +33,6 @@ bool m_duplex = true;
bool m_tx = false; bool m_tx = false;
bool m_dcd = false; bool m_dcd = false;
q15_t m_dcLevel = 0;
CDStarRX dstarRX; CDStarRX dstarRX;
CDStarTX dstarTX; CDStarTX dstarTX;

2
P25RX.cpp
View File

@ -95,7 +95,7 @@ void CP25RX::samples(const q15_t* samples, uint16_t* rssi, uint8_t length)
m_rssiCount++; m_rssiCount++;
m_bitBuffer[m_bitPtr] <<= 1; m_bitBuffer[m_bitPtr] <<= 1;
if (sample < m_dcLevel) if (sample < 0)
m_bitBuffer[m_bitPtr] |= 0x01U; m_bitBuffer[m_bitPtr] |= 0x01U;
m_buffer[m_dataPtr] = sample; m_buffer[m_dataPtr] = sample;

2
YSFRX.cpp
View File

@ -91,7 +91,7 @@ void CYSFRX::samples(const q15_t* samples, uint16_t* rssi, uint8_t length)
m_rssiCount++; m_rssiCount++;
m_bitBuffer[m_bitPtr] <<= 1; m_bitBuffer[m_bitPtr] <<= 1;
if (sample < m_dcLevel) if (sample < 0)
m_bitBuffer[m_bitPtr] |= 0x01U; m_bitBuffer[m_bitPtr] |= 0x01U;
m_buffer[m_dataPtr] = sample; m_buffer[m_dataPtr] = sample;