From c178e99a5d6cf2872541983c93ec461016794d6e Mon Sep 17 00:00:00 2001 From: denny Date: Mon, 9 Nov 2015 20:35:12 -0500 Subject: [PATCH] Work in progress - P25 LSM --- src/dsp/psk/LSMDemodulator.java | 6 +++--- src/module/decode/p25/P25_LSMDecoder.java | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/dsp/psk/LSMDemodulator.java b/src/dsp/psk/LSMDemodulator.java index 12c27eb8..dd44a5a1 100644 --- a/src/dsp/psk/LSMDemodulator.java +++ b/src/dsp/psk/LSMDemodulator.java @@ -248,9 +248,9 @@ public class LSMDemodulator implements Instrumentable, ComplexSampleListener private RealInterpolator mInterpolator = new RealInterpolator( 1.0f ); - private Complex mPreviousSample; - private Complex mPreviousMiddleSample; - private Complex mPreviousSymbol; + private Complex mPreviousSample = new Complex( 0, 0 ); + private Complex mPreviousMiddleSample = new Complex( 0, 0 ); + private Complex mPreviousSymbol = new Complex( 0, 0 ); /** * Provides symbol sampling timing control diff --git a/src/module/decode/p25/P25_LSMDecoder.java b/src/module/decode/p25/P25_LSMDecoder.java index 4d1404fd..21555ae9 100644 --- a/src/module/decode/p25/P25_LSMDecoder.java +++ b/src/module/decode/p25/P25_LSMDecoder.java @@ -79,8 +79,6 @@ public class P25_LSMDecoder extends P25Decoder implements IComplexBufferListener mCQPSKDemodulator.setSymbolListener( mCQPSKSlicer ); - mCQPSKSlicer.addListener( mMessageFramer ); - mMessageFramer = new P25MessageFramer( aliasList, mCQPSKDemodulator ); mCQPSKSlicer.addListener( mMessageFramer );