From edaa9f42f96cb79f041ce12372bff37cf79c8a45 Mon Sep 17 00:00:00 2001 From: Tobias Blomberg Date: Mon, 27 Jul 2020 00:51:44 +0200 Subject: [PATCH] Bugfix: Some squelch types did not report the integrated siglev Squelch types DDR, SIM and TONE reported the "raw" signal strength instead of the integrated one. This fix can change the behavior of the voter and the extended hangtime feature. --- src/svxlink/trx/SigLevDetDdr.cpp | 2 +- src/svxlink/trx/SigLevDetSim.cpp | 2 +- src/svxlink/trx/SigLevDetTone.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/svxlink/trx/SigLevDetDdr.cpp b/src/svxlink/trx/SigLevDetDdr.cpp index c40ebc84..28868370 100644 --- a/src/svxlink/trx/SigLevDetDdr.cpp +++ b/src/svxlink/trx/SigLevDetDdr.cpp @@ -234,7 +234,7 @@ void SigLevDetDdr::processSamples(const vector &samples) update_counter += block_size; if (update_counter >= update_interval) { - signalLevelUpdated(lastSiglev()); + signalLevelUpdated(siglevIntegrated()); update_counter = 0; } } diff --git a/src/svxlink/trx/SigLevDetSim.cpp b/src/svxlink/trx/SigLevDetSim.cpp index ee8437c6..be7e2e43 100644 --- a/src/svxlink/trx/SigLevDetSim.cpp +++ b/src/svxlink/trx/SigLevDetSim.cpp @@ -238,7 +238,7 @@ int SigLevDetSim::writeSamples(const float *samples, int count) if (++update_counter >= update_interval) { update_counter = 0; - signalLevelUpdated(lastSiglev()); + signalLevelUpdated(siglevIntegrated()); } } } diff --git a/src/svxlink/trx/SigLevDetTone.cpp b/src/svxlink/trx/SigLevDetTone.cpp index b0b66d02..baa0b6db 100644 --- a/src/svxlink/trx/SigLevDetTone.cpp +++ b/src/svxlink/trx/SigLevDetTone.cpp @@ -386,7 +386,7 @@ int SigLevDetTone::processSamples(const float *samples, int count) update_counter += BLOCK_SIZE; if (update_counter >= update_interval) { - signalLevelUpdated(lastSiglev()); + signalLevelUpdated(siglevIntegrated()); update_counter = 0; } }