From ba358a7d48394ae1639276afcb6ba1e1b5fdaf57 Mon Sep 17 00:00:00 2001 From: Denny Date: Sun, 23 Sep 2018 05:34:41 -0400 Subject: [PATCH] Adjusted costas loop gain values. Updated channel filter values to mitigate adjacent channel interference. --- .../dsp/filter/channelizer/PolyphaseChannelSource.java | 6 ------ src/main/java/io/github/dsheirer/dsp/psk/pll/PLLGain.java | 4 ++-- .../dsheirer/module/decode/p25/DecodeConfigP25Phase1.java | 3 +-- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/main/java/io/github/dsheirer/dsp/filter/channelizer/PolyphaseChannelSource.java b/src/main/java/io/github/dsheirer/dsp/filter/channelizer/PolyphaseChannelSource.java index ac06614d..a21a244e 100644 --- a/src/main/java/io/github/dsheirer/dsp/filter/channelizer/PolyphaseChannelSource.java +++ b/src/main/java/io/github/dsheirer/dsp/filter/channelizer/PolyphaseChannelSource.java @@ -148,12 +148,6 @@ public class PolyphaseChannelSource extends TunerChannelSource //Register to receive buffer overflow notifications so we can push them up through the source chain mPolyphaseChannelOutputProcessor.setSourceOverflowListener(this); - //Fully process the residual channel results buffer of the previous channel output processor - if(existingProcessor != null) - { - existingProcessor.processChannelResults(mReusableComplexBufferAssembler); - } - //Finally, setup the frequency offset for the output processor. mIndexCenterFrequency = mReplacementFrequency; mPolyphaseChannelOutputProcessor.setFrequencyOffset(getFrequencyOffset()); diff --git a/src/main/java/io/github/dsheirer/dsp/psk/pll/PLLGain.java b/src/main/java/io/github/dsheirer/dsp/psk/pll/PLLGain.java index dd813578..2e0a52a6 100644 --- a/src/main/java/io/github/dsheirer/dsp/psk/pll/PLLGain.java +++ b/src/main/java/io/github/dsheirer/dsp/psk/pll/PLLGain.java @@ -23,8 +23,8 @@ public enum PLLGain //NOTE: static gain level of 200 produced the best results for releases prior to 0.3.4b2 LEVEL_1(150.0, 0, 1), - LEVEL_2(175.0, 2, 4), - LEVEL_3(200.0, 5, 6), + LEVEL_2(170.0, 2, 4), + LEVEL_3(190.0, 5, 6), LEVEL_4(200.0, 7, 8), LEVEL_5(200.0, 9, 10); diff --git a/src/main/java/io/github/dsheirer/module/decode/p25/DecodeConfigP25Phase1.java b/src/main/java/io/github/dsheirer/module/decode/p25/DecodeConfigP25Phase1.java index e76b3267..d9300630 100644 --- a/src/main/java/io/github/dsheirer/module/decode/p25/DecodeConfigP25Phase1.java +++ b/src/main/java/io/github/dsheirer/module/decode/p25/DecodeConfigP25Phase1.java @@ -113,7 +113,6 @@ public class DecodeConfigP25Phase1 extends DecodeConfiguration @Override public ChannelSpecification getChannelSpecification() { - return new ChannelSpecification(50000.0, - 12500, 6000.0, 7000.0); + return new ChannelSpecification(50000.0, 12500, 5750.0, 6500.0); } }