From 60f87072ba6f868ac91b91d49bf23952936f395b Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Thu, 15 Oct 2020 09:40:35 +0100 Subject: [PATCH] Rescale the TX filter for M17. --- M17TX.cpp | 7 ++++--- SerialPort.cpp | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/M17TX.cpp b/M17TX.cpp index 3aa2ba1..d478c9f 100644 --- a/M17TX.cpp +++ b/M17TX.cpp @@ -24,9 +24,10 @@ #include "M17Defines.h" // Generated using rcosdesign(0.5, 8, 5, 'sqrt') in MATLAB -static q15_t RRC_0_5_FILTER[] = {0, 0, 0, 0, -147, -88, 72, 220, 223, 46, -197, -285, -79, 334, 623, 390, -498, -1691, -2363, -1556, - 1284, 5872, 11033, 15109, 16656, 15109, 11033, 5872, 1284, -1556, -2363, -1691, -498, 390, 623, 334, - -79, -285, -197, 46, 223, 220, 72, -88, -147}; // numTaps = 45, L = 5 +static q15_t RRC_0_5_FILTER[] = {0, 0, 0, 0, -290, -174, 142, 432, 438, 90, -387, -561, -155, 658, 1225, 767, + -980, -3326, -4648, -3062, 2527, 11552, 21705, 29724, 32767, 29724, 21705, + 11552, 2527, -3062, -4648, -3326, -980, 767, 1225, 658, -155, -561, -387, 90, + 438, 432, 142, -174, -290}; // numTaps = 45, L = 5 const uint16_t RRC_0_5_FILTER_PHASE_LEN = 9U; // phaseLength = numTaps/L const q15_t M17_LEVELA = 1683; diff --git a/SerialPort.cpp b/SerialPort.cpp index 20c2766..c72d244 100644 --- a/SerialPort.cpp +++ b/SerialPort.cpp @@ -106,7 +106,7 @@ const uint8_t MMDVM_DEBUG5 = 0xF5U; #define HW_TYPE "MMDVM" #endif -#define DESCRIPTION "20201014 (D-Star/DMR/System Fusion/P25/NXDN/M17/POCSAG/FM)" +#define DESCRIPTION "20201015 (D-Star/DMR/System Fusion/P25/NXDN/M17/POCSAG/FM)" #if defined(GITVERSION) #define concat(h, a, b, c) h " " a " " b " GitID #" c ""