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

[WIP] Updates the passport decoder to use the new LTRDecoder.

Browse Source 
Deprecates the Listener<Boolean> interface method in the MessageFramer
to optimize for primitive booleans and reduce impact on memory.  Will
remove this interface once the AFSK1200 decoders are updated.
This commit is contained in:
Denny
2018-06-02 09:31:49 -04:00
parent a898be265f
commit e4209c8e4f
6 changed files with 65 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/io/github/dsheirer/module/decode/ltrnet/LTRNetDecoder.java
View File

@@ -50,7 +50,7 @@ public class LTRNetDecoder extends Decoder implements IReusableBufferListener, L
mLTRMessageFramer = new MessageFramer(SyncPattern.LTR_STANDARD_ISW.getPattern(), LTR_NET_MESSAGE_LENGTH);
}
mLTRDecoder.setListener(mLTRMessageFramer);
mLTRDecoder.setMessageFramer(mLTRMessageFramer);
mLTRMessageFramer.setSyncDetectListener(mLTRDecoder);
mLTRMessageProcessor = new LTRNetMessageProcessor(config.getMessageDirection(), aliasList);
mLTRMessageFramer.addMessageListener(mLTRMessageProcessor);

2
src/main/java/io/github/dsheirer/module/decode/ltrstandard/LTRStandardDecoder.java
View File

@@ -51,7 +51,7 @@ public class LTRStandardDecoder extends Decoder implements IReusableBufferListen
mLTRMessageFramer = new MessageFramer(SyncPattern.LTR_STANDARD_ISW.getPattern(), LTR_STANDARD_MESSAGE_LENGTH);
}
mLTRDecoder.setListener(mLTRMessageFramer);
mLTRDecoder.setMessageFramer(mLTRMessageFramer);
mLTRMessageFramer.setSyncDetectListener(mLTRDecoder);
mLTRMessageProcessor = new LTRStandardMessageProcessor(direction, aliasList);
mLTRMessageFramer.addMessageListener(mLTRMessageProcessor);

127
src/main/java/io/github/dsheirer/module/decode/passport/PassportDecoder.java
View File

@@ -1,110 +1,77 @@
/*******************************************************************************
* SDR Trunk
* Copyright (C) 2014 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.passport;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.bits.MessageFramer;
import io.github.dsheirer.bits.SyncPattern;
import io.github.dsheirer.dsp.fsk.LTRFSKDecoderLegacy;
import io.github.dsheirer.instrument.Instrumentable;
import io.github.dsheirer.instrument.tap.Tap;
import io.github.dsheirer.instrument.tap.TapGroup;
import io.github.dsheirer.dsp.fsk.LTRDecoder;
import io.github.dsheirer.module.decode.Decoder;
import io.github.dsheirer.module.decode.DecoderType;
import io.github.dsheirer.module.decode.config.DecodeConfiguration;
import io.github.dsheirer.sample.Listener;
import io.github.dsheirer.sample.real.IUnFilteredRealBufferListener;
import io.github.dsheirer.sample.real.RealBuffer;
import io.github.dsheirer.sample.buffer.IReusableBufferListener;
import io.github.dsheirer.sample.buffer.ReusableBuffer;
import java.util.ArrayList;
import java.util.List;
public class PassportDecoder extends Decoder
implements IUnFilteredRealBufferListener, Instrumentable
public class PassportDecoder extends Decoder implements IReusableBufferListener, Listener<ReusableBuffer>
{
public static final int PASSPORT_MESSAGE_LENGTH = 68;
public static final int PASSPORT_SYNC_LENGTH = 9;
public static final int PASSPORT_MESSAGE_LENGTH = 68;
private LTRFSKDecoderLegacy mPassportFSKDecoder;
private MessageFramer mPassportMessageFramer;
private PassportMessageProcessor mPassportMessageProcessor;
private List<TapGroup> mAvailableTaps;
private LTRDecoder mLTRDecoder;
private MessageFramer mPassportMessageFramer;
private PassportMessageProcessor mPassportMessageProcessor;
/**
* Passport Decoder. Decodes unfiltered (e.g. demodulated but with no DC or
* audio filtering) samples and produces Passport messages.
*/
public PassportDecoder(DecodeConfiguration config, AliasList aliasList )
{
mPassportFSKDecoder = new LTRFSKDecoderLegacy();
mPassportMessageFramer =
new MessageFramer( SyncPattern.PASSPORT.getPattern(),
PASSPORT_MESSAGE_LENGTH );
mPassportFSKDecoder.addListener( mPassportMessageFramer );
mPassportMessageProcessor = new PassportMessageProcessor( aliasList );
mPassportMessageFramer.addMessageListener( mPassportMessageProcessor );
mPassportMessageProcessor.setMessageListener( getMessageListener() );
}
@Override
public Listener<RealBuffer> getUnFilteredRealBufferListener()
{
return mPassportFSKDecoder;
}
@Override
public DecoderType getDecoderType()
{
return DecoderType.PASSPORT;
}
@Override
public List<TapGroup> getTapGroups()
public PassportDecoder(DecodeConfiguration config, AliasList aliasList)
{
if( mAvailableTaps == null )
{
mAvailableTaps = new ArrayList<>();
mAvailableTaps.addAll( mPassportFSKDecoder.getTapGroups() );
}
mLTRDecoder = new LTRDecoder(PASSPORT_MESSAGE_LENGTH);
return mAvailableTaps;
mPassportMessageFramer = new MessageFramer(SyncPattern.PASSPORT.getPattern(), PASSPORT_MESSAGE_LENGTH);
mLTRDecoder.setMessageFramer(mPassportMessageFramer);
mPassportMessageFramer.setSyncDetectListener(mLTRDecoder);
mPassportMessageProcessor = new PassportMessageProcessor(aliasList);
mPassportMessageFramer.addMessageListener(mPassportMessageProcessor);
mPassportMessageProcessor.setMessageListener(getMessageListener());
}
@Override
public void registerTap( Tap tap )
@Override
public Listener<ReusableBuffer> getReusableBufferListener()
{
mPassportFSKDecoder.registerTap( tap );
return mLTRDecoder;
}
@Override
public void unregisterTap( Tap tap )
@Override
public void receive(ReusableBuffer reusableBuffer)
{
mPassportFSKDecoder.unregisterTap( tap );
mLTRDecoder.receive(reusableBuffer);
}
@Override
public void reset()
{
mPassportMessageFramer.reset();
}
@Override
public DecoderType getDecoderType()
{
return DecoderType.PASSPORT;
}
@Override
public void reset()
{
mPassportMessageFramer.reset();
}
}