mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-17 02:57:35 -05:00
Added instrumentation to the LTR-Net decoder.
This commit is contained in:
@@ -65,6 +65,7 @@ public enum DecoderType
|
|||||||
public static EnumSet<DecoderType> getInstrumentableDecoders()
|
public static EnumSet<DecoderType> getInstrumentableDecoders()
|
||||||
{
|
{
|
||||||
return EnumSet.of( DecoderType.FLEETSYNC2,
|
return EnumSet.of( DecoderType.FLEETSYNC2,
|
||||||
|
DecoderType.LTR_NET,
|
||||||
DecoderType.MDC1200,
|
DecoderType.MDC1200,
|
||||||
DecoderType.MPT1327,
|
DecoderType.MPT1327,
|
||||||
DecoderType.PASSPORT );
|
DecoderType.PASSPORT );
|
||||||
|
|||||||
@@ -17,6 +17,12 @@
|
|||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
package decode.ltrnet;
|
package decode.ltrnet;
|
||||||
|
|
||||||
|
import instrument.Instrumentable;
|
||||||
|
import instrument.tap.Tap;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
import message.MessageDirection;
|
import message.MessageDirection;
|
||||||
import source.Source.SampleType;
|
import source.Source.SampleType;
|
||||||
import alias.AliasList;
|
import alias.AliasList;
|
||||||
@@ -28,7 +34,7 @@ import dsp.filter.DCRemovalFilter2;
|
|||||||
import dsp.fsk.LTRFSKDecoder;
|
import dsp.fsk.LTRFSKDecoder;
|
||||||
import dsp.nbfm.FilteringNBFMDemodulator;
|
import dsp.nbfm.FilteringNBFMDemodulator;
|
||||||
|
|
||||||
public class LTRNetDecoder extends Decoder
|
public class LTRNetDecoder extends Decoder implements Instrumentable
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* This value determines how quickly the DC remove filter responds to
|
* This value determines how quickly the DC remove filter responds to
|
||||||
@@ -43,6 +49,8 @@ public class LTRNetDecoder extends Decoder
|
|||||||
private MessageFramer mLTRMessageFramer;
|
private MessageFramer mLTRMessageFramer;
|
||||||
private LTRNetMessageProcessor mLTRMessageProcessor;
|
private LTRNetMessageProcessor mLTRMessageProcessor;
|
||||||
|
|
||||||
|
private List<Tap> mAvailableTaps;
|
||||||
|
|
||||||
public LTRNetDecoder( SampleType sampleType,
|
public LTRNetDecoder( SampleType sampleType,
|
||||||
AliasList aliasList,
|
AliasList aliasList,
|
||||||
MessageDirection direction )
|
MessageDirection direction )
|
||||||
@@ -115,4 +123,29 @@ public class LTRNetDecoder extends Decoder
|
|||||||
{
|
{
|
||||||
return DecoderType.LTR_NET;
|
return DecoderType.LTR_NET;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<Tap> getTaps()
|
||||||
|
{
|
||||||
|
if( mAvailableTaps == null )
|
||||||
|
{
|
||||||
|
mAvailableTaps = new ArrayList<Tap>();
|
||||||
|
|
||||||
|
mAvailableTaps.addAll( mLTRFSKDecoder.getTaps() );
|
||||||
|
}
|
||||||
|
|
||||||
|
return mAvailableTaps;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void addTap( Tap tap )
|
||||||
|
{
|
||||||
|
mLTRFSKDecoder.addTap( tap );
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void removeTap( Tap tap )
|
||||||
|
{
|
||||||
|
mLTRFSKDecoder.removeTap( tap );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -35,6 +35,7 @@ import javax.swing.JPanel;
|
|||||||
import javax.swing.JTextField;
|
import javax.swing.JTextField;
|
||||||
|
|
||||||
import log.Log;
|
import log.Log;
|
||||||
|
import message.MessageDirection;
|
||||||
import net.miginfocom.swing.MigLayout;
|
import net.miginfocom.swing.MigLayout;
|
||||||
import source.Source.SampleType;
|
import source.Source.SampleType;
|
||||||
import source.wave.WaveSource;
|
import source.wave.WaveSource;
|
||||||
@@ -42,6 +43,7 @@ import source.wave.WaveSource.PositionListener;
|
|||||||
import decode.Decoder;
|
import decode.Decoder;
|
||||||
import decode.DecoderType;
|
import decode.DecoderType;
|
||||||
import decode.fleetsync2.Fleetsync2Decoder;
|
import decode.fleetsync2.Fleetsync2Decoder;
|
||||||
|
import decode.ltrnet.LTRNetDecoder;
|
||||||
import decode.mdc1200.MDCDecoder;
|
import decode.mdc1200.MDCDecoder;
|
||||||
import decode.mpt1327.MPT1327Decoder;
|
import decode.mpt1327.MPT1327Decoder;
|
||||||
import decode.passport.PassportDecoder;
|
import decode.passport.PassportDecoder;
|
||||||
@@ -133,6 +135,9 @@ public class WaveSourceFrame extends JInternalFrame implements PositionListener
|
|||||||
case FLEETSYNC2:
|
case FLEETSYNC2:
|
||||||
decoder = new Fleetsync2Decoder( null );
|
decoder = new Fleetsync2Decoder( null );
|
||||||
break;
|
break;
|
||||||
|
case LTR_NET:
|
||||||
|
decoder = new LTRNetDecoder( SampleType.FLOAT, null, MessageDirection.OSW );
|
||||||
|
break;
|
||||||
case MDC1200:
|
case MDC1200:
|
||||||
decoder = new MDCDecoder( null );
|
decoder = new MDCDecoder( null );
|
||||||
break;
|
break;
|
||||||
|
|||||||
Reference in New Issue
Block a user