From a033ee66fd1d7aac94b948dfc05afb964df60581 Mon Sep 17 00:00:00 2001 From: Andy CA6JAU Date: Fri, 31 Mar 2017 01:25:45 -0300 Subject: [PATCH 1/2] Restoring original TX filter for YSF, fixing symbol generation (zero padding for FIR interpolation) --- YSFTX.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/YSFTX.cpp b/YSFTX.cpp index dc209cc..b53684b 100644 --- a/YSFTX.cpp +++ b/YSFTX.cpp @@ -30,22 +30,22 @@ static q15_t YSF_C4FSK_FILTER[] = {688, -680, -2158, -3060, -2724, -775, 2684, 7 11310, 7041, 2684, -775, -2724, -3060, -2158, -680, 688, 0}; const uint16_t YSF_C4FSK_FILTER_LEN = 22U; #else -// Generated using rcosdesign(0.2, 8, 4, 'sqrt') in MATLAB -static q15_t YSF_C4FSK_FILTER[] = {448, 0, -622, -954, -619, 349, 1391, 1704, 764, -1182, -3028, -3279, -861, - 4135, 10280, 15335, 17288, 15335, 10280, 4135, -861, -3279, -3028, -1182, - 764, 1704, 1391, 349, -619, -954, -622, 0, 448, 0}; -const uint16_t YSF_C4FSK_FILTER_LEN = 34U; +// 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, + 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; #endif -const q15_t YSF_LEVELA_HI[] = { 809, 809, 809, 809, 809}; -const q15_t YSF_LEVELB_HI[] = { 269, 269, 269, 269, 269}; -const q15_t YSF_LEVELC_HI[] = {-269, -269, -269, -269, -269}; -const q15_t YSF_LEVELD_HI[] = {-809, -809, -809, -809, -809}; +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_LO[] = { 405, 405, 405, 405, 405}; -const q15_t YSF_LEVELB_LO[] = { 135, 135, 135, 135, 135}; -const q15_t YSF_LEVELC_LO[] = {-135, -135, -135, -135, -135}; -const q15_t YSF_LEVELD_LO[] = {-405, -405, -405, -405, -405}; +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 uint8_t YSF_START_SYNC = 0x77U; const uint8_t YSF_END_SYNC = 0xFFU; @@ -143,7 +143,7 @@ void CYSFTX::writeByte(uint8_t c) break; } } - + ::arm_fir_fast_q15(&m_modFilter, inBuffer, outBuffer, YSF_RADIO_SYMBOL_LENGTH * 4U); io.write(STATE_YSF, outBuffer, YSF_RADIO_SYMBOL_LENGTH * 4U); From 546243eec6318bd1d5de21ef8a8f4f80b93bbe76 Mon Sep 17 00:00:00 2001 From: Andy CA6JAU Date: Fri, 31 Mar 2017 01:26:07 -0300 Subject: [PATCH 2/2] Fixing symbol generation (zero padding for FIR interpolation) --- DMRTX.cpp | 8 ++++---- DStarTX.cpp | 4 ++-- P25TX.cpp | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/DMRTX.cpp b/DMRTX.cpp index 51cd60d..196e967 100644 --- a/DMRTX.cpp +++ b/DMRTX.cpp @@ -36,10 +36,10 @@ static q15_t DMR_C4FSK_FILTER[] = {401, 104, -340, -731, -847, -553, 112, 909, 1 const uint16_t DMR_C4FSK_FILTER_LEN = 42U; #endif -const q15_t DMR_LEVELA[] = { 640, 640 , 640, 640, 640}; -const q15_t DMR_LEVELB[] = { 213, 213, 213, 213, 213}; -const q15_t DMR_LEVELC[] = {-213, -213, -213, -213, -213}; -const q15_t DMR_LEVELD[] = {-640, -640, -640, -640, -640}; +const q15_t DMR_LEVELA[] = { 3195, 0 , 0, 0, 0}; +const q15_t DMR_LEVELB[] = { 1065, 0 , 0, 0, 0}; +const q15_t DMR_LEVELC[] = {-1065, 0 , 0, 0, 0}; +const q15_t DMR_LEVELD[] = {-3195, 0 , 0, 0, 0}; // The PR FILL and Data Sync pattern. const uint8_t IDLE_DATA[] = diff --git a/DStarTX.cpp b/DStarTX.cpp index b4c89e5..d4640d1 100644 --- a/DStarTX.cpp +++ b/DStarTX.cpp @@ -32,8 +32,8 @@ const uint8_t FRAME_SYNC[] = {0xEAU, 0xA6U, 0x00U}; static q15_t DSTAR_GMSK_FILTER[] = {8, 104, 760, 3158, 7421, 9866, 7421, 3158, 760, 104, 8, 0}; const uint16_t DSTAR_GMSK_FILTER_LEN = 12U; -const q15_t DSTAR_LEVEL0[] = {-800, -800, -800, -800, -800}; -const q15_t DSTAR_LEVEL1[] = { 800, 800, 800, 800, 800}; +const q15_t DSTAR_LEVEL0[] = {-4000, 0, 0, 0, 0}; +const q15_t DSTAR_LEVEL1[] = { 4000, 0, 0, 0, 0}; const uint8_t BIT_MASK_TABLE[] = {0x80U, 0x40U, 0x20U, 0x10U, 0x08U, 0x04U, 0x02U, 0x01U}; diff --git a/P25TX.cpp b/P25TX.cpp index 42cbfc3..1cb7488 100644 --- a/P25TX.cpp +++ b/P25TX.cpp @@ -44,10 +44,10 @@ static q15_t P25_LP_FILTER[] = {170, 401, 340, -203, -715, -478, 281, 419, -440, 281, -478, -715, -203, 340, 401, 170}; const uint16_t P25_LP_FILTER_LEN = 44U; -const q15_t P25_LEVELA[] = { 495, 495, 495, 495, 495}; -const q15_t P25_LEVELB[] = { 165, 165, 165, 165, 165}; -const q15_t P25_LEVELC[] = {-165, -165, -165, -165, -165}; -const q15_t P25_LEVELD[] = {-495, -495, -495, -495, -495}; +const q15_t P25_LEVELA[] = { 2475, 0, 0, 0, 0}; +const q15_t P25_LEVELB[] = { 825, 0, 0, 0, 0}; +const q15_t P25_LEVELC[] = {-825, 0, 0, 0, 0}; +const q15_t P25_LEVELD[] = {-2475, 0, 0, 0, 0}; const uint8_t P25_START_SYNC = 0x77U;