Updates PlaylistManager to use faster jackson XML serialization.

Removes native xml.bind serialization for improved compatibility with
 Java 9.

 Global optimize imports on the entire project.
This commit is contained in:
Denny
2017-12-21 07:18:26 -05:00
parent 47cc194415
commit ee6aeafa84
303 changed files with 3457 additions and 4687 deletions

View File

@@ -17,6 +17,7 @@
******************************************************************************/
package io.github.dsheirer.module.decode.am;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
import io.github.dsheirer.module.decode.DecoderType;
import io.github.dsheirer.module.decode.config.DecodeConfiguration;
@@ -24,11 +25,15 @@ public class DecodeConfigAM extends DecodeConfiguration
{
public DecodeConfigAM()
{
super( DecoderType.AM );
setAFC( false );
}
@JacksonXmlProperty(isAttribute = true, localName = "type", namespace = "http://www.w3.org/2001/XMLSchema-instance")
public DecoderType getDecoderType()
{
return DecoderType.AM;
}
public boolean supportsAFC()
{
return false;

View File

@@ -17,12 +17,14 @@
******************************************************************************/
package io.github.dsheirer.module.decode.config;
import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
import io.github.dsheirer.controller.config.Configuration;
import io.github.dsheirer.module.decode.DecoderType;
import javax.xml.bind.annotation.XmlElement;
import java.util.ArrayList;
@JsonSubTypes.Type(value = AuxDecodeConfiguration.class, name = "auxDecodeConfiguration")
public class AuxDecodeConfiguration extends Configuration
{
ArrayList<DecoderType> mAuxDecoders = new ArrayList<DecoderType>();
@@ -31,7 +33,7 @@ public class AuxDecodeConfiguration extends Configuration
{
}
@XmlElement( name="aux_decoder" )
@JacksonXmlProperty(isAttribute = false, localName = "aux_decoder")
public ArrayList<DecoderType> getAuxDecoders()
{
return mAuxDecoders;

View File

@@ -1,22 +1,27 @@
/*******************************************************************************
* 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/>
******************************************************************************/
package io.github.dsheirer.module.decode.config;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
import io.github.dsheirer.controller.config.Configuration;
import io.github.dsheirer.module.decode.DecoderType;
import io.github.dsheirer.module.decode.am.DecodeConfigAM;
@@ -27,78 +32,69 @@ import io.github.dsheirer.module.decode.nbfm.DecodeConfigNBFM;
import io.github.dsheirer.module.decode.p25.DecodeConfigP25Phase1;
import io.github.dsheirer.module.decode.passport.DecodeConfigPassport;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlSeeAlso;
@XmlSeeAlso( { DecodeConfigAM.class,
DecodeConfigNBFM.class,
DecodeConfigLTRNet.class,
DecodeConfigLTRStandard.class,
DecodeConfigMPT1327.class,
DecodeConfigPassport.class,
DecodeConfigP25Phase1.class } )
@XmlRootElement( name = "decode_configuration" )
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
@JsonSubTypes({
@JsonSubTypes.Type(value = DecodeConfigAM.class, name = "decodeConfigAM"),
@JsonSubTypes.Type(value = DecodeConfigLTRNet.class, name = "decodeConfigLTRNet"),
@JsonSubTypes.Type(value = DecodeConfigLTRStandard.class, name = "decodeConfigLTRStandard"),
@JsonSubTypes.Type(value = DecodeConfigMPT1327.class, name = "decodeConfigMPT1327"),
@JsonSubTypes.Type(value = DecodeConfigNBFM.class, name = "decodeConfigNBFM"),
@JsonSubTypes.Type(value = DecodeConfigP25Phase1.class, name = "decodeConfigP25Phase1"),
@JsonSubTypes.Type(value = DecodeConfigPassport.class, name = "decodeConfigPassport")
})
@JacksonXmlRootElement(localName = "decode_configuration")
public abstract class DecodeConfiguration extends Configuration
{
public static final int DEFAULT_CALL_TIMEOUT_SECONDS = 45;
public static final int CALL_TIMEOUT_MINIMUM = 1;
public static final int CALL_TIMEOUT_MAXIMUM = 300; //5 minutes
public static final int TRAFFIC_CHANNEL_LIMIT_DEFAULT = 3;
public static final int TRAFFIC_CHANNEL_LIMIT_MINIMUM = 0;
public static final int TRAFFIC_CHANNEL_LIMIT_MAXIMUM = 30;
public static final int DEFAULT_CALL_TIMEOUT_SECONDS = 45;
public static final int CALL_TIMEOUT_MINIMUM = 1;
public static final int CALL_TIMEOUT_MAXIMUM = 300; //5 minutes
public static final int DEFAULT_AFC_MAX_CORRECTION = 1000;
private DecoderType mDecoderType = DecoderType.NBFM;
private boolean mAFCEnabled = true;
private int mAFCMaxCorrection = DEFAULT_AFC_MAX_CORRECTION;
public static final int TRAFFIC_CHANNEL_LIMIT_DEFAULT = 3;
public static final int TRAFFIC_CHANNEL_LIMIT_MINIMUM = 0;
public static final int TRAFFIC_CHANNEL_LIMIT_MAXIMUM = 30;
public DecodeConfiguration()
{
this( DecoderType.NBFM );
}
public DecodeConfiguration( DecoderType type )
{
mDecoderType = type;
}
public static final int DEFAULT_AFC_MAX_CORRECTION = 1000;
public DecoderType getDecoderType()
{
return mDecoderType;
}
private boolean mAFCEnabled = true;
private int mAFCMaxCorrection = DEFAULT_AFC_MAX_CORRECTION;
@XmlAttribute( name = "afc" )
public boolean getAFC()
{
return mAFCEnabled;
}
public boolean isAFCEnabled()
{
return mAFCEnabled;
}
public void setAFC( boolean enabled )
{
mAFCEnabled = enabled;
}
@XmlAttribute( name = "AFCMaximumCorrection" )
public int getAFCMaximumCorrection()
{
return mAFCMaxCorrection;
}
public void setAFCMaximumCorrection( int max )
{
mAFCMaxCorrection = max;
}
public boolean supportsAFC()
{
return true;
}
public DecodeConfiguration()
{
}
@JsonIgnore
public abstract DecoderType getDecoderType();
@JacksonXmlProperty(isAttribute = true, localName = "afc")
public boolean getAFC()
{
return mAFCEnabled;
}
@JsonIgnore
public boolean isAFCEnabled()
{
return mAFCEnabled;
}
public void setAFC(boolean enabled)
{
mAFCEnabled = enabled;
}
@JacksonXmlProperty(isAttribute = true, localName = "AFCMaximumCorrection")
public int getAFCMaximumCorrection()
{
return mAFCMaxCorrection;
}
public void setAFCMaximumCorrection(int max)
{
mAFCMaxCorrection = max;
}
public boolean supportsAFC()
{
return true;
}
}

View File

@@ -18,10 +18,10 @@
******************************************************************************/
package io.github.dsheirer.module.decode.event;
import io.github.dsheirer.alias.Alias;
import io.github.dsheirer.icon.IconManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.github.dsheirer.alias.Alias;
import javax.swing.*;
import javax.swing.table.DefaultTableCellRenderer;

View File

@@ -17,8 +17,8 @@
******************************************************************************/
package io.github.dsheirer.module.decode.event;
import io.github.dsheirer.sample.Listener;
import io.github.dsheirer.alias.Alias;
import io.github.dsheirer.sample.Listener;
import javax.swing.table.AbstractTableModel;
import java.text.DecimalFormat;

View File

@@ -19,9 +19,9 @@
package io.github.dsheirer.module.decode.event;
import io.github.dsheirer.icon.IconManager;
import io.github.dsheirer.module.ProcessingChain;
import io.github.dsheirer.sample.Listener;
import net.miginfocom.swing.MigLayout;
import io.github.dsheirer.module.ProcessingChain;
import javax.swing.*;
import java.awt.*;

View File

@@ -17,10 +17,10 @@
******************************************************************************/
package io.github.dsheirer.module.decode.fleetsync1;
import io.github.dsheirer.alias.Alias;
import io.github.dsheirer.bits.BinaryMessage;
import io.github.dsheirer.map.Plottable;
import io.github.dsheirer.message.Message;
import io.github.dsheirer.alias.Alias;
import java.text.SimpleDateFormat;
import java.util.ArrayList;

View File

@@ -17,24 +17,24 @@
******************************************************************************/
package io.github.dsheirer.module.decode.fleetsync2;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.bits.MessageFramer;
import io.github.dsheirer.bits.SyncPattern;
import io.github.dsheirer.instrument.Instrumentable;
import io.github.dsheirer.instrument.tap.Tap;
import io.github.dsheirer.instrument.tap.TapGroup;
import io.github.dsheirer.instrument.tap.stream.BinaryTap;
import io.github.dsheirer.instrument.tap.stream.FloatBufferTap;
import io.github.dsheirer.sample.Listener;
import io.github.dsheirer.sample.real.IFilteredRealBufferListener;
import io.github.dsheirer.sample.real.RealBuffer;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.dsp.filter.Filters;
import io.github.dsheirer.dsp.filter.fir.real.RealFIRFilter_RB_RB;
import io.github.dsheirer.dsp.filter.halfband.real.HalfBandFilter_RB_RB;
import io.github.dsheirer.dsp.fsk.FSK2Decoder;
import io.github.dsheirer.dsp.fsk.FSK2Decoder.Output;
import io.github.dsheirer.instrument.Instrumentable;
import io.github.dsheirer.instrument.tap.Tap;
import io.github.dsheirer.instrument.tap.TapGroup;
import io.github.dsheirer.instrument.tap.stream.BinaryTap;
import io.github.dsheirer.instrument.tap.stream.FloatBufferTap;
import io.github.dsheirer.module.decode.Decoder;
import io.github.dsheirer.module.decode.DecoderType;
import io.github.dsheirer.sample.Listener;
import io.github.dsheirer.sample.real.IFilteredRealBufferListener;
import io.github.dsheirer.sample.real.RealBuffer;
import java.util.ArrayList;
import java.util.List;

View File

@@ -18,6 +18,9 @@
******************************************************************************/
package io.github.dsheirer.module.decode.fleetsync2;
import io.github.dsheirer.alias.Alias;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.alias.id.AliasIDType;
import io.github.dsheirer.channel.metadata.AliasedStringAttributeMonitor;
import io.github.dsheirer.channel.metadata.Attribute;
import io.github.dsheirer.channel.metadata.AttributeChangeRequest;
@@ -28,9 +31,6 @@ import io.github.dsheirer.channel.state.State;
import io.github.dsheirer.message.Message;
import io.github.dsheirer.module.decode.DecoderType;
import io.github.dsheirer.util.StringUtils;
import io.github.dsheirer.alias.Alias;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.alias.id.AliasIDType;
import java.util.Iterator;
import java.util.TreeSet;

View File

@@ -17,10 +17,10 @@
******************************************************************************/
package io.github.dsheirer.module.decode.fleetsync2;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.bits.BinaryMessage;
import io.github.dsheirer.message.Message;
import io.github.dsheirer.sample.Listener;
import io.github.dsheirer.alias.AliasList;
public class Fleetsync2MessageProcessor implements Listener<BinaryMessage>
{

View File

@@ -17,9 +17,9 @@
******************************************************************************/
package io.github.dsheirer.module.decode.fleetsync2;
import io.github.dsheirer.module.decode.DecoderType;
import io.github.dsheirer.alias.Alias;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.module.decode.DecoderType;
import io.github.dsheirer.module.decode.event.CallEvent;
public class FleetsyncCallEvent extends CallEvent

View File

@@ -17,14 +17,14 @@
******************************************************************************/
package io.github.dsheirer.module.decode.fleetsync2;
import io.github.dsheirer.alias.Alias;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.bits.BinaryMessage;
import io.github.dsheirer.edac.CRC;
import io.github.dsheirer.edac.CRCFleetsync;
import io.github.dsheirer.map.Plottable;
import io.github.dsheirer.message.Message;
import org.jdesktop.swingx.mapviewer.GeoPosition;
import io.github.dsheirer.alias.Alias;
import io.github.dsheirer.alias.AliasList;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;

View File

@@ -17,9 +17,9 @@
******************************************************************************/
package io.github.dsheirer.module.decode.lj1200;
import io.github.dsheirer.module.decode.DecoderType;
import io.github.dsheirer.alias.Alias;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.module.decode.DecoderType;
import io.github.dsheirer.module.decode.event.CallEvent;
public class LJ1200CallEvent extends CallEvent

View File

@@ -17,27 +17,27 @@
******************************************************************************/
package io.github.dsheirer.module.decode.lj1200;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.bits.MessageFramer;
import io.github.dsheirer.bits.SyncPattern;
import io.github.dsheirer.dsp.filter.Filters;
import io.github.dsheirer.dsp.filter.fir.real.RealFIRFilter_RB_RB;
import io.github.dsheirer.dsp.filter.halfband.real.HalfBandFilter_RB_RB;
import io.github.dsheirer.dsp.fsk.FSK2Decoder;
import io.github.dsheirer.dsp.fsk.FSK2Decoder.Output;
import io.github.dsheirer.instrument.Instrumentable;
import io.github.dsheirer.instrument.tap.Tap;
import io.github.dsheirer.instrument.tap.TapGroup;
import io.github.dsheirer.instrument.tap.stream.BinaryTap;
import io.github.dsheirer.instrument.tap.stream.FloatBufferTap;
import io.github.dsheirer.instrument.tap.stream.FloatTap;
import io.github.dsheirer.module.decode.Decoder;
import io.github.dsheirer.module.decode.DecoderType;
import io.github.dsheirer.sample.Broadcaster;
import io.github.dsheirer.sample.Listener;
import io.github.dsheirer.sample.real.IFilteredRealBufferListener;
import io.github.dsheirer.sample.real.RealBuffer;
import io.github.dsheirer.sample.real.RealSampleListener;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.dsp.filter.Filters;
import io.github.dsheirer.dsp.filter.fir.real.RealFIRFilter_RB_RB;
import io.github.dsheirer.dsp.filter.halfband.real.HalfBandFilter_RB_RB;
import io.github.dsheirer.dsp.fsk.FSK2Decoder;
import io.github.dsheirer.dsp.fsk.FSK2Decoder.Output;
import io.github.dsheirer.module.decode.Decoder;
import java.util.ArrayList;
import java.util.List;

View File

@@ -18,6 +18,8 @@
******************************************************************************/
package io.github.dsheirer.module.decode.lj1200;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.alias.id.AliasIDType;
import io.github.dsheirer.channel.metadata.AliasedStringAttributeMonitor;
import io.github.dsheirer.channel.metadata.Attribute;
import io.github.dsheirer.channel.state.DecoderState;
@@ -28,8 +30,6 @@ import io.github.dsheirer.message.Message;
import io.github.dsheirer.module.decode.DecoderType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.alias.id.AliasIDType;
import java.util.ArrayList;
import java.util.Collections;

View File

@@ -17,6 +17,8 @@
******************************************************************************/
package io.github.dsheirer.module.decode.lj1200;
import io.github.dsheirer.alias.Alias;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.bits.BinaryMessage;
import io.github.dsheirer.edac.CRC;
import io.github.dsheirer.edac.CRCLJ;
@@ -24,8 +26,6 @@ import io.github.dsheirer.map.Plottable;
import io.github.dsheirer.message.Message;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.github.dsheirer.alias.Alias;
import io.github.dsheirer.alias.AliasList;
import java.util.ArrayList;
import java.util.List;

View File

@@ -17,12 +17,12 @@
******************************************************************************/
package io.github.dsheirer.module.decode.lj1200;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.bits.BinaryMessage;
import io.github.dsheirer.message.Message;
import io.github.dsheirer.sample.Listener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.github.dsheirer.alias.AliasList;
public class LJ1200MessageProcessor implements Listener<BinaryMessage>
{

View File

@@ -17,14 +17,14 @@
******************************************************************************/
package io.github.dsheirer.module.decode.lj1200;
import io.github.dsheirer.alias.Alias;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.bits.BinaryMessage;
import io.github.dsheirer.edac.CRC;
import io.github.dsheirer.map.Plottable;
import io.github.dsheirer.message.Message;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.github.dsheirer.alias.Alias;
import io.github.dsheirer.alias.AliasList;
import java.text.SimpleDateFormat;

View File

@@ -1,45 +1,49 @@
/*******************************************************************************
* 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/>
******************************************************************************/
package io.github.dsheirer.module.decode.ltrnet;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
import io.github.dsheirer.message.MessageDirection;
import io.github.dsheirer.module.decode.DecoderType;
import io.github.dsheirer.module.decode.config.DecodeConfiguration;
import javax.xml.bind.annotation.XmlAttribute;
public class DecodeConfigLTRNet extends DecodeConfiguration
{
private MessageDirection mMessageDirection = MessageDirection.OSW;
public DecodeConfigLTRNet()
private MessageDirection mMessageDirection = MessageDirection.OSW;
public DecodeConfigLTRNet()
{
super( DecoderType.LTR_NET );
}
@XmlAttribute( name = "direction" )
public MessageDirection getMessageDirection()
{
return mMessageDirection;
}
public void setMessageDirection( MessageDirection direction )
{
mMessageDirection = direction;
}
@JacksonXmlProperty(isAttribute = true, localName = "type", namespace = "http://www.w3.org/2001/XMLSchema-instance")
public DecoderType getDecoderType()
{
return DecoderType.LTR_NET;
}
@JacksonXmlProperty(isAttribute = true, localName = "direction")
public MessageDirection getMessageDirection()
{
return mMessageDirection;
}
public void setMessageDirection(MessageDirection direction)
{
mMessageDirection = direction;
}
}

View File

@@ -1,45 +1,50 @@
/*******************************************************************************
* 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/>
******************************************************************************/
package io.github.dsheirer.module.decode.ltrstandard;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
import io.github.dsheirer.message.MessageDirection;
import io.github.dsheirer.module.decode.DecoderType;
import io.github.dsheirer.module.decode.config.DecodeConfiguration;
import javax.xml.bind.annotation.XmlAttribute;
public class DecodeConfigLTRStandard extends DecodeConfiguration
{
private MessageDirection mMessageDirection = MessageDirection.OSW;
private MessageDirection mMessageDirection = MessageDirection.OSW;
public DecodeConfigLTRStandard()
public DecodeConfigLTRStandard()
{
super( DecoderType.LTR_STANDARD );
}
@XmlAttribute( name = "direction" )
public MessageDirection getMessageDirection()
{
return mMessageDirection;
}
public void setMessageDirection( MessageDirection direction )
{
mMessageDirection = direction;
}
@JacksonXmlProperty(isAttribute = true, localName = "type", namespace = "http://www.w3.org/2001/XMLSchema-instance")
public DecoderType getDecoderType()
{
return DecoderType.LTR_STANDARD;
}
@JacksonXmlProperty(isAttribute = false, localName = "direction")
public MessageDirection getMessageDirection()
{
return mMessageDirection;
}
public void setMessageDirection(MessageDirection direction)
{
mMessageDirection = direction;
}
}

View File

@@ -26,9 +26,6 @@ import io.github.dsheirer.message.MessageDirection;
import io.github.dsheirer.message.MessageType;
import io.github.dsheirer.module.decode.DecoderType;
import org.apache.commons.lang3.StringUtils;
import io.github.dsheirer.alias.Alias;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.module.decode.DecoderType;
import java.text.SimpleDateFormat;
import java.util.ArrayList;

View File

@@ -17,9 +17,9 @@
******************************************************************************/
package io.github.dsheirer.module.decode.mdc1200;
import io.github.dsheirer.module.decode.DecoderType;
import io.github.dsheirer.alias.Alias;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.module.decode.DecoderType;
import io.github.dsheirer.module.decode.event.CallEvent;
public class MDCCallEvent extends CallEvent

View File

@@ -17,26 +17,26 @@
******************************************************************************/
package io.github.dsheirer.module.decode.mdc1200;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.bits.MessageFramer;
import io.github.dsheirer.bits.SyncPattern;
import io.github.dsheirer.instrument.Instrumentable;
import io.github.dsheirer.instrument.tap.Tap;
import io.github.dsheirer.instrument.tap.TapGroup;
import io.github.dsheirer.instrument.tap.stream.BinaryTap;
import io.github.dsheirer.instrument.tap.stream.FloatBufferTap;
import io.github.dsheirer.instrument.tap.stream.FloatTap;
import io.github.dsheirer.module.decode.DecoderType;
import io.github.dsheirer.sample.Listener;
import io.github.dsheirer.sample.real.IFilteredRealBufferListener;
import io.github.dsheirer.sample.real.RealBuffer;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.dsp.NRZDecoder;
import io.github.dsheirer.dsp.filter.Filters;
import io.github.dsheirer.dsp.filter.fir.real.RealFIRFilter_RB_RB;
import io.github.dsheirer.dsp.filter.halfband.real.HalfBandFilter_RB_RB;
import io.github.dsheirer.dsp.fsk.FSK2Decoder;
import io.github.dsheirer.dsp.fsk.FSK2Decoder.Output;
import io.github.dsheirer.instrument.Instrumentable;
import io.github.dsheirer.instrument.tap.Tap;
import io.github.dsheirer.instrument.tap.TapGroup;
import io.github.dsheirer.instrument.tap.stream.BinaryTap;
import io.github.dsheirer.instrument.tap.stream.FloatBufferTap;
import io.github.dsheirer.instrument.tap.stream.FloatTap;
import io.github.dsheirer.module.decode.Decoder;
import io.github.dsheirer.module.decode.DecoderType;
import io.github.dsheirer.sample.Listener;
import io.github.dsheirer.sample.real.IFilteredRealBufferListener;
import io.github.dsheirer.sample.real.RealBuffer;
import java.util.ArrayList;
import java.util.List;

View File

@@ -18,6 +18,9 @@
******************************************************************************/
package io.github.dsheirer.module.decode.mdc1200;
import io.github.dsheirer.alias.Alias;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.alias.id.AliasIDType;
import io.github.dsheirer.channel.metadata.AliasedStringAttributeMonitor;
import io.github.dsheirer.channel.metadata.Attribute;
import io.github.dsheirer.channel.metadata.AttributeChangeRequest;
@@ -28,9 +31,6 @@ import io.github.dsheirer.channel.state.State;
import io.github.dsheirer.message.Message;
import io.github.dsheirer.module.decode.DecoderType;
import io.github.dsheirer.util.StringUtils;
import io.github.dsheirer.alias.Alias;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.alias.id.AliasIDType;
import java.util.Iterator;
import java.util.TreeSet;

View File

@@ -17,11 +17,11 @@
******************************************************************************/
package io.github.dsheirer.module.decode.mdc1200;
import io.github.dsheirer.alias.Alias;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.bits.BinaryMessage;
import io.github.dsheirer.map.Plottable;
import io.github.dsheirer.message.Message;
import io.github.dsheirer.alias.Alias;
import io.github.dsheirer.alias.AliasList;
import java.text.SimpleDateFormat;
import java.util.ArrayList;

View File

@@ -17,11 +17,11 @@
******************************************************************************/
package io.github.dsheirer.module.decode.mdc1200;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.bits.BinaryMessage;
import io.github.dsheirer.message.Message;
import io.github.dsheirer.sample.Broadcaster;
import io.github.dsheirer.sample.Listener;
import io.github.dsheirer.alias.AliasList;
public class MDCMessageProcessor implements Listener<BinaryMessage>
{

View File

@@ -1,102 +1,106 @@
/*******************************************************************************
* 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/>
******************************************************************************/
package io.github.dsheirer.module.decode.mpt1327;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
import io.github.dsheirer.module.decode.DecoderType;
import io.github.dsheirer.module.decode.config.DecodeConfiguration;
import io.github.dsheirer.module.decode.mpt1327.MPT1327Decoder.Sync;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
public class DecodeConfigMPT1327 extends DecodeConfiguration
{
private String mChannelMapName;
private Sync mSync = Sync.NORMAL;
private int mCallTimeout = DEFAULT_CALL_TIMEOUT_SECONDS;
private int mTrafficChannelPoolSize = TRAFFIC_CHANNEL_LIMIT_DEFAULT;
public DecodeConfigMPT1327()
private String mChannelMapName;
private Sync mSync = Sync.NORMAL;
private int mCallTimeout = DEFAULT_CALL_TIMEOUT_SECONDS;
private int mTrafficChannelPoolSize = TRAFFIC_CHANNEL_LIMIT_DEFAULT;
public DecodeConfigMPT1327()
{
super( DecoderType.MPT1327 );
}
@XmlElement
public String getChannelMapName()
{
return mChannelMapName;
}
public void setChannelMapName( String name )
{
mChannelMapName = name;
}
@JacksonXmlProperty(isAttribute = true, localName = "type", namespace = "http://www.w3.org/2001/XMLSchema-instance")
public DecoderType getDecoderType()
{
return DecoderType.MPT1327;
}
@XmlAttribute( name="sync" )
public Sync getSync()
{
return mSync;
}
public void setSync( Sync sync )
{
mSync = sync;
}
@XmlAttribute( name="call_timeout" )
public int getCallTimeout()
{
return mCallTimeout;
}
/**
* Sets the call timeout value in seconds ( 10 - 600 );
* @param timeout
*/
public void setCallTimeout( int timeout )
{
if( CALL_TIMEOUT_MINIMUM <= timeout && timeout <= CALL_TIMEOUT_MAXIMUM )
{
mCallTimeout = timeout;
}
else
{
mCallTimeout = DEFAULT_CALL_TIMEOUT_SECONDS;
}
}
@XmlAttribute( name="traffic_channel_pool_size" )
public int getTrafficChannelPoolSize()
{
return mTrafficChannelPoolSize;
}
/**
* Sets the traffic channel pool size which is the maximum number of
* simultaneous traffic channels that can be allocated.
*
* This limits the maximum calls so that busy systems won't cause more
* traffic channels to be allocated than the decoder/software/host computer
* can support.
*/
public void setTrafficChannelPoolSize( int size )
{
mTrafficChannelPoolSize = size;
}
@JacksonXmlProperty(isAttribute = false, localName = "channelMapName")
public String getChannelMapName()
{
return mChannelMapName;
}
public void setChannelMapName(String name)
{
mChannelMapName = name;
}
@JacksonXmlProperty(isAttribute = true, localName = "sync")
public Sync getSync()
{
return mSync;
}
public void setSync(Sync sync)
{
mSync = sync;
}
@JacksonXmlProperty(isAttribute = true, localName = "call_timeout")
public int getCallTimeout()
{
return mCallTimeout;
}
/**
* Sets the call timeout value in seconds ( 10 - 600 );
*
* @param timeout
*/
public void setCallTimeout(int timeout)
{
if(CALL_TIMEOUT_MINIMUM <= timeout && timeout <= CALL_TIMEOUT_MAXIMUM)
{
mCallTimeout = timeout;
}
else
{
mCallTimeout = DEFAULT_CALL_TIMEOUT_SECONDS;
}
}
@JacksonXmlProperty(isAttribute = true, localName = "traffic_channel_pool_size")
public int getTrafficChannelPoolSize()
{
return mTrafficChannelPoolSize;
}
/**
* Sets the traffic channel pool size which is the maximum number of
* simultaneous traffic channels that can be allocated.
*
* This limits the maximum calls so that busy systems won't cause more
* traffic channels to be allocated than the decoder/software/host computer
* can support.
*/
public void setTrafficChannelPoolSize(int size)
{
mTrafficChannelPoolSize = size;
}
}

View File

@@ -1,29 +1,36 @@
/*******************************************************************************
* 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/>
******************************************************************************/
package io.github.dsheirer.module.decode.nbfm;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
import io.github.dsheirer.module.decode.DecoderType;
import io.github.dsheirer.module.decode.config.DecodeConfiguration;
public class DecodeConfigNBFM extends DecodeConfiguration
{
public DecodeConfigNBFM()
public DecodeConfigNBFM()
{
super( DecoderType.NBFM );
}
@JacksonXmlProperty(isAttribute = true, localName = "type", namespace = "http://www.w3.org/2001/XMLSchema-instance")
public DecoderType getDecoderType()
{
return DecoderType.NBFM;
}
}

View File

@@ -1,5 +1,6 @@
package io.github.dsheirer.module.decode.p25;
import io.github.dsheirer.dsp.gain.DirectGainControl;
import io.github.dsheirer.instrument.Instrumentable;
import io.github.dsheirer.instrument.tap.Tap;
import io.github.dsheirer.instrument.tap.TapGroup;
@@ -12,7 +13,6 @@ import io.github.dsheirer.sample.real.RealSampleProvider;
import io.github.dsheirer.source.tuner.frequency.FrequencyChangeEvent;
import io.github.dsheirer.source.tuner.frequency.FrequencyChangeEvent.Event;
import io.github.dsheirer.source.tuner.frequency.IFrequencyChangeListener;
import io.github.dsheirer.dsp.gain.DirectGainControl;
import java.util.ArrayList;
import java.util.List;

View File

@@ -1,108 +1,113 @@
/*******************************************************************************
* 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/>
******************************************************************************/
package io.github.dsheirer.module.decode.p25;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
import io.github.dsheirer.module.decode.DecoderType;
import io.github.dsheirer.module.decode.config.DecodeConfiguration;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlTransient;
public class DecodeConfigP25Phase1 extends DecodeConfiguration
{
private P25_LSMDecoder.Modulation mModulation = P25Decoder.Modulation.C4FM;
private int mCallTimeout = 1;
private int mTrafficChannelPoolSize = TRAFFIC_CHANNEL_LIMIT_DEFAULT;
private boolean mIgnoreDataCalls = true;
public DecodeConfigP25Phase1()
private P25_LSMDecoder.Modulation mModulation = P25Decoder.Modulation.C4FM;
private int mCallTimeout = 1;
private int mTrafficChannelPoolSize = TRAFFIC_CHANNEL_LIMIT_DEFAULT;
private boolean mIgnoreDataCalls = true;
public DecodeConfigP25Phase1()
{
super( DecoderType.P25_PHASE1 );
setAFC( false );
setAFC(false);
}
@JacksonXmlProperty(isAttribute = true, localName = "type", namespace = "http://www.w3.org/2001/XMLSchema-instance")
public DecoderType getDecoderType()
{
return DecoderType.P25_PHASE1;
}
public boolean supportsAFC()
{
return false;
}
@XmlAttribute( name = "modulation" )
public P25_LSMDecoder.Modulation getModulation()
{
return mModulation;
}
public void setModulation( P25_LSMDecoder.Modulation modulation )
{
mModulation = modulation;
}
@XmlAttribute( name = "ignore_data_calls" )
public boolean getIgnoreDataCalls()
{
return mIgnoreDataCalls;
}
public void setIgnoreDataCalls( boolean ignore )
{
mIgnoreDataCalls = ignore;
}
/**
* Note: this field is now deprecated.
* @return
*/
@XmlTransient
@Deprecated
public int getCallTimeout()
{
return mCallTimeout;
}
/**
* Sets the call timeout value in seconds ( 10 - 600 );
* @param timeout
*/
@Deprecated
public void setCallTimeout( int timeout )
{
}
@JacksonXmlProperty(isAttribute = true, localName = "modulation")
public P25_LSMDecoder.Modulation getModulation()
{
return mModulation;
}
@XmlAttribute( name="traffic_channel_pool_size" )
public int getTrafficChannelPoolSize()
{
return mTrafficChannelPoolSize;
}
/**
* Sets the traffic channel pool size which is the maximum number of
* simultaneous traffic channels that can be allocated.
*
* This limits the maximum calls so that busy systems won't cause more
* traffic channels to be allocated than the decoder/software/host computer
* can support.
*/
public void setTrafficChannelPoolSize( int size )
{
mTrafficChannelPoolSize = size;
}
public void setModulation(P25_LSMDecoder.Modulation modulation)
{
mModulation = modulation;
}
@JacksonXmlProperty(isAttribute = true, localName = "ignore_data_calls")
public boolean getIgnoreDataCalls()
{
return mIgnoreDataCalls;
}
public void setIgnoreDataCalls(boolean ignore)
{
mIgnoreDataCalls = ignore;
}
/**
* Note: this field is now deprecated.
*
* @return
*/
@JsonIgnore
@Deprecated
public int getCallTimeout()
{
return mCallTimeout;
}
/**
* Sets the call timeout value in seconds ( 10 - 600 );
*
* @param timeout
*/
@Deprecated
public void setCallTimeout(int timeout)
{
}
@JacksonXmlProperty(isAttribute = true, localName = "traffic_channel_pool_size")
public int getTrafficChannelPoolSize()
{
return mTrafficChannelPoolSize;
}
/**
* Sets the traffic channel pool size which is the maximum number of
* simultaneous traffic channels that can be allocated.
*
* This limits the maximum calls so that busy systems won't cause more
* traffic channels to be allocated than the decoder/software/host computer
* can support.
*/
public void setTrafficChannelPoolSize(int size)
{
mTrafficChannelPoolSize = size;
}
}

View File

@@ -17,9 +17,9 @@
******************************************************************************/
package io.github.dsheirer.module.decode.p25;
import io.github.dsheirer.module.decode.DecoderType;
import io.github.dsheirer.alias.Alias;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.module.decode.DecoderType;
import io.github.dsheirer.module.decode.event.CallEvent;
public class P25CallEvent extends CallEvent

View File

@@ -129,7 +129,6 @@ import io.github.dsheirer.module.decode.p25.message.tsbk.osp.voice.UnitToUnitVoi
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.voice.UnitToUnitVoiceChannelGrantUpdate;
import io.github.dsheirer.module.decode.p25.reference.IPProtocol;
import io.github.dsheirer.module.decode.p25.reference.LinkControlOpcode;
import io.github.dsheirer.module.decode.p25.reference.PDUType;
import io.github.dsheirer.module.decode.p25.reference.Response;
import io.github.dsheirer.module.decode.p25.reference.Vendor;
import org.slf4j.Logger;
@@ -145,8 +144,6 @@ import java.util.Set;
import java.util.TreeSet;
import java.util.concurrent.ScheduledExecutorService;
import static io.github.dsheirer.module.decode.p25.reference.PDUType.*;
public class P25DecoderState extends DecoderState
{
private final static Logger mLog = LoggerFactory.getLogger(P25DecoderState.class);

View File

@@ -17,6 +17,13 @@
******************************************************************************/
package io.github.dsheirer.module.decode.p25;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.dsp.filter.FilterFactory;
import io.github.dsheirer.dsp.filter.Window.WindowType;
import io.github.dsheirer.dsp.filter.fir.complex.ComplexFIRFilter_CB_CB;
import io.github.dsheirer.dsp.gain.ComplexFeedForwardGainControl;
import io.github.dsheirer.dsp.psk.LSMDemodulator;
import io.github.dsheirer.dsp.psk.QPSKPolarSlicer;
import io.github.dsheirer.instrument.tap.Tap;
import io.github.dsheirer.instrument.tap.TapGroup;
import io.github.dsheirer.instrument.tap.stream.ComplexSampleTap;
@@ -30,13 +37,6 @@ import io.github.dsheirer.sample.complex.IComplexBufferListener;
import io.github.dsheirer.source.tuner.frequency.FrequencyChangeEvent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.dsp.filter.FilterFactory;
import io.github.dsheirer.dsp.filter.Window.WindowType;
import io.github.dsheirer.dsp.filter.fir.complex.ComplexFIRFilter_CB_CB;
import io.github.dsheirer.dsp.gain.ComplexFeedForwardGainControl;
import io.github.dsheirer.dsp.psk.LSMDemodulator;
import io.github.dsheirer.dsp.psk.QPSKPolarSlicer;
import java.util.ArrayList;
import java.util.List;

View File

@@ -18,12 +18,12 @@
******************************************************************************/
package io.github.dsheirer.module.decode.p25;
import io.github.dsheirer.module.decode.event.CallEvent;
import io.github.dsheirer.sample.Broadcaster;
import io.github.dsheirer.alias.Alias;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.alias.PatchGroupAlias;
import io.github.dsheirer.alias.id.talkgroup.TalkgroupID;
import io.github.dsheirer.module.decode.event.CallEvent;
import io.github.dsheirer.sample.Broadcaster;
import java.util.ArrayList;
import java.util.Iterator;

View File

@@ -1,9 +1,9 @@
package io.github.dsheirer.module.decode.p25;
import io.github.dsheirer.bits.BinaryMessage;
import io.github.dsheirer.dsp.symbol.Dibit;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.github.dsheirer.dsp.symbol.Dibit;
import java.util.ArrayList;
import java.util.Random;

View File

@@ -1,9 +1,9 @@
package io.github.dsheirer.module.decode.p25;
import io.github.dsheirer.bits.BinaryMessage;
import io.github.dsheirer.dsp.symbol.Dibit;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.github.dsheirer.dsp.symbol.Dibit;
import java.util.ArrayList;
import java.util.HashMap;

View File

@@ -6,19 +6,19 @@ import io.github.dsheirer.audio.IAudioPacketProvider;
import io.github.dsheirer.audio.squelch.ISquelchStateListener;
import io.github.dsheirer.audio.squelch.SquelchState;
import io.github.dsheirer.channel.metadata.Metadata;
import io.github.dsheirer.dsp.gain.NonClippingGain;
import io.github.dsheirer.message.IMessageListener;
import io.github.dsheirer.message.Message;
import io.github.dsheirer.sample.Listener;
import jmbe.iface.AudioConversionLibrary;
import jmbe.iface.AudioConverter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.github.dsheirer.dsp.gain.NonClippingGain;
import io.github.dsheirer.module.Module;
import io.github.dsheirer.module.decode.p25.message.hdu.HDUMessage;
import io.github.dsheirer.module.decode.p25.message.ldu.LDU1Message;
import io.github.dsheirer.module.decode.p25.message.ldu.LDU2Message;
import io.github.dsheirer.module.decode.p25.message.ldu.LDUMessage;
import io.github.dsheirer.sample.Listener;
import jmbe.iface.AudioConversionLibrary;
import jmbe.iface.AudioConverter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.concurrent.ScheduledExecutorService;

View File

@@ -6,8 +6,8 @@ import io.github.dsheirer.filter.FilterSet;
import io.github.dsheirer.message.Message;
import io.github.dsheirer.module.decode.p25.message.tsbk.TSBKMessage;
import io.github.dsheirer.module.decode.p25.message.tsbk.motorola.MotorolaOpcode;
import io.github.dsheirer.module.decode.p25.reference.Opcode;
import io.github.dsheirer.module.decode.p25.message.tsbk.vendor.VendorOpcode;
import io.github.dsheirer.module.decode.p25.reference.Opcode;
import io.github.dsheirer.module.decode.p25.reference.Vendor;
import java.util.ArrayList;

View File

@@ -1,15 +1,15 @@
package io.github.dsheirer.module.decode.p25.message.hdu;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.bits.BinaryMessage;
import io.github.dsheirer.edac.CRC;
import io.github.dsheirer.edac.Golay18;
import io.github.dsheirer.edac.ReedSolomon_63_47_17;
import io.github.dsheirer.module.decode.p25.message.P25Message;
import io.github.dsheirer.module.decode.p25.reference.DataUnitID;
import io.github.dsheirer.module.decode.p25.reference.Encryption;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.module.decode.p25.reference.Encryption;
public class HDUMessage extends P25Message
{

View File

@@ -1,10 +1,10 @@
package io.github.dsheirer.module.decode.p25.message.ldu.lc;
import io.github.dsheirer.module.decode.p25.message.ldu.LDU1Message;
import io.github.dsheirer.module.decode.p25.reference.ExtendedFunction;
import io.github.dsheirer.module.decode.p25.reference.LinkControlOpcode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.github.dsheirer.module.decode.p25.message.ldu.LDU1Message;
import io.github.dsheirer.module.decode.p25.reference.LinkControlOpcode;
public class ExtendedFunctionCommand extends LDU1Message
{

View File

@@ -1,13 +1,10 @@
package io.github.dsheirer.module.decode.p25.message.ldu.lc;
import io.github.dsheirer.module.decode.p25.message.ldu.LDU1Message;
import io.github.dsheirer.module.decode.p25.reference.LinkControlOpcode;
import io.github.dsheirer.module.decode.p25.reference.Vendor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static io.github.dsheirer.module.decode.p25.reference.LinkControlOpcode.*;
public class LDULCMessageFactory
{

View File

@@ -1,9 +1,9 @@
package io.github.dsheirer.module.decode.p25.message.ldu.lc;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.github.dsheirer.module.decode.p25.message.ldu.LDU1Message;
import io.github.dsheirer.module.decode.p25.reference.LinkControlOpcode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class MessageUpdate extends LDU1Message
{

View File

@@ -19,10 +19,10 @@
package io.github.dsheirer.module.decode.p25.message.ldu.lc;
import io.github.dsheirer.module.decode.p25.message.IBandIdentifier;
import io.github.dsheirer.module.decode.p25.reference.Service;
import io.github.dsheirer.module.decode.p25.message.IdentifierReceiver;
import io.github.dsheirer.module.decode.p25.message.ldu.LDU1Message;
import io.github.dsheirer.module.decode.p25.reference.LinkControlOpcode;
import io.github.dsheirer.module.decode.p25.reference.Service;
public class NetworkStatusBroadcast extends LDU1Message implements IdentifierReceiver
{

View File

@@ -1,10 +1,10 @@
package io.github.dsheirer.module.decode.p25.message.ldu.lc;
import io.github.dsheirer.module.decode.p25.message.ldu.LDU1Message;
import io.github.dsheirer.module.decode.p25.reference.Encryption;
import io.github.dsheirer.module.decode.p25.reference.LinkControlOpcode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.github.dsheirer.module.decode.p25.reference.Encryption;
public class ProtectionParameterBroadcast extends LDU1Message
{

View File

@@ -20,8 +20,8 @@ package io.github.dsheirer.module.decode.p25.message.ldu.lc;
import io.github.dsheirer.module.decode.p25.message.IBandIdentifier;
import io.github.dsheirer.module.decode.p25.message.IdentifierReceiver;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.control.SystemService;
import io.github.dsheirer.module.decode.p25.message.ldu.LDU1Message;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.control.SystemService;
import io.github.dsheirer.module.decode.p25.reference.LinkControlOpcode;
public class RFSSStatusBroadcastExplicit extends LDU1Message implements IdentifierReceiver

View File

@@ -19,9 +19,9 @@
package io.github.dsheirer.module.decode.p25.message.ldu.lc;
import io.github.dsheirer.module.decode.p25.message.IBandIdentifier;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.control.SystemService;
import io.github.dsheirer.module.decode.p25.message.IdentifierReceiver;
import io.github.dsheirer.module.decode.p25.message.ldu.LDU1Message;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.control.SystemService;
import io.github.dsheirer.module.decode.p25.reference.LinkControlOpcode;
public class SecondaryControlChannelBroadcast extends LDU1Message implements IdentifierReceiver

View File

@@ -19,9 +19,9 @@
package io.github.dsheirer.module.decode.p25.message.ldu.lc;
import io.github.dsheirer.module.decode.p25.message.IBandIdentifier;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.control.SystemService;
import io.github.dsheirer.module.decode.p25.message.IdentifierReceiver;
import io.github.dsheirer.module.decode.p25.message.ldu.LDU1Message;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.control.SystemService;
import io.github.dsheirer.module.decode.p25.reference.LinkControlOpcode;
public class SecondaryControlChannelBroadcastExplicit extends LDU1Message implements IdentifierReceiver

View File

@@ -1,9 +1,9 @@
package io.github.dsheirer.module.decode.p25.message.ldu.lc;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.github.dsheirer.module.decode.p25.message.ldu.LDU1Message;
import io.github.dsheirer.module.decode.p25.reference.LinkControlOpcode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class StatusQuery extends LDU1Message
{

View File

@@ -1,10 +1,10 @@
package io.github.dsheirer.module.decode.p25.message.ldu.lc;
import io.github.dsheirer.module.decode.p25.message.ldu.LDU1Message;
import io.github.dsheirer.module.decode.p25.reference.LinkControlOpcode;
import io.github.dsheirer.module.decode.p25.reference.Service;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.github.dsheirer.module.decode.p25.message.ldu.LDU1Message;
import io.github.dsheirer.module.decode.p25.reference.LinkControlOpcode;
import java.util.List;

View File

@@ -1,9 +1,9 @@
package io.github.dsheirer.module.decode.p25.message.ldu.lc;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.github.dsheirer.module.decode.p25.message.ldu.LDU1Message;
import io.github.dsheirer.module.decode.p25.reference.LinkControlOpcode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class TelephoneInterconnectVoiceChannelUser extends LDU1Message
{

View File

@@ -1,9 +1,9 @@
package io.github.dsheirer.module.decode.p25.message.ldu.lc;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.github.dsheirer.module.decode.p25.message.ldu.LDU1Message;
import io.github.dsheirer.module.decode.p25.reference.LinkControlOpcode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class UnitAuthenticationCommand extends LDU1Message
{

View File

@@ -1,9 +1,9 @@
package io.github.dsheirer.module.decode.p25.message.ldu.lc;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.github.dsheirer.module.decode.p25.message.ldu.LDU1Message;
import io.github.dsheirer.module.decode.p25.reference.LinkControlOpcode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class UnitRegistrationCommand extends LDU1Message
{

View File

@@ -1,9 +1,9 @@
package io.github.dsheirer.module.decode.p25.message.ldu.lc;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.github.dsheirer.module.decode.p25.message.ldu.LDU1Message;
import io.github.dsheirer.module.decode.p25.reference.LinkControlOpcode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class UnitToUnitVoiceChannelUser extends LDU1Message
{

View File

@@ -1,9 +1,9 @@
package io.github.dsheirer.module.decode.p25.message.ldu.lc.motorola;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.github.dsheirer.module.decode.p25.message.ldu.LDU1Message;
import io.github.dsheirer.module.decode.p25.reference.LinkControlOpcode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class MotorolaOpcode_0 extends LDU1Message
{

View File

@@ -1,15 +1,15 @@
package io.github.dsheirer.module.decode.p25.message.pdu.confirmed;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.bits.BinaryMessage;
import io.github.dsheirer.edac.CRC;
import io.github.dsheirer.edac.CRCP25;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.module.decode.p25.message.pdu.PDUMessage;
import io.github.dsheirer.module.decode.p25.reference.DataUnitID;
import io.github.dsheirer.module.decode.p25.reference.PDUType;
import io.github.dsheirer.module.decode.p25.reference.Vendor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class PDUConfirmedMessage extends PDUMessage
{

View File

@@ -1,9 +1,9 @@
package io.github.dsheirer.module.decode.p25.message.pdu.confirmed;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.bits.BinaryMessage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.github.dsheirer.alias.AliasList;
public class PacketData extends PDUConfirmedMessage
{

View File

@@ -1,8 +1,8 @@
package io.github.dsheirer.module.decode.p25.message.pdu.confirmed;
import io.github.dsheirer.module.decode.p25.reference.MDPConfigurationOption;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.github.dsheirer.module.decode.p25.reference.MDPConfigurationOption;
public class SNDCPActivateTDSContextAccept extends PDUConfirmedMessage
{

View File

@@ -1,8 +1,8 @@
package io.github.dsheirer.module.decode.p25.message.pdu.confirmed;
import io.github.dsheirer.module.decode.p25.reference.SNDCPActivationRejectReason;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.github.dsheirer.module.decode.p25.reference.SNDCPActivationRejectReason;
public class SNDCPActivateTDSContextReject extends PDUConfirmedMessage
{

View File

@@ -1,8 +1,8 @@
package io.github.dsheirer.module.decode.p25.message.pdu.confirmed;
import io.github.dsheirer.module.decode.p25.reference.MDPConfigurationOption;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.github.dsheirer.module.decode.p25.reference.MDPConfigurationOption;
public class SNDCPActivateTDSContextRequest extends PDUConfirmedMessage
{

View File

@@ -1,12 +1,12 @@
package io.github.dsheirer.module.decode.p25.message.pdu.osp.control;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.bits.BinaryMessage;
import io.github.dsheirer.edac.CRCP25;
import io.github.dsheirer.module.decode.p25.P25MessageFramer;
import io.github.dsheirer.module.decode.p25.message.pdu.PDUMessage;
import io.github.dsheirer.module.decode.p25.reference.DataUnitID;
import io.github.dsheirer.module.decode.p25.reference.Opcode;
import io.github.dsheirer.alias.AliasList;
public class RoamingAddressUpdateExtended extends PDUMessage
{

View File

@@ -1,8 +1,8 @@
package io.github.dsheirer.module.decode.p25.message.pdu.osp.control;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.bits.BinaryMessage;
import io.github.dsheirer.edac.CRCP25;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.module.decode.p25.message.pdu.PDUMessage;
import io.github.dsheirer.module.decode.p25.reference.DataUnitID;
import io.github.dsheirer.module.decode.p25.reference.Opcode;

View File

@@ -1,8 +1,8 @@
package io.github.dsheirer.module.decode.p25.message.pdu.osp.control;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.bits.BinaryMessage;
import io.github.dsheirer.edac.CRCP25;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.module.decode.p25.message.pdu.PDUMessage;
import io.github.dsheirer.module.decode.p25.reference.DataUnitID;
import io.github.dsheirer.module.decode.p25.reference.Opcode;

View File

@@ -1,8 +1,8 @@
package io.github.dsheirer.module.decode.p25.message.pdu.osp.control;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.bits.BinaryMessage;
import io.github.dsheirer.edac.CRCP25;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.module.decode.p25.message.pdu.PDUMessage;
import io.github.dsheirer.module.decode.p25.reference.DataUnitID;
import io.github.dsheirer.module.decode.p25.reference.Opcode;

View File

@@ -18,6 +18,7 @@
******************************************************************************/
package io.github.dsheirer.module.decode.p25.message.pdu.osp.voice;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.bits.BinaryMessage;
import io.github.dsheirer.edac.CRCP25;
import io.github.dsheirer.module.decode.p25.message.IBandIdentifier;
@@ -26,7 +27,6 @@ import io.github.dsheirer.module.decode.p25.message.P25Message;
import io.github.dsheirer.module.decode.p25.message.pdu.PDUMessage;
import io.github.dsheirer.module.decode.p25.reference.DataUnitID;
import io.github.dsheirer.module.decode.p25.reference.Opcode;
import io.github.dsheirer.alias.AliasList;
import java.util.Date;

View File

@@ -1,9 +1,9 @@
package io.github.dsheirer.module.decode.p25.message.pdu.osp.voice;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.bits.BinaryMessage;
import io.github.dsheirer.module.decode.p25.reference.DataUnitID;
import io.github.dsheirer.module.decode.p25.reference.Opcode;
import io.github.dsheirer.alias.AliasList;
public class TelephoneInterconnectChannelGrantUpdateExplicit
extends TelephoneInterconnectChannelGrantExplicit

View File

@@ -1,12 +1,12 @@
package io.github.dsheirer.module.decode.p25.message.pdu.osp.voice;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.bits.BinaryMessage;
import io.github.dsheirer.edac.CRCP25;
import io.github.dsheirer.module.decode.p25.message.P25Message;
import io.github.dsheirer.module.decode.p25.message.pdu.PDUMessage;
import io.github.dsheirer.module.decode.p25.reference.DataUnitID;
import io.github.dsheirer.module.decode.p25.reference.Opcode;
import io.github.dsheirer.alias.AliasList;
public class UnitToUnitAnswerRequestExplicit extends PDUMessage
{

View File

@@ -1,9 +1,9 @@
package io.github.dsheirer.module.decode.p25.message.pdu.osp.voice;
import io.github.dsheirer.bits.BinaryMessage;
import io.github.dsheirer.module.decode.p25.message.pdu.UnitToUnitChannelGrantExtended;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.bits.BinaryMessage;
import io.github.dsheirer.module.decode.p25.message.IdentifierReceiver;
import io.github.dsheirer.module.decode.p25.message.pdu.UnitToUnitChannelGrantExtended;
import io.github.dsheirer.module.decode.p25.reference.DataUnitID;
import io.github.dsheirer.module.decode.p25.reference.Opcode;

View File

@@ -18,9 +18,9 @@
******************************************************************************/
package io.github.dsheirer.module.decode.p25.message.pdu.osp.voice;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.bits.BinaryMessage;
import io.github.dsheirer.edac.CRCP25;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.module.decode.p25.message.IBandIdentifier;
import io.github.dsheirer.module.decode.p25.message.IdentifierReceiver;
import io.github.dsheirer.module.decode.p25.message.pdu.PDUMessage;

View File

@@ -18,11 +18,11 @@
package io.github.dsheirer.module.decode.p25.message.tdu;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.bits.BinaryMessage;
import io.github.dsheirer.edac.CRC;
import io.github.dsheirer.module.decode.p25.message.P25Message;
import io.github.dsheirer.module.decode.p25.reference.DataUnitID;
import io.github.dsheirer.alias.AliasList;
public class TDUMessage extends P25Message
{

View File

@@ -1,8 +1,8 @@
package io.github.dsheirer.module.decode.p25.message.tdu.lc;
import io.github.dsheirer.module.decode.p25.reference.LinkControlOpcode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.github.dsheirer.module.decode.p25.reference.LinkControlOpcode;
public class GroupAffiliationQuery extends TDULinkControlMessage
{

View File

@@ -18,11 +18,11 @@
******************************************************************************/
package io.github.dsheirer.module.decode.p25.message.tdu.lc;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.github.dsheirer.module.decode.p25.message.IBandIdentifier;
import io.github.dsheirer.module.decode.p25.message.IdentifierReceiver;
import io.github.dsheirer.module.decode.p25.reference.LinkControlOpcode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class GroupVoiceChannelUpdateExplicit extends TDULinkControlMessage
implements IdentifierReceiver

View File

@@ -1,8 +1,8 @@
package io.github.dsheirer.module.decode.p25.message.tdu.lc;
import io.github.dsheirer.module.decode.p25.reference.LinkControlOpcode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.github.dsheirer.module.decode.p25.reference.LinkControlOpcode;
public class GroupVoiceChannelUser extends TDULinkControlMessage
{

View File

@@ -1,8 +1,8 @@
package io.github.dsheirer.module.decode.p25.message.tdu.lc;
import io.github.dsheirer.module.decode.p25.reference.LinkControlOpcode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.github.dsheirer.module.decode.p25.reference.LinkControlOpcode;
public class MessageUpdate extends TDULinkControlMessage
{

View File

@@ -18,10 +18,10 @@
******************************************************************************/
package io.github.dsheirer.module.decode.p25.message.tdu.lc;
import io.github.dsheirer.module.decode.p25.reference.Service;
import io.github.dsheirer.module.decode.p25.message.IBandIdentifier;
import io.github.dsheirer.module.decode.p25.message.IdentifierReceiver;
import io.github.dsheirer.module.decode.p25.reference.LinkControlOpcode;
import io.github.dsheirer.module.decode.p25.reference.Service;
public class NetworkStatusBroadcast extends TDULinkControlMessage implements IdentifierReceiver
{

View File

@@ -1,9 +1,9 @@
package io.github.dsheirer.module.decode.p25.message.tdu.lc;
import io.github.dsheirer.module.decode.p25.reference.Encryption;
import io.github.dsheirer.module.decode.p25.reference.LinkControlOpcode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.github.dsheirer.module.decode.p25.reference.Encryption;
public class ProtectionParameterBroadcast extends TDULinkControlMessage
{

View File

@@ -18,12 +18,12 @@
******************************************************************************/
package io.github.dsheirer.module.decode.p25.message.tdu.lc;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.github.dsheirer.module.decode.p25.message.IBandIdentifier;
import io.github.dsheirer.module.decode.p25.message.IdentifierReceiver;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.control.SystemService;
import io.github.dsheirer.module.decode.p25.reference.LinkControlOpcode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class RFSSStatusBroadcastExplicit extends TDULinkControlMessage implements IdentifierReceiver
{

View File

@@ -1,8 +1,8 @@
package io.github.dsheirer.module.decode.p25.message.tdu.lc;
import io.github.dsheirer.module.decode.p25.reference.LinkControlOpcode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.github.dsheirer.module.decode.p25.reference.LinkControlOpcode;
public class StatusQuery extends TDULinkControlMessage
{

View File

@@ -1,9 +1,9 @@
package io.github.dsheirer.module.decode.p25.message.tdu.lc;
import io.github.dsheirer.module.decode.p25.reference.LinkControlOpcode;
import io.github.dsheirer.module.decode.p25.reference.Service;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.github.dsheirer.module.decode.p25.reference.LinkControlOpcode;
import java.util.List;

View File

@@ -1,8 +1,8 @@
package io.github.dsheirer.module.decode.p25.message.tdu.lc;
import io.github.dsheirer.module.decode.p25.reference.Vendor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.github.dsheirer.module.decode.p25.reference.Vendor;
public class TDULCMessageFactory

View File

@@ -1,5 +1,6 @@
package io.github.dsheirer.module.decode.p25.message.tdu.lc;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.bits.BinaryMessage;
import io.github.dsheirer.edac.CRC;
import io.github.dsheirer.edac.Golay24;
@@ -12,7 +13,6 @@ import io.github.dsheirer.module.decode.p25.reference.Vendor;
import io.github.dsheirer.module.decode.p25.reference.VendorLinkControlOpcode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.github.dsheirer.alias.AliasList;
public class TDULinkControlMessage extends P25Message
{

View File

@@ -1,9 +1,9 @@
package io.github.dsheirer.module.decode.p25.message.tdu.lc;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.github.dsheirer.module.decode.p25.reference.Digit;
import io.github.dsheirer.module.decode.p25.reference.LinkControlOpcode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.List;

View File

@@ -1,8 +1,8 @@
package io.github.dsheirer.module.decode.p25.message.tdu.lc;
import io.github.dsheirer.module.decode.p25.reference.LinkControlOpcode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.github.dsheirer.module.decode.p25.reference.LinkControlOpcode;
public class UnitAuthenticationCommand extends TDULinkControlMessage
{

View File

@@ -1,8 +1,8 @@
package io.github.dsheirer.module.decode.p25.message.tdu.lc;
import io.github.dsheirer.module.decode.p25.reference.LinkControlOpcode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.github.dsheirer.module.decode.p25.reference.LinkControlOpcode;
public class UnitRegistrationCommand extends TDULinkControlMessage
{

View File

@@ -1,8 +1,8 @@
package io.github.dsheirer.module.decode.p25.message.tdu.lc;
import io.github.dsheirer.module.decode.p25.reference.LinkControlOpcode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.github.dsheirer.module.decode.p25.reference.LinkControlOpcode;
public class UnitToUnitAnswerRequest extends TDULinkControlMessage
{

View File

@@ -18,11 +18,11 @@
******************************************************************************/
package io.github.dsheirer.module.decode.p25.message.tsbk;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.bits.BinaryMessage;
import io.github.dsheirer.module.decode.p25.message.IBandIdentifier;
import io.github.dsheirer.module.decode.p25.message.IdentifierReceiver;
import io.github.dsheirer.module.decode.p25.reference.DataUnitID;
import io.github.dsheirer.alias.AliasList;
public abstract class ChannelGrant extends ServiceMessage implements IdentifierReceiver
{

View File

@@ -1,9 +1,9 @@
package io.github.dsheirer.module.decode.p25.message.tsbk;
import io.github.dsheirer.bits.BinaryMessage;
import io.github.dsheirer.module.decode.p25.reference.DataUnitID;
import io.github.dsheirer.alias.Alias;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.bits.BinaryMessage;
import io.github.dsheirer.module.decode.p25.reference.DataUnitID;
public abstract class GroupChannelGrant extends ChannelGrant
{

View File

@@ -18,9 +18,9 @@
******************************************************************************/
package io.github.dsheirer.module.decode.p25.message.tsbk;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.bits.BinaryMessage;
import io.github.dsheirer.module.decode.p25.message.IBandIdentifier;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.module.decode.p25.reference.DataUnitID;
public abstract class GroupChannelGrantExplicit extends ChannelGrant

View File

@@ -18,11 +18,11 @@
******************************************************************************/
package io.github.dsheirer.module.decode.p25.message.tsbk;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.bits.BinaryMessage;
import io.github.dsheirer.module.decode.p25.message.IBandIdentifier;
import io.github.dsheirer.module.decode.p25.message.IdentifierReceiver;
import io.github.dsheirer.module.decode.p25.reference.DataUnitID;
import io.github.dsheirer.alias.AliasList;
public abstract class GroupMultiChannelGrant extends ChannelGrant implements IdentifierReceiver
{

View File

@@ -1,9 +1,9 @@
package io.github.dsheirer.module.decode.p25.message.tsbk;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.bits.BinaryMessage;
import io.github.dsheirer.module.decode.p25.message.P25Message;
import io.github.dsheirer.module.decode.p25.reference.DataUnitID;
import io.github.dsheirer.alias.AliasList;
public abstract class ServiceMessage extends TSBKMessage
{

View File

@@ -1,8 +1,8 @@
package io.github.dsheirer.module.decode.p25.message.tsbk;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.bits.BinaryMessage;
import io.github.dsheirer.edac.CRC;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.module.decode.p25.message.P25Message;
import io.github.dsheirer.module.decode.p25.message.tsbk.motorola.MotorolaOpcode;
import io.github.dsheirer.module.decode.p25.message.tsbk.vendor.VendorOpcode;

View File

@@ -1,31 +1,44 @@
package io.github.dsheirer.module.decode.p25.message.tsbk;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.bits.BinaryMessage;
import io.github.dsheirer.module.decode.p25.message.tsbk.motorola.ControlChannelBaseStationIdentification;
import io.github.dsheirer.module.decode.p25.message.tsbk.motorola.MotorolaOpcode;
import io.github.dsheirer.module.decode.p25.message.tsbk.motorola.MotorolaTSBKMessage;
import io.github.dsheirer.module.decode.p25.message.tsbk.motorola.PatchGroupAdd;
import io.github.dsheirer.module.decode.p25.message.tsbk.motorola.PatchGroupDelete;
import io.github.dsheirer.module.decode.p25.message.tsbk.motorola.PatchGroupVoiceChannelGrant;
import io.github.dsheirer.module.decode.p25.message.tsbk.motorola.PatchGroupVoiceChannelGrantUpdate;
import io.github.dsheirer.module.decode.p25.message.tsbk.motorola.PlannedControlChannnelShutdown;
import io.github.dsheirer.module.decode.p25.message.tsbk.motorola.SystemLoading;
import io.github.dsheirer.module.decode.p25.message.tsbk.motorola.TrafficChannelBaseStationIdentification;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.control.AcknowledgeResponse;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.control.AdjacentStatusBroadcast;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.control.AuthenticationCommand;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.control.CallAlert;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.control.DenyResponse;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.control.ExtendedFunctionCommand;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.control.GroupAffiliationQuery;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.control.GroupAffiliationResponse;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.control.IdentifierUpdateNonVUHF;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.control.IdentifierUpdateTDMA;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.control.IdentifierUpdateVUHF;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.control.LocationRegistrationResponse;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.control.MessageUpdate;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.control.NetworkStatusBroadcast;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.control.ProtectionParameterUpdate;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.control.QueuedResponse;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.control.RFSSStatusBroadcast;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.control.RadioUnitMonitorCommand;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.control.RoamingAddressCommand;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.control.SecondaryControlChannelBroadcast;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.control.SecondaryControlChannelBroadcastExplicit;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.control.StatusQuery;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.control.StatusUpdate;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.control.SyncBroadcast;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.control.SystemServiceBroadcast;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.control.TimeAndDateAnnouncement;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.control.UnitDeregistrationAcknowledge;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.control.UnitRegistrationCommand;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.control.UnitRegistrationResponse;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.data.GroupDataChannelAnnouncement;
@@ -33,32 +46,19 @@ import io.github.dsheirer.module.decode.p25.message.tsbk.osp.data.GroupDataChann
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.data.GroupDataChannelGrant;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.data.IndividualDataChannelGrant;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.data.SNDCPDataChannelAnnouncementExplicit;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.data.SNDCPDataChannelGrant;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.data.SNDCPDataPageRequest;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.voice.GroupVoiceChannelGrant;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.voice.GroupVoiceChannelGrantUpdate;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.voice.GroupVoiceChannelGrantUpdateExplicit;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.voice.TelephoneInterconnectAnswerRequest;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.voice.TelephoneInterconnectVoiceChannelGrant;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.voice.UnitToUnitAnswerRequest;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.voice.UnitToUnitVoiceChannelGrant;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.voice.UnitToUnitVoiceChannelGrantUpdate;
import io.github.dsheirer.module.decode.p25.reference.DataUnitID;
import io.github.dsheirer.module.decode.p25.reference.Opcode;
import io.github.dsheirer.module.decode.p25.reference.Vendor;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.module.decode.p25.message.tsbk.motorola.MotorolaTSBKMessage;
import io.github.dsheirer.module.decode.p25.message.tsbk.motorola.PatchGroupVoiceChannelGrantUpdate;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.control.AcknowledgeResponse;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.control.DenyResponse;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.control.ExtendedFunctionCommand;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.control.GroupAffiliationQuery;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.control.LocationRegistrationResponse;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.control.RadioUnitMonitorCommand;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.control.StatusQuery;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.control.StatusUpdate;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.control.SystemServiceBroadcast;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.control.UnitDeregistrationAcknowledge;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.data.SNDCPDataChannelGrant;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.data.SNDCPDataPageRequest;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.voice.GroupVoiceChannelGrantUpdate;
import io.github.dsheirer.module.decode.p25.message.tsbk.osp.voice.UnitToUnitVoiceChannelGrant;
public class TSBKMessageFactory
{

View File

@@ -18,10 +18,10 @@
******************************************************************************/
package io.github.dsheirer.module.decode.p25.message.tsbk;
import io.github.dsheirer.bits.BinaryMessage;
import io.github.dsheirer.module.decode.p25.reference.DataUnitID;
import io.github.dsheirer.alias.Alias;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.bits.BinaryMessage;
import io.github.dsheirer.module.decode.p25.reference.DataUnitID;
public abstract class UnitChannelGrant extends ChannelGrant
{

View File

@@ -18,9 +18,9 @@
******************************************************************************/
package io.github.dsheirer.module.decode.p25.message.tsbk.motorola;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.bits.BinaryMessage;
import io.github.dsheirer.module.decode.p25.message.IBandIdentifier;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.module.decode.p25.message.IdentifierReceiver;
import io.github.dsheirer.module.decode.p25.reference.DataUnitID;

View File

@@ -1,9 +1,9 @@
package io.github.dsheirer.module.decode.p25.message.tsbk.motorola;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.bits.BinaryMessage;
import io.github.dsheirer.module.decode.p25.message.tsbk.TSBKMessage;
import io.github.dsheirer.module.decode.p25.reference.DataUnitID;
import io.github.dsheirer.alias.AliasList;
public class MotorolaTSBKMessage extends TSBKMessage
{

View File

@@ -1,7 +1,7 @@
package io.github.dsheirer.module.decode.p25.message.tsbk.motorola;
import io.github.dsheirer.bits.BinaryMessage;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.bits.BinaryMessage;
import io.github.dsheirer.module.decode.p25.reference.DataUnitID;
import java.util.ArrayList;

View File

@@ -1,7 +1,7 @@
package io.github.dsheirer.module.decode.p25.message.tsbk.motorola;
import io.github.dsheirer.bits.BinaryMessage;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.bits.BinaryMessage;
import io.github.dsheirer.module.decode.p25.reference.DataUnitID;
public class PatchGroupAdd extends PatchGroup

View File

@@ -1,7 +1,7 @@
package io.github.dsheirer.module.decode.p25.message.tsbk.motorola;
import io.github.dsheirer.bits.BinaryMessage;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.bits.BinaryMessage;
import io.github.dsheirer.module.decode.p25.reference.DataUnitID;
public class PatchGroupDelete extends PatchGroup

View File

@@ -18,8 +18,8 @@
******************************************************************************/
package io.github.dsheirer.module.decode.p25.message.tsbk.motorola;
import io.github.dsheirer.bits.BinaryMessage;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.bits.BinaryMessage;
import io.github.dsheirer.module.decode.p25.message.IBandIdentifier;
import io.github.dsheirer.module.decode.p25.message.IdentifierReceiver;
import io.github.dsheirer.module.decode.p25.reference.DataUnitID;

View File

@@ -18,11 +18,11 @@
******************************************************************************/
package io.github.dsheirer.module.decode.p25.message.tsbk.motorola;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.bits.BinaryMessage;
import io.github.dsheirer.module.decode.p25.message.IBandIdentifier;
import io.github.dsheirer.module.decode.p25.message.IdentifierReceiver;
import io.github.dsheirer.module.decode.p25.reference.DataUnitID;
import io.github.dsheirer.alias.AliasList;
public class PatchGroupVoiceChannelGrantUpdate extends MotorolaTSBKMessage implements IdentifierReceiver
{

View File

@@ -1,8 +1,8 @@
package io.github.dsheirer.module.decode.p25.message.tsbk.motorola;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.bits.BinaryMessage;
import io.github.dsheirer.module.decode.p25.reference.DataUnitID;
import io.github.dsheirer.alias.AliasList;
public class PlannedControlChannnelShutdown extends MotorolaTSBKMessage
{

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