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

Updated P25 channel display to show relevant site information.

Browse Source 
Changed Site ID Alias to a string from integer to support P25 style site identifiers (RFSS-Site)
This commit is contained in:
dennis.sheirer
2014-11-26 12:09:21 +00:00
parent 86899e8a77
commit 1ff69404f4
16 changed files with 286 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/decode/mpt1327/MPT1327Message.java
View File

@@ -327,19 +327,19 @@ public class MPT1327Message extends Message
/**
* MPT1327 Site identifier
*/
public int getSiteID()
public String getSiteID()
{
if( mMessageType == MPTMessageType.BCAST )
{
return mMessage.getInt( B1_SYSTEM_ID );
return String.valueOf( mMessage.getInt( B1_SYSTEM_ID ) );
}
else if( mMessageType == MPTMessageType.ALH )
{
return mMessage.getInt( B2_SYSTEM_ID );
return String.valueOf( mMessage.getInt( B2_SYSTEM_ID ) );
}
else
{
return 0;
return null;
}
}
@@ -348,7 +348,7 @@ public class MPT1327Message extends Message
*/
public boolean hasSystemID()
{
return getSiteID() != 0;
return getSiteID() != null;
}
public SystemDefinition getSystemDefinition()
@@ -599,7 +599,7 @@ public class MPT1327Message extends Message
break;
case ACKT:
sb.append( " SITE:" );
sb.append( format( getSiteID(), 5 ) );
sb.append( getSiteID() );
sb.append( " LONG ACK MESSAGE" );
@@ -619,7 +619,7 @@ public class MPT1327Message extends Message
break;
case ACKQ:
sb.append( " SYSTEM:" );
sb.append( format( getSiteID(), 5 ) );
sb.append( getSiteID() );
sb.append( " CALL QUEUED FROM:" );
@@ -637,7 +637,7 @@ public class MPT1327Message extends Message
break;
case ACKX:
sb.append( " SYSTEM:" );
sb.append( format( getSiteID(), 5 ) );
sb.append( getSiteID() );
sb.append( " MESSAGE REJECTED FROM:" );
@@ -687,7 +687,7 @@ public class MPT1327Message extends Message
case ALHX:
case ALHF:
sb.append( " SYSTEM:" );
sb.append( format( getSiteID(), 5 ) );
sb.append( getSiteID() );
if( hasToID() )
{
@@ -706,7 +706,7 @@ public class MPT1327Message extends Message
break;
case BCAST:
sb.append( " SYSTEM:" );
sb.append( format( getSiteID(), 5 ) );
sb.append( getSiteID() );
SystemDefinition sysdef = getSystemDefinition();