GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-13 00:57: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

26
src/module/decode/tait/Tait1200Decoder.java
View File

@@ -19,6 +19,7 @@ package module.decode.tait;
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;
@@ -57,7 +58,7 @@ public class Tait1200Decoder extends Decoder implements IRealBufferListener,
private static final int MESSAGE_LENGTH = 440;
/* 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_MESSAGE_FRAMER =
@@ -123,26 +124,31 @@ public class Tait1200Decoder extends Decoder implements IRealBufferListener,
}
@Override
public List<Tap> getTaps()
public List<TapGroup> getTapGroups()
{
if( mAvailableTaps == null )
{
mAvailableTaps = new ArrayList<Tap>();
mAvailableTaps = new ArrayList<>();
TapGroup group = new TapGroup( "Tait 1200 Decoder" );
mAvailableTaps.add( new FloatTap(
group.add( new FloatTap(
INSTRUMENT_BANDPASS_FILTER_TO_FSK2_DEMOD, 0, 0.5f ) );
mAvailableTaps.addAll( mFSKDecoder.getTaps() );
mAvailableTaps.add( new BinaryTap(
group.add( new BinaryTap(
INSTRUMENT_FSK2_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() )
{
@@ -159,9 +165,9 @@ public class Tait1200Decoder 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/tait/Tait1200Panel.java → src/module/decode/tait/Tait1200DecoderPanel.java
View File

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