GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-14 09:37:36 -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

19
src/decode/mpt1327/MPT1327ActivitySummary.java
View File

@@ -33,7 +33,7 @@ public class MPT1327ActivitySummary implements ActivitySummaryProvider,
private AliasList mAliasList;
private TreeSet<String> mIdents = new TreeSet<String>();
private int mSite;
private String mSite;
/**
* Compiles a summary of active talkgroups, unique radio ids encountered
@@ -103,7 +103,7 @@ public class MPT1327ActivitySummary implements ActivitySummaryProvider,
sb.append( "Decoder:\tMPT-1327\n" );
sb.append( "Site:\t" );
if( mSite != 0 )
if( mSite != null )
{
sb.append( mSite );
@@ -118,21 +118,6 @@ public class MPT1327ActivitySummary implements ActivitySummaryProvider,
sb.append( "\n" );
}
}
sb.append( "Network:\t" );
if( ( mSite & 0x4000 ) == 0x4000 )
{
sb.append( "National #" );
int net = (int)Long.rotateRight( ( mSite & 0x3000 ) , 12 );
sb.append( net );
sb.append( "\n" );
}
else
{
sb.append( "Regional\n" );
}
}
else
{

8
src/decode/mpt1327/MPT1327ChannelState.java
View File

@@ -36,7 +36,7 @@ import decode.mpt1327.MPT1327Message.IdentType;
public class MPT1327ChannelState extends ChannelState
{
private int mSite;
private String mSite;
private String mFromTalkgroup;
private String mToTalkgroup;
private int mChannelNumber;
@@ -153,9 +153,9 @@ public class MPT1327ChannelState extends ChannelState
.build() );
break;
case ALH:
int sys = mpt.getSiteID();
String sys = mpt.getSiteID();
if( sys != 0 && sys != mSite )
if( sys != null && !sys.contentEquals( mSite ) )
{
mSite = sys;
broadcastChange( ChangedAttribute.CHANNEL_SITE_NUMBER );
@@ -315,7 +315,7 @@ public class MPT1327ChannelState extends ChannelState
super.reset();
}
public int getSite()
public String getSite()
{
return mSite;
}

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();

4
src/decode/mpt1327/MPT1327Panel.java
View File

@@ -191,9 +191,9 @@ public class MPT1327Panel extends ChannelStatePanel
return null;
}
private Alias getSiteAlias( int site )
private Alias getSiteAlias( String site )
{
if( site != 0 && mAliasList != null )
if( site != null && mAliasList != null )
{
return mAliasList.getSiteID( site );
}