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

Work in progress

Browse Source
This commit is contained in:
denny
2015-09-14 21:31:26 -04:00
parent 732d478502
commit c7227ca780
42 changed files with 978 additions and 1356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/module/decode/mdc1200/MDCDecoder.java
View File

@@ -19,6 +19,7 @@ package module.decode.mdc1200;
import instrument.Instrumentable;
import instrument.tap.Tap;
import instrument.tap.TapGroup;
import instrument.tap.stream.BinaryTap;
import instrument.tap.stream.FloatBufferTap;
import instrument.tap.stream.FloatTap;
@@ -58,7 +59,7 @@ public class MDCDecoder extends Decoder implements IRealBufferListener,
private static final int sMESSAGE_LENGTH = 304;
/* Instrumentation Taps */
private ArrayList<Tap> mAvailableTaps;
private ArrayList<TapGroup> mAvailableTaps;
private static final String INSTRUMENT_BANDPASS_FILTER_TO_FSK2_DEMOD =
"Tap Point: Bandpass Filter > < FSK2 Decoder";
private static final String INSTRUMENT_FSK2_DECODER_TO_NRZ_DECODER =
@@ -120,28 +121,32 @@ public class MDCDecoder extends Decoder implements IRealBufferListener,
/* Instrumentation */
@Override
public List<Tap> getTaps()
public List<TapGroup> getTapGroups()
{
if( mAvailableTaps == null )
{
mAvailableTaps = new ArrayList<Tap>();
mAvailableTaps = new ArrayList<TapGroup>();
TapGroup group = new TapGroup( "MDC-1200 Decoder" );
mAvailableTaps.add(
group.add(
new FloatTap( INSTRUMENT_BANDPASS_FILTER_TO_FSK2_DEMOD, 0, 0.5f ) );
mAvailableTaps.addAll( mFSKDecoder.getTaps() );
mAvailableTaps.add(
group.add(
new BinaryTap( INSTRUMENT_FSK2_DECODER_TO_NRZ_DECODER, 0, 0.025f ) );
mAvailableTaps.add(
group.add(
new BinaryTap( INSTRUMENT_NRZI_DECODER_TO_MESSAGE_FRAMER, 0, 0.025f ) );
mAvailableTaps.add( group );
mAvailableTaps.addAll( mFSKDecoder.getTapGroups() );
}
return mAvailableTaps;
}
@Override
public void addTap( Tap tap )
public void registerTap( Tap tap )
{
mFSKDecoder.addTap( tap );
mFSKDecoder.registerTap( tap );
switch( tap.getName() )
{
@@ -168,9 +173,9 @@ public class MDCDecoder extends Decoder implements IRealBufferListener,
}
@Override
public void removeTap( Tap tap )
public void unregisterTap( Tap tap )
{
mFSKDecoder.removeTap( tap );
mFSKDecoder.unregisterTap( tap );
switch( tap.getName() )
{

4
src/module/decode/mdc1200/MDCPanel.java → src/module/decode/mdc1200/MDCDecoderPanel.java
View File

@@ -30,7 +30,7 @@ import settings.ColorSetting.ColorSettingName;
import settings.Setting;
import settings.SettingsManager;
public class MDCPanel extends DecoderPanel
public class MDCDecoderPanel extends DecoderPanel
{
private static final long serialVersionUID = 1L;
private static final String sPROTOCOL = "MDC-1200";
@@ -47,7 +47,7 @@ public class MDCPanel extends DecoderPanel
private JLabel mMessage = new JLabel();
private JLabel mMessageType = new JLabel();
public MDCPanel( SettingsManager settingsManager, MDCDecoder decoder )
public MDCDecoderPanel( SettingsManager settingsManager, MDCDecoder decoder )
{
super( settingsManager, decoder );