mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-16 18:47:33 -05:00
This commit is contained in:
@@ -122,7 +122,10 @@ public class P25Channel implements IChannelDescriptor
|
|||||||
@Override
|
@Override
|
||||||
public void setFrequencyBand(IFrequencyBand frequencyBand)
|
public void setFrequencyBand(IFrequencyBand frequencyBand)
|
||||||
{
|
{
|
||||||
mFrequencyBand = frequencyBand;
|
if(frequencyBand.getIdentifier() == getDownlinkBandIdentifier())
|
||||||
|
{
|
||||||
|
mFrequencyBand = frequencyBand;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -206,7 +209,6 @@ public class P25Channel implements IChannelDescriptor
|
|||||||
.append("-")
|
.append("-")
|
||||||
.append(getDownlinkLogicalChannelNumber())
|
.append(getDownlinkLogicalChannelNumber())
|
||||||
.append("/-----");
|
.append("/-----");
|
||||||
return getDownlinkBandIdentifier() + "-" + (getDownlinkLogicalChannelNumber()) + "/-----";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if(isTDMAChannel())
|
if(isTDMAChannel())
|
||||||
|
|||||||
@@ -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
|
* * Copyright (C) 2014-2019 Dennis Sheirer
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* *
|
||||||
* (at your option) any later version.
|
* * 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;
|
package io.github.dsheirer.module.decode.p25.identifier.channel;
|
||||||
@@ -36,11 +38,13 @@ public class P25ExplicitChannel extends P25Channel implements Comparable<P25Chan
|
|||||||
mUplinkChannelNumber = uplinkChannelNumber;
|
mUplinkChannelNumber = uplinkChannelNumber;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
public int getUplinkBandIdentifier()
|
public int getUplinkBandIdentifier()
|
||||||
{
|
{
|
||||||
return mUplinkBandIdentifier;
|
return mUplinkBandIdentifier;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
public int getUplinkChannelNumber()
|
public int getUplinkChannelNumber()
|
||||||
{
|
{
|
||||||
return mUplinkChannelNumber;
|
return mUplinkChannelNumber;
|
||||||
|
|||||||
Reference in New Issue
Block a user