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

Global rename of BitSetBuffer to BinaryMessage.

Browse Source 
Corrected issue in P25 NID error correction.
This commit is contained in:
dennis.sheirer
2015-01-24 13:37:42 +00:00
parent 871705ece8
commit 9310fb0daf
148 changed files with 513 additions and 443 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/bits/BitSetBuffer.java → src/bits/BinaryMessage.java
View File

@@ -22,9 +22,11 @@ import java.util.BitSet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class BitSetBuffer extends BitSet
import edac.CRC;
public class BinaryMessage extends BitSet
{
private final static Logger mLog = LoggerFactory.getLogger( BitSetBuffer.class );
private final static Logger mLog = LoggerFactory.getLogger( BinaryMessage.class );
private static final long serialVersionUID = 1L;
@@ -48,7 +50,14 @@ public class BitSetBuffer extends BitSet
* that the size parameter specified.
* @param size
*/
public BitSetBuffer( int size )
/**
* Used for temporary storage of CRC check results when we're passing this
* message to an EDAC function.
*/
private CRC mCRC;
public BinaryMessage( int size )
{
super( size );
mSize = size;
@@ -62,7 +71,7 @@ public class BitSetBuffer extends BitSet
* @param size
* @param bitsToPreload
*/
public BitSetBuffer( int size, boolean[] bitsToPreload )
public BinaryMessage( int size, boolean[] bitsToPreload )
{
this( size );
@@ -86,20 +95,30 @@ public class BitSetBuffer extends BitSet
/**
* Constructs a new BitSetBuffer from an existing one
*/
private BitSetBuffer( BitSetBuffer toCopyFrom )
private BinaryMessage( BinaryMessage toCopyFrom )
{
this( toCopyFrom.size() );
this.or( toCopyFrom );
this.mPointer = toCopyFrom.pointer();
}
public BitSetBuffer( BitSet bitset, int size )
public BinaryMessage( BitSet bitset, int size )
{
this( size );
this.or( bitset );
this.mPointer = size - 1;
}
public CRC getCRC()
{
return mCRC;
}
public void setCRC( CRC crc )
{
mCRC = crc;
}
/**
* Current pointer index
*/
@@ -136,9 +155,9 @@ public class BitSetBuffer extends BitSet
* @param bitsetToAppend - full bitset to be appended to the residual bits array
* @return - new Bitset preloaded with residual bits and new bitset
*/
public static BitSetBuffer merge( boolean[] preloadBits, BitSetBuffer bitsetToAppend )
public static BinaryMessage merge( boolean[] preloadBits, BinaryMessage bitsetToAppend )
{
BitSetBuffer returnValue = new BitSetBuffer( preloadBits.length + bitsetToAppend.size(), preloadBits );
BinaryMessage returnValue = new BinaryMessage( preloadBits.length + bitsetToAppend.size(), preloadBits );
int pointer = 0;
@@ -163,9 +182,9 @@ public class BitSetBuffer extends BitSet
* Returns a (new) copy of this bitsetbuffer
* @return
*/
public BitSetBuffer copy()
public BinaryMessage copy()
{
return new BitSetBuffer( this );
return new BinaryMessage( this );
}
public boolean isFull()
@@ -251,14 +270,15 @@ public class BitSetBuffer extends BitSet
/**
* Returns this bitset as a reversed bit order array of integer ones and zeros
* from the specified index range
*/
public int[] toReverseIntegerArray()
public int[] toReverseIntegerArray( int start, int end )
{
int[] values = new int[ mSize ];
int[] values = new int[ end - start + 1 ];
for (int i = nextSetBit( 0 ); i >= 0 && i < mSize; i = nextSetBit( i+1 ) )
for (int i = nextSetBit( start ); i >= start && i <= end; i = nextSetBit( i+1 ) )
{
values[ mSize - i - 1 ] = 1;
values[ end - i ] = 1;
}
return values;
@@ -531,9 +551,9 @@ public class BitSetBuffer extends BitSet
* @param fill - initial fill value
* @return - filled buffer
*/
public static BitSetBuffer getBuffer( int width, long fill )
public static BinaryMessage getBuffer( int width, long fill )
{
BitSetBuffer buffer = new BitSetBuffer( width );
BinaryMessage buffer = new BinaryMessage( width );
buffer.load( 0, width, fill );
@@ -596,7 +616,7 @@ public class BitSetBuffer extends BitSet
* @param message - string containing only zeros and ones
* @return - loaded buffer
*/
public static BitSetBuffer load( String message )
public static BinaryMessage load( String message )
{
if( !message.matches( "[01]*" ) )
{
@@ -604,7 +624,7 @@ public class BitSetBuffer extends BitSet
"Message must contain only zeros and ones" );
}
BitSetBuffer buffer = new BitSetBuffer( message.length() );
BinaryMessage buffer = new BinaryMessage( message.length() );
for( int x = 0; x < message.length(); x++ )
{
@@ -705,7 +725,7 @@ public class BitSetBuffer extends BitSet
*/
public void xor( int offset, int width, int value )
{
BitSetBuffer mask = new BitSetBuffer( this.size() );
BinaryMessage mask = new BinaryMessage( this.size() );
mask.load( offset, width, value );

18
src/bits/MessageFramer.java
View File

@@ -22,8 +22,8 @@ import java.util.Iterator;
import sample.Broadcaster;
import sample.Listener;
import dsp.SyncDetectListener;
import dsp.SyncDetectProvider;
import dsp.symbol.SyncDetectListener;
import dsp.symbol.SyncDetectProvider;
/**
* MessageFramer - processes bitsets looking for a sync pattern within
@@ -39,15 +39,15 @@ public class MessageFramer implements Listener<Boolean>,
private boolean[] mSyncPattern;
private int mMessageLength;
private SyncDetectListener mSyncDetectListener;
private Broadcaster<BitSetBuffer> mBroadcaster =
new Broadcaster<BitSetBuffer>();
private Broadcaster<BinaryMessage> mBroadcaster =
new Broadcaster<BinaryMessage>();
private ArrayList<MessageAssembler> mMessageAssemblers =
new ArrayList<MessageAssembler>();
private ArrayList<MessageAssembler> mCompletedMessageAssemblers =
new ArrayList<MessageAssembler>();
private BitSetBuffer mPreviousBuffer = null;
private BinaryMessage mPreviousBuffer = null;
private SyncPatternMatcher mMatcher;
@@ -127,12 +127,12 @@ public class MessageFramer implements Listener<Boolean>,
* Allow a message listener to register with this framer to receive
* all framed messages
*/
public void addMessageListener( Listener<BitSetBuffer> listener )
public void addMessageListener( Listener<BinaryMessage> listener )
{
mBroadcaster.addListener( listener );
}
public void removeMessageListener( Listener<BitSetBuffer> listener )
public void removeMessageListener( Listener<BinaryMessage> listener )
{
mBroadcaster.removeListener( listener );
}
@@ -161,12 +161,12 @@ public class MessageFramer implements Listener<Boolean>,
*/
private class MessageAssembler implements Listener<Boolean>
{
BitSetBuffer mMessage;
BinaryMessage mMessage;
boolean mComplete = false;
MessageAssembler( int messageLength )
{
mMessage = new BitSetBuffer( messageLength );
mMessage = new BinaryMessage( messageLength );
}
MessageAssembler( int messageLength, boolean[] initialFill )

6
src/decode/fleetsync1/Fleetsync1Message.java
View File

@@ -23,15 +23,15 @@ import java.util.Date;
import map.Plottable;
import message.Message;
import alias.Alias;
import bits.BitSetBuffer;
import bits.BinaryMessage;
public class Fleetsync1Message extends Message
{
private static SimpleDateFormat mSDF = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" );
private BitSetBuffer mMessage;
private BinaryMessage mMessage;
public Fleetsync1Message( BitSetBuffer message )
public Fleetsync1Message( BinaryMessage message )
{
mMessage = message;
}

6
src/decode/fleetsync1/Fleetsync1MessageProcessor.java
View File

@@ -24,9 +24,9 @@ import org.slf4j.LoggerFactory;
import sample.Broadcaster;
import sample.Listener;
import bits.BitSetBuffer;
import bits.BinaryMessage;
public class Fleetsync1MessageProcessor implements Listener<BitSetBuffer>
public class Fleetsync1MessageProcessor implements Listener<BinaryMessage>
{
private final static Logger mLog =
LoggerFactory.getLogger( Fleetsync1MessageProcessor.class );
@@ -34,7 +34,7 @@ public class Fleetsync1MessageProcessor implements Listener<BitSetBuffer>
private Broadcaster<Message> mBroadcaster = new Broadcaster<Message>();
@Override
public void receive( BitSetBuffer buffer )
public void receive( BinaryMessage buffer )
{
Fleetsync1Message message = new Fleetsync1Message( buffer );

6
src/decode/fleetsync2/Fleetsync2MessageProcessor.java
View File

@@ -21,9 +21,9 @@ import message.Message;
import sample.Broadcaster;
import sample.Listener;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
public class Fleetsync2MessageProcessor implements Listener<BitSetBuffer>
public class Fleetsync2MessageProcessor implements Listener<BinaryMessage>
{
private Broadcaster<Message> mBroadcaster = new Broadcaster<Message>();
@@ -40,7 +40,7 @@ public class Fleetsync2MessageProcessor implements Listener<BitSetBuffer>
}
@Override
public void receive( BitSetBuffer buffer )
public void receive( BinaryMessage buffer )
{
FleetsyncMessage message = new FleetsyncMessage( buffer, mAliasList );

6
src/decode/fleetsync2/FleetsyncMessage.java
View File

@@ -31,7 +31,7 @@ import org.jdesktop.swingx.mapviewer.GeoPosition;
import alias.Alias;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import edac.CRC;
import edac.CRCFleetsync;
@@ -111,11 +111,11 @@ public class FleetsyncMessage extends Message
private static int[] sGPSSpeedFractional = { 499,498,497,496,495,494,493,492 };
private static int[] sCRC8 = { 532,531,530,529,528,527,526,525,524,523,522,521,520,519,518,517 };
private BitSetBuffer mMessage;
private BinaryMessage mMessage;
private CRC[] mCRC = new CRC[ 8 ];
private AliasList mAliasList;
public FleetsyncMessage( BitSetBuffer message, AliasList list )
public FleetsyncMessage( BinaryMessage message, AliasList list )
{
mMessage = message;
mAliasList = list;

6
src/decode/lj1200/LJ1200Message.java
View File

@@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory;
import alias.Alias;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import edac.CRC;
import edac.CRCLJ;
@@ -65,11 +65,11 @@ public class LJ1200Message extends Message
private static SimpleDateFormat mSDF = new SimpleDateFormat( "yyyyMMdd HHmmss" );
private BitSetBuffer mMessage;
private BinaryMessage mMessage;
private AliasList mAliasList;
private CRC mCRC;
public LJ1200Message( BitSetBuffer message, AliasList list )
public LJ1200Message( BinaryMessage message, AliasList list )
{
mMessage = message;
mAliasList = list;

6
src/decode/lj1200/LJ1200MessageProcessor.java
View File

@@ -25,9 +25,9 @@ import org.slf4j.LoggerFactory;
import sample.Broadcaster;
import sample.Listener;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
public class LJ1200MessageProcessor implements Listener<BitSetBuffer>
public class LJ1200MessageProcessor implements Listener<BinaryMessage>
{
private final static Logger mLog =
LoggerFactory.getLogger( LJ1200MessageProcessor.class );
@@ -52,7 +52,7 @@ public class LJ1200MessageProcessor implements Listener<BitSetBuffer>
}
@Override
public void receive( BitSetBuffer buffer )
public void receive( BinaryMessage buffer )
{
int sync = buffer.getInt( SYNC );

6
src/decode/lj1200/LJ1200TransponderMessage.java
View File

@@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory;
import alias.Alias;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import edac.CRC;
import edac.CRCLJ;
@@ -41,11 +41,11 @@ public class LJ1200TransponderMessage extends Message
private static SimpleDateFormat mSDF = new SimpleDateFormat( "yyyyMMdd HHmmss" );
private BitSetBuffer mMessage;
private BinaryMessage mMessage;
private AliasList mAliasList;
private CRC mCRC;
public LJ1200TransponderMessage( BitSetBuffer message, AliasList list )
public LJ1200TransponderMessage( BinaryMessage message, AliasList list )
{
mMessage = message;
mAliasList = list;

4
src/decode/ltrnet/LTRNetISWMessage.java
View File

@@ -24,7 +24,7 @@ import message.MessageDirection;
import message.MessageType;
import alias.Alias;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import edac.CRC;
import edac.CRCLTR;
@@ -41,7 +41,7 @@ public class LTRNetISWMessage extends LTRNetMessage
private LTRNetISWMessage mAuxMessage;
public LTRNetISWMessage( BitSetBuffer message, AliasList list )
public LTRNetISWMessage( BinaryMessage message, AliasList list )
{
super( message, MessageDirection.ISW, list );

6
src/decode/ltrnet/LTRNetMessage.java
View File

@@ -25,7 +25,7 @@ import message.MessageDirection;
import message.MessageType;
import alias.Alias;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.DecoderType;
import edac.CRC;
import edac.CRCLTR;
@@ -49,12 +49,12 @@ public abstract class LTRNetMessage extends Message
protected static final int[] sSIXTEEN_BITS = { 32,31,30,29,28,27,26,25,24,23,22,21,20,19,18,17 };
protected static final int[] sMANUFACTURER_ID = { 23,22,21,20,19,18,17 };
protected BitSetBuffer mMessage;
protected BinaryMessage mMessage;
protected MessageType mMessageType;
protected CRC mCRC;
protected AliasList mAliasList;
public LTRNetMessage( BitSetBuffer message,
public LTRNetMessage( BinaryMessage message,
MessageDirection direction,
AliasList list )
{

6
src/decode/ltrnet/LTRNetMessageProcessor.java
View File

@@ -25,9 +25,9 @@ import message.MessageType;
import sample.Broadcaster;
import sample.Listener;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
public class LTRNetMessageProcessor implements Listener<BitSetBuffer>
public class LTRNetMessageProcessor implements Listener<BinaryMessage>
{
private Broadcaster<Message> mBroadcaster = new Broadcaster<Message>();
@@ -55,7 +55,7 @@ public class LTRNetMessageProcessor implements Listener<BitSetBuffer>
}
@Override
public void receive( BitSetBuffer buffer )
public void receive( BinaryMessage buffer )
{
LTRNetMessage message;

4
src/decode/ltrnet/LTRNetOSWMessage.java
View File

@@ -25,7 +25,7 @@ import message.MessageDirection;
import message.MessageType;
import alias.Alias;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
public class LTRNetOSWMessage extends LTRNetMessage
{
@@ -53,7 +53,7 @@ public class LTRNetOSWMessage extends LTRNetMessage
private LTRNetOSWMessage mAuxMessage;
public LTRNetOSWMessage( BitSetBuffer message, AliasList list )
public LTRNetOSWMessage( BinaryMessage message, AliasList list )
{
super( message, MessageDirection.OSW, list );
mMessageType = getType();

4
src/decode/ltrstandard/LTRStandardISWMessage.java
View File

@@ -24,14 +24,14 @@ import message.MessageDirection;
import message.MessageType;
import alias.Alias;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
public class LTRStandardISWMessage extends LTRStandardMessage
{
private static final int sCALL_END = 31;
private static final int sIDLE = 255;
public LTRStandardISWMessage( BitSetBuffer message, AliasList list )
public LTRStandardISWMessage( BinaryMessage message, AliasList list )
{
super( message, MessageDirection.OSW, list );
mMessageType = getType();

6
src/decode/ltrstandard/LTRStandardMessage.java
View File

@@ -25,7 +25,7 @@ import message.MessageDirection;
import message.MessageType;
import alias.Alias;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.DecoderType;
import edac.CRC;
import edac.CRCLTR;
@@ -47,12 +47,12 @@ public abstract class LTRStandardMessage extends Message
protected static final int[] sFREE = { 32,31,30,29,28 };
protected static final int[] sCRC = { 39,38,37,36,35,34,33 };
protected BitSetBuffer mMessage;
protected BinaryMessage mMessage;
protected MessageType mMessageType;
protected CRC mCRC;
protected AliasList mAliasList;
public LTRStandardMessage( BitSetBuffer message,
public LTRStandardMessage( BinaryMessage message,
MessageDirection direction,
AliasList list )
{

6
src/decode/ltrstandard/LTRStandardMessageProcessor.java
View File

@@ -22,9 +22,9 @@ import message.MessageDirection;
import sample.Broadcaster;
import sample.Listener;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
public class LTRStandardMessageProcessor implements Listener<BitSetBuffer>
public class LTRStandardMessageProcessor implements Listener<BinaryMessage>
{
private MessageDirection mDirection;
private Broadcaster<Message> mBroadcaster = new Broadcaster<Message>();
@@ -37,7 +37,7 @@ public class LTRStandardMessageProcessor implements Listener<BitSetBuffer>
}
@Override
public void receive( BitSetBuffer buffer )
public void receive( BinaryMessage buffer )
{
LTRStandardMessage message;

4
src/decode/ltrstandard/LTRStandardOSWMessage.java
View File

@@ -24,14 +24,14 @@ import message.MessageDirection;
import message.MessageType;
import alias.Alias;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
public class LTRStandardOSWMessage extends LTRStandardMessage
{
private static final int sCALL_END = 31;
private static final int sIDLE = 255;
public LTRStandardOSWMessage( BitSetBuffer message, AliasList list )
public LTRStandardOSWMessage( BinaryMessage message, AliasList list )
{
super( message, MessageDirection.OSW, list );
mMessageType = getType();

6
src/decode/mdc1200/MDCMessage.java
View File

@@ -24,7 +24,7 @@ import map.Plottable;
import message.Message;
import alias.Alias;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
public class MDCMessage extends Message
{
@@ -48,10 +48,10 @@ public class MDCMessage extends Message
private static int[] sDIGIT_4 = { 67,66,65,64 };
private static int[] sDIGIT_3 = { 71,70,69,68 };
private BitSetBuffer mMessage;
private BinaryMessage mMessage;
private AliasList mAliasList;
public MDCMessage( BitSetBuffer message, AliasList list )
public MDCMessage( BinaryMessage message, AliasList list )
{
mMessage = message;
mAliasList = list;

12
src/decode/mdc1200/MDCMessageProcessor.java
View File

@@ -21,9 +21,9 @@ import message.Message;
import sample.Broadcaster;
import sample.Listener;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
public class MDCMessageProcessor implements Listener<BitSetBuffer>
public class MDCMessageProcessor implements Listener<BinaryMessage>
{
private static int sMESSAGE_LENGTH = 112;
@@ -41,7 +41,7 @@ public class MDCMessageProcessor implements Listener<BitSetBuffer>
}
@Override
public void receive( BitSetBuffer buffer )
public void receive( BinaryMessage buffer )
{
/**
* De-interleave the 112 bits of message one, starting after the sync
@@ -80,7 +80,7 @@ public class MDCMessageProcessor implements Listener<BitSetBuffer>
* bit will be a 0 after decode, despite what is currently in the buffer,
* in order to maintain correct polarity of the decoded message.
*/
private void removeNRZIEncoding( BitSetBuffer buffer )
private void removeNRZIEncoding( BinaryMessage buffer )
{
/**
* Clear bit position 0, the first bit of the sync pattern, to start
@@ -111,7 +111,7 @@ public class MDCMessageProcessor implements Listener<BitSetBuffer>
/**
* Deinterleaves a 112-bit packet, starting at the offset into the buffer
*/
private void deinterleave( BitSetBuffer buffer, int offset )
private void deinterleave( BinaryMessage buffer, int offset )
{
if( buffer.size() < sMESSAGE_LENGTH + offset )
{
@@ -119,7 +119,7 @@ public class MDCMessageProcessor implements Listener<BitSetBuffer>
+ "cannot deinterleave message - message buffer too short" );
}
BitSetBuffer deinterleaved = new BitSetBuffer( 112 );
BinaryMessage deinterleaved = new BinaryMessage( 112 );
int deinterleavedPointer = 0;

6
src/decode/mpt1327/MPT1327Message.java
View File

@@ -29,7 +29,7 @@ import map.Plottable;
import message.Message;
import alias.Alias;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import edac.CRC;
import edac.CRCFleetsync;
@@ -123,12 +123,12 @@ public class MPT1327Message extends Message
private static SimpleDateFormat mSDF = new SimpleDateFormat( "yyyyMMdd HHmmss" );
Calendar mCalendar = new GregorianCalendar();
private BitSetBuffer mMessage;
private BinaryMessage mMessage;
private CRC[] mCRC = new CRC[ 5 ];
private AliasList mAliasList;
private MPTMessageType mMessageType;
public MPT1327Message( BitSetBuffer message, AliasList list )
public MPT1327Message( BinaryMessage message, AliasList list )
{
mMessage = message;
mAliasList = list;

6
src/decode/mpt1327/MPT1327MessageProcessor.java
View File

@@ -21,9 +21,9 @@ import message.Message;
import sample.Broadcaster;
import sample.Listener;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
public class MPT1327MessageProcessor implements Listener<BitSetBuffer>
public class MPT1327MessageProcessor implements Listener<BinaryMessage>
{
private Broadcaster<Message> mBroadcaster = new Broadcaster<Message>();
@@ -40,7 +40,7 @@ public class MPT1327MessageProcessor implements Listener<BitSetBuffer>
}
@Override
public void receive( BitSetBuffer buffer )
public void receive( BinaryMessage buffer )
{
MPT1327Message message = new MPT1327Message( buffer, mAliasList );

6
src/dsp/fsk/C4FMFrameListener.java → src/decode/p25/C4FMFrameListener.java
View File

@@ -1,6 +1,6 @@
package dsp.fsk;
package decode.p25;
import bits.BitSetBuffer;
import bits.BinaryMessage;
public interface C4FMFrameListener
{
@@ -10,6 +10,6 @@ public interface C4FMFrameListener
* @param buffer - framed message without the sync pattern
* @param inverted - flag indicating if the message was received inverted
*/
public void receive( BitSetBuffer buffer, boolean inverted );
public void receive( BinaryMessage buffer, boolean inverted );
}

3
src/dsp/fsk/C4FMSlicer.java → src/decode/p25/C4FMSlicer.java
View File

@@ -1,5 +1,6 @@
package dsp.fsk;
package decode.p25;
import dsp.symbol.Dibit;
import sample.Broadcaster;
import sample.Listener;
import sample.real.RealSampleListener;

2
src/dsp/fsk/C4FMSymbolFilter.java → src/decode/p25/C4FMSymbolFilter.java
View File

@@ -1,4 +1,4 @@
package dsp.fsk;
package decode.p25;
import instrument.Instrumentable;
import instrument.tap.Tap;

4
src/decode/p25/P25Decoder.java
View File

@@ -39,12 +39,10 @@ import dsp.filter.ComplexFIRFilter;
import dsp.filter.FilterFactory;
import dsp.filter.FloatFIRFilter;
import dsp.filter.Window.WindowType;
import dsp.fsk.C4FMSlicer;
import dsp.fsk.C4FMSymbolFilter;
import dsp.fsk.P25MessageFramer;
import dsp.gain.DirectGainControl;
import dsp.nbfm.FMDiscriminator;
import dsp.nbfm.FilteringNBFMDemodulator;
import dsp.symbol.FrameSync;
public class P25Decoder extends Decoder
implements DirectFrequencyController, Instrumentable

16
src/decode/p25/P25Interleave.java
View File

@@ -5,7 +5,7 @@ import java.util.BitSet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import bits.BitSetBuffer;
import bits.BinaryMessage;
/**
* Utility class to process interleave of P25 Voice and Data messages.
@@ -65,19 +65,19 @@ public class P25Interleave
* @param start - starting bit index for the block
* @param end - ending bit index for the block, plus 1
*/
public static BitSetBuffer deinterleaveData( BitSetBuffer message,
public static BinaryMessage deinterleaveData( BinaryMessage message,
int start, int end )
{
return deinterleave( DATA_DEINTERLEAVE, message, start, end );
}
public static BitSetBuffer deinterleaveVoice( BitSetBuffer message,
public static BinaryMessage deinterleaveVoice( BinaryMessage message,
int start, int end )
{
return deinterleave( VOICE_DEINTERLEAVE, message, start, end );
}
public static BitSetBuffer deinterleave( int[] pattern, BitSetBuffer message,
public static BinaryMessage deinterleave( int[] pattern, BinaryMessage message,
int start, int end )
{
BitSet original = message.get( start, end );
@@ -106,19 +106,19 @@ public class P25Interleave
* @param start - starting bit index for the block
* @param end - ending bit index for the block, plus 1
*/
public static BitSetBuffer interleaveData( BitSetBuffer message,
public static BinaryMessage interleaveData( BinaryMessage message,
int start, int end )
{
return interleave( DATA_INTERLEAVE, message, start, end );
}
public static BitSetBuffer interleaveVoice( BitSetBuffer message,
public static BinaryMessage interleaveVoice( BinaryMessage message,
int start, int end )
{
return interleave( VOICE_INTERLEAVE, message, start, end );
}
public static BitSetBuffer interleave( int[] pattern, BitSetBuffer message,
public static BinaryMessage interleave( int[] pattern, BinaryMessage message,
int start, int end )
{
BitSet original = message.get( start, end );
@@ -146,7 +146,7 @@ public class P25Interleave
int end = 196;
String interleaved = "0010010100000000000000000000000000000000000010100011001011111010101010101010101010101010010111101010100011010000000000000000000000000000110001011010011010101010101010101010101010101010100101100101";
BitSetBuffer b = new BitSetBuffer( end );
BinaryMessage b = new BinaryMessage( end );
for( int x = 0; x < end; x++ )
{

38
src/dsp/fsk/P25MessageFramer.java → src/decode/p25/P25MessageFramer.java
View File

@@ -1,4 +1,4 @@
package dsp.fsk;
package decode.p25;
import java.util.ArrayList;
@@ -9,12 +9,9 @@ import org.slf4j.LoggerFactory;
import sample.Listener;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import bits.BitSetFullException;
import bits.SyncPatternMatcher;
import decode.p25.P25Interleave;
import decode.p25.Trellis_1_2_Rate;
import decode.p25.Trellis_3_4_Rate;
import decode.p25.message.P25Message;
import decode.p25.message.hdu.HDUMessage;
import decode.p25.message.ldu.LDU1Message;
@@ -30,6 +27,7 @@ import decode.p25.message.tdu.lc.TDULinkControlMessage;
import decode.p25.message.tsbk.TSBKMessage;
import decode.p25.message.tsbk.TSBKMessageFactory;
import decode.p25.reference.DataUnitID;
import dsp.symbol.Dibit;
import edac.BCH_63_16_11;
import edac.CRC;
import edac.CRCP25;
@@ -163,7 +161,7 @@ public class P25MessageFramer implements Listener<Dibit>
/* Starting position of the status symbol counter is 24 symbols to
* account for the 48-bit sync pattern which is not included in message */
private int mStatusSymbolPointer = 24;
private BitSetBuffer mMessage;
private BinaryMessage mMessage;
private int mMessageLength;
private boolean mComplete = false;
private boolean mActive = false;
@@ -172,7 +170,7 @@ public class P25MessageFramer implements Listener<Dibit>
public P25MessageAssembler()
{
mMessageLength = mDUID.getMessageLength();
mMessage = new BitSetBuffer( mMessageLength );
mMessage = new BinaryMessage( mMessageLength );
reset();
}
@@ -234,9 +232,9 @@ public class P25MessageFramer implements Listener<Dibit>
switch( mDUID )
{
case NID:
CRC crc = mNIDDecoder.correctNID( mMessage );
mMessage = mNIDDecoder.correctNID( mMessage );
if( crc != CRC.FAILED_CRC )
if( mMessage.getCRC() != CRC.FAILED_CRC )
{
int value = mMessage.getInt( P25Message.DUID );
@@ -281,11 +279,11 @@ public class P25MessageFramer implements Listener<Dibit>
* unsuccessful decode due to excessive errors */
if( mHalfRate.decode( mMessage, PDU0_BEGIN, PDU0_END ) )
{
CRC pduCRC = CRCP25.correctCCITT80( mMessage,
mMessage = CRCP25.correctCCITT80( mMessage,
PDU0_BEGIN, PDU0_CRC_BEGIN );
if( pduCRC != CRC.FAILED_CRC )
if( mMessage.getCRC() != CRC.FAILED_CRC )
{
boolean confirmed = mMessage.get(
PDUMessage.CONFIRMATION_REQUIRED_INDICATOR );
@@ -462,12 +460,12 @@ public class P25MessageFramer implements Listener<Dibit>
if( mHalfRate.decode( mMessage, TSBK_BEGIN, TSBK_END ) )
{
CRC tsbkCRC = CRCP25.correctCCITT80( mMessage,
mMessage = CRCP25.correctCCITT80( mMessage,
TSBK_BEGIN, TSBK_CRC_START );
if( tsbkCRC != CRC.FAILED_CRC )
if( mMessage.getCRC() != CRC.FAILED_CRC )
{
BitSetBuffer tsbkBuffer1 = mMessage.copy();
BinaryMessage tsbkBuffer1 = mMessage.copy();
tsbkBuffer1.setSize( TSBK_DECODED_END );
TSBKMessage tsbkMessage1 = TSBKMessageFactory.getMessage(
@@ -503,12 +501,12 @@ public class P25MessageFramer implements Listener<Dibit>
* unsuccessful decode due to excessive errors */
if( mHalfRate.decode( mMessage, TSBK_BEGIN, TSBK_END ) )
{
CRC tsbkCRC = CRCP25.correctCCITT80( mMessage,
mMessage = CRCP25.correctCCITT80( mMessage,
TSBK_BEGIN, TSBK_CRC_START );
if( tsbkCRC != CRC.FAILED_CRC )
if( mMessage.getCRC() != CRC.FAILED_CRC )
{
BitSetBuffer tsbkBuffer2 = mMessage.copy();
BinaryMessage tsbkBuffer2 = mMessage.copy();
tsbkBuffer2.setSize( TSBK_DECODED_END );
TSBKMessage tsbkMessage2 = TSBKMessageFactory.getMessage(
@@ -544,12 +542,12 @@ public class P25MessageFramer implements Listener<Dibit>
* unsuccessful decode due to excessive errors */
if( mHalfRate.decode( mMessage, TSBK_BEGIN, TSBK_END ) )
{
CRC tsbkCRC = CRCP25.correctCCITT80( mMessage,
mMessage = CRCP25.correctCCITT80( mMessage,
TSBK_BEGIN, TSBK_CRC_START );
if( tsbkCRC != CRC.FAILED_CRC )
if( mMessage.getCRC() != CRC.FAILED_CRC )
{
BitSetBuffer tsbkBuffer3 = mMessage.copy();
BinaryMessage tsbkBuffer3 = mMessage.copy();
tsbkBuffer3.setSize( TSBK_DECODED_END );
TSBKMessage tsbkMessage3 = TSBKMessageFactory.getMessage(

10
src/decode/p25/Trellis_1_2_Rate.java
View File

@@ -6,8 +6,8 @@ import java.util.Random;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import bits.BitSetBuffer;
import dsp.fsk.Dibit;
import bits.BinaryMessage;
import dsp.symbol.Dibit;
public class Trellis_1_2_Rate
{
@@ -97,7 +97,7 @@ public class Trellis_1_2_Rate
return sb.toString();
}
public boolean decode( BitSetBuffer message, int start, int end )
public boolean decode( BinaryMessage message, int start, int end )
{
/* load each of the nodes with de-interleaved constellations */
for( int index = 0; index < 49; index++ )
@@ -148,7 +148,7 @@ public class Trellis_1_2_Rate
return true;
}
private Constellation getConstellation( BitSetBuffer message, int index )
private Constellation getConstellation( BinaryMessage message, int index )
{
int transmittedValue = 0;
@@ -500,7 +500,7 @@ public class Trellis_1_2_Rate
{
Random random = new Random();
BitSetBuffer buffer = new BitSetBuffer( 196 );
BinaryMessage buffer = new BinaryMessage( 196 );
try
{

10
src/decode/p25/Trellis_3_4_Rate.java
View File

@@ -8,8 +8,8 @@ import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import bits.BitSetBuffer;
import dsp.fsk.Dibit;
import bits.BinaryMessage;
import dsp.symbol.Dibit;
public class Trellis_3_4_Rate
{
@@ -102,7 +102,7 @@ public class Trellis_3_4_Rate
*
* @return - original message with decoded message bits..
*/
public boolean decode( BitSetBuffer message, int start, int end )
public boolean decode( BinaryMessage message, int start, int end )
{
reset();
@@ -190,7 +190,7 @@ public class Trellis_3_4_Rate
}
}
private Con getConstellation( BitSetBuffer message, int index )
private Con getConstellation( BinaryMessage message, int index )
{
int value = message.getInt( index, index + 3 );
return Con.fromTransmittedValue( value );
@@ -642,7 +642,7 @@ public class Trellis_3_4_Rate
{
String raw = "12:58:51.635 DEBUG dsp.fsk.P25MessageFramer - AFTER DEINTERLEAVE: 00100110000011001010010101111101000101010110100111111100101011000111011011000110000000000000000000000111111101011000001000001111000110000000000010101011110110010000000001011011000000010100011110110001000010100100011111000000000100000000000000000000010000000000001100000000000000011010101010101010101010100010001010000110010111111101101000001010000010100000101000001010000010100000101000001010000010100000101000001010000010100000101000001010000010100000010111001001000011100101011010101010101001010011";
BitSetBuffer message = BitSetBuffer.load( raw );
BinaryMessage message = BinaryMessage.load( raw );
mLog.debug( "MSG: " + message.toString() );

8
src/decode/p25/message/P25Message.java
View File

@@ -6,7 +6,7 @@ import map.Plottable;
import message.Message;
import alias.Alias;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.reference.DataUnitID;
import edac.CRC;
@@ -24,13 +24,13 @@ public class P25Message extends Message
protected SimpleDateFormat mTimeDurationFormat =
new SimpleDateFormat( "HH:mm:ss.SSS");
protected BitSetBuffer mMessage;
protected BinaryMessage mMessage;
protected DataUnitID mDUID;
protected AliasList mAliasList;
protected CRC[] mCRC;
public P25Message( BitSetBuffer message,
public P25Message( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{
@@ -46,7 +46,7 @@ public class P25Message extends Message
return mCRC;
}
public BitSetBuffer getSourceMessage()
public BinaryMessage getSourceMessage()
{
return mMessage;
}

4
src/decode/p25/message/hdu/HDUMessage.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.hdu;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.P25Message;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Encryption;
@@ -22,7 +22,7 @@ public class HDUMessage extends P25Message
public static final int[] TALKGROUP_ID = { 372,373,374,375,388,389,390,391,
392,393,406,407,408,409,410,411 };
public HDUMessage( BitSetBuffer message, DataUnitID duid,
public HDUMessage( BinaryMessage message, DataUnitID duid,
AliasList aliasList )
{
super( message, duid, aliasList );

4
src/decode/p25/message/ldu/LDU1Message.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.ldu;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.P25Interleave;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.LinkControlOpcode;
@@ -25,7 +25,7 @@ public class LDU1Message extends LDUMessage
// public static final int[] OCTET_7 = { 732,733,734,735,740,741,742,743 };
// public static final int[] OCTET_8 = { 744,745,750,751,752,753,754,755 };
public LDU1Message( BitSetBuffer message, DataUnitID duid,
public LDU1Message( BinaryMessage message, DataUnitID duid,
AliasList aliasList )
{
super( message, duid, aliasList );

4
src/decode/p25/message/ldu/LDU2Message.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.ldu;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Encryption;
import edac.CRC;
@@ -28,7 +28,7 @@ public class LDU2Message extends LDUMessage
public static final int[] KEY_ID = { 916,917,918,919,924,925,926,927,928,
929,934,935,936,937,938,939 };
public LDU2Message( BitSetBuffer message, DataUnitID duid,
public LDU2Message( BinaryMessage message, DataUnitID duid,
AliasList aliasList )
{
super( message, duid, aliasList );

4
src/decode/p25/message/ldu/LDUMessage.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.ldu;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.P25Interleave;
import decode.p25.message.P25Message;
import decode.p25.reference.DataUnitID;
@@ -22,7 +22,7 @@ public class LDUMessage extends P25Message
public static final int[] LOW_SPEED_DATA = { 1456,1457,1458,1459,1460,1461,
1462,1463,1472,1473,1474,1475,1476,1477,1478,1479 };
public LDUMessage( BitSetBuffer message, DataUnitID duid,
public LDUMessage( BinaryMessage message, DataUnitID duid,
AliasList aliasList )
{
super( message, duid, aliasList );

4
src/decode/p25/message/pdu/PDUMessage.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.pdu;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.P25Message;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -26,7 +26,7 @@ public class PDUMessage extends P25Message
public static final int[] PDU_CRC = { 144,145,146,147,148,149,150,151,152,
153,154,155,156,157,158,159 };
public PDUMessage( BitSetBuffer message, DataUnitID duid, AliasList aliasList )
public PDUMessage( BinaryMessage message, DataUnitID duid, AliasList aliasList )
{
super( message, duid, aliasList );

4
src/decode/p25/message/pdu/PDUMessageFactory.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.pdu;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.pdu.osp.control.AdjacentStatusBroadcastExtended;
import decode.p25.message.pdu.osp.control.CallAlertExtended;
import decode.p25.message.pdu.osp.control.GroupAffiliationQueryExtended;
@@ -29,7 +29,7 @@ import decode.p25.reference.Vendor;
public class PDUMessageFactory
{
public static PDUMessage getMessage( BitSetBuffer message,
public static PDUMessage getMessage( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

7
src/decode/p25/message/pdu/UnitToUnitChannelGrantExtended.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.pdu;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.IdentifierProvider;
import decode.p25.message.IdentifierReceiver;
import decode.p25.reference.DataUnitID;
@@ -42,14 +42,15 @@ public abstract class UnitToUnitChannelGrantExtended extends PDUMessage
private IdentifierProvider mTransmitIdentifierUpdate;
private IdentifierProvider mReceiveIdentifierUpdate;
public UnitToUnitChannelGrantExtended( BitSetBuffer message,
public UnitToUnitChannelGrantExtended( BinaryMessage message,
DataUnitID duid, AliasList aliasList )
{
super( message, duid, aliasList );
/* Header block is already error detected/corrected - perform error
* detection correction on the intermediate and final data blocks */
mCRC[ 1 ] = CRCP25.correctPDU2( mMessage );
mMessage = CRCP25.correctPDU2( mMessage );
mCRC[ 1 ] = mMessage.getCRC();
}
public String getMessage()

4
src/decode/p25/message/pdu/confirmed/PDUConfirmedMessage.java
View File

@@ -4,7 +4,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.pdu.PDUMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.PDUType;
@@ -23,7 +23,7 @@ public class PDUConfirmedMessage extends PDUMessage
public static final int[] FRAGMENT_SEQUENCE_NUMBER = { 133,134,135 };
public static final int[] PDU_TYPE = { 176,177,178,179 };
public PDUConfirmedMessage( BitSetBuffer message, AliasList aliasList )
public PDUConfirmedMessage( BinaryMessage message, AliasList aliasList )
{
super( message, DataUnitID.PDUC, aliasList );

4
src/decode/p25/message/pdu/confirmed/SNDCPActivateTDSContextAccept.java
View File

@@ -4,7 +4,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.pdu.PDUMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.MDPConfigurationOption;
@@ -50,7 +50,7 @@ public class SNDCPActivateTDSContextAccept extends PDUConfirmedMessage
sb.append( "NAC:" );
sb.append( getNAC() );
sb.append( " LLID:" );
sb.append( " PDUC LLID:" );
sb.append( getLogicalLinkID() );
sb.append( " ACCEPT SNDCP PACKET DATA ACTIVATE " );
sb.append( getNetworkAddressType() );

2
src/decode/p25/message/pdu/confirmed/SNDCPActivateTDSContextReject.java
View File

@@ -25,7 +25,7 @@ public class SNDCPActivateTDSContextReject extends PDUConfirmedMessage
sb.append( "NAC:" );
sb.append( getNAC() );
sb.append( " LLID:" );
sb.append( " PDUC LLID:" );
sb.append( getLogicalLinkID() );
sb.append( " REJECT SNDCP PACKET DATA ACTIVATE - REASON:" );
sb.append( getReason().getLabel() );

2
src/decode/p25/message/pdu/confirmed/SNDCPActivateTDSContextRequest.java
View File

@@ -36,7 +36,7 @@ public class SNDCPActivateTDSContextRequest extends PDUConfirmedMessage
sb.append( "NAC:" );
sb.append( getNAC() );
sb.append( " LLID:" );
sb.append( " PDUC LLID:" );
sb.append( getLogicalLinkID() );
sb.append( " REQUEST SNDCP PACKET DATA ACTIVATE " );
sb.append( getNetworkAddressType() );

2
src/decode/p25/message/pdu/confirmed/SNDCPDeactivateTDSContext.java
View File

@@ -27,7 +27,7 @@ public class SNDCPDeactivateTDSContext extends PDUConfirmedMessage
sb.append( "NAC:" );
sb.append( getNAC() );
sb.append( " LLID:" );
sb.append( " PDUC LLID:" );
sb.append( getLogicalLinkID() );
sb.append( " REQUEST SNDCP PACKET DATA DEACTIVATE " );
sb.append( getDeactivationType() );

2
src/decode/p25/message/pdu/confirmed/SNDCPUserData.java
View File

@@ -70,7 +70,7 @@ public class SNDCPUserData extends PDUConfirmedMessage
sb.append( "NAC:" );
sb.append( getNAC() );
sb.append( " LLID:" );
sb.append( " PDUC LLID:" );
sb.append( getLogicalLinkID() );
sb.append( " SNDCP NSAPI:" );
sb.append( getNSAPI() );

7
src/decode/p25/message/pdu/osp/control/AdjacentStatusBroadcastExtended.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.pdu.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.IdentifierProvider;
import decode.p25.message.IdentifierReceiver;
import decode.p25.message.pdu.PDUMessage;
@@ -34,14 +34,15 @@ public class AdjacentStatusBroadcastExtended extends PDUMessage
private IdentifierProvider mTransmitIdentifierProvider;
private IdentifierProvider mReceiveIdentifierProvider;
public AdjacentStatusBroadcastExtended( BitSetBuffer message,
public AdjacentStatusBroadcastExtended( BinaryMessage message,
DataUnitID duid, AliasList aliasList )
{
super( message, duid, aliasList );
/* Header block is already error detected/corrected - perform error
* detection correction on the intermediate and final data blocks */
mCRC[ 1 ] = CRCP25.correctPDU1( mMessage );
mMessage = CRCP25.correctPDU1( mMessage );
mCRC[ 1 ] = mMessage.getCRC();
}
@Override

7
src/decode/p25/message/pdu/osp/control/CallAlertExtended.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.pdu.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.pdu.PDUMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -21,14 +21,15 @@ public class CallAlertExtended extends PDUMessage
230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,
248,249,250,251,252,253,254,255 };
public CallAlertExtended( BitSetBuffer message,
public CallAlertExtended( BinaryMessage message,
DataUnitID duid, AliasList aliasList )
{
super( message, duid, aliasList );
/* Header block is already error detected/corrected - perform error
* detection correction on the intermediate and final data blocks */
mCRC[ 1 ] = CRCP25.correctPDU1( mMessage );
mMessage = CRCP25.correctPDU1( mMessage );
mCRC[ 1 ] = mMessage.getCRC();
}
@Override

7
src/decode/p25/message/pdu/osp/control/GroupAffiliationQueryExtended.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.pdu.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.pdu.PDUMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -21,14 +21,15 @@ public class GroupAffiliationQueryExtended extends PDUMessage
230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,
248,249,250,251,252,253,254,255 };
public GroupAffiliationQueryExtended( BitSetBuffer message,
public GroupAffiliationQueryExtended( BinaryMessage message,
DataUnitID duid, AliasList aliasList )
{
super( message, duid, aliasList );
/* Header block is already error detected/corrected - perform error
* detection correction on the intermediate and final data blocks */
mCRC[ 1 ] = CRCP25.correctPDU1( mMessage );
mMessage = CRCP25.correctPDU1( mMessage );
mCRC[ 1 ] = mMessage.getCRC();
}
@Override

7
src/decode/p25/message/pdu/osp/control/GroupAffiliationResponseExtended.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.pdu.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.pdu.PDUMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -31,14 +31,15 @@ public class GroupAffiliationResponseExtended extends PDUMessage
326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,
343,344,345,346,347,348,349,350,351 };
public GroupAffiliationResponseExtended( BitSetBuffer message,
public GroupAffiliationResponseExtended( BinaryMessage message,
DataUnitID duid, AliasList aliasList )
{
super( message, duid, aliasList );
/* Header block is already error detected/corrected - perform error
* detection correction on the intermediate and final data blocks */
mCRC[ 1 ] = CRCP25.correctPDU2( mMessage );
mMessage = CRCP25.correctPDU1( mMessage );
mCRC[ 1 ] = mMessage.getCRC();
}
@Override

7
src/decode/p25/message/pdu/osp/control/MessageUpdateExtended.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.pdu.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.pdu.PDUMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -23,14 +23,15 @@ public class MessageUpdateExtended extends PDUMessage
230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,
248,249,250,251,252,253,254,255 };
public MessageUpdateExtended( BitSetBuffer message,
public MessageUpdateExtended( BinaryMessage message,
DataUnitID duid, AliasList aliasList )
{
super( message, duid, aliasList );
/* Header block is already error detected/corrected - perform error
* detection correction on the intermediate and final data blocks */
mCRC[ 1 ] = CRCP25.correctPDU1( mMessage );
mMessage = CRCP25.correctPDU1( mMessage );
mCRC[ 1 ] = mMessage.getCRC();
}
@Override

7
src/decode/p25/message/pdu/osp/control/NetworkStatusBroadcastExtended.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.pdu.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.IdentifierProvider;
import decode.p25.message.IdentifierReceiver;
import decode.p25.message.pdu.PDUMessage;
@@ -34,14 +34,15 @@ public class NetworkStatusBroadcastExtended extends PDUMessage
private IdentifierProvider mTransmitIdentifierUpdate;
private IdentifierProvider mReceiveIdentifierUpdate;
public NetworkStatusBroadcastExtended( BitSetBuffer message,
public NetworkStatusBroadcastExtended( BinaryMessage message,
DataUnitID duid, AliasList aliasList )
{
super( message, duid, aliasList );
/* Header block is already error detected/corrected - perform error
* detection correction on the intermediate and final data blocks */
mCRC[ 1 ] = CRCP25.correctPDU1( mMessage );
mMessage = CRCP25.correctPDU1( mMessage );
mCRC[ 1 ] = mMessage.getCRC();
}
@Override

7
src/decode/p25/message/pdu/osp/control/ProtectionParameterBroadcast.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.pdu.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.pdu.PDUMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Encryption;
@@ -35,14 +35,15 @@ public class ProtectionParameterBroadcast extends PDUMessage
326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,
343,344,345,346,347,348,349,350,351 };
public ProtectionParameterBroadcast( BitSetBuffer message,
public ProtectionParameterBroadcast( BinaryMessage message,
DataUnitID duid, AliasList aliasList )
{
super( message, duid, aliasList );
/* Header block is already error detected/corrected - perform error
* detection correction on the intermediate and final data blocks */
mCRC[ 1 ] = CRCP25.correctPDU2( mMessage );
mMessage = CRCP25.correctPDU1( mMessage );
mCRC[ 1 ] = mMessage.getCRC();
}
@Override

7
src/decode/p25/message/pdu/osp/control/RFSSStatusBroadcastExtended.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.pdu.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.IdentifierProvider;
import decode.p25.message.IdentifierReceiver;
import decode.p25.message.pdu.PDUMessage;
@@ -34,14 +34,15 @@ public class RFSSStatusBroadcastExtended extends PDUMessage
private IdentifierProvider mTransmitIdentifierUpdate;
private IdentifierProvider mReceiveIdentifierUpdate;
public RFSSStatusBroadcastExtended( BitSetBuffer message,
public RFSSStatusBroadcastExtended( BinaryMessage message,
DataUnitID duid, AliasList aliasList )
{
super( message, duid, aliasList );
/* Header block is already error detected/corrected - perform error
* detection correction on the intermediate and final data blocks */
mCRC[ 1 ] = CRCP25.correctPDU1( mMessage );
mMessage = CRCP25.correctPDU1( mMessage );
mCRC[ 1 ] = mMessage.getCRC();
}
@Override

18
src/decode/p25/message/pdu/osp/control/RoamingAddressUpdateExtended.java
View File

@@ -1,11 +1,11 @@
package decode.p25.message.pdu.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.P25MessageFramer;
import decode.p25.message.pdu.PDUMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
import dsp.fsk.P25MessageFramer;
import edac.CRCP25;
public class RoamingAddressUpdateExtended extends PDUMessage
@@ -62,7 +62,7 @@ public class RoamingAddressUpdateExtended extends PDUMessage
private Format mFormat;
public RoamingAddressUpdateExtended( BitSetBuffer message,
public RoamingAddressUpdateExtended( BinaryMessage message,
DataUnitID duid, AliasList aliasList )
{
super( message, duid, aliasList );
@@ -73,7 +73,8 @@ public class RoamingAddressUpdateExtended extends PDUMessage
/* Header block is already error detected/corrected - perform error
* detection correction on the intermediate and final data blocks */
mCRC[ 1 ] = CRCP25.correctPDU1( mMessage );
mMessage = CRCP25.correctPDU1( mMessage );
mCRC[ 1 ] = mMessage.getCRC();
}
else if( mMessage.size() == P25MessageFramer.PDU3_BEGIN )
{
@@ -81,7 +82,8 @@ public class RoamingAddressUpdateExtended extends PDUMessage
/* Header block is already error detected/corrected - perform error
* detection correction on the intermediate and final data blocks */
mCRC[ 1 ] = CRCP25.correctPDU2( mMessage );
mMessage = CRCP25.correctPDU2( mMessage );
mCRC[ 1 ] = mMessage.getCRC();
}
else if( mMessage.size() == P25MessageFramer.PDU3_DECODED_END )
{
@@ -89,7 +91,8 @@ public class RoamingAddressUpdateExtended extends PDUMessage
/* Header block is already error detected/corrected - perform error
* detection correction on the intermediate and final data blocks */
mCRC[ 1 ] = CRCP25.correctPDU3( mMessage );
mMessage = CRCP25.correctPDU3( mMessage );
mCRC[ 1 ] = mMessage.getCRC();
}
else
{
@@ -97,7 +100,8 @@ public class RoamingAddressUpdateExtended extends PDUMessage
/* Header block is already error detected/corrected - perform error
* detection correction on the intermediate and final data blocks */
mCRC[ 1 ] = CRCP25.correctPDU1( mMessage );
mMessage = CRCP25.correctPDU1( mMessage );
mCRC[ 1 ] = mMessage.getCRC();
}
}

7
src/decode/p25/message/pdu/osp/control/StatusQueryExtended.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.pdu.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.pdu.PDUMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -21,14 +21,15 @@ public class StatusQueryExtended extends PDUMessage
230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,
248,249,250,251,252,253,254,255 };
public StatusQueryExtended( BitSetBuffer message,
public StatusQueryExtended( BinaryMessage message,
DataUnitID duid, AliasList aliasList )
{
super( message, duid, aliasList );
/* Header block is already error detected/corrected - perform error
* detection correction on the intermediate and final data blocks */
mCRC[ 1 ] = CRCP25.correctPDU1( mMessage );
mMessage = CRCP25.correctPDU1( mMessage );
mCRC[ 1 ] = mMessage.getCRC();
}
@Override

7
src/decode/p25/message/pdu/osp/control/StatusUpdateExtended.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.pdu.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.pdu.PDUMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -23,14 +23,15 @@ public class StatusUpdateExtended extends PDUMessage
230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,
248,249,250,251,252,253,254,255 };
public StatusUpdateExtended( BitSetBuffer message,
public StatusUpdateExtended( BinaryMessage message,
DataUnitID duid, AliasList aliasList )
{
super( message, duid, aliasList );
/* Header block is already error detected/corrected - perform error
* detection correction on the intermediate and final data blocks */
mCRC[ 1 ] = CRCP25.correctPDU1( mMessage );
mMessage = CRCP25.correctPDU1( mMessage );
mCRC[ 1 ] = mMessage.getCRC();
}
@Override

7
src/decode/p25/message/pdu/osp/control/UnitRegistrationResponseExtended.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.pdu.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.pdu.PDUMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -25,14 +25,15 @@ public class UnitRegistrationResponseExtended extends PDUMessage
326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,
343,344,345,346,347,348,349,350,351 };
public UnitRegistrationResponseExtended( BitSetBuffer message,
public UnitRegistrationResponseExtended( BinaryMessage message,
DataUnitID duid, AliasList aliasList )
{
super( message, duid, aliasList );
/* Header block is already error detected/corrected - perform error
* detection correction on the intermediate and final data blocks */
mCRC[ 1 ] = CRCP25.correctPDU2( mMessage );
mMessage = CRCP25.correctPDU1( mMessage );
mCRC[ 1 ] = mMessage.getCRC();
}
@Override

7
src/decode/p25/message/pdu/osp/data/GroupDataChannelGrantExtended.java
View File

@@ -3,7 +3,7 @@ package decode.p25.message.pdu.osp.data;
import java.util.Date;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.IdentifierProvider;
import decode.p25.message.IdentifierReceiver;
import decode.p25.message.pdu.PDUMessage;
@@ -39,14 +39,15 @@ public class GroupDataChannelGrantExtended extends PDUMessage
private IdentifierProvider mTransmitIdentifierUpdate;
private IdentifierProvider mReceiveIdentifierUpdate;
public GroupDataChannelGrantExtended( BitSetBuffer message,
public GroupDataChannelGrantExtended( BinaryMessage message,
DataUnitID duid, AliasList aliasList )
{
super( message, duid, aliasList );
/* Header block is already error detected/corrected - perform error
* detection correction on the intermediate and final data blocks */
mCRC[ 1 ] = CRCP25.correctPDU1( mMessage );
mMessage = CRCP25.correctPDU1( mMessage );
mCRC[ 1 ] = mMessage.getCRC();
}
@Override

4
src/decode/p25/message/pdu/osp/data/IndividualDataChannelGrantExtended.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.pdu.osp.data;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.IdentifierReceiver;
import decode.p25.message.pdu.UnitToUnitChannelGrantExtended;
import decode.p25.reference.DataUnitID;
@@ -11,7 +11,7 @@ public class IndividualDataChannelGrantExtended
extends UnitToUnitChannelGrantExtended
implements IdentifierReceiver
{
public IndividualDataChannelGrantExtended( BitSetBuffer message,
public IndividualDataChannelGrantExtended( BinaryMessage message,
DataUnitID duid, AliasList aliasList )
{
super( message, duid, aliasList );

7
src/decode/p25/message/pdu/osp/voice/GroupVoiceChannelGrantExplicit.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.pdu.osp.voice;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.IdentifierProvider;
import decode.p25.message.IdentifierReceiver;
import decode.p25.message.pdu.PDUMessage;
@@ -37,14 +37,15 @@ public class GroupVoiceChannelGrantExplicit extends PDUMessage
private IdentifierProvider mTransmitIdentifierUpdate;
private IdentifierProvider mReceiveIdentifierUpdate;
public GroupVoiceChannelGrantExplicit( BitSetBuffer message,
public GroupVoiceChannelGrantExplicit( BinaryMessage message,
DataUnitID duid, AliasList aliasList )
{
super( message, duid, aliasList );
/* Header block is already error detected/corrected - perform error
* detection correction on the intermediate and final data blocks */
mCRC[ 1 ] = CRCP25.correctPDU1( mMessage );
mMessage = CRCP25.correctPDU1( mMessage );
mCRC[ 1 ] = mMessage.getCRC();
}
@Override

7
src/decode/p25/message/pdu/osp/voice/TelephoneInterconnectChannelGrantExplicit.java
View File

@@ -3,7 +3,7 @@ package decode.p25.message.pdu.osp.voice;
import java.util.Date;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.IdentifierProvider;
import decode.p25.message.IdentifierReceiver;
import decode.p25.message.pdu.PDUMessage;
@@ -39,14 +39,15 @@ public class TelephoneInterconnectChannelGrantExplicit extends PDUMessage
private IdentifierProvider mTransmitIdentifierUpdate;
private IdentifierProvider mReceiveIdentifierUpdate;
public TelephoneInterconnectChannelGrantExplicit( BitSetBuffer message,
public TelephoneInterconnectChannelGrantExplicit( BinaryMessage message,
DataUnitID duid, AliasList aliasList )
{
super( message, duid, aliasList );
/* Header block is already error detected/corrected - perform error
* detection correction on the intermediate and final data blocks */
mCRC[ 1 ] = CRCP25.correctPDU1( mMessage );
mMessage = CRCP25.correctPDU1( mMessage );
mCRC[ 1 ] = mMessage.getCRC();
}
@Override

4
src/decode/p25/message/pdu/osp/voice/TelephoneInterconnectChannelGrantUpdateExplicit.java
View File

@@ -1,14 +1,14 @@
package decode.p25.message.pdu.osp.voice;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
public class TelephoneInterconnectChannelGrantUpdateExplicit
extends TelephoneInterconnectChannelGrantExplicit
{
public TelephoneInterconnectChannelGrantUpdateExplicit( BitSetBuffer message,
public TelephoneInterconnectChannelGrantUpdateExplicit( BinaryMessage message,
DataUnitID duid, AliasList aliasList )
{
super( message, duid, aliasList );

7
src/decode/p25/message/pdu/osp/voice/UnitToUnitAnswerRequestExplicit.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.pdu.osp.voice;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.pdu.PDUMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -27,14 +27,15 @@ public class UnitToUnitAnswerRequestExplicit extends PDUMessage
230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,
248,249,250,251,252,253,254,255 };
public UnitToUnitAnswerRequestExplicit( BitSetBuffer message,
public UnitToUnitAnswerRequestExplicit( BinaryMessage message,
DataUnitID duid, AliasList aliasList )
{
super( message, duid, aliasList );
/* Header block is already error detected/corrected - perform error
* detection correction on the intermediate and final data blocks */
mCRC[ 1 ] = CRCP25.correctPDU1( mMessage );
mMessage = CRCP25.correctPDU1( mMessage );
mCRC[ 1 ] = mMessage.getCRC();
}
@Override

4
src/decode/p25/message/pdu/osp/voice/UnitToUnitVoiceChannelGrantExtended.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.pdu.osp.voice;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.IdentifierReceiver;
import decode.p25.message.pdu.UnitToUnitChannelGrantExtended;
import decode.p25.reference.DataUnitID;
@@ -11,7 +11,7 @@ public class UnitToUnitVoiceChannelGrantExtended
extends UnitToUnitChannelGrantExtended
implements IdentifierReceiver
{
public UnitToUnitVoiceChannelGrantExtended( BitSetBuffer message,
public UnitToUnitVoiceChannelGrantExtended( BinaryMessage message,
DataUnitID duid, AliasList aliasList )
{
super( message, duid, aliasList );

7
src/decode/p25/message/pdu/osp/voice/UnitToUnitVoiceChannelGrantUpdateExtended.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.pdu.osp.voice;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.IdentifierProvider;
import decode.p25.message.IdentifierReceiver;
import decode.p25.message.pdu.PDUMessage;
@@ -43,14 +43,15 @@ public class UnitToUnitVoiceChannelGrantUpdateExtended extends PDUMessage
private IdentifierProvider mTransmitIdentifierUpdate;
private IdentifierProvider mReceiveIdentifierUpdate;
public UnitToUnitVoiceChannelGrantUpdateExtended( BitSetBuffer message,
public UnitToUnitVoiceChannelGrantUpdateExtended( BinaryMessage message,
DataUnitID duid, AliasList aliasList )
{
super( message, duid, aliasList );
/* Header block is already error detected/corrected - perform error
* detection correction on the intermediate and final data blocks */
mCRC[ 1 ] = CRCP25.correctPDU2( mMessage );
mMessage = CRCP25.correctPDU2( mMessage );
mCRC[ 1 ] = mMessage.getCRC();
}
@Override

8
src/decode/p25/message/tdu/TDULinkControlMessage.java
View File

@@ -4,7 +4,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.P25Message;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.LinkControlOpcode;
@@ -51,7 +51,7 @@ public class TDULinkControlMessage extends P25Message
public static final ReedSolomon_24_12_13 mReedSolomonDecoder =
new ReedSolomon_24_12_13();
public TDULinkControlMessage( BitSetBuffer message, DataUnitID duid,
public TDULinkControlMessage( BinaryMessage message, DataUnitID duid,
AliasList aliasList )
{
super( message, duid, aliasList );
@@ -167,9 +167,9 @@ public class TDULinkControlMessage extends P25Message
while( x < mMessage.size() )
{
boolean passes = Galois24.checkAndCorrect( mMessage, x );
mMessage = Galois24.checkAndCorrect( mMessage, x );
if( !passes )
if( !( mMessage.getCRC() == CRC.PASSED ) )
{
mCRC[ 1 ] = CRC.FAILED_CRC;
}

4
src/decode/p25/message/tdu/TDUMessage.java
View File

@@ -1,14 +1,14 @@
package decode.p25.message.tdu;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.P25Message;
import decode.p25.reference.DataUnitID;
import edac.CRC;
public class TDUMessage extends P25Message
{
public TDUMessage( BitSetBuffer message, DataUnitID duid,
public TDUMessage( BinaryMessage message, DataUnitID duid,
AliasList aliasList )
{
super( message, duid, aliasList );

8
src/decode/p25/message/tdu/lc/TDULinkControlMessage.java
View File

@@ -4,7 +4,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.P25Message;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.LinkControlOpcode;
@@ -51,7 +51,7 @@ public class TDULinkControlMessage extends P25Message
public static final ReedSolomon_24_12_13 mReedSolomonDecoder =
new ReedSolomon_24_12_13();
public TDULinkControlMessage( BitSetBuffer message, DataUnitID duid,
public TDULinkControlMessage( BinaryMessage message, DataUnitID duid,
AliasList aliasList )
{
super( message, duid, aliasList );
@@ -167,9 +167,9 @@ public class TDULinkControlMessage extends P25Message
while( x < mMessage.size() )
{
boolean passes = Galois24.checkAndCorrect( mMessage, x );
mMessage = Galois24.checkAndCorrect( mMessage, x );
if( !passes )
if( !( mMessage.getCRC() == CRC.PASSED ) )
{
mCRC[ 1 ] = CRC.FAILED_CRC;
}

4
src/decode/p25/message/tsbk/ChannelGrant.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.IdentifierProvider;
import decode.p25.message.IdentifierReceiver;
import decode.p25.reference.DataUnitID;
@@ -16,7 +16,7 @@ public abstract class ChannelGrant extends ServiceMessage
private IdentifierProvider mIdentifierUpdate;
public ChannelGrant( BitSetBuffer message,
public ChannelGrant( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

4
src/decode/p25/message/tsbk/GroupChannelGrant.java
View File

@@ -2,7 +2,7 @@ package decode.p25.message.tsbk;
import alias.Alias;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.reference.DataUnitID;
public abstract class GroupChannelGrant extends ChannelGrant
@@ -13,7 +13,7 @@ public abstract class GroupChannelGrant extends ChannelGrant
public static final int[] SOURCE_ADDRESS = { 120,121,122,123,124,125,126,
127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 };
public GroupChannelGrant( BitSetBuffer message,
public GroupChannelGrant( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

4
src/decode/p25/message/tsbk/GroupChannelGrantExplicit.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.IdentifierProvider;
import decode.p25.reference.DataUnitID;
@@ -19,7 +19,7 @@ public abstract class GroupChannelGrantExplicit extends ChannelGrant
private IdentifierProvider mTransmitIdentifierUpdate;
private IdentifierProvider mReceiveIdentifierUpdate;
public GroupChannelGrantExplicit( BitSetBuffer message,
public GroupChannelGrantExplicit( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

4
src/decode/p25/message/tsbk/GroupMultiChannelGrant.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.IdentifierProvider;
import decode.p25.message.IdentifierReceiver;
import decode.p25.reference.DataUnitID;
@@ -24,7 +24,7 @@ public abstract class GroupMultiChannelGrant extends ChannelGrant
private IdentifierProvider mIdentifierUpdate1;
private IdentifierProvider mIdentifierUpdate2;
public GroupMultiChannelGrant( BitSetBuffer message,
public GroupMultiChannelGrant( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

4
src/decode/p25/message/tsbk/ServiceMessage.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.reference.DataUnitID;
public abstract class ServiceMessage extends TSBKMessage
@@ -12,7 +12,7 @@ public abstract class ServiceMessage extends TSBKMessage
public static final int DUPLEX_MODE = 82;
public static final int SESSION_MODE = 83;
public ServiceMessage( BitSetBuffer message,
public ServiceMessage( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

4
src/decode/p25/message/tsbk/TSBKMessage.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.P25Message;
import decode.p25.message.tsbk.motorola.MotorolaOpcode;
import decode.p25.message.tsbk.vendor.VendorOpcode;
@@ -32,7 +32,7 @@ public class TSBKMessage extends P25Message
public static final int[] BLOCK12 = { 152,153,154,155,156,157,158,159 };
public static final int CRC_START = 144;
public TSBKMessage( BitSetBuffer message, DataUnitID duid, AliasList aliasList )
public TSBKMessage( BinaryMessage message, DataUnitID duid, AliasList aliasList )
{
super( message, duid, aliasList );

4
src/decode/p25/message/tsbk/TSBKMessageFactory.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.tsbk.motorola.ChannelCWIDUpdate;
import decode.p25.message.tsbk.motorola.MotorolaOpcode;
import decode.p25.message.tsbk.motorola.MotorolaTSBKMessage;
@@ -54,7 +54,7 @@ import decode.p25.reference.Vendor;
public class TSBKMessageFactory
{
public static TSBKMessage getMessage( BitSetBuffer message,
public static TSBKMessage getMessage( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

4
src/decode/p25/message/tsbk/UnitChannelGrant.java
View File

@@ -2,7 +2,7 @@ package decode.p25.message.tsbk;
import alias.Alias;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.reference.DataUnitID;
public abstract class UnitChannelGrant extends ChannelGrant
@@ -13,7 +13,7 @@ public abstract class UnitChannelGrant extends ChannelGrant
public static final int[] SOURCE_ADDRESS = { 120,121,122,123,124,125,126,
127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 };
public UnitChannelGrant( BitSetBuffer message,
public UnitChannelGrant( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

4
src/decode/p25/message/tsbk/motorola/ChannelCWIDUpdate.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk.motorola;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.IdentifierProvider;
import decode.p25.message.IdentifierReceiver;
import decode.p25.reference.DataUnitID;
@@ -24,7 +24,7 @@ public class ChannelCWIDUpdate extends MotorolaTSBKMessage
private IdentifierProvider mIdentifierUpdate;
public ChannelCWIDUpdate( BitSetBuffer message,
public ChannelCWIDUpdate( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

4
src/decode/p25/message/tsbk/motorola/MotorolaTSBKMessage.java
View File

@@ -1,13 +1,13 @@
package decode.p25.message.tsbk.motorola;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.tsbk.TSBKMessage;
import decode.p25.reference.DataUnitID;
public class MotorolaTSBKMessage extends TSBKMessage
{
public MotorolaTSBKMessage( BitSetBuffer message, DataUnitID duid,
public MotorolaTSBKMessage( BinaryMessage message, DataUnitID duid,
AliasList aliasList )
{
super( message, duid, aliasList );

4
src/decode/p25/message/tsbk/motorola/SystemLoading.java
View File

@@ -1,13 +1,13 @@
package decode.p25.message.tsbk.motorola;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.tsbk.TSBKMessage;
import decode.p25.reference.DataUnitID;
public class SystemLoading extends MotorolaTSBKMessage
{
public SystemLoading( BitSetBuffer message, DataUnitID duid,
public SystemLoading( BinaryMessage message, DataUnitID duid,
AliasList aliasList )
{
super( message, duid, aliasList );

4
src/decode/p25/message/tsbk/osp/control/AcknowledgeResponse.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.tsbk.TSBKMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -20,7 +20,7 @@ public class AcknowledgeResponse extends TSBKMessage
public static final int[] TARGET_ADDRESS = { 120,121,122,123,124,125,126,
127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 };
public AcknowledgeResponse( BitSetBuffer message,
public AcknowledgeResponse( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

4
src/decode/p25/message/tsbk/osp/control/AdjacentStatusBroadcast.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.IdentifierProvider;
import decode.p25.message.IdentifierReceiver;
import decode.p25.message.tsbk.TSBKMessage;
@@ -28,7 +28,7 @@ public class AdjacentStatusBroadcast extends TSBKMessage implements IdentifierRe
private IdentifierProvider mIdentifierUpdate;
public AdjacentStatusBroadcast( BitSetBuffer message,
public AdjacentStatusBroadcast( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

4
src/decode/p25/message/tsbk/osp/control/AuthenticationCommand.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.tsbk.TSBKMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -15,7 +15,7 @@ public class AuthenticationCommand extends TSBKMessage
public static final int[] TARGET_ID = { 120,121,122,123,124,125,126,
127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 };
public AuthenticationCommand( BitSetBuffer message,
public AuthenticationCommand( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

4
src/decode/p25/message/tsbk/osp/control/CallAlert.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.tsbk.TSBKMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -13,7 +13,7 @@ public class CallAlert extends TSBKMessage
public static final int[] SOURCE_ID = { 120,121,122,123,124,125,126,
127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 };
public CallAlert( BitSetBuffer message,
public CallAlert( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

4
src/decode/p25/message/tsbk/osp/control/DenyResponse.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.tsbk.TSBKMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.DenyReason;
@@ -21,7 +21,7 @@ public class DenyResponse extends TSBKMessage
public static final int[] TARGET_ADDRESS = { 120,121,122,123,124,125,126,
127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 };
public DenyResponse( BitSetBuffer message,
public DenyResponse( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

4
src/decode/p25/message/tsbk/osp/control/ExtendedFunctionCommand.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.tsbk.TSBKMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.ExtendedFunction;
@@ -16,7 +16,7 @@ public class ExtendedFunctionCommand extends TSBKMessage
public static final int[] TARGET_ADDRESS = { 120,121,122,123,124,125,126,
127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 };
public ExtendedFunctionCommand( BitSetBuffer message,
public ExtendedFunctionCommand( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

4
src/decode/p25/message/tsbk/osp/control/GroupAffiliationQuery.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.tsbk.TSBKMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -13,7 +13,7 @@ public class GroupAffiliationQuery extends TSBKMessage
public static final int[] SOURCE_ADDRESS = { 120,121,122,123,124,125,126,
127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 };
public GroupAffiliationQuery( BitSetBuffer message,
public GroupAffiliationQuery( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

4
src/decode/p25/message/tsbk/osp/control/GroupAffiliationResponse.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.tsbk.TSBKMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -18,7 +18,7 @@ public class GroupAffiliationResponse extends TSBKMessage
public static final int[] TARGET_ADDRESS = { 120,121,122,123,124,125,126,
127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 };
public GroupAffiliationResponse( BitSetBuffer message,
public GroupAffiliationResponse( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

4
src/decode/p25/message/tsbk/osp/control/IdentifierUpdate.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.IdentifierProvider;
import decode.p25.message.tsbk.TSBKMessage;
import decode.p25.reference.DataUnitID;
@@ -18,7 +18,7 @@ public abstract class IdentifierUpdate extends TSBKMessage
119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,
137,138,139,140,141,142,143 };
public IdentifierUpdate( BitSetBuffer message,
public IdentifierUpdate( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

4
src/decode/p25/message/tsbk/osp/control/IdentifierUpdateNonVUHF.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -13,7 +13,7 @@ public class IdentifierUpdateNonVUHF extends IdentifierUpdate
public static final int[] TRANSMIT_OFFSET = { 94,95,96,97,98,99,100,101 };
public IdentifierUpdateNonVUHF( BitSetBuffer message,
public IdentifierUpdateNonVUHF( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

4
src/decode/p25/message/tsbk/osp/control/IdentifierUpdateVUHF.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -14,7 +14,7 @@ public class IdentifierUpdateVUHF extends IdentifierUpdate
public static final int[] TRANSMIT_OFFSET = { 89,90,91,92,93,94,95,96,97,98,
99,100,101 };
public IdentifierUpdateVUHF( BitSetBuffer message,
public IdentifierUpdateVUHF( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

4
src/decode/p25/message/tsbk/osp/control/LocationRegistrationResponse.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.tsbk.TSBKMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -17,7 +17,7 @@ public class LocationRegistrationResponse extends TSBKMessage
public static final int[] TARGET_ADDRESS = { 120,121,122,123,124,125,126,
127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 };
public LocationRegistrationResponse( BitSetBuffer message,
public LocationRegistrationResponse( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

4
src/decode/p25/message/tsbk/osp/control/MessageUpdate.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.tsbk.TSBKMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -15,7 +15,7 @@ public class MessageUpdate extends TSBKMessage
public static final int[] SOURCE_ADDRESS = { 120,121,122,123,124,125,126,
127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 };
public MessageUpdate( BitSetBuffer message,
public MessageUpdate( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

4
src/decode/p25/message/tsbk/osp/control/NetworkStatusBroadcast.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.IdentifierProvider;
import decode.p25.message.IdentifierReceiver;
import decode.p25.message.tsbk.TSBKMessage;
@@ -25,7 +25,7 @@ public class NetworkStatusBroadcast extends TSBKMessage implements IdentifierRec
private IdentifierProvider mIdentifierUpdate;
public NetworkStatusBroadcast( BitSetBuffer message,
public NetworkStatusBroadcast( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

4
src/decode/p25/message/tsbk/osp/control/ProtectionParameterUpdate.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.tsbk.TSBKMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Encryption;
@@ -15,7 +15,7 @@ public class ProtectionParameterUpdate extends TSBKMessage
public static final int[] TARGET_ADDRESS = { 120,121,122,123,124,125,126,
127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 };
public ProtectionParameterUpdate( BitSetBuffer message,
public ProtectionParameterUpdate( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

4
src/decode/p25/message/tsbk/osp/control/QueuedResponse.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.tsbk.TSBKMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -21,7 +21,7 @@ public class QueuedResponse extends TSBKMessage
public static final int[] TARGET_ADDRESS = { 120,121,122,123,124,125,126,
127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 };
public QueuedResponse( BitSetBuffer message,
public QueuedResponse( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

4
src/decode/p25/message/tsbk/osp/control/RFSSStatusBroadcast.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.IdentifierProvider;
import decode.p25.message.IdentifierReceiver;
import decode.p25.message.tsbk.TSBKMessage;
@@ -25,7 +25,7 @@ public class RFSSStatusBroadcast extends TSBKMessage implements IdentifierReceiv
private IdentifierProvider mIdentifierUpdate;
public RFSSStatusBroadcast( BitSetBuffer message,
public RFSSStatusBroadcast( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

4
src/decode/p25/message/tsbk/osp/control/RadioUnitMonitorCommand.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.tsbk.TSBKMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -14,7 +14,7 @@ public class RadioUnitMonitorCommand extends TSBKMessage
public static final int[] TARGET_ADDRESS = { 120,121,122,123,124,125,126,
127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 };
public RadioUnitMonitorCommand( BitSetBuffer message,
public RadioUnitMonitorCommand( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

4
src/decode/p25/message/tsbk/osp/control/RoamingAddressCommand.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.tsbk.TSBKMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -18,7 +18,7 @@ public class RoamingAddressCommand extends TSBKMessage
public static final int[] TARGET_ID = { 120,121,122,123,124,125,126,127,128,
129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 };
public RoamingAddressCommand( BitSetBuffer message,
public RoamingAddressCommand( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

4
src/decode/p25/message/tsbk/osp/control/SecondaryControlChannelBroadcast.java
View File

@@ -4,7 +4,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.IdentifierProvider;
import decode.p25.message.IdentifierReceiver;
import decode.p25.message.tsbk.TSBKMessage;
@@ -33,7 +33,7 @@ public class SecondaryControlChannelBroadcast extends TSBKMessage
private IdentifierProvider mIdentifierUpdate1;
private IdentifierProvider mIdentifierUpdate2;
public SecondaryControlChannelBroadcast( BitSetBuffer message,
public SecondaryControlChannelBroadcast( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

4
src/decode/p25/message/tsbk/osp/control/SecondaryControlChannelBroadcastExplicit.java
View File

@@ -4,7 +4,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -14,7 +14,7 @@ public class SecondaryControlChannelBroadcastExplicit
private final static Logger mLog = LoggerFactory.getLogger(
SecondaryControlChannelBroadcastExplicit.class );
public SecondaryControlChannelBroadcastExplicit( BitSetBuffer message,
public SecondaryControlChannelBroadcastExplicit( BinaryMessage message,
DataUnitID duid, AliasList aliasList )
{
super( message, duid, aliasList );

4
src/decode/p25/message/tsbk/osp/control/StatusQuery.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.tsbk.TSBKMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -13,7 +13,7 @@ public class StatusQuery extends TSBKMessage
public static final int[] SOURCE_ADDRESS = { 120,121,122,123,124,125,126,
127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 };
public StatusQuery( BitSetBuffer message,
public StatusQuery( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

4
src/decode/p25/message/tsbk/osp/control/StatusUpdate.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.tsbk.TSBKMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -15,7 +15,7 @@ public class StatusUpdate extends TSBKMessage
public static final int[] SOURCE_ADDRESS = { 160,161,162,163,164,165,166,
167,168,169,170,171,184,185,186,187,188,189,190,190,192,193,194,195 };
public StatusUpdate( BitSetBuffer message,
public StatusUpdate( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

Some files were not shown because too many files have changed in this diff Show More