From 4a01e9b3a1e22235e8e39f7e3f14e15f0b154b44 Mon Sep 17 00:00:00 2001 From: Andy CA6JAU Date: Wed, 12 Apr 2017 00:15:43 -0300 Subject: [PATCH 1/4] Testing new RX filter for D-Star --- IO.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/IO.cpp b/IO.cpp index 22163d9..0472c0d 100644 --- a/IO.cpp +++ b/IO.cpp @@ -37,9 +37,9 @@ static q15_t C4FSK_FILTER[] = {401, 104, -340, -731, -847, -553, 112, 909, 1472, const uint16_t C4FSK_FILTER_LEN = 42U; #endif -// Generated using gaussfir(0.5, 4, 5) in MATLAB -static q15_t GMSK_FILTER[] = {8, 104, 760, 3158, 7421, 9866, 7421, 3158, 760, 104, 8, 0}; -const uint16_t GMSK_FILTER_LEN = 12U; +// Generated using fir1(31, 0.25) in MATLAB +static q15_t GMSK_FILTER[] = {-21,-60,-84,-52,78,273,387,221,-301,-974,-1305,-731,1017,3642,6306,7987,7987,6306,3642,1017,-731,-1305,-974,-301,221,387,273,78,-52,-84,-60,-21}; +const uint16_t GMSK_FILTER_LEN = 32U; // One symbol boxcar filter static q15_t P25_FILTER[] = {3000, 3000, 3000, 3000, 3000, 0}; From 27b3773f00096904441aa7d33742b902bdb3483c Mon Sep 17 00:00:00 2001 From: Andy CA6JAU Date: Wed, 12 Apr 2017 23:00:54 -0300 Subject: [PATCH 2/4] Update the copyright message --- DMRDMOTX.cpp | 1 + DStarRX.cpp | 1 + DStarTX.cpp | 1 + P25TX.cpp | 1 + YSFTX.cpp | 1 + 5 files changed, 5 insertions(+) diff --git a/DMRDMOTX.cpp b/DMRDMOTX.cpp index 0bb5a84..6ce2957 100644 --- a/DMRDMOTX.cpp +++ b/DMRDMOTX.cpp @@ -1,6 +1,7 @@ /* * Copyright (C) 2009-2017 by Jonathan Naylor G4KLX * Copyright (C) 2016 by Colin Durbridge G4EML + * Copyright (C) 2017 by Andy Uribe CA6JAU * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/DStarRX.cpp b/DStarRX.cpp index 5cb692c..38ebe09 100644 --- a/DStarRX.cpp +++ b/DStarRX.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2009-2017 by Jonathan Naylor G4KLX + * Copyright (C) 2017 by Andy Uribe CA6JAU * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/DStarTX.cpp b/DStarTX.cpp index 5ba86cb..865738b 100644 --- a/DStarTX.cpp +++ b/DStarTX.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2009-2017 by Jonathan Naylor G4KLX + * Copyright (C) 2017 by Andy Uribe CA6JAU * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/P25TX.cpp b/P25TX.cpp index bf0f8e9..a762fa9 100644 --- a/P25TX.cpp +++ b/P25TX.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2016,2017 by Jonathan Naylor G4KLX + * Copyright (C) 2017 by Andy Uribe CA6JAU * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/YSFTX.cpp b/YSFTX.cpp index a5a8b92..b768aed 100644 --- a/YSFTX.cpp +++ b/YSFTX.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2009-2017 by Jonathan Naylor G4KLX + * Copyright (C) 2017 by Andy Uribe CA6JAU * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by From 6a1c06576b7aa723e7c9685a5bfb4c1e540982b1 Mon Sep 17 00:00:00 2001 From: Andy CA6JAU Date: Wed, 12 Apr 2017 23:26:48 -0300 Subject: [PATCH 3/4] Reverting new RX filter for D-Star --- IO.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/IO.cpp b/IO.cpp index 0472c0d..22163d9 100644 --- a/IO.cpp +++ b/IO.cpp @@ -37,9 +37,9 @@ static q15_t C4FSK_FILTER[] = {401, 104, -340, -731, -847, -553, 112, 909, 1472, const uint16_t C4FSK_FILTER_LEN = 42U; #endif -// Generated using fir1(31, 0.25) in MATLAB -static q15_t GMSK_FILTER[] = {-21,-60,-84,-52,78,273,387,221,-301,-974,-1305,-731,1017,3642,6306,7987,7987,6306,3642,1017,-731,-1305,-974,-301,221,387,273,78,-52,-84,-60,-21}; -const uint16_t GMSK_FILTER_LEN = 32U; +// Generated using gaussfir(0.5, 4, 5) in MATLAB +static q15_t GMSK_FILTER[] = {8, 104, 760, 3158, 7421, 9866, 7421, 3158, 760, 104, 8, 0}; +const uint16_t GMSK_FILTER_LEN = 12U; // One symbol boxcar filter static q15_t P25_FILTER[] = {3000, 3000, 3000, 3000, 3000, 0}; From 38bcf1f4c4d258371def69d1c50140abd507f6c7 Mon Sep 17 00:00:00 2001 From: Andy CA6JAU Date: Wed, 12 Apr 2017 23:28:43 -0300 Subject: [PATCH 4/4] Update the copyright message --- DMRTX.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/DMRTX.cpp b/DMRTX.cpp index 22986cc..fd719c0 100644 --- a/DMRTX.cpp +++ b/DMRTX.cpp @@ -1,6 +1,7 @@ /* * Copyright (C) 2009-2017 by Jonathan Naylor G4KLX * Copyright (C) 2016 by Colin Durbridge G4EML + * Copyright (C) 2017 by Andy Uribe CA6JAU * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by