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

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

View File

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