GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-12 08:37:25 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

Improved LTR FSK decoder for LTR, LTR-Net and Passport decoders. Added IIR DC blocking filter and used improved slicer from the FSK decoder.

Browse Source 
Added instrumentation to Passport decoder and updated some of the instrumentation components.
This commit is contained in:
dennis.sheirer
2014-05-01 23:24:51 +00:00
parent d7115f2886
commit da1db8a804
25 changed files with 803 additions and 496 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/decode/ltrnet/LTRNetDecoder.java
View File

@@ -24,8 +24,8 @@ import bits.MessageFramer;
import bits.SyncPattern;
import decode.Decoder;
import decode.DecoderType;
import decode.ltrstandard.LTRFSKDemodulator;
import dsp.filter.DCRemovalFilter2;
import dsp.fsk.LTRFSKDecoder;
import dsp.nbfm.FilteringNBFMDemodulator;
public class LTRNetDecoder extends Decoder
@@ -39,7 +39,7 @@ public class LTRNetDecoder extends Decoder
public static final int sLTR_STANDARD_MESSAGE_LENGTH = 40;
private FilteringNBFMDemodulator mDemodulator;
private DCRemovalFilter2 mDCRemovalFilter;
private LTRFSKDemodulator mLTRFSKDemodulator;
private LTRFSKDecoder mLTRFSKDecoder;
private MessageFramer mLTRMessageFramer;
private LTRNetMessageProcessor mLTRMessageProcessor;
@@ -75,7 +75,7 @@ public class LTRNetDecoder extends Decoder
mDCRemovalFilter.setListener( this.getFloatReceiver() );
}
mLTRFSKDemodulator = new LTRFSKDemodulator();
mLTRFSKDecoder = new LTRFSKDecoder();
/**
* The DC removal filter will impact performance of the LTRFSKDemod,
@@ -83,11 +83,11 @@ public class LTRNetDecoder extends Decoder
*/
if( mSourceSampleType == SampleType.COMPLEX )
{
mDemodulator.addListener( mLTRFSKDemodulator );
mDemodulator.addListener( mLTRFSKDecoder );
}
else
{
mDCRemovalFilter.setListener( mLTRFSKDemodulator );
mDCRemovalFilter.setListener( mLTRFSKDecoder );
}
if( direction == MessageDirection.OSW )
@@ -103,7 +103,7 @@ public class LTRNetDecoder extends Decoder
sLTR_STANDARD_MESSAGE_LENGTH );
}
mLTRFSKDemodulator.addListener( mLTRMessageFramer );
mLTRFSKDecoder.addListener( mLTRMessageFramer );
mLTRMessageProcessor = new LTRNetMessageProcessor( direction, aliasList );
mLTRMessageFramer.addMessageListener( mLTRMessageProcessor );