P25 work in progress

This commit is contained in:
dennis.sheirer
2014-11-22 16:13:44 +00:00
parent 960de375bc
commit 1660f13633
44 changed files with 788 additions and 656 deletions

View File

@@ -37,7 +37,7 @@ public class AcknowledgeResponse extends TSBKMessage
{
StringBuilder sb = new StringBuilder();
sb.append( super.getMessage() );
sb.append( getMessageStub() );
sb.append( " SVC TYPE: " + getServiceType() );

View File

@@ -40,7 +40,7 @@ public class AdjacentStatusBroadcast extends TSBKMessage
{
StringBuilder sb = new StringBuilder();
sb.append( super.getMessage() );
sb.append( getMessageStub() );
sb.append( " LRA:" + getLocationRegistrationArea() );

View File

@@ -32,7 +32,7 @@ public class AuthenticationCommand extends TSBKMessage
{
StringBuilder sb = new StringBuilder();
sb.append( super.getMessage() );
sb.append( getMessageStub() );
sb.append( " WACN: " + getWACN() );
sb.append( " SYS ID: " + getSystemID() );

View File

@@ -30,7 +30,7 @@ public class CallAlert extends TSBKMessage
{
StringBuilder sb = new StringBuilder();
sb.append( super.getMessage() );
sb.append( getMessageStub() );
sb.append( " SRC ID: " + getSourceID() );
sb.append( " TGT ADDR: " + getTargetAddress() );

View File

@@ -35,7 +35,7 @@ public class DenyResponse extends TSBKMessage
{
StringBuilder sb = new StringBuilder();
sb.append( super.getMessage() );
sb.append( getMessageStub() );
sb.append( " TGT ADDR: " + getTargetAddress() );

View File

@@ -31,7 +31,7 @@ public class ExtendedFunctionCommand extends TSBKMessage
{
StringBuilder sb = new StringBuilder();
sb.append( super.getMessage() );
sb.append( getMessageStub() );
sb.append( " EXTENDED FUNCTION:" + getExtendedFunction() );

View File

@@ -30,7 +30,7 @@ public class GroupAffiliationQuery extends TSBKMessage
{
StringBuilder sb = new StringBuilder();
sb.append( super.getMessage() );
sb.append( getMessageStub() );
sb.append( " SRC ADDR: " + getSourceAddress() );

View File

@@ -35,7 +35,7 @@ public class GroupAffiliationResponse extends TSBKMessage
{
StringBuilder sb = new StringBuilder();
sb.append( super.getMessage() );
sb.append( getMessageStub() );
sb.append( " AFFILIATION:" + getResponse().name() );
sb.append( " ANNOUNCE GROUP:" + getAnnouncementGroupAddress() );

View File

@@ -26,8 +26,8 @@ public class IdentifierUpdate extends TSBKMessage
137,138,139,140,141,142,143 };
public IdentifierUpdate( BitSetBuffer message,
DataUnitID duid,
AliasList aliasList )
DataUnitID duid,
AliasList aliasList )
{
super( message, duid, aliasList );
}
@@ -35,14 +35,14 @@ public class IdentifierUpdate extends TSBKMessage
@Override
public String getEventType()
{
return Opcode.IDENTIFIER_UPDATE.getDescription();
return getOpcode().getDescription();
}
public String getMessage()
{
StringBuilder sb = new StringBuilder();
sb.append( super.getMessage() );
sb.append( getMessageStub() );
sb.append( " CHAN:" + getIdentifier() );

View File

@@ -34,7 +34,7 @@ public class LocationRegistrationResponse extends TSBKMessage
{
StringBuilder sb = new StringBuilder();
sb.append( super.getMessage() );
sb.append( getMessageStub() );
sb.append( " REGISTRATION:" + getResponse().name() );
sb.append( " GROUP:" + getGroupAddress() );

View File

@@ -32,7 +32,7 @@ public class MessageUpdate extends TSBKMessage
{
StringBuilder sb = new StringBuilder();
sb.append( super.getMessage() );
sb.append( getMessageStub() );
sb.append( " MSG:" + getShortDataMessage() );
sb.append( " SRC ADDR: " + getSourceAddress() );

View File

@@ -36,7 +36,7 @@ public class NetworkStatusBroadcast extends TSBKMessage
{
StringBuilder sb = new StringBuilder();
sb.append( super.getMessage() );
sb.append( getMessageStub() );
sb.append( " LRA:" + getLocationRegistrationArea() );

View File

@@ -32,7 +32,7 @@ public class ProtectionParameterUpdate extends TSBKMessage
{
StringBuilder sb = new StringBuilder();
sb.append( super.getMessage() );
sb.append( getMessageStub() );
sb.append( " TGT ADDR: " + getTargetAddress() );

View File

@@ -35,7 +35,7 @@ public class QueuedResponse extends TSBKMessage
{
StringBuilder sb = new StringBuilder();
sb.append( super.getMessage() );
sb.append( getMessageStub() );
sb.append( " TGT ADDR: " + getTargetAddress() );

View File

@@ -37,7 +37,7 @@ public class RFSSStatusBroadcast extends TSBKMessage
{
StringBuilder sb = new StringBuilder();
sb.append( super.getMessage() );
sb.append( getMessageStub() );
sb.append( " LRA:" + getLocationRegistrationArea() );

View File

@@ -31,7 +31,7 @@ public class RadioUnitMonitorCommand extends TSBKMessage
{
StringBuilder sb = new StringBuilder();
sb.append( super.getMessage() );
sb.append( getMessageStub() );
sb.append( " MULT:" + getTransmitMultiplier() );
sb.append( " SRC ADDR: " + getSourceAddress() );

View File

@@ -35,7 +35,7 @@ public class RoamingAddressCommand extends TSBKMessage
{
StringBuilder sb = new StringBuilder();
sb.append( super.getMessage() );
sb.append( getMessageStub() );
sb.append( getStackOperation().name() );
sb.append( " WACN:" + getWACN() );

View File

@@ -36,7 +36,7 @@ public class SecondaryControlChannelBroadcast extends TSBKMessage
{
StringBuilder sb = new StringBuilder();
sb.append( super.getMessage() );
sb.append( getMessageStub() );
sb.append( " RFSS:" + getRFSS() );

View File

@@ -30,7 +30,7 @@ public class StatusQuery extends TSBKMessage
{
StringBuilder sb = new StringBuilder();
sb.append( super.getMessage() );
sb.append( getMessageStub() );
sb.append( " SRC ADDR: " + getSourceAddress() );
sb.append( " TGT ADDR: " + getTargetAddress() );

View File

@@ -32,7 +32,7 @@ public class StatusUpdate extends TSBKMessage
{
StringBuilder sb = new StringBuilder();
sb.append( super.getMessage() );
sb.append( getMessageStub() );
sb.append( " STATUS USER:" + getUserStatus() );
sb.append( " UNIT:" + getUnitStatus() );

View File

@@ -35,7 +35,7 @@ public class SystemServiceBroadcast extends TSBKMessage
{
StringBuilder sb = new StringBuilder();
sb.append( super.getMessage() );
sb.append( getMessageStub() );
sb.append( " SERVICES AVAILABLE " );

View File

@@ -33,7 +33,7 @@ public class UnitDeregistrationAcknowledge extends TSBKMessage
{
StringBuilder sb = new StringBuilder();
sb.append( super.getMessage() );
sb.append( getMessageStub() );
sb.append( " WACN:" + getWACN() );
sb.append( " SYSTEM:" + getSystemID() );

View File

@@ -30,7 +30,7 @@ public class UnitRegistrationCommand extends TSBKMessage
{
StringBuilder sb = new StringBuilder();
sb.append( super.getMessage() );
sb.append( getMessageStub() );
sb.append( " SRC ADDR: " + getSourceAddress() );
sb.append( " TGT ADDR: " + getTargetAddress() );

View File

@@ -33,7 +33,7 @@ public class UnitRegistrationResponse extends TSBKMessage
{
StringBuilder sb = new StringBuilder();
sb.append( super.getMessage() );
sb.append( getMessageStub() );
sb.append( " REGISTRATION:" + getResponse().name() );
sb.append( " SYSTEM:" + getSystemID() );

View File

@@ -38,7 +38,7 @@ public class TelephoneInterconnectAnswerRequest extends TSBKMessage
{
StringBuilder sb = new StringBuilder();
sb.append( super.getMessage() );
sb.append( getMessageStub() );
sb.append( " TO:" );
sb.append( getTargetAddress() );

View File

@@ -22,7 +22,7 @@ public class TelephoneInterconnectVoiceChannelGrant extends UnitChannelGrant
{
StringBuilder sb = new StringBuilder();
sb.append( super.getMessage() );
sb.append( getMessageStub() );
if( isEmergency() )
{