Work in progress

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

View File

@@ -19,6 +19,7 @@ package module.decode.lj1200;
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 LJ1200Decoder extends Decoder implements IRealBufferListener,
private static final int MESSAGE_LENGTH = 80;
/* 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 =
@@ -131,26 +132,30 @@ public class LJ1200Decoder extends Decoder implements IRealBufferListener,
}
@Override
public List<Tap> getTaps()
public List<TapGroup> getTapGroups()
{
if( mAvailableTaps == null )
{
mAvailableTaps = new ArrayList<Tap>();
mAvailableTaps = new ArrayList<TapGroup>();
TapGroup group = new TapGroup( "LJ-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() )
{
@@ -168,9 +173,9 @@ public class LJ1200Decoder extends Decoder implements IRealBufferListener,
}
@Override
public void removeTap( Tap tap )
public void unregisterTap( Tap tap )
{
mFSKDecoder.removeTap( tap );
mFSKDecoder.unregisterTap( tap );
switch( tap.getName() )
{