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

Resolves #623 issue with P25 channels where uplink/downlink use different frequency bands. (#624)

Browse Source
This commit is contained in:
Denny Sheirer
2019-12-21 07:08:05 -05:00
committed by GitHub
parent 08672c33bd
commit 35b0b5ef9b
2 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,7 +122,10 @@ public class P25Channel implements IChannelDescriptor
@Override
public void setFrequencyBand(IFrequencyBand frequencyBand)
{
mFrequencyBand = frequencyBand;
if(frequencyBand.getIdentifier() == getDownlinkBandIdentifier())
{
mFrequencyBand = frequencyBand;
}
}
@Override
@@ -206,7 +209,6 @@ public class P25Channel implements IChannelDescriptor
.append("-")
.append(getDownlinkLogicalChannelNumber())
.append("/-----");
return getDownlinkBandIdentifier() + "-" + (getDownlinkLogicalChannelNumber()) + "/-----";
}
if(isTDMAChannel())

32
src/main/java/io/github/dsheirer/module/decode/p25/identifier/channel/P25ExplicitChannel.java
View File

@@ -1,21 +1,23 @@
/*
* ******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2019 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* * ******************************************************************************
* * Copyright (C) 2014-2019 Dennis Sheirer
* *
* * This program is free software: you can redistribute it and/or modify
* * it under the terms of the GNU General Public License as published by
* * the Free Software Foundation, either version 3 of the License, or
* * (at your option) any later version.
* *
* * This program is distributed in the hope that it will be useful,
* * but WITHOUT ANY WARRANTY; without even the implied warranty of
* * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* * GNU General Public License for more details.
* *
* * You should have received a copy of the GNU General Public License
* * along with this program. If not, see <http://www.gnu.org/licenses/>
* * *****************************************************************************
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
* *****************************************************************************
*/
package io.github.dsheirer.module.decode.p25.identifier.channel;
@@ -36,11 +38,13 @@ public class P25ExplicitChannel extends P25Channel implements Comparable<P25Chan
mUplinkChannelNumber = uplinkChannelNumber;
}
@Override
public int getUplinkBandIdentifier()
{
return mUplinkBandIdentifier;
}
@Override
public int getUplinkChannelNumber()
{
return mUplinkChannelNumber;