From 95ddadc59897fe3473c573fbc6af4e823d8500d5 Mon Sep 17 00:00:00 2001 From: "dennis.sheirer" Date: Sun, 28 Dec 2014 01:51:55 +0000 Subject: [PATCH] Resolved issue with LJ1200 not decoding tower transmissions after addition of transponder decoder. --- src/decode/lj1200/LJ1200Decoder.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/decode/lj1200/LJ1200Decoder.java b/src/decode/lj1200/LJ1200Decoder.java index c8f0cd9e..dbecfe4a 100644 --- a/src/decode/lj1200/LJ1200Decoder.java +++ b/src/decode/lj1200/LJ1200Decoder.java @@ -25,6 +25,7 @@ import instrument.tap.stream.FloatTap; import java.util.ArrayList; import java.util.List; +import sample.Broadcaster; import sample.real.RealSampleListener; import source.Source.SampleType; import alias.AliasList; @@ -62,6 +63,9 @@ public class LJ1200Decoder extends Decoder implements Instrumentable "Tap Point: FSK2 Decoder > < Message Framer"; private FSK2Decoder mFSKDecoder; + private Broadcaster mFSKDecoderBroadcaster = + new Broadcaster(); + private FloatHalfBandFilter mDecimationFilter; private FloatFIRFilter mBandPassFilter; private MessageFramer mTowerMessageFramer; @@ -84,13 +88,14 @@ public class LJ1200Decoder extends Decoder implements Instrumentable SYMBOL_RATE, Output.INVERTED ); mBandPassFilter.setListener( mFSKDecoder ); + mFSKDecoder.setListener( mFSKDecoderBroadcaster ); + mTowerMessageFramer = new MessageFramer( SyncPattern.LJ1200.getPattern(), MESSAGE_LENGTH ); - mFSKDecoder.setListener( mTowerMessageFramer ); - mTransponderMessageFramer = new MessageFramer( SyncPattern.LJ1200_TRANSPONDER.getPattern(), MESSAGE_LENGTH ); - mFSKDecoder.setListener( mTransponderMessageFramer ); + mFSKDecoderBroadcaster.addListener( mTowerMessageFramer ); + mFSKDecoderBroadcaster.addListener( mTransponderMessageFramer ); mMessageProcessor = new LJ1200MessageProcessor( aliasList ); mTowerMessageFramer.addMessageListener( mMessageProcessor );