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

P25 work in progress.

Browse Source
This commit is contained in:
dennis.sheirer
2014-11-26 03:42:22 +00:00
parent 23901c7a2f
commit 86899e8a77
19 changed files with 907 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/decode/p25/reference/DataUnitID.java
View File

@@ -14,9 +14,10 @@ public enum DataUnitID
TSBK2( 7, 260, false, "TSBK2", "Trunking Signaling Block" ),
TSBK3( 7, 260, false, "TSBK3", "Trunking Signaling Block" ),
LDU2 ( 10, 1632, true, "LDU2 ", "Logical Link Data Unit 2" ),
PDU1 ( 12, 456, false, "PDU1 ", "Packet Data Unit" ),
PDU2 ( 12, 652, false, "PDU2 ", "Packet Data Unit" ),
PDU3 ( 12, 848, false, "PDU3 ", "Packet Data Unit" ),
PDU0 ( 12, 260, false, "PDU0 ", "Packet Header Data Unit" ),
PDU1 ( 12, 356, false, "PDU1 ", "Packet Data Unit" ),
PDU2 ( 12, 452, false, "PDU2 ", "Packet Data Unit" ),
PDU3 ( 12, 548, false, "PDU3 ", "Packet Data Unit" ),
TDULC( 15, 372, false, "TDULC", "Terminator Data Unit With Link Control" ),
UNKN ( -1, 0, false, "UNKWN", "Unknown" );
@@ -76,7 +77,7 @@ public enum DataUnitID
case 10:
return LDU2;
case 12:
return PDU1;
return PDU0;
case 15:
return TDULC;
default:

6
src/decode/p25/reference/PDUFormat.java
View File

@@ -23,9 +23,9 @@ public enum PDUFormat
F18( "F18", 18 ),
F19( "F19", 19 ),
F20( "F20", 20 ),
UNCONFIRMED_MULTI_BLOCK_TRUNKING_CONTROL( "UMBTC", 21 ),
ALTERNATE_MULTI_BLOCK_TRUNKING_CONTROL( "AMBTC", 22 ),
F23( "F23", 23 ),
UNCONFIRMED_MULTI_BLOCK_TRUNKING_CONTROL( "UNCONFIRMED MBTC", 21 ),
F22( "F22", 22 ),
ALTERNATE_MULTI_BLOCK_TRUNKING_CONTROL( "ALTERNATE MBTC", 23 ),
F24( "F24", 24 ),
F25( "F25", 25 ),
F26( "F26", 26 ),

5
src/decode/p25/reference/Service.java
View File

@@ -58,7 +58,10 @@ public enum Service
{
if( isSupported( service, serviceBitmap ) )
{
services.add( service );
if( service != Service.UNKNOWN )
{
services.add( service );
}
}
}

4
src/decode/p25/reference/ServiceAccessPoint.java
View File

@@ -63,9 +63,9 @@ public enum ServiceAccessPoint
SAP_58( "58", 58 ),
SAP_59( "59", 59 ),
SAP_60( "60", 60 ),
UNENCRYPTED_TRUNKING_CONTROL( "OPEN TRUNK", 61 ),
UNENCRYPTED_TRUNKING_CONTROL( "UNENCRYPTED TRUNKING CONTROL", 61 ),
SAP_62( "62", 62 ),
ENCRYPTED_TRUNKING_CONTROL( "ENC TRUNK", 63 ),
ENCRYPTED_TRUNKING_CONTROL( "ENCRYPTED TRUNKING CONTROL", 63 ),
UKNOWN( "UNKN", -1 );
private String mLabel;