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

Resolved issue with LJ1200 not decoding tower transmissions after addition of transponder decoder.

Browse Source
This commit is contained in:
dennis.sheirer
2014-12-28 01:51:55 +00:00
parent f6687decef
commit 95ddadc598
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/decode/lj1200/LJ1200Decoder.java
View File

@@ -25,6 +25,7 @@ import instrument.tap.stream.FloatTap;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import sample.Broadcaster;
import sample.real.RealSampleListener; import sample.real.RealSampleListener;
import source.Source.SampleType; import source.Source.SampleType;
import alias.AliasList; import alias.AliasList;
@@ -62,6 +63,9 @@ public class LJ1200Decoder extends Decoder implements Instrumentable
"Tap Point: FSK2 Decoder > < Message Framer"; "Tap Point: FSK2 Decoder > < Message Framer";
private FSK2Decoder mFSKDecoder; private FSK2Decoder mFSKDecoder;
private Broadcaster<Boolean> mFSKDecoderBroadcaster =
new Broadcaster<Boolean>();
private FloatHalfBandFilter mDecimationFilter; private FloatHalfBandFilter mDecimationFilter;
private FloatFIRFilter mBandPassFilter; private FloatFIRFilter mBandPassFilter;
private MessageFramer mTowerMessageFramer; private MessageFramer mTowerMessageFramer;
@@ -84,13 +88,14 @@ public class LJ1200Decoder extends Decoder implements Instrumentable
SYMBOL_RATE, Output.INVERTED ); SYMBOL_RATE, Output.INVERTED );
mBandPassFilter.setListener( mFSKDecoder ); mBandPassFilter.setListener( mFSKDecoder );
mFSKDecoder.setListener( mFSKDecoderBroadcaster );
mTowerMessageFramer = new MessageFramer( mTowerMessageFramer = new MessageFramer(
SyncPattern.LJ1200.getPattern(), MESSAGE_LENGTH ); SyncPattern.LJ1200.getPattern(), MESSAGE_LENGTH );
mFSKDecoder.setListener( mTowerMessageFramer );
mTransponderMessageFramer = new MessageFramer( mTransponderMessageFramer = new MessageFramer(
SyncPattern.LJ1200_TRANSPONDER.getPattern(), MESSAGE_LENGTH ); SyncPattern.LJ1200_TRANSPONDER.getPattern(), MESSAGE_LENGTH );
mFSKDecoder.setListener( mTransponderMessageFramer ); mFSKDecoderBroadcaster.addListener( mTowerMessageFramer );
mFSKDecoderBroadcaster.addListener( mTransponderMessageFramer );
mMessageProcessor = new LJ1200MessageProcessor( aliasList ); mMessageProcessor = new LJ1200MessageProcessor( aliasList );
mTowerMessageFramer.addMessageListener( mMessageProcessor ); mTowerMessageFramer.addMessageListener( mMessageProcessor );