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

Resolves #719 P25 Phase 2 display channel number (#722)

Browse Source 
Co-authored-by: Denny <denny@denny-desktop>
This commit is contained in:
Denny Sheirer
2020-04-01 07:28:26 +00:00
committed by GitHub
parent 57f56d31a2
commit 85c27a6cca
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/io/github/dsheirer/module/decode/p25/identifier/channel/P25Channel.java
View File

@@ -189,25 +189,40 @@ public class P25Channel implements IChannelDescriptor
{
StringBuilder sb = new StringBuilder();
int downlinkChannelNumber = getDownlinkChannelNumber();
if(isTDMAChannel())
{
downlinkChannelNumber -= downlinkChannelNumber % getTimeslotCount();
}
if(getDownlinkBandIdentifier() == getUplinkBandIdentifier() && getDownlinkChannelNumber() == getUplinkChannelNumber())
{
sb.append(getDownlinkBandIdentifier()).append("-").append(getDownlinkLogicalChannelNumber());
sb.append(getDownlinkBandIdentifier()).append("-").append(downlinkChannelNumber);
}
else if(hasUplinkChannel())
{
int uplinkChannelNumber = getUplinkChannelNumber();
if(isTDMAChannel())
{
uplinkChannelNumber -= uplinkChannelNumber % getTimeslotCount();
}
sb.append(getDownlinkBandIdentifier())
.append("-")
.append(getDownlinkLogicalChannelNumber())
.append(downlinkChannelNumber)
.append("/")
.append(getUplinkBandIdentifier())
.append("-")
.append(getUplinkLogicalChannelNumber());
.append(uplinkChannelNumber);
}
else
{
sb.append(getDownlinkBandIdentifier())
.append("-")
.append(getDownlinkLogicalChannelNumber())
.append(downlinkChannelNumber)
.append("/-----");
}