mirror of
https://github.com/g4klx/MMDVM.git
synced 2026-04-05 14:37:02 +00:00
Using CMSIS FIR interpolator for all modulators
This commit is contained in:
parent
9bcaba0419
commit
a49871cd8b
10 changed files with 148 additions and 145 deletions
52
YSFTX.cpp
52
YSFTX.cpp
|
|
@ -26,26 +26,26 @@
|
|||
|
||||
#if defined(WIDE_C4FSK_FILTERS_TX)
|
||||
// Generated using rcosdesign(0.2, 4, 5, 'sqrt') in MATLAB
|
||||
static q15_t YSF_C4FSK_FILTER[] = {688, -680, -2158, -3060, -2724, -775, 2684, 7041, 11310, 14425, 15565, 14425,
|
||||
11310, 7041, 2684, -775, -2724, -3060, -2158, -680, 688, 0};
|
||||
const uint16_t YSF_C4FSK_FILTER_LEN = 22U;
|
||||
static q15_t YSF_C4FSK_FILTER[] = {0, 0, 0, 0, 688, -680, -2158, -3060, -2724, -775, 2684, 7041, 11310, 14425, 15565, 14425,
|
||||
11310, 7041, 2684, -775, -2724, -3060, -2158, -680, 688}; // numTaps = 25, L = 5
|
||||
const uint16_t YSF_C4FSK_FILTER_PHASE_LEN = 5U; // phaseLength = numTaps/L
|
||||
#else
|
||||
// Generated using rcosdesign(0.2, 8, 5, 'sqrt') in MATLAB
|
||||
static q15_t YSF_C4FSK_FILTER[] = {401, 104, -340, -731, -847, -553, 112, 909, 1472, 1450, 683, -675, -2144, -3040, -2706, -770, 2667, 6995,
|
||||
static q15_t YSF_C4FSK_FILTER[] = {0, 0, 0, 0, 401, 104, -340, -731, -847, -553, 112, 909, 1472, 1450, 683, -675, -2144, -3040, -2706, -770, 2667, 6995,
|
||||
11237, 14331, 15464, 14331, 11237, 6995, 2667, -770, -2706, -3040, -2144, -675, 683, 1450, 1472, 909, 112,
|
||||
-553, -847, -731, -340, 104, 401, 0};
|
||||
const uint16_t YSF_C4FSK_FILTER_LEN = 42U;
|
||||
-553, -847, -731, -340, 104, 401}; // numTaps = 45, L = 5
|
||||
const uint16_t YSF_C4FSK_FILTER_PHASE_LEN = 9U; // phaseLength = numTaps/L
|
||||
#endif
|
||||
|
||||
const q15_t YSF_LEVELA_HI[] = { 4035, 0, 0, 0, 0};
|
||||
const q15_t YSF_LEVELB_HI[] = { 1345, 0, 0, 0, 0};
|
||||
const q15_t YSF_LEVELC_HI[] = {-1345, 0, 0, 0, 0};
|
||||
const q15_t YSF_LEVELD_HI[] = {-4035, 0, 0, 0, 0};
|
||||
const q15_t YSF_LEVELA_HI = 4035;
|
||||
const q15_t YSF_LEVELB_HI = 1345;
|
||||
const q15_t YSF_LEVELC_HI = -1345;
|
||||
const q15_t YSF_LEVELD_HI = -4035;
|
||||
|
||||
const q15_t YSF_LEVELA_LO[] = { 2019, 0, 0, 0, 0};
|
||||
const q15_t YSF_LEVELB_LO[] = { 673, 0, 0, 0, 0};
|
||||
const q15_t YSF_LEVELC_LO[] = { -673, 0, 0, 0, 0};
|
||||
const q15_t YSF_LEVELD_LO[] = {-2019, 0, 0, 0, 0};
|
||||
const q15_t YSF_LEVELA_LO = 2019;
|
||||
const q15_t YSF_LEVELB_LO = 673;
|
||||
const q15_t YSF_LEVELC_LO = -673;
|
||||
const q15_t YSF_LEVELD_LO = -2019;
|
||||
|
||||
const uint8_t YSF_START_SYNC = 0x77U;
|
||||
const uint8_t YSF_END_SYNC = 0xFFU;
|
||||
|
|
@ -60,11 +60,12 @@ m_poPtr(0U),
|
|||
m_txDelay(240U), // 200ms
|
||||
m_loDev(false)
|
||||
{
|
||||
::memset(m_modState, 0x00U, 70U * sizeof(q15_t));
|
||||
::memset(m_modState, 0x00U, 16U * sizeof(q15_t));
|
||||
|
||||
m_modFilter.numTaps = YSF_C4FSK_FILTER_LEN;
|
||||
m_modFilter.pState = m_modState;
|
||||
m_modFilter.L = YSF_RADIO_SYMBOL_LENGTH;
|
||||
m_modFilter.phaseLength = YSF_C4FSK_FILTER_PHASE_LEN;
|
||||
m_modFilter.pCoeffs = YSF_C4FSK_FILTER;
|
||||
m_modFilter.pState = m_modState;
|
||||
}
|
||||
|
||||
void CYSFTX::process()
|
||||
|
|
@ -121,30 +122,29 @@ uint8_t CYSFTX::writeData(const uint8_t* data, uint8_t length)
|
|||
|
||||
void CYSFTX::writeByte(uint8_t c)
|
||||
{
|
||||
q15_t inBuffer[YSF_RADIO_SYMBOL_LENGTH * 4U];
|
||||
q15_t inBuffer[4U];
|
||||
q15_t outBuffer[YSF_RADIO_SYMBOL_LENGTH * 4U];
|
||||
|
||||
const uint8_t MASK = 0xC0U;
|
||||
|
||||
q15_t* p = inBuffer;
|
||||
for (uint8_t i = 0U; i < 4U; i++, c <<= 2, p += YSF_RADIO_SYMBOL_LENGTH) {
|
||||
for (uint8_t i = 0U; i < 4U; i++, c <<= 2) {
|
||||
switch (c & MASK) {
|
||||
case 0xC0U:
|
||||
::memcpy(p, m_loDev ? YSF_LEVELA_LO : YSF_LEVELA_HI, YSF_RADIO_SYMBOL_LENGTH * sizeof(q15_t));
|
||||
inBuffer[i] = m_loDev ? YSF_LEVELA_LO : YSF_LEVELA_HI;
|
||||
break;
|
||||
case 0x80U:
|
||||
::memcpy(p, m_loDev ? YSF_LEVELB_LO : YSF_LEVELB_HI, YSF_RADIO_SYMBOL_LENGTH * sizeof(q15_t));
|
||||
inBuffer[i] = m_loDev ? YSF_LEVELB_LO : YSF_LEVELB_HI;
|
||||
break;
|
||||
case 0x00U:
|
||||
::memcpy(p, m_loDev ? YSF_LEVELC_LO : YSF_LEVELC_HI, YSF_RADIO_SYMBOL_LENGTH * sizeof(q15_t));
|
||||
inBuffer[i] = m_loDev ? YSF_LEVELC_LO : YSF_LEVELC_HI;
|
||||
break;
|
||||
default:
|
||||
::memcpy(p, m_loDev ? YSF_LEVELD_LO : YSF_LEVELD_HI, YSF_RADIO_SYMBOL_LENGTH * sizeof(q15_t));
|
||||
inBuffer[i] = m_loDev ? YSF_LEVELD_LO : YSF_LEVELD_HI;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
::arm_fir_fast_q15(&m_modFilter, inBuffer, outBuffer, YSF_RADIO_SYMBOL_LENGTH * 4U);
|
||||
|
||||
::arm_fir_interpolate_q15(&m_modFilter, inBuffer, outBuffer, 4U);
|
||||
|
||||
io.write(STATE_YSF, outBuffer, YSF_RADIO_SYMBOL_LENGTH * 4U);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue