Incrementing build to 0.3.0-beta4

This commit is contained in:
Denny
2017-02-11 09:02:35 -05:00
parent cf0018e6ba
commit a3e50acfe3
3 changed files with 82 additions and 96 deletions

View File

@@ -18,6 +18,7 @@
<w>talkgroup</w> <w>talkgroup</w>
<w>tgid</w> <w>tgid</w>
<w>ultravox</w> <w>ultravox</w>
<w>wacn</w>
<w>xtea</w> <w>xtea</w>
</words> </words>
</dictionary> </dictionary>

View File

@@ -38,7 +38,7 @@ public class ChannelDetailPanel extends JPanel implements Listener<ProcessingCha
private JLabel mSystemLabel; private JLabel mSystemLabel;
private JLabel mSiteLabel; private JLabel mSiteLabel;
private JLabel mNameLabel; private JLabel mNameLabel;
private JTextArea mDetailTextArea; private JTextPane mDetailTextPane;
private ChannelProcessingManager mChannelProcessingManager; private ChannelProcessingManager mChannelProcessingManager;
private ProcessingChain mProcessingChain; private ProcessingChain mProcessingChain;
@@ -82,10 +82,12 @@ public class ChannelDetailPanel extends JPanel implements Listener<ProcessingCha
add(buttonPanel, "wrap"); add(buttonPanel, "wrap");
mDetailTextArea = new JTextArea(EMPTY_DETAILS); mDetailTextPane = new JTextPane();
DefaultCaret caret = (DefaultCaret)mDetailTextArea.getCaret(); mDetailTextPane.setContentType("text/html");
mDetailTextPane.setText(EMPTY_DETAILS);
DefaultCaret caret = (DefaultCaret)mDetailTextPane.getCaret();
caret.setUpdatePolicy(DefaultCaret.NEVER_UPDATE); caret.setUpdatePolicy(DefaultCaret.NEVER_UPDATE);
add(new JScrollPane(mDetailTextArea)); add(new JScrollPane(mDetailTextPane));
} }
@Override @Override
@@ -126,7 +128,7 @@ public class ChannelDetailPanel extends JPanel implements Listener<ProcessingCha
mSystemLabel.setText(system); mSystemLabel.setText(system);
mSiteLabel.setText(site); mSiteLabel.setText(site);
mNameLabel.setText(name); mNameLabel.setText(name);
mDetailTextArea.setText(details); mDetailTextPane.setText(details);
} }
}); });
} }

View File

@@ -3343,29 +3343,25 @@ public class P25DecoderState extends DecoderState
{ {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.append("Activity Summary\n"); sb.append("<html><h2>Activity Summary - Decoder:P25 ").append(getModulation().name()).append("</h2>");
sb.append("Decoder:\tP25\n"); sb.append("<hr>");
sb.append("===================== THIS SITE ======================"); sb.append("<b>SITE:</b> ");
if(mNetworkStatus != null) if(mNetworkStatus != null)
{ {
sb.append("\nNAC:\t" + mNetworkStatus.getNAC()); sb.append("NAC:" + mNetworkStatus.getNAC());
sb.append("\nWACN-SYS:\t" + mNetworkStatus.getWACN()); sb.append("h WACN:" + mNetworkStatus.getWACN());
sb.append("-" + mNetworkStatus.getSystemID()); sb.append("h SYS:" + mNetworkStatus.getSystemID());
sb.append(" ["); sb.append("h [").append(mNetworkStatus.getNetworkCallsign()).append("]");
sb.append(mNetworkStatus.getNetworkCallsign()); sb.append(" LRA:" + mNetworkStatus.getLocationRegistrationArea());
sb.append("]");
sb.append("\nLRA:\t" + mNetworkStatus.getLocationRegistrationArea());
} }
else if(mNetworkStatusExtended != null) else if(mNetworkStatusExtended != null)
{ {
sb.append("\nNAC:\t" + mNetworkStatusExtended.getNAC()); sb.append("NAC:" + mNetworkStatusExtended.getNAC());
sb.append("\nWACN-SYS:\t" + mNetworkStatusExtended.getWACN()); sb.append("h WACN:" + mNetworkStatusExtended.getWACN());
sb.append("-" + mNetworkStatusExtended.getSystemID()); sb.append("h SYS:" + mNetworkStatusExtended.getSystemID());
sb.append(" ["); sb.append("h [").append(mNetworkStatusExtended.getNetworkCallsign()).append("]");
sb.append(mNetworkStatusExtended.getNetworkCallsign()); sb.append(" LRA:" + mNetworkStatusExtended.getLocationRegistrationArea());
sb.append("]");
sb.append("\nLRA:\t" + mNetworkStatusExtended.getLocationRegistrationArea());
} }
String site = null; String site = null;
@@ -3376,11 +3372,10 @@ public class P25DecoderState extends DecoderState
} }
else if(mRFSSStatusMessageExtended != null) else if(mRFSSStatusMessageExtended != null)
{ {
site = mRFSSStatusMessageExtended.getRFSubsystemID() + "-" + site = mRFSSStatusMessageExtended.getRFSubsystemID() + "-" + mRFSSStatusMessageExtended.getSiteID();
mRFSSStatusMessageExtended.getSiteID();
} }
sb.append("\nRFSS-SITE:\t" + site); sb.append("h RFSS-SITE:").append(site).append("h");
if(hasAliasList()) if(hasAliasList())
{ {
@@ -3394,95 +3389,81 @@ public class P25DecoderState extends DecoderState
if(mNetworkStatus != null) if(mNetworkStatus != null)
{ {
sb.append("\nSERVICES:\t" + SystemService.toString( sb.append("<br><b>SERVICES:<b>" + SystemService.toString(mNetworkStatus.getSystemServiceClass()));
mNetworkStatus.getSystemServiceClass())); sb.append("<br>PCCH:DOWNLINK ")
sb.append("\nPCCH:\tDNLINK " + mFrequencyFormatter.format( .append(mFrequencyFormatter.format((double)mNetworkStatus.getDownlinkFrequency() / 1E6d))
(double)mNetworkStatus.getDownlinkFrequency() / 1E6d) + .append(" [").append(mNetworkStatus.getIdentifier()).append("-").append(mNetworkStatus.getChannel())
" [" + mNetworkStatus.getIdentifier() + "-" + .append("] UPLINK ")
mNetworkStatus.getChannel() + "]\n"); .append(mFrequencyFormatter.format((double)mNetworkStatus.getUplinkFrequency() / 1E6d))
sb.append("\tUPLINK " + mFrequencyFormatter.format( .append(" [").append(mNetworkStatus.getIdentifier()).append("-").append(mNetworkStatus.getChannel())
(double)mNetworkStatus.getUplinkFrequency() / 1E6d) + " [" + .append("]<br>");
mNetworkStatus.getIdentifier() + "-" +
mNetworkStatus.getChannel() + "]\n");
} }
else if(mNetworkStatusExtended != null) else if(mNetworkStatusExtended != null)
{ {
sb.append("\nSERVICES:\t" + SystemService.toString( sb.append("<br><b>SERVICES:</b>").append(SystemService.toString(mNetworkStatusExtended.getSystemServiceClass()));
mNetworkStatusExtended.getSystemServiceClass())); sb.append("<br><b>PCCH:</b> DOWNLINK ")
sb.append("\nPCCH:\tDNLINK " + mFrequencyFormatter.format( .append(mFrequencyFormatter.format((double)mNetworkStatusExtended.getDownlinkFrequency() / 1E6d))
(double)mNetworkStatusExtended.getDownlinkFrequency() / 1E6d) + .append(" [").append(mNetworkStatusExtended.getTransmitIdentifier()).append("-")
" [" + mNetworkStatusExtended.getTransmitIdentifier() + "-" + .append(mNetworkStatusExtended.getTransmitChannel()).append("] UPLINK ")
mNetworkStatusExtended.getTransmitChannel() + "]\n"); .append(mFrequencyFormatter.format((double)mNetworkStatusExtended.getUplinkFrequency() / 1E6d))
sb.append("\tUPLINK " + mFrequencyFormatter.format( .append(" [").append(mNetworkStatusExtended.getReceiveIdentifier()).append("-")
(double)mNetworkStatusExtended.getUplinkFrequency() / 1E6d) + .append(mNetworkStatusExtended.getReceiveChannel()).append("]");
" [" + mNetworkStatusExtended.getReceiveIdentifier() + "-" +
mNetworkStatusExtended.getReceiveChannel() + "]");
} }
if(mSecondaryControlChannels.isEmpty()) if(mSecondaryControlChannels.isEmpty())
{ {
sb.append("\nSCCH:\tNONE"); sb.append("<br><b>SCCH:</b> NONE");
} }
else else
{ {
for(module.decode.p25.message.tsbk.osp.control.SecondaryControlChannelBroadcast for(module.decode.p25.message.tsbk.osp.control.SecondaryControlChannelBroadcast sec : mSecondaryControlChannels)
sec : mSecondaryControlChannels)
{ {
sb.append("\nSCCH:\tDNLINK " + mFrequencyFormatter.format( sb.append("<br><b>SCCH:</b> DOWNLINK ")
(double)sec.getDownlinkFrequency1() / 1E6d) + .append(mFrequencyFormatter.format((double)sec.getDownlinkFrequency1() / 1E6d))
" [" + sec.getIdentifier1() + "-" + sec.getChannel1() + "]\n"); .append(" [").append(sec.getIdentifier1()).append("-").append(sec.getChannel1()).append("] UPLINK ")
sb.append("\tUPLINK " + mFrequencyFormatter.format( .append(mFrequencyFormatter.format((double)sec.getUplinkFrequency1() / 1E6d))
(double)sec.getUplinkFrequency1() / 1E6d) + " [" + .append(" [").append(sec.getIdentifier1()).append("-").append(sec.getChannel1()).append("]");
sec.getIdentifier1() + "-" + sec.getChannel1() + "]\n");
if(sec.hasChannel2()) if(sec.hasChannel2())
{ {
sb.append("\nSCCH:\tDNLINK " + mFrequencyFormatter.format( sb.append("<br><b>SCCH:</b> DOWNLINK ")
(double)sec.getDownlinkFrequency2() / 1E6d) + .append(mFrequencyFormatter.format((double)sec.getDownlinkFrequency2() / 1E6d))
" [" + sec.getIdentifier2() + "-" + sec.getChannel2() + "]\n"); .append(" [").append(sec.getIdentifier2()).append("-").append(sec.getChannel2())
sb.append("\tUPLINK " + mFrequencyFormatter.format( .append("] UPLINK ").append(mFrequencyFormatter.format((double)sec.getUplinkFrequency2() / 1E6d))
(double)sec.getUplinkFrequency2() / 1E6d) + " [" + .append(" [").append(sec.getIdentifier2()).append("-").append(sec.getChannel2()).append("]");
sec.getIdentifier2() + "-" + sec.getChannel2() + "]");
} }
} }
} }
if(mSNDCPDataChannel != null) if(mSNDCPDataChannel != null)
{ {
sb.append("\nSNDCP:"); sb.append("<br><b>SNDCP:</b> DOWNLINK ")
sb.append("\tDNLINK " + mFrequencyFormatter.format( .append(mFrequencyFormatter.format((double)mSNDCPDataChannel.getDownlinkFrequency() / 1E6D))
(double)mSNDCPDataChannel.getDownlinkFrequency() / 1E6D) + .append(" [").append(mSNDCPDataChannel.getTransmitChannel()).append("]").append(" UPLINK ")
" [" + mSNDCPDataChannel.getTransmitChannel() + "]"); .append(mFrequencyFormatter.format((double)mSNDCPDataChannel.getUplinkFrequency() / 1E6D))
sb.append("\tUPLINK " + mFrequencyFormatter.format( .append(" [").append(mSNDCPDataChannel.getReceiveChannel()).append("]");
(double)mSNDCPDataChannel.getUplinkFrequency() / 1E6D) +
" [" + mSNDCPDataChannel.getReceiveChannel() + "]");
} }
if(mProtectionParameterBroadcast != null) if(mProtectionParameterBroadcast != null)
{ {
sb.append("\nENCRYPTION:"); sb.append("<br><b>ENCRYPTION:</b> TYPE:").append(mProtectionParameterBroadcast.getEncryptionType().name());
sb.append("\nTYPE:\t" + mProtectionParameterBroadcast sb.append(" ALGORITHM:").append(mProtectionParameterBroadcast.getAlgorithmID());
.getEncryptionType().name()); sb.append(" KEY:").append(mProtectionParameterBroadcast.getKeyID());
sb.append("\nALGORITHM:\t" + mProtectionParameterBroadcast sb.append(" INBOUND IV:").append(mProtectionParameterBroadcast.getInboundInitializationVector());
.getAlgorithmID()); sb.append(" OUTBOUND IV:").append(mProtectionParameterBroadcast.getOutboundInitializationVector());
sb.append("\nKEY:\t" + mProtectionParameterBroadcast.getKeyID());
sb.append("\nINBOUND IV:\t" + mProtectionParameterBroadcast
.getInboundInitializationVector());
sb.append("\nOUTBOUND IV:\t" + mProtectionParameterBroadcast
.getOutboundInitializationVector());
} }
List<Integer> identifiers = new ArrayList<>(mBands.keySet()); List<Integer> identifiers = new ArrayList<>(mBands.keySet());
Collections.sort(identifiers); Collections.sort(identifiers);
sb.append("\nFREQUENCY BANDS:"); sb.append("<br><b>FREQUENCY BANDS:</b>");
for(Integer id : identifiers) for(Integer id : identifiers)
{ {
IBandIdentifier band = mBands.get(id); IBandIdentifier band = mBands.get(id);
sb.append("\n\t" + id); sb.append("<br>&nbsp;&nbsp;<b>").append(id).append("</b>");
sb.append("- BASE: " + mFrequencyFormatter.format( sb.append(" - BASE: " + mFrequencyFormatter.format(
(double)band.getBaseFrequency() / 1E6d)); (double)band.getBaseFrequency() / 1E6d));
sb.append(" CHANNEL SIZE: " + mFrequencyFormatter.format( sb.append(" CHANNEL SIZE: " + mFrequencyFormatter.format(
(double)band.getChannelSpacing() / 1E6d)); (double)band.getChannelSpacing() / 1E6d));
@@ -3490,23 +3471,24 @@ public class P25DecoderState extends DecoderState
(double)band.getTransmitOffset() / 1E6D)); (double)band.getTransmitOffset() / 1E6D));
} }
sb.append("\n\n=================== NEIGHBORS ======================"); sb.append("<br><b>NEIGHBORS:</b>");
if(mNeighborMap.isEmpty()) if(mNeighborMap.isEmpty())
{ {
sb.append("\n\tNONE\n"); sb.append("<li>NONE</li>");
sb.append("\n----------------------------------------------------");
} }
else else
{ {
for(IAdjacentSite neighbor : mNeighborMap.values()) for(IAdjacentSite neighbor : mNeighborMap.values())
{ {
sb.append("\nNAC:\t" + ((P25Message)neighbor).getNAC()); sb.append("<li>NAC:").append(((P25Message)neighbor).getNAC());
sb.append("\nSYSTEM:\t" + neighbor.getSystemID()); sb.append("h SYSTEM:" + neighbor.getSystemID());
sb.append("\nLRA:\t" + neighbor.getLRA()); sb.append("h LRA:" + neighbor.getLRA());
String neighborID = neighbor.getRFSS() + "-" + neighbor.getSiteID(); String neighborID = neighbor.getRFSS() + "-" + neighbor.getSiteID();
sb.append("\nRFSS-SITE:\t" + neighborID); sb.append("h RFSS-SITE:" + neighborID);
sb.append("h ");
if(hasAliasList()) if(hasAliasList())
{ {
@@ -3514,21 +3496,22 @@ public class P25DecoderState extends DecoderState
if(siteAlias != null) if(siteAlias != null)
{ {
sb.append(" " + siteAlias.getName()); sb.append(siteAlias.getName());
} }
} }
sb.append("\nPCCH:\tDNLINK " + mFrequencyFormatter.format( sb.append("<br>&nbsp;&nbsp;PCCH: DOWNLINK ")
(double)neighbor.getDownlinkFrequency() / 1E6d) + .append(mFrequencyFormatter.format((double)neighbor.getDownlinkFrequency() / 1E6d))
" [" + neighbor.getDownlinkChannel() + "]"); .append(" [").append(neighbor.getDownlinkChannel()).append("] UPLINK:")
sb.append("\n\tUPLINK:" + mFrequencyFormatter.format( .append(mFrequencyFormatter.format((double)neighbor.getUplinkFrequency() / 1E6d))
(double)neighbor.getUplinkFrequency() / 1E6d) + .append(" [").append(neighbor.getDownlinkChannel()).append("] SERVICES: ")
" [" + neighbor.getDownlinkChannel() + "]\n"); .append(neighbor.getSystemServiceClass());
sb.append("\nSERVICES:\t" + neighbor.getSystemServiceClass()); sb.append("</li");
sb.append("\n----------------------------------------------------");
} }
} }
sb.append("</html>");
return sb.toString(); return sb.toString();
} }