mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-12 16:47:31 -05:00
[WIP]Updates the Tait1200 decoder to use the new AFSK1200 decoder
class. Adds Demodulator Viewer FX pane for Tait1200 decoder.
This commit is contained in:
Denny
@@ -39,7 +39,7 @@ public class Fleetsync2Decoder extends AbstractAFSKDecoder
|
||||
* @param afsk1200Decoder to use for decoding the symbols
|
||||
* @param aliasList to assign aliases to decoded values
|
||||
*/
|
||||
public Fleetsync2Decoder(AFSK1200Decoder afsk1200Decoder, AliasList aliasList)
|
||||
protected Fleetsync2Decoder(AFSK1200Decoder afsk1200Decoder, AliasList aliasList)
|
||||
{
|
||||
super(afsk1200Decoder);
|
||||
init(aliasList);
|
||||
|
||||
@@ -1,191 +1,99 @@
|
||||
/*******************************************************************************
|
||||
* SDR Trunk
|
||||
* Copyright (C) 2014,2015 Dennis Sheirer
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||
* sdr-trunk
|
||||
* Copyright (C) 2014-2018 Dennis Sheirer
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public
|
||||
* License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
|
||||
* later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
|
||||
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along with this program.
|
||||
* If not, see <http://www.gnu.org/licenses/>
|
||||
*
|
||||
******************************************************************************/
|
||||
package io.github.dsheirer.module.decode.tait;
|
||||
|
||||
import io.github.dsheirer.alias.AliasList;
|
||||
import io.github.dsheirer.bits.IBinarySymbolProcessor;
|
||||
import io.github.dsheirer.bits.MessageFramer;
|
||||
import io.github.dsheirer.bits.SyncPattern;
|
||||
import io.github.dsheirer.dsp.filter.Filters;
|
||||
import io.github.dsheirer.dsp.filter.fir.real.RealFIRFilter_RB_RB;
|
||||
import io.github.dsheirer.dsp.filter.halfband.real.HalfBandFilter_RB_RB;
|
||||
import io.github.dsheirer.dsp.fsk.FSK2Decoder;
|
||||
import io.github.dsheirer.dsp.fsk.FSK2Decoder.Output;
|
||||
import io.github.dsheirer.instrument.Instrumentable;
|
||||
import io.github.dsheirer.instrument.tap.Tap;
|
||||
import io.github.dsheirer.instrument.tap.TapGroup;
|
||||
import io.github.dsheirer.instrument.tap.stream.BinaryTap;
|
||||
import io.github.dsheirer.instrument.tap.stream.FloatBufferTap;
|
||||
import io.github.dsheirer.instrument.tap.stream.FloatTap;
|
||||
import io.github.dsheirer.module.decode.Decoder;
|
||||
import io.github.dsheirer.dsp.afsk.AFSK1200Decoder;
|
||||
import io.github.dsheirer.module.decode.DecoderType;
|
||||
import io.github.dsheirer.sample.Broadcaster;
|
||||
import io.github.dsheirer.sample.Listener;
|
||||
import io.github.dsheirer.sample.real.IFilteredRealBufferListener;
|
||||
import io.github.dsheirer.sample.real.RealBuffer;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import io.github.dsheirer.module.decode.afsk.AbstractAFSKDecoder;
|
||||
|
||||
/**
|
||||
* TAIT 1200 - 1200 baud 2FSK decoder
|
||||
* TAIT 1200 - 1200 baud AFSK decoder
|
||||
*/
|
||||
public class Tait1200Decoder extends Decoder implements IFilteredRealBufferListener,
|
||||
Instrumentable
|
||||
public class Tait1200Decoder extends AbstractAFSKDecoder implements IBinarySymbolProcessor
|
||||
{
|
||||
/* Decimated sample rate ( 48,000 / 2 = 24,000 ) feeding the decoder */
|
||||
private static final int DECIMATED_SAMPLE_RATE = 24000;
|
||||
|
||||
/* Baud or Symbol Rate */
|
||||
private static final int SYMBOL_RATE = 1200;
|
||||
|
||||
/* Message length ... */
|
||||
/* Message length ... */
|
||||
private static final int MESSAGE_LENGTH = 440;
|
||||
|
||||
/* Instrumentation Taps */
|
||||
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 =
|
||||
"Tap Point: FSK2 Decoder > < Message Framer";
|
||||
|
||||
private FSK2Decoder mFSKDecoder;
|
||||
|
||||
private HalfBandFilter_RB_RB mDecimationFilter;
|
||||
private RealFIRFilter_RB_RB mBandPassFilter;
|
||||
|
||||
private MessageFramer mMessageFramerGPS;
|
||||
private MessageFramer mMessageFramerANI;
|
||||
private Broadcaster<Boolean> mFSKBroadcaster = new Broadcaster<Boolean>();
|
||||
private Tait1200GPSMessageProcessor mMessageAProcessor;
|
||||
private Tait1200ANIMessageProcessor mMessageBProcessor;
|
||||
|
||||
public Tait1200Decoder( AliasList aliasList )
|
||||
{
|
||||
mDecimationFilter = new HalfBandFilter_RB_RB(
|
||||
Filters.FIR_HALF_BAND_31T_ONE_EIGHTH_FCO.getCoefficients(), 1.0002f, true );
|
||||
|
||||
mBandPassFilter = new RealFIRFilter_RB_RB(
|
||||
Filters.FIRBP_1200FSK_24000FS.getCoefficients(), 1.02f );
|
||||
mDecimationFilter.setListener( mBandPassFilter );
|
||||
protected Tait1200Decoder(AFSK1200Decoder decoder, AliasList aliasList)
|
||||
{
|
||||
super(decoder);
|
||||
init(aliasList);
|
||||
}
|
||||
|
||||
mFSKDecoder = new FSK2Decoder( DECIMATED_SAMPLE_RATE,
|
||||
SYMBOL_RATE, Output.INVERTED );
|
||||
mBandPassFilter.setListener( mFSKDecoder );
|
||||
public Tait1200Decoder(AliasList aliasList)
|
||||
{
|
||||
super(AFSK1200Decoder.Output.NORMAL);
|
||||
init(aliasList);
|
||||
}
|
||||
|
||||
private void init(AliasList aliasList)
|
||||
{
|
||||
getDecoder().setSymbolProcessor(this);
|
||||
|
||||
mFSKDecoder.setListener( mFSKBroadcaster );
|
||||
mMessageFramerGPS = new MessageFramer(SyncPattern.TAIT_CCDI_GPS_MESSAGE.getPattern(), MESSAGE_LENGTH);
|
||||
mMessageFramerANI = new MessageFramer(SyncPattern.TAIT_SELCAL_MESSAGE.getPattern(), MESSAGE_LENGTH);
|
||||
|
||||
mMessageFramerGPS = new MessageFramer(
|
||||
SyncPattern.TAIT_CCDI_GPS_MESSAGE.getPattern(), MESSAGE_LENGTH );
|
||||
mMessageFramerANI = new MessageFramer(
|
||||
SyncPattern.TAIT_SELCAL_MESSAGE.getPattern(), MESSAGE_LENGTH );
|
||||
|
||||
mFSKBroadcaster.addListener( mMessageFramerGPS );
|
||||
mFSKBroadcaster.addListener( mMessageFramerANI );
|
||||
mMessageAProcessor = new Tait1200GPSMessageProcessor(aliasList);
|
||||
mMessageBProcessor = new Tait1200ANIMessageProcessor(aliasList);
|
||||
|
||||
mMessageFramerGPS.addMessageListener(mMessageAProcessor);
|
||||
mMessageFramerANI.addMessageListener(mMessageBProcessor);
|
||||
|
||||
mMessageAProcessor = new Tait1200GPSMessageProcessor( aliasList );
|
||||
mMessageBProcessor = new Tait1200ANIMessageProcessor( aliasList );
|
||||
|
||||
mMessageFramerGPS.addMessageListener( mMessageAProcessor );
|
||||
mMessageFramerANI.addMessageListener( mMessageBProcessor );
|
||||
|
||||
mMessageAProcessor.setMessageListener(getMessageListener());
|
||||
mMessageBProcessor.setMessageListener(getMessageListener());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public DecoderType getDecoderType()
|
||||
{
|
||||
return DecoderType.TAIT_1200;
|
||||
}
|
||||
|
||||
public void dispose()
|
||||
{
|
||||
super.dispose();
|
||||
|
||||
mDecimationFilter.dispose();
|
||||
mBandPassFilter.dispose();
|
||||
mFSKDecoder.dispose();
|
||||
mMessageFramerGPS.dispose();
|
||||
mMessageFramerANI.dispose();
|
||||
mMessageAProcessor.dispose();
|
||||
mMessageBProcessor.dispose();
|
||||
super.dispose();
|
||||
mMessageFramerGPS.dispose();
|
||||
mMessageFramerANI.dispose();
|
||||
mMessageAProcessor.dispose();
|
||||
mMessageBProcessor.dispose();
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<TapGroup> getTapGroups()
|
||||
@Override
|
||||
public void receive(boolean symbol)
|
||||
{
|
||||
if( mAvailableTaps == null )
|
||||
{
|
||||
mAvailableTaps = new ArrayList<>();
|
||||
|
||||
TapGroup group = new TapGroup( "Tait 1200 Decoder" );
|
||||
|
||||
group.add( new FloatTap(
|
||||
INSTRUMENT_BANDPASS_FILTER_TO_FSK2_DEMOD, 0, 0.5f ) );
|
||||
group.add( new BinaryTap(
|
||||
INSTRUMENT_FSK2_DECODER_TO_MESSAGE_FRAMER, 0, 0.025f ) );
|
||||
|
||||
mAvailableTaps.add( group );
|
||||
|
||||
mAvailableTaps.addAll( mFSKDecoder.getTapGroups() );
|
||||
}
|
||||
|
||||
return mAvailableTaps;
|
||||
mMessageFramerANI.receive(symbol);
|
||||
mMessageFramerGPS.receive(symbol);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerTap( Tap tap )
|
||||
public MessageFramer getANIMessageFramer()
|
||||
{
|
||||
mFSKDecoder.registerTap( tap );
|
||||
|
||||
switch( tap.getName() )
|
||||
{
|
||||
case INSTRUMENT_BANDPASS_FILTER_TO_FSK2_DEMOD:
|
||||
FloatBufferTap bpTap = (FloatBufferTap)tap;
|
||||
mBandPassFilter.setListener( bpTap );
|
||||
bpTap.setListener( mFSKDecoder );
|
||||
break;
|
||||
case INSTRUMENT_FSK2_DECODER_TO_MESSAGE_FRAMER:
|
||||
BinaryTap decoderTap = (BinaryTap)tap;
|
||||
mFSKBroadcaster.addListener( decoderTap );
|
||||
break;
|
||||
}
|
||||
return mMessageFramerANI;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void unregisterTap( Tap tap )
|
||||
public MessageFramer getGPSMessageFramer()
|
||||
{
|
||||
mFSKDecoder.unregisterTap( tap );
|
||||
|
||||
switch( tap.getName() )
|
||||
{
|
||||
case INSTRUMENT_BANDPASS_FILTER_TO_FSK2_DEMOD:
|
||||
mBandPassFilter.setListener( mFSKDecoder );
|
||||
break;
|
||||
case INSTRUMENT_FSK2_DECODER_TO_MESSAGE_FRAMER:
|
||||
mFSKBroadcaster.removeListener( (BinaryTap)tap );
|
||||
break;
|
||||
}
|
||||
return mMessageFramerGPS;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Listener<RealBuffer> getFilteredRealBufferListener()
|
||||
{
|
||||
return mDecimationFilter;
|
||||
}
|
||||
|
||||
@Override
|
||||
public DecoderType getDecoderType()
|
||||
{
|
||||
return DecoderType.TAIT_1200;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
/*******************************************************************************
|
||||
* sdr-trunk
|
||||
* Copyright (C) 2014-2018 Dennis Sheirer
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public
|
||||
* License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
|
||||
* later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
|
||||
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along with this program.
|
||||
* If not, see <http://www.gnu.org/licenses/>
|
||||
*
|
||||
******************************************************************************/
|
||||
package io.github.dsheirer.module.decode.tait;
|
||||
|
||||
import io.github.dsheirer.dsp.afsk.AFSK1200DecoderInstrumented;
|
||||
import io.github.dsheirer.instrument.gui.viewer.chart.IInstrumentedAFSK1200Decoder;
|
||||
import io.github.dsheirer.sample.buffer.ReusableBuffer;
|
||||
import javafx.beans.property.SimpleIntegerProperty;
|
||||
|
||||
/**
|
||||
* Instrumented version of the AFSK-1200 decoder for use with DemodulatorViewerFX
|
||||
*/
|
||||
public class Tait1200DecoderInstrumented extends Tait1200Decoder implements IInstrumentedAFSK1200Decoder
|
||||
{
|
||||
public SimpleIntegerProperty bufferCount = new SimpleIntegerProperty();
|
||||
|
||||
public Tait1200DecoderInstrumented()
|
||||
{
|
||||
super(new AFSK1200DecoderInstrumented(false), null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public SimpleIntegerProperty getBufferCountProperty()
|
||||
{
|
||||
return bufferCount;
|
||||
}
|
||||
|
||||
public AFSK1200DecoderInstrumented getAFSK1200Decoder()
|
||||
{
|
||||
return (AFSK1200DecoderInstrumented)getDecoder();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void receive(ReusableBuffer reusableBuffer)
|
||||
{
|
||||
super.receive(reusableBuffer);
|
||||
|
||||
bufferCount.setValue(bufferCount.intValue() + 1);
|
||||
}
|
||||
}
|
||||
@@ -121,8 +121,6 @@ public class Tait1200GPSMessage extends Message
|
||||
{
|
||||
mMessage = message;
|
||||
mAliasList = list;
|
||||
|
||||
mLog.debug( toString() );
|
||||
}
|
||||
|
||||
public boolean isValid()
|
||||
|
||||
Reference in New Issue
Block a user