GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-14 17:47:32 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

P25 work in progress - final check-in of channel state and activity summary processing of TSBK and PDU messages and event generation.

Browse Source
This commit is contained in:
dennis.sheirer
2014-12-21 14:30:06 +00:00
parent ba053457bd
commit 1d77f28958
36 changed files with 1952 additions and 438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,7 +54,7 @@ public class GroupAffiliationResponseExtended extends PDUMessage
sb.append( getMessageStub() );
sb.append( "AFFILIATION:" );
sb.append( getGroupAffiliationResponse().name() );
sb.append( getResponse().name() );
sb.append( " TO:" );
sb.append( getTargetAddress() );
@@ -123,7 +123,7 @@ public class GroupAffiliationResponseExtended extends PDUMessage
return mMessage.getHex( GROUP_ID, 4 );
}
public Response getGroupAffiliationResponse()
public Response getResponse()
{
return Response.fromValue(
mMessage.getInt( GROUP_AFFILIATION_RESPONSE_VALUE ) );

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

@@ -9,6 +9,7 @@ import decode.p25.message.tsbk.osp.control.IdentifierUpdateReceiver;
import decode.p25.message.tsbk.osp.control.SystemService;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
import decode.p25.reference.P25NetworkCallsign;
public class NetworkStatusBroadcastExtended extends PDUMessage
implements IdentifierUpdateReceiver
@@ -88,7 +89,13 @@ public class NetworkStatusBroadcastExtended extends PDUMessage
public String getWACN()
{
return mMessage.getHex( WACN, 6 );
return mMessage.getHex( WACN, 5 );
}
public String getNetworkCallsign()
{
return P25NetworkCallsign.getCallsign( mMessage.getInt( WACN ),
mMessage.getInt( SYSTEM_ID ) );
}
public int getTransmitIdentifier()

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

@@ -10,7 +10,7 @@ import decode.p25.reference.Response;
public class UnitRegistrationResponseExtended extends PDUMessage
{
public static final int[] REGISTRATION_DEFAULT_ADDRESS = { 88,89,90,91,92,
public static final int[] ASSIGNED_SOURCE_ADDRESS = { 88,89,90,91,92,
93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111 };
public static final int[] WACN = { 128,129,130,131,132,133,134,135,
136,137,138,139,140,141,142,143,160,161,162,163 };
@@ -48,7 +48,7 @@ public class UnitRegistrationResponseExtended extends PDUMessage
sb.append( getMessageStub() );
sb.append( "REGISTRATION:" );
sb.append( getUnitRegistrationResponse().name() );
sb.append( getResponse().name() );
sb.append( " SRC ID:" );
sb.append( getSourceID() );
@@ -65,6 +65,11 @@ public class UnitRegistrationResponseExtended extends PDUMessage
return sb.toString();
}
public String getAssignedSourceAddress()
{
return mMessage.getHex( ASSIGNED_SOURCE_ADDRESS, 6 );
}
public String getWACN()
{
return mMessage.getHex( WACN, 5 );
@@ -85,7 +90,7 @@ public class UnitRegistrationResponseExtended extends PDUMessage
return mMessage.getHex( SOURCE_ADDRESS, 6 );
}
public Response getUnitRegistrationResponse()
public Response getResponse()
{
return Response.fromValue(
mMessage.getInt( UNIT_REGISTRATION_RESPONSE_VALUE ) );