GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-13 09:07:27 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

P25 - work in progress - this is a fairly stable version of the P25 channel state. There is still work to do, but I'm going to release a test version based on this commit.

Browse Source 
- Channel state now processes HDU, TDU, TDULC, PDU, PDULC, LDU1/2, LDULC
This commit is contained in:
dennis.sheirer
2015-02-22 18:46:03 +00:00
parent a0b38afee1
commit d7a03c7196
59 changed files with 2392 additions and 1331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,7 @@ package decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BinaryMessage;
import decode.p25.message.IdentifierProvider;
import decode.p25.message.IBandIdentifier;
import decode.p25.message.IdentifierReceiver;
import decode.p25.message.tsbk.TSBKMessage;
import decode.p25.reference.DataUnitID;
@@ -26,7 +26,7 @@ public class AdjacentStatusBroadcast extends TSBKMessage implements IdentifierRe
public static final int[] SYSTEM_SERVICE_CLASS = { 136,137,138,139,140,141,
142,143 };
private IdentifierProvider mIdentifierUpdate;
private IBandIdentifier mIdentifierUpdate;
public AdjacentStatusBroadcast( BinaryMessage message,
DataUnitID duid,
@@ -163,7 +163,7 @@ public class AdjacentStatusBroadcast extends TSBKMessage implements IdentifierRe
}
@Override
public void setIdentifierMessage( int identifier, IdentifierProvider message )
public void setIdentifierMessage( int identifier, IBandIdentifier message )
{
/* we're only expecting 1 identifier, so use whatever is received */
mIdentifierUpdate = message;

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

@@ -2,12 +2,12 @@ package decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BinaryMessage;
import decode.p25.message.IdentifierProvider;
import decode.p25.message.IBandIdentifier;
import decode.p25.message.tsbk.TSBKMessage;
import decode.p25.reference.DataUnitID;
public abstract class IdentifierUpdate extends TSBKMessage
implements IdentifierProvider
implements IBandIdentifier
{
public static final int[] IDENTIFIER = { 80,81,82,83 };

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

@@ -2,7 +2,7 @@ package decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BinaryMessage;
import decode.p25.message.IdentifierProvider;
import decode.p25.message.IBandIdentifier;
import decode.p25.message.IdentifierReceiver;
import decode.p25.message.tsbk.TSBKMessage;
import decode.p25.reference.DataUnitID;
@@ -23,7 +23,7 @@ public class NetworkStatusBroadcast extends TSBKMessage implements IdentifierRec
public static final int[] SYSTEM_SERVICE_CLASS = { 136,137,138,139,140,141,
142,143 };
private IdentifierProvider mIdentifierUpdate;
private IBandIdentifier mIdentifierUpdate;
public NetworkStatusBroadcast( BinaryMessage message,
DataUnitID duid,
@@ -109,7 +109,7 @@ public class NetworkStatusBroadcast extends TSBKMessage implements IdentifierRec
}
@Override
public void setIdentifierMessage( int identifier, IdentifierProvider message )
public void setIdentifierMessage( int identifier, IBandIdentifier message )
{
/* we're only expecting 1 identifier, so use whatever is received */
mIdentifierUpdate = message;

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

@@ -2,7 +2,7 @@ package decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BinaryMessage;
import decode.p25.message.IdentifierProvider;
import decode.p25.message.IBandIdentifier;
import decode.p25.message.IdentifierReceiver;
import decode.p25.message.tsbk.TSBKMessage;
import decode.p25.reference.DataUnitID;
@@ -23,7 +23,7 @@ public class RFSSStatusBroadcast extends TSBKMessage implements IdentifierReceiv
public static final int[] SYSTEM_SERVICE_CLASS = { 136,137,138,139,140,141,
142,143 };
private IdentifierProvider mIdentifierUpdate;
private IBandIdentifier mIdentifierUpdate;
public RFSSStatusBroadcast( BinaryMessage message,
DataUnitID duid,
@@ -119,7 +119,7 @@ public class RFSSStatusBroadcast extends TSBKMessage implements IdentifierReceiv
}
@Override
public void setIdentifierMessage( int identifier, IdentifierProvider message )
public void setIdentifierMessage( int identifier, IBandIdentifier message )
{
/* we're only expecting 1 identifier, so use whatever is received */
mIdentifierUpdate = message;

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

@@ -5,7 +5,7 @@ import org.slf4j.LoggerFactory;
import alias.AliasList;
import bits.BinaryMessage;
import decode.p25.message.IdentifierProvider;
import decode.p25.message.IBandIdentifier;
import decode.p25.message.IdentifierReceiver;
import decode.p25.message.tsbk.TSBKMessage;
import decode.p25.reference.DataUnitID;
@@ -30,8 +30,8 @@ public class SecondaryControlChannelBroadcast extends TSBKMessage
public static final int[] SYSTEM_SERVICE_CLASS_2 = { 136,137,138,139,140,
141,142,143 };
private IdentifierProvider mIdentifierUpdate1;
private IdentifierProvider mIdentifierUpdate2;
private IBandIdentifier mIdentifierUpdate1;
private IBandIdentifier mIdentifierUpdate2;
public SecondaryControlChannelBroadcast( BinaryMessage message,
DataUnitID duid,
@@ -145,7 +145,7 @@ public class SecondaryControlChannelBroadcast extends TSBKMessage
}
@Override
public void setIdentifierMessage( int identifier, IdentifierProvider message )
public void setIdentifierMessage( int identifier, IBandIdentifier message )
{
if( identifier == getIdentifier1() )
{