From 7f3af43192a9db6ea6d1f5894ace3ed160da1c21 Mon Sep 17 00:00:00 2001 From: Rob Riggs Date: Thu, 13 Jun 2019 22:01:46 -0500 Subject: [PATCH] Force DCD off when no audio is present. Update version to 1.1.4rc1. --- TNC/DigitalPLL.hpp | 5 ++++- TNC/KissHardware.cpp | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/TNC/DigitalPLL.hpp b/TNC/DigitalPLL.hpp index 5c00093..802dd28 100644 --- a/TNC/DigitalPLL.hpp +++ b/TNC/DigitalPLL.hpp @@ -90,9 +90,12 @@ struct BaseDigitalPLL count_ -= sps_; } + // Force lock off when no stimulus is present (squelch closed). + const float_type adjust = bits_ > 16 ? 5.0 : 0.0; + const float_type offset = count_ / bits_; const float_type jitter = loop_filter_(offset); - const float_type abs_offset = std::abs(offset); + const float_type abs_offset = std::abs(offset) + adjust; jitter_ = lock_filter_(abs_offset); count_ -= jitter / 2; diff --git a/TNC/KissHardware.cpp b/TNC/KissHardware.cpp index 9a2be40..7782f0c 100644 --- a/TNC/KissHardware.cpp +++ b/TNC/KissHardware.cpp @@ -26,7 +26,7 @@ int powerOffViaUSB(void) namespace mobilinkd { namespace tnc { namespace kiss { -const char FIRMWARE_VERSION[] = "1.1.3"; +const char FIRMWARE_VERSION[] = "1.1.4rc1"; const char HARDWARE_VERSION[] = "Mobilinkd TNC3 2.1.1"; Hardware& settings()