From 7d77f20ee964160fd01e887a7bc37354f8fd09ee Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Thu, 10 Mar 2016 18:16:01 +0000 Subject: [PATCH] Restore previous C4FSK filter. --- IO.cpp | 6 ++++-- SerialPort.cpp | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/IO.cpp b/IO.cpp index 60496bd..9981773 100644 --- a/IO.cpp +++ b/IO.cpp @@ -21,8 +21,10 @@ #include "IO.h" // Generated using rcosdesign(0.2, 8, 5, 'sqrt') in MATLAB -static q15_t C4FSK_FILTER[] = {-770, 2667, 6995, 11237, 14331, 15464, 14331, 11237, 6995, 2667, -770, 0}; -const uint16_t C4FSK_FILTER_LEN = 12U; +static q15_t 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 C4FSK_FILTER_LEN = 42U; // 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}; diff --git a/SerialPort.cpp b/SerialPort.cpp index b6f3357..97cb463 100644 --- a/SerialPort.cpp +++ b/SerialPort.cpp @@ -57,7 +57,7 @@ const uint8_t MMDVM_DEBUG4 = 0xF4U; const uint8_t MMDVM_DEBUG5 = 0xF5U; const uint8_t MMDVM_SAMPLES = 0xF8U; -const uint8_t HARDWARE[] = "MMDVM 20160309 (D-Star/DMR/System Fusion)"; +const uint8_t HARDWARE[] = "MMDVM 20160310 (D-Star/DMR/System Fusion)"; const uint8_t PROTOCOL_VERSION = 1U;