Merge pull request #195 from DSheirer/173-p25-tdma-channel-frequencies-incorrect

Resolves #173 - logging/management of  P25 TDMA channels.
This commit is contained in:
Denny Sheirer
2017-02-12 15:21:50 +00:00
committed by GitHub
53 changed files with 5780 additions and 4601 deletions

View File

@@ -18,6 +18,7 @@
buffers. Bounded queues have ability to enter/exit overflow state when queue buffers. Bounded queues have ability to enter/exit overflow state when queue
size reaches overflow threshold and reset when queue size falls below the reset size reaches overflow threshold and reset when queue size falls below the reset
threshold. Channel state will show OVERFLOW in red/yellow. threshold. Channel state will show OVERFLOW in red/yellow.
- Improves handling of P25 TDMA channels (NO Phase 2 decoder support yet)
- Updated airspy controller for airspy-mini specific sample rate handling. - Updated airspy controller for airspy-mini specific sample rate handling.
- New developer remez filter designer tool and internal usage - New developer remez filter designer tool and internal usage

View File

@@ -19,8 +19,6 @@
package channel.metadata; package channel.metadata;
import alias.Alias; import alias.Alias;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sample.Listener; import sample.Listener;
import java.util.ArrayList; import java.util.ArrayList;
@@ -30,8 +28,6 @@ import java.util.Map;
public class AttributeMonitor<T> public class AttributeMonitor<T>
{ {
private final static Logger mLog = LoggerFactory.getLogger(AttributeMonitor.class);
private Attribute mAttribute; private Attribute mAttribute;
private Listener<AttributeChangeRequest> mListener; private Listener<AttributeChangeRequest> mListener;
private boolean mHeuristicsEnabled = true; private boolean mHeuristicsEnabled = true;
@@ -50,8 +46,8 @@ public class AttributeMonitor<T>
* an internal mapping of values to occurrence counts is updated and a change is emitted once a value that is * an internal mapping of values to occurrence counts is updated and a change is emitted once a value that is
* different from the current value, has a higher occurrence count than the current value. If heuristics are * different from the current value, has a higher occurrence count than the current value. If heuristics are
* disabled, then a change is emitted at each change in the value. * disabled, then a change is emitted at each change in the value.
* @param t
* *
* @param t type
* @return true if the value was changed after processing * @return true if the value was changed after processing
*/ */
public boolean process(T t) public boolean process(T t)
@@ -155,35 +151,4 @@ public class AttributeMonitor<T>
{ {
return mCurrentValue != null; return mCurrentValue != null;
} }
public static void main(String[] args)
{
AttributeMonitor<String> monitor = new AttributeMonitor<>(Attribute.PRIMARY_ADDRESS_TO, new Listener<AttributeChangeRequest>()
{
@Override
public void receive(AttributeChangeRequest attributeChangeRequest)
{
mLog.debug("Attribute Changed - value:" + attributeChangeRequest.getValue());
}
});
monitor.addIllegalValue("0000");
monitor.addIllegalValue("000000");
monitor.process("ABCD");
monitor.process("EFGH");
monitor.process("0000");
monitor.process("0000");
monitor.process("ABCD");
monitor.reset();
monitor.process("EFGH");
monitor.process("ABCD");
monitor.process("ABCD");
monitor.process("EFGH");
monitor.process("EFGH");
monitor.process("000000");
monitor.process("000000");
monitor.process("000000");
monitor.process("000000");
}
} }

View File

@@ -2742,7 +2742,7 @@ public class P25DecoderState extends DecoderState
P25CallEvent event = new P25CallEvent.Builder(CallEventType.PATCH_GROUP_CALL) P25CallEvent event = new P25CallEvent.Builder(CallEventType.PATCH_GROUP_CALL)
.aliasList(getAliasList()) .aliasList(getAliasList())
.channel(channel) .channel(channel + (pgvcg.isTDMAChannel() ? " TDMA" : ""))
.details(details.toString()) .details(details.toString())
.frequency(pgvcg.getDownlinkFrequency()) .frequency(pgvcg.getDownlinkFrequency())
.from(from) .from(from)
@@ -2753,8 +2753,10 @@ public class P25DecoderState extends DecoderState
broadcast(event); broadcast(event);
} }
broadcast(new TrafficChannelAllocationEvent(this, if(!pgvcg.isTDMAChannel())
mChannelCallMap.get(channel))); {
broadcast(new TrafficChannelAllocationEvent(this, mChannelCallMap.get(channel)));
}
break; break;
case PATCH_GROUP_CHANNEL_GRANT_UPDATE: case PATCH_GROUP_CHANNEL_GRANT_UPDATE:
//Cleanup patch groups - auto-expire any patch groups before we allocate a channel //Cleanup patch groups - auto-expire any patch groups before we allocate a channel
@@ -2773,10 +2775,8 @@ public class P25DecoderState extends DecoderState
{ {
P25CallEvent event = new P25CallEvent.Builder(CallEventType.PATCH_GROUP_CALL) P25CallEvent event = new P25CallEvent.Builder(CallEventType.PATCH_GROUP_CALL)
.aliasList(getAliasList()) .aliasList(getAliasList())
.channel(channel) .channel(channel + (gvcgu.isTDMAChannel1() ? " TDMA" : ""))
.details((gvcgu.isEncrypted() ? "ENCRYPTED " : "") + .details((gvcgu.isEncrypted() ? "ENCRYPTED " : ""))
"PATCH UPDATE - GROUP 2:" + gvcgu.getPatchGroupAddress2() +
" DN:" + gvcgu.getDownlinkFrequency2())
.frequency(gvcgu.getDownlinkFrequency1()) .frequency(gvcgu.getDownlinkFrequency1())
.to(to) .to(to)
.build(); .build();
@@ -2785,8 +2785,37 @@ public class P25DecoderState extends DecoderState
broadcast(event); broadcast(event);
} }
broadcast(new TrafficChannelAllocationEvent(this, if(!gvcgu.isTDMAChannel1())
mChannelCallMap.get(channel))); {
broadcast(new TrafficChannelAllocationEvent(this, mChannelCallMap.get(channel)));
}
String channel2 = gvcgu.getChannel2();
String to2 = gvcgu.getPatchGroupAddress2();
if(hasCallEvent(channel2, null, to2))
{
updateCallEvent(channel2, null, to2);
}
else
{
P25CallEvent event = new P25CallEvent.Builder(CallEventType.PATCH_GROUP_CALL)
.aliasList(getAliasList())
.channel(channel2 + (gvcgu.isTDMAChannel2() ? " TDMA" : ""))
.details((gvcgu.isEncrypted() ? "ENCRYPTED " : ""))
.frequency(gvcgu.getDownlinkFrequency2())
.to(to2)
.build();
registerCallEvent(event);
broadcast(event);
}
if(!gvcgu.isTDMAChannel2())
{
broadcast(new TrafficChannelAllocationEvent(this, mChannelCallMap.get(channel2)));
}
break; break;
case PATCH_GROUP_ADD: case PATCH_GROUP_ADD:
PatchGroupAdd pga = (PatchGroupAdd)tsbk; PatchGroupAdd pga = (PatchGroupAdd)tsbk;
@@ -2844,7 +2873,7 @@ public class P25DecoderState extends DecoderState
P25CallEvent event = new P25CallEvent.Builder(CallEventType.DATA_CALL) P25CallEvent event = new P25CallEvent.Builder(CallEventType.DATA_CALL)
.aliasList(getAliasList()) .aliasList(getAliasList())
.channel(channel) .channel(channel + (gdcg.isTDMAChannel() ? " TDMA" : ""))
.details(details.toString()) .details(details.toString())
.frequency(gdcg.getDownlinkFrequency()) .frequency(gdcg.getDownlinkFrequency())
.from(from) .from(from)
@@ -2855,7 +2884,7 @@ public class P25DecoderState extends DecoderState
broadcast(event); broadcast(event);
} }
if(!mIgnoreDataCalls) if(!mIgnoreDataCalls && !gdcg.isTDMAChannel())
{ {
broadcast(new TrafficChannelAllocationEvent(this, broadcast(new TrafficChannelAllocationEvent(this,
mChannelCallMap.get(channel))); mChannelCallMap.get(channel)));
@@ -2882,7 +2911,7 @@ public class P25DecoderState extends DecoderState
P25CallEvent event = new P25CallEvent.Builder(CallEventType.GROUP_CALL) P25CallEvent event = new P25CallEvent.Builder(CallEventType.GROUP_CALL)
.aliasList(getAliasList()) .aliasList(getAliasList())
.channel(channel) .channel(channel + (gvcg.isTDMAChannel() ? " TDMA" : ""))
.details(details.toString()) .details(details.toString())
.frequency(gvcg.getDownlinkFrequency()) .frequency(gvcg.getDownlinkFrequency())
.from(from) .from(from)
@@ -2893,8 +2922,10 @@ public class P25DecoderState extends DecoderState
broadcast(event); broadcast(event);
} }
broadcast(new TrafficChannelAllocationEvent(this, if(!gvcg.isTDMAChannel())
mChannelCallMap.get(channel))); {
broadcast(new TrafficChannelAllocationEvent(this, mChannelCallMap.get(channel)));
}
break; break;
case GROUP_VOICE_CHANNEL_GRANT_UPDATE: case GROUP_VOICE_CHANNEL_GRANT_UPDATE:
GroupVoiceChannelGrantUpdate gvcgu = GroupVoiceChannelGrantUpdate gvcgu =
@@ -2918,8 +2949,7 @@ public class P25DecoderState extends DecoderState
P25CallEvent event = new P25CallEvent.Builder(CallEventType.GROUP_CALL) P25CallEvent event = new P25CallEvent.Builder(CallEventType.GROUP_CALL)
.aliasList(getAliasList()) .aliasList(getAliasList())
.channel(channel) .channel(gvcgu.getChannel1() + (gvcgu.isTDMAChannel1() ? " TDMA" : ""))
.channel(gvcgu.getChannel1())
.details(details.toString()) .details(details.toString())
.frequency(gvcgu.getDownlinkFrequency1()) .frequency(gvcgu.getDownlinkFrequency1())
.from(from) .from(from)
@@ -2930,8 +2960,10 @@ public class P25DecoderState extends DecoderState
broadcast(event); broadcast(event);
} }
broadcast(new TrafficChannelAllocationEvent(this, if(!gvcgu.isTDMAChannel1())
mChannelCallMap.get(channel))); {
broadcast(new TrafficChannelAllocationEvent(this, mChannelCallMap.get(channel)));
}
if(gvcgu.hasChannelNumber2()) if(gvcgu.hasChannelNumber2())
{ {
@@ -2952,7 +2984,7 @@ public class P25DecoderState extends DecoderState
P25CallEvent event2 = new P25CallEvent.Builder(CallEventType.GROUP_CALL) P25CallEvent event2 = new P25CallEvent.Builder(CallEventType.GROUP_CALL)
.aliasList(getAliasList()) .aliasList(getAliasList())
.channel(gvcgu.getChannel2()) .channel(gvcgu.getChannel2() + (gvcgu.isTDMAChannel2() ? " TDMA" : ""))
.details(details.toString()) .details(details.toString())
.frequency(gvcgu.getDownlinkFrequency2()) .frequency(gvcgu.getDownlinkFrequency2())
.to(gvcgu.getGroupAddress2()) .to(gvcgu.getGroupAddress2())
@@ -2962,8 +2994,10 @@ public class P25DecoderState extends DecoderState
broadcast(event2); broadcast(event2);
} }
broadcast(new TrafficChannelAllocationEvent(this, if(!gvcgu.isTDMAChannel2())
mChannelCallMap.get(channel))); {
broadcast(new TrafficChannelAllocationEvent(this, mChannelCallMap.get(channel)));
}
} }
break; break;
case GROUP_VOICE_CHANNEL_GRANT_UPDATE_EXPLICIT: case GROUP_VOICE_CHANNEL_GRANT_UPDATE_EXPLICIT:
@@ -2989,7 +3023,7 @@ public class P25DecoderState extends DecoderState
P25CallEvent event = new P25CallEvent.Builder(CallEventType.GROUP_CALL) P25CallEvent event = new P25CallEvent.Builder(CallEventType.GROUP_CALL)
.aliasList(getAliasList()) .aliasList(getAliasList())
.channel(channel) .channel(channel + (gvcgue.isTDMAChannel() ? " TDMA" : ""))
.details(details.toString()) .details(details.toString())
.frequency(gvcgue.getDownlinkFrequency()) .frequency(gvcgue.getDownlinkFrequency())
.from(from) .from(from)
@@ -3000,8 +3034,10 @@ public class P25DecoderState extends DecoderState
broadcast(event); broadcast(event);
} }
broadcast(new TrafficChannelAllocationEvent(this, if(!gvcgue.isTDMAChannel())
mChannelCallMap.get(channel))); {
broadcast(new TrafficChannelAllocationEvent(this, mChannelCallMap.get(channel)));
}
break; break;
case INDIVIDUAL_DATA_CHANNEL_GRANT: case INDIVIDUAL_DATA_CHANNEL_GRANT:
IndividualDataChannelGrant idcg = (IndividualDataChannelGrant)message; IndividualDataChannelGrant idcg = (IndividualDataChannelGrant)message;
@@ -3024,7 +3060,7 @@ public class P25DecoderState extends DecoderState
P25CallEvent event = new P25CallEvent.Builder(CallEventType.DATA_CALL) P25CallEvent event = new P25CallEvent.Builder(CallEventType.DATA_CALL)
.aliasList(getAliasList()) .aliasList(getAliasList())
.channel(channel) .channel(channel + (idcg.isTDMAChannel() ? " TDMA" : ""))
.details(details.toString()) .details(details.toString())
.frequency(idcg.getDownlinkFrequency()) .frequency(idcg.getDownlinkFrequency())
.from(from) .from(from)
@@ -3035,10 +3071,9 @@ public class P25DecoderState extends DecoderState
broadcast(event); broadcast(event);
} }
if(!mIgnoreDataCalls) if(!mIgnoreDataCalls && !idcg.isTDMAChannel())
{ {
broadcast(new TrafficChannelAllocationEvent(this, broadcast(new TrafficChannelAllocationEvent(this, mChannelCallMap.get(channel)));
mChannelCallMap.get(channel)));
} }
break; break;
case SNDCP_DATA_CHANNEL_GRANT: case SNDCP_DATA_CHANNEL_GRANT:
@@ -3061,7 +3096,7 @@ public class P25DecoderState extends DecoderState
P25CallEvent event = new P25CallEvent.Builder(CallEventType.DATA_CALL) P25CallEvent event = new P25CallEvent.Builder(CallEventType.DATA_CALL)
.aliasList(getAliasList()) .aliasList(getAliasList())
.channel(channel) .channel(channel + (sdcg.isTDMAChannel() ? " TDMA" : ""))
.details(details.toString()) .details(details.toString())
.frequency(sdcg.getDownlinkFrequency()) .frequency(sdcg.getDownlinkFrequency())
.from(from) .from(from)
@@ -3072,15 +3107,13 @@ public class P25DecoderState extends DecoderState
broadcast(event); broadcast(event);
} }
if(!mIgnoreDataCalls) if(!mIgnoreDataCalls && !sdcg.isTDMAChannel())
{ {
broadcast(new TrafficChannelAllocationEvent(this, broadcast(new TrafficChannelAllocationEvent(this, mChannelCallMap.get(channel)));
mChannelCallMap.get(channel)));
} }
break; break;
case TELEPHONE_INTERCONNECT_VOICE_CHANNEL_GRANT: case TELEPHONE_INTERCONNECT_VOICE_CHANNEL_GRANT:
TelephoneInterconnectVoiceChannelGrant tivcg = TelephoneInterconnectVoiceChannelGrant tivcg = (TelephoneInterconnectVoiceChannelGrant)message;
(TelephoneInterconnectVoiceChannelGrant)message;
channel = tivcg.getChannel(); channel = tivcg.getChannel();
from = null; from = null;
@@ -3104,7 +3137,7 @@ public class P25DecoderState extends DecoderState
P25CallEvent event = new P25CallEvent.Builder( P25CallEvent event = new P25CallEvent.Builder(
CallEventType.TELEPHONE_INTERCONNECT) CallEventType.TELEPHONE_INTERCONNECT)
.aliasList(getAliasList()) .aliasList(getAliasList())
.channel(channel) .channel(channel + (tivcg.isTDMAChannel() ? " TDMA" : ""))
.details(details.toString()) .details(details.toString())
.frequency(tivcg.getDownlinkFrequency()) .frequency(tivcg.getDownlinkFrequency())
.from(from) .from(from)
@@ -3115,15 +3148,15 @@ public class P25DecoderState extends DecoderState
broadcast(event); broadcast(event);
} }
broadcast(new TrafficChannelAllocationEvent(this, if(!tivcg.isTDMAChannel())
mChannelCallMap.get(channel))); {
broadcast(new TrafficChannelAllocationEvent(this, mChannelCallMap.get(channel)));
}
break; break;
case TELEPHONE_INTERCONNECT_VOICE_CHANNEL_GRANT_UPDATE: case TELEPHONE_INTERCONNECT_VOICE_CHANNEL_GRANT_UPDATE:
TelephoneInterconnectVoiceChannelGrantUpdate tivcgu = TelephoneInterconnectVoiceChannelGrantUpdate tivcgu = (TelephoneInterconnectVoiceChannelGrantUpdate)message;
(TelephoneInterconnectVoiceChannelGrantUpdate)message;
channel = tivcgu.getChannelIdentifier() + "-" + channel = tivcgu.getChannelIdentifier() + "-" + tivcgu.getChannelNumber();
tivcgu.getChannelNumber();
from = null; from = null;
/* Address is ambiguous and could mean either source or target, /* Address is ambiguous and could mean either source or target,
@@ -3146,7 +3179,7 @@ public class P25DecoderState extends DecoderState
P25CallEvent event = new P25CallEvent.Builder( P25CallEvent event = new P25CallEvent.Builder(
CallEventType.TELEPHONE_INTERCONNECT) CallEventType.TELEPHONE_INTERCONNECT)
.aliasList(getAliasList()) .aliasList(getAliasList())
.channel(channel) .channel(channel + (tivcgu.isTDMAChannel() ? " TDMA" : ""))
.details(details.toString()) .details(details.toString())
.frequency(tivcgu.getDownlinkFrequency()) .frequency(tivcgu.getDownlinkFrequency())
.from(from) .from(from)
@@ -3157,15 +3190,15 @@ public class P25DecoderState extends DecoderState
broadcast(event); broadcast(event);
} }
broadcast(new TrafficChannelAllocationEvent(this, if(!tivcgu.isTDMAChannel())
mChannelCallMap.get(channel))); {
broadcast(new TrafficChannelAllocationEvent(this, mChannelCallMap.get(channel)));
}
break; break;
case UNIT_TO_UNIT_VOICE_CHANNEL_GRANT: case UNIT_TO_UNIT_VOICE_CHANNEL_GRANT:
UnitToUnitVoiceChannelGrant uuvcg = UnitToUnitVoiceChannelGrant uuvcg = (UnitToUnitVoiceChannelGrant)message;
(UnitToUnitVoiceChannelGrant)message;
channel = uuvcg.getChannelIdentifier() + "-" + channel = uuvcg.getChannelIdentifier() + "-" + uuvcg.getChannelNumber();
uuvcg.getChannelNumber();
from = uuvcg.getSourceAddress(); from = uuvcg.getSourceAddress();
to = uuvcg.getTargetAddress(); to = uuvcg.getTargetAddress();
@@ -3184,7 +3217,7 @@ public class P25DecoderState extends DecoderState
P25CallEvent event = new P25CallEvent.Builder( P25CallEvent event = new P25CallEvent.Builder(
CallEventType.UNIT_TO_UNIT_CALL) CallEventType.UNIT_TO_UNIT_CALL)
.aliasList(getAliasList()) .aliasList(getAliasList())
.channel(channel) .channel(channel + (uuvcg.isTDMAChannel() ? " TDMA" : ""))
.details(details.toString()) .details(details.toString())
.frequency(uuvcg.getDownlinkFrequency()) .frequency(uuvcg.getDownlinkFrequency())
.from(from) .from(from)
@@ -3195,15 +3228,15 @@ public class P25DecoderState extends DecoderState
broadcast(event); broadcast(event);
} }
broadcast(new TrafficChannelAllocationEvent(this, if(!uuvcg.isTDMAChannel())
mChannelCallMap.get(channel))); {
broadcast(new TrafficChannelAllocationEvent(this, mChannelCallMap.get(channel)));
}
break; break;
case UNIT_TO_UNIT_VOICE_CHANNEL_GRANT_UPDATE: case UNIT_TO_UNIT_VOICE_CHANNEL_GRANT_UPDATE:
UnitToUnitVoiceChannelGrantUpdate uuvcgu = UnitToUnitVoiceChannelGrantUpdate uuvcgu = (UnitToUnitVoiceChannelGrantUpdate)message;
(UnitToUnitVoiceChannelGrantUpdate)message;
channel = uuvcgu.getChannelIdentifier() + "-" + channel = uuvcgu.getChannelIdentifier() + "-" + uuvcgu.getChannelNumber();
uuvcgu.getChannelNumber();
from = uuvcgu.getSourceAddress(); from = uuvcgu.getSourceAddress();
to = uuvcgu.getTargetAddress(); to = uuvcgu.getTargetAddress();
@@ -3222,7 +3255,7 @@ public class P25DecoderState extends DecoderState
P25CallEvent event = new P25CallEvent.Builder( P25CallEvent event = new P25CallEvent.Builder(
CallEventType.UNIT_TO_UNIT_CALL) CallEventType.UNIT_TO_UNIT_CALL)
.aliasList(getAliasList()) .aliasList(getAliasList())
.channel(channel) .channel(channel + (uuvcgu.isTDMAChannel() ? " TDMA" : ""))
.details(details.toString()) .details(details.toString())
.frequency(uuvcgu.getDownlinkFrequency()) .frequency(uuvcgu.getDownlinkFrequency())
.from(from) .from(from)
@@ -3233,8 +3266,10 @@ public class P25DecoderState extends DecoderState
broadcast(event); broadcast(event);
} }
broadcast(new TrafficChannelAllocationEvent(this, if(!uuvcgu.isTDMAChannel())
mChannelCallMap.get(channel))); {
broadcast(new TrafficChannelAllocationEvent(this, mChannelCallMap.get(channel)));
}
break; break;
default: default:
break; break;

View File

@@ -1,3 +1,21 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 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/>
*
******************************************************************************/
package module.decode.p25.message; package module.decode.p25.message;
public interface IBandIdentifier public interface IBandIdentifier
@@ -29,4 +47,18 @@ public interface IBandIdentifier
*/ */
public abstract long getTransmitOffset(); public abstract long getTransmitOffset();
/**
* Downlink (tower to mobile) Frequency for the specified channel
*/
public abstract long getDownlinkFrequency(int channelNumber);
/**
* Uplink (mobile to tower) Frequency for the specified channel
*/
public abstract long getUplinkFrequency(int channelNumber);
/**
* Indicates if this band is an FDMA (false) or TDMA (true) band
*/
public boolean isTDMA();
} }

View File

@@ -1,14 +1,32 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 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/>
*
******************************************************************************/
package module.decode.p25.message; package module.decode.p25.message;
import java.text.SimpleDateFormat;
import map.Plottable;
import message.Message;
import module.decode.p25.reference.DataUnitID;
import alias.Alias; import alias.Alias;
import alias.AliasList; import alias.AliasList;
import bits.BinaryMessage; import bits.BinaryMessage;
import edac.CRC; import edac.CRC;
import map.Plottable;
import message.Message;
import module.decode.p25.reference.DataUnitID;
import java.text.SimpleDateFormat;
public class P25Message extends Message public class P25Message extends Message
{ {
@@ -17,12 +35,10 @@ public class P25Message extends Message
public static final int[] NAC = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}; public static final int[] NAC = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11};
public static final int[] DUID = {12, 13, 14, 15}; public static final int[] DUID = {12, 13, 14, 15};
public static final int[] BCH = { 16,17,18,19,20,21,22,23,24,25,26,27,28,29, public static final int[] BCH = {16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63};
54,55,56,57,58,59,60,61,62,63 };
protected SimpleDateFormat mTimeDurationFormat = protected SimpleDateFormat mTimeDurationFormat = new SimpleDateFormat("HH:mm:ss.SSS");
new SimpleDateFormat( "HH:mm:ss.SSS");
protected BinaryMessage mMessage; protected BinaryMessage mMessage;
protected DataUnitID mDUID; protected DataUnitID mDUID;
@@ -30,9 +46,7 @@ public class P25Message extends Message
protected CRC[] mCRC; protected CRC[] mCRC;
public P25Message( BinaryMessage message, public P25Message(BinaryMessage message, DataUnitID duid, AliasList aliasList)
DataUnitID duid,
AliasList aliasList )
{ {
super(); super();
@@ -171,44 +185,4 @@ public class P25Message extends Message
return true; return true;
} }
/**
* Calculates the frequency of the uplink channel using the channel number
* and the IdentifierUpdate message.
*
* @param iden - Identifier Update message
* @param channel - channel number
* @return - frequency in Hertz
*/
protected static long calculateUplink( IBandIdentifier iden, int channel )
{
long downlink = calculateDownlink( iden, channel );
if( downlink > 0 && iden != null )
{
return downlink + iden.getTransmitOffset();
}
return 0;
}
/**
* Calculates the frequency of the downlink channel using the channel number
* and the IdentifierUpdate message.
*
* @param iden - Identifier Update message
* @param channel - channel number
* @return - frequency in Hertz
*/
protected static long calculateDownlink( IBandIdentifier iden, int channel )
{
if( iden != null )
{
return iden.getBaseFrequency() +
( channel * iden.getChannelSpacing() );
}
return 0;
}
} }

View File

@@ -1,3 +1,21 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 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/>
*
******************************************************************************/
package module.decode.p25.message.ldu.lc; package module.decode.p25.message.ldu.lc;
import module.decode.p25.message.IAdjacentSite; import module.decode.p25.message.IAdjacentSite;
@@ -7,19 +25,15 @@ import module.decode.p25.message.ldu.LDU1Message;
import module.decode.p25.message.tsbk.osp.control.SystemService; import module.decode.p25.message.tsbk.osp.control.SystemService;
import module.decode.p25.reference.LinkControlOpcode; import module.decode.p25.reference.LinkControlOpcode;
public class AdjacentSiteStatusBroadcast extends LDU1Message public class AdjacentSiteStatusBroadcast extends LDU1Message implements IdentifierReceiver, IAdjacentSite
implements IdentifierReceiver, IAdjacentSite
{ {
public static final int[] LRA = {364, 365, 366, 367, 372, 373, 374, 375}; public static final int[] LRA = {364, 365, 366, 367, 372, 373, 374, 375};
public static final int[] SYSTEM_ID = { 384,385,386,387,536,537,538,539,540, public static final int[] SYSTEM_ID = {384, 385, 386, 387, 536, 537, 538, 539, 540, 541, 546, 547};
541,546,547 };
public static final int[] RFSS_ID = {548, 549, 550, 551, 556, 557, 558, 559}; public static final int[] RFSS_ID = {548, 549, 550, 551, 556, 557, 558, 559};
public static final int[] SITE_ID = {560, 561, 566, 567, 568, 569, 570, 571}; public static final int[] SITE_ID = {560, 561, 566, 567, 568, 569, 570, 571};
public static final int[] IDENTIFIER = {720, 721, 722, 723}; public static final int[] IDENTIFIER = {720, 721, 722, 723};
public static final int[] CHANNEL = { 724,725,730,731,732,733,734,735,740, public static final int[] CHANNEL = {724, 725, 730, 731, 732, 733, 734, 735, 740, 741, 742, 743};
741,742,743 }; public static final int[] SYSTEM_SERVICE_CLASS = {744, 745, 750, 751, 752, 753, 754, 755};
public static final int[] SYSTEM_SERVICE_CLASS = { 744,745,750,751,752,753,
754,755 };
private IBandIdentifier mIdentifierUpdate; private IBandIdentifier mIdentifierUpdate;
@@ -138,11 +152,21 @@ public class AdjacentSiteStatusBroadcast extends LDU1Message
public long getDownlinkFrequency() public long getDownlinkFrequency()
{ {
return calculateDownlink( mIdentifierUpdate, getChannelNumber() ); if(mIdentifierUpdate != null)
{
return mIdentifierUpdate.getDownlinkFrequency(getChannelNumber());
}
return 0;
} }
public long getUplinkFrequency() public long getUplinkFrequency()
{ {
return calculateUplink( mIdentifierUpdate, getChannelNumber() ); if(mIdentifierUpdate != null)
{
return mIdentifierUpdate.getUplinkFrequency(getChannelNumber());
}
return 0;
} }
} }

View File

@@ -1,3 +1,21 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 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/>
*
******************************************************************************/
package module.decode.p25.message.ldu.lc; package module.decode.p25.message.ldu.lc;
import module.decode.p25.message.IAdjacentSite; import module.decode.p25.message.IAdjacentSite;
@@ -6,19 +24,15 @@ import module.decode.p25.message.IdentifierReceiver;
import module.decode.p25.message.ldu.LDU1Message; import module.decode.p25.message.ldu.LDU1Message;
import module.decode.p25.reference.LinkControlOpcode; import module.decode.p25.reference.LinkControlOpcode;
public class AdjacentSiteStatusBroadcastExplicit extends LDU1Message public class AdjacentSiteStatusBroadcastExplicit extends LDU1Message implements IdentifierReceiver, IAdjacentSite
implements IdentifierReceiver, IAdjacentSite
{ {
public static final int[] LRA = {364, 365, 366, 367, 372, 373, 374, 375}; public static final int[] LRA = {364, 365, 366, 367, 372, 373, 374, 375};
public static final int[] TRANSMIT_IDENTIFIER = {376, 377, 382, 383}; public static final int[] TRANSMIT_IDENTIFIER = {376, 377, 382, 383};
public static final int[] TRANSMIT_CHANNEL = { 384,385,386,387,536,537,538, public static final int[] TRANSMIT_CHANNEL = {384, 385, 386, 387, 536, 537, 538, 539, 540, 541, 546, 547};
539,540,541,546,547 };
public static final int[] RFSS_ID = {548, 549, 550, 551, 556, 557, 558, 559}; public static final int[] RFSS_ID = {548, 549, 550, 551, 556, 557, 558, 559};
public static final int[] SITE_ID = {560, 561, 566, 567, 568, 569, 570, 571}; public static final int[] SITE_ID = {560, 561, 566, 567, 568, 569, 570, 571};
public static final int[] RECEIVE_IDENTIFIER = {720, 721, 722, 723}; public static final int[] RECEIVE_IDENTIFIER = {720, 721, 722, 723};
public static final int[] RECEIVE_CHANNEL = { 724,725,730,731,732,733,734, public static final int[] RECEIVE_CHANNEL = {724, 725, 730, 731, 732, 733, 734, 735, 740, 741, 742, 743};
735,740,741,742,743 };
private IBandIdentifier mTransmitBand; private IBandIdentifier mTransmitBand;
private IBandIdentifier mReceiveBand; private IBandIdentifier mReceiveBand;
@@ -123,12 +137,22 @@ public class AdjacentSiteStatusBroadcastExplicit extends LDU1Message
public long getDownlinkFrequency() public long getDownlinkFrequency()
{ {
return calculateDownlink( mTransmitBand, getTransmitChannel() ); if(mTransmitBand != null)
{
return mTransmitBand.getDownlinkFrequency(getTransmitChannel());
}
return 0;
} }
public long getUplinkFrequency() public long getUplinkFrequency()
{ {
return calculateUplink( mReceiveBand, getReceiveChannel() ); if(mReceiveBand != null)
{
return mReceiveBand.getUplinkFrequency(getReceiveChannel());
}
return 0;
} }
@Override @Override

View File

@@ -1,11 +1,28 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 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/>
*
******************************************************************************/
package module.decode.p25.message.ldu.lc; package module.decode.p25.message.ldu.lc;
import module.decode.p25.message.IBandIdentifier; import module.decode.p25.message.IBandIdentifier;
import module.decode.p25.message.ldu.LDU1Message; import module.decode.p25.message.ldu.LDU1Message;
import module.decode.p25.reference.LinkControlOpcode; import module.decode.p25.reference.LinkControlOpcode;
public class ChannelIdentifierUpdate extends LDU1Message public class ChannelIdentifierUpdate extends LDU1Message implements IBandIdentifier
implements IBandIdentifier
{ {
public static final int[] IDENTIFIER = {364, 365, 366, 367}; public static final int[] IDENTIFIER = {364, 365, 366, 367};
public static final int[] BANDWIDTH = {372, 373, 374, 375, 376, 377, 382, 383, 384}; public static final int[] BANDWIDTH = {372, 373, 374, 375, 376, 377, 382, 383, 384};
@@ -80,4 +97,22 @@ public class ChannelIdentifierUpdate extends LDU1Message
{ {
return -1 * mMessage.getLong(TRANSMIT_OFFSET) * 250000l; return -1 * mMessage.getLong(TRANSMIT_OFFSET) * 250000l;
} }
@Override
public long getDownlinkFrequency(int channelNumber)
{
return getBaseFrequency() + (channelNumber * getChannelSpacing());
}
@Override
public long getUplinkFrequency(int channelNumber)
{
return getDownlinkFrequency(channelNumber) + getTransmitOffset();
}
@Override
public boolean isTDMA()
{
return false;
}
} }

View File

@@ -4,8 +4,7 @@ import module.decode.p25.message.IBandIdentifier;
import module.decode.p25.message.ldu.LDU1Message; import module.decode.p25.message.ldu.LDU1Message;
import module.decode.p25.reference.LinkControlOpcode; import module.decode.p25.reference.LinkControlOpcode;
public class ChannelIdentifierUpdateExplicit extends LDU1Message public class ChannelIdentifierUpdateExplicit extends LDU1Message implements IBandIdentifier
implements IBandIdentifier
{ {
public static final int[] IDENTIFIER = { 364,365,366,367 }; public static final int[] IDENTIFIER = { 364,365,366,367 };
public static final int[] BANDWIDTH = { 372,373,374,375 }; public static final int[] BANDWIDTH = { 372,373,374,375 };
@@ -80,4 +79,22 @@ public class ChannelIdentifierUpdateExplicit extends LDU1Message
{ {
return -1 * mMessage.getLong( TRANSMIT_OFFSET ) * 250000l; return -1 * mMessage.getLong( TRANSMIT_OFFSET ) * 250000l;
} }
@Override
public long getDownlinkFrequency(int channelNumber)
{
return getBaseFrequency() + ( channelNumber * getChannelSpacing() );
}
@Override
public long getUplinkFrequency(int channelNumber)
{
return getDownlinkFrequency(channelNumber) + getTransmitOffset();
}
@Override
public boolean isTDMA()
{
return false;
}
} }

View File

@@ -1,3 +1,21 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 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/>
*
******************************************************************************/
package module.decode.p25.message.ldu.lc; package module.decode.p25.message.ldu.lc;
import module.decode.p25.message.IBandIdentifier; import module.decode.p25.message.IBandIdentifier;
@@ -5,25 +23,16 @@ import module.decode.p25.message.IdentifierReceiver;
import module.decode.p25.message.ldu.LDU1Message; import module.decode.p25.message.ldu.LDU1Message;
import module.decode.p25.reference.LinkControlOpcode; import module.decode.p25.reference.LinkControlOpcode;
import org.slf4j.Logger; public class GroupVoiceChannelUpdate extends LDU1Message implements IdentifierReceiver
import org.slf4j.LoggerFactory;
public class GroupVoiceChannelUpdate extends LDU1Message
implements IdentifierReceiver
{ {
private final static Logger mLog =
LoggerFactory.getLogger( GroupVoiceChannelUpdate.class );
public static final int[] IDENTIFIER_A = {364, 365, 366, 367}; public static final int[] IDENTIFIER_A = {364, 365, 366, 367};
public static final int[] CHANNEL_A = { 372,373,374,375,376,377,382,383,384, public static final int[] CHANNEL_A = {372, 373, 374, 375, 376, 377, 382, 383, 384, 385, 386, 387};
385,386,387 }; public static final int[] GROUP_ADDRESS_A = {536, 537, 538, 539, 540, 541, 546, 547, 548, 549, 550, 551, 556, 557,
public static final int[] GROUP_ADDRESS_A = { 536,537,538,539,540,541,546, 558, 559};
547,548,549,550,551,556,557,558,559 };
public static final int[] IDENTIFIER_B = {560, 561, 566, 567}; public static final int[] IDENTIFIER_B = {560, 561, 566, 567};
public static final int[] CHANNEL_B = { 568,569,570,571,720,721,722,723,724, public static final int[] CHANNEL_B = {568, 569, 570, 571, 720, 721, 722, 723, 724, 725, 730, 731};
725,730,731 }; public static final int[] GROUP_ADDRESS_B = {732, 733, 734, 735, 740, 741, 742, 743, 744, 745, 750, 751, 752, 753,
public static final int[] GROUP_ADDRESS_B = { 732,733,734,735,740,741,742, 754, 755};
743,744,745,750,751,752,753,754,755 };
private IBandIdentifier mIdentifierUpdateA; private IBandIdentifier mIdentifierUpdateA;
private IBandIdentifier mIdentifierUpdateB; private IBandIdentifier mIdentifierUpdateB;
@@ -140,21 +149,41 @@ public class GroupVoiceChannelUpdate extends LDU1Message
public long getDownlinkFrequencyA() public long getDownlinkFrequencyA()
{ {
return calculateDownlink( mIdentifierUpdateA, getChannelNumberA() ); if(mIdentifierUpdateA != null)
{
return mIdentifierUpdateA.getDownlinkFrequency(getChannelNumberA());
}
return 0;
} }
public long getUplinkFrequencyA() public long getUplinkFrequencyA()
{ {
return calculateUplink( mIdentifierUpdateA, getChannelNumberA() ); if(mIdentifierUpdateA != null)
{
return mIdentifierUpdateA.getUplinkFrequency(getChannelNumberA());
}
return 0;
} }
public long getDownlinkFrequencyB() public long getDownlinkFrequencyB()
{ {
return calculateDownlink( mIdentifierUpdateB, getChannelNumberA() ); if(mIdentifierUpdateB != null)
{
return mIdentifierUpdateB.getDownlinkFrequency(getChannelNumberB());
}
return 0;
} }
public long getUplinkFrequencyB() public long getUplinkFrequencyB()
{ {
return calculateUplink( mIdentifierUpdateB, getChannelNumberA() ); if(mIdentifierUpdateB != null)
{
return mIdentifierUpdateB.getUplinkFrequency(getChannelNumberB());
}
return 0;
} }
} }

View File

@@ -1,3 +1,21 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 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/>
*
******************************************************************************/
package module.decode.p25.message.ldu.lc; package module.decode.p25.message.ldu.lc;
import module.decode.p25.message.IBandIdentifier; import module.decode.p25.message.IBandIdentifier;
@@ -5,27 +23,17 @@ import module.decode.p25.message.IdentifierReceiver;
import module.decode.p25.message.ldu.LDU1Message; import module.decode.p25.message.ldu.LDU1Message;
import module.decode.p25.reference.LinkControlOpcode; import module.decode.p25.reference.LinkControlOpcode;
import org.slf4j.Logger; public class GroupVoiceChannelUpdateExplicit extends LDU1Message implements IdentifierReceiver
import org.slf4j.LoggerFactory;
public class GroupVoiceChannelUpdateExplicit extends LDU1Message
implements IdentifierReceiver
{ {
private final static Logger mLog =
LoggerFactory.getLogger( GroupVoiceChannelUpdateExplicit.class );
public static final int EMERGENCY_FLAG = 376; public static final int EMERGENCY_FLAG = 376;
public static final int ENCRYPTED_CHANNEL_FLAG = 377; public static final int ENCRYPTED_CHANNEL_FLAG = 377;
public static final int DUPLEX_MODE = 382; public static final int DUPLEX_MODE = 382;
public static final int SESSION_MODE = 383; public static final int SESSION_MODE = 383;
public static final int[] GROUP_ADDRESS = { 536,537,538,539,540,541,546,547, public static final int[] GROUP_ADDRESS = {536, 537, 538, 539, 540, 541, 546, 547, 548, 549, 550, 551, 556, 557, 558, 559};
548,549,550,551,556,557,558,559 };
public static final int[] TRANSMIT_IDENTIFIER = {560, 561, 566, 567}; public static final int[] TRANSMIT_IDENTIFIER = {560, 561, 566, 567};
public static final int[] TRANSMIT_CHANNEL = { 568,569,570,571,720,721,722, public static final int[] TRANSMIT_CHANNEL = {568, 569, 570, 571, 720, 721, 722, 723, 724, 725, 730, 731};
723,724,725,730,731 };
public static final int[] RECEIVE_IDENTIFIER = {732, 733, 734, 735}; public static final int[] RECEIVE_IDENTIFIER = {732, 733, 734, 735};
public static final int[] RECEIVE_CHANNEL = { 740,741,742,743,744,745,750, public static final int[] RECEIVE_CHANNEL = {740, 741, 742, 743, 744, 745, 750, 751, 752, 753, 754, 755};
751,752,753,754,755 };
private IBandIdentifier mTransmitIdentifierUpdate; private IBandIdentifier mTransmitIdentifierUpdate;
private IBandIdentifier mReceiveIdentifierUpdate; private IBandIdentifier mReceiveIdentifierUpdate;
@@ -143,13 +151,21 @@ public class GroupVoiceChannelUpdateExplicit extends LDU1Message
public long getDownlinkFrequency() public long getDownlinkFrequency()
{ {
return calculateDownlink( mTransmitIdentifierUpdate, if(mTransmitIdentifierUpdate != null)
getTransmitChannelNumber() ); {
return mTransmitIdentifierUpdate.getDownlinkFrequency(getTransmitChannelNumber());
}
return 0;
} }
public long getUplinkFrequency() public long getUplinkFrequency()
{ {
return calculateUplink( mReceiveIdentifierUpdate, if(mReceiveIdentifierUpdate != null)
getReceiveChannelNumber() ); {
return mReceiveIdentifierUpdate.getUplinkFrequency(getReceiveChannelNumber());
}
return 0;
} }
} }

View File

@@ -1,3 +1,21 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 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/>
*
******************************************************************************/
package module.decode.p25.message.ldu.lc; package module.decode.p25.message.ldu.lc;
import module.decode.p25.message.IBandIdentifier; import module.decode.p25.message.IBandIdentifier;
@@ -6,23 +24,14 @@ import module.decode.p25.message.ldu.LDU1Message;
import module.decode.p25.reference.LinkControlOpcode; import module.decode.p25.reference.LinkControlOpcode;
import module.decode.p25.reference.Service; import module.decode.p25.reference.Service;
import org.slf4j.Logger; public class NetworkStatusBroadcast extends LDU1Message implements IdentifierReceiver
import org.slf4j.LoggerFactory;
public class NetworkStatusBroadcast extends LDU1Message
implements IdentifierReceiver
{ {
private final static Logger mLog = public static final int[] NETWORK_ID = {376, 377, 382, 383, 384, 385, 386, 387, 536, 537, 538, 539, 540, 541, 546,
LoggerFactory.getLogger( NetworkStatusBroadcast.class ); 547, 548, 549, 550, 551};
public static final int[] NETWORK_ID = { 376,377,382,383,384,385,386,387, public static final int[] SYSTEM_ID = {556, 557, 558, 559, 560, 561, 566, 567, 568, 569, 570, 571};
536,537,538,539,540,541,546,547,548,549,550,551 };
public static final int[] SYSTEM_ID = { 556,557,558,559,560,561,566,567,568,
569,570,571 };
public static final int[] IDENTIFIER = {720, 721, 722, 723}; public static final int[] IDENTIFIER = {720, 721, 722, 723};
public static final int[] CHANNEL = { 724,725,730,731,732,733,734,735,740, public static final int[] CHANNEL = {724, 725, 730, 731, 732, 733, 734, 735, 740, 741, 742, 743};
741,742,743 }; public static final int[] SYSTEM_SERVICE_CLASS = {744, 745, 750, 751, 752, 753, 754, 755};
public static final int[] SYSTEM_SERVICE_CLASS = { 744,745,750,751,752,753,
754,755 };
private IBandIdentifier mIdentifierUpdate; private IBandIdentifier mIdentifierUpdate;
@@ -100,11 +109,21 @@ public class NetworkStatusBroadcast extends LDU1Message
public long getDownlinkFrequency() public long getDownlinkFrequency()
{ {
return calculateDownlink( mIdentifierUpdate, getChannelNumber() ); if(mIdentifierUpdate != null)
{
return mIdentifierUpdate.getDownlinkFrequency(getChannelNumber());
}
return 0;
} }
public long getUplinkFrequency() public long getUplinkFrequency()
{ {
return calculateUplink( mIdentifierUpdate, getChannelNumber() ); if(mIdentifierUpdate != null)
{
return mIdentifierUpdate.getUplinkFrequency(getChannelNumber());
}
return 0;
} }
} }

View File

@@ -1,28 +1,39 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 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/>
*
******************************************************************************/
package module.decode.p25.message.ldu.lc; package module.decode.p25.message.ldu.lc;
import module.decode.p25.message.IBandIdentifier; import module.decode.p25.message.IBandIdentifier;
import module.decode.p25.message.IdentifierReceiver; import module.decode.p25.message.IdentifierReceiver;
import module.decode.p25.message.ldu.LDU1Message; import module.decode.p25.message.ldu.LDU1Message;
import module.decode.p25.reference.LinkControlOpcode; import module.decode.p25.reference.LinkControlOpcode;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
public class NetworkStatusBroadcastExplicit extends LDU1Message public class NetworkStatusBroadcastExplicit extends LDU1Message implements IdentifierReceiver
implements IdentifierReceiver
{ {
private final static Logger mLog = public static final int[] NETWORK_ID = {364, 365, 366, 367, 372, 373, 374, 375, 376, 377, 382, 383, 384, 385, 386,
LoggerFactory.getLogger( NetworkStatusBroadcastExplicit.class ); 387, 536, 537, 538, 539};
public static final int[] NETWORK_ID = { 364,365,366,367,372,373,374,375, public static final int[] SYSTEM_ID = {540, 541, 546, 547, 548, 549, 550, 551, 556, 557, 558, 559};
376,377,382,383,384,385,386,387,536,537,538,539 };
public static final int[] SYSTEM_ID = { 540,541,546,547,548,549,550,551,556,
557,558,559 };
public static final int[] TRANSMIT_IDENTIFIER = {560, 561, 566, 567}; public static final int[] TRANSMIT_IDENTIFIER = {560, 561, 566, 567};
public static final int[] TRANSMIT_CHANNEL = { 568,569,570,571,720,721,722, public static final int[] TRANSMIT_CHANNEL = {568, 569, 570, 571, 720, 721, 722, 723, 724, 725, 730, 731};
723,724,725,730,731 };
public static final int[] RECEIVE_IDENTIFIER = {732, 733, 734, 735}; public static final int[] RECEIVE_IDENTIFIER = {732, 733, 734, 735};
public static final int[] RECEIVE_CHANNEL = { 740,741,742,743,744,745,750, public static final int[] RECEIVE_CHANNEL = {740, 741, 742, 743, 744, 745, 750, 751, 752, 753, 754, 755};
751,752,753,754,755 };
private IBandIdentifier mTransmitIdentifierUpdate; private IBandIdentifier mTransmitIdentifierUpdate;
private IBandIdentifier mReceiveIdentifierUpdate; private IBandIdentifier mReceiveIdentifierUpdate;
@@ -119,13 +130,21 @@ public class NetworkStatusBroadcastExplicit extends LDU1Message
public long getDownlinkFrequency() public long getDownlinkFrequency()
{ {
return calculateDownlink( mTransmitIdentifierUpdate, if(mTransmitIdentifierUpdate != null)
getTransmitChannelNumber() ); {
return mTransmitIdentifierUpdate.getDownlinkFrequency(getTransmitChannelNumber());
}
return 0;
} }
public long getUplinkFrequency() public long getUplinkFrequency()
{ {
return calculateUplink( mReceiveIdentifierUpdate, if(mReceiveIdentifierUpdate != null)
getReceiveChannelNumber() ); {
return mReceiveIdentifierUpdate.getUplinkFrequency(getReceiveChannelNumber());
}
return 0;
} }
} }

View File

@@ -1,3 +1,21 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 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/>
*
******************************************************************************/
package module.decode.p25.message.ldu.lc; package module.decode.p25.message.ldu.lc;
import module.decode.p25.message.IBandIdentifier; import module.decode.p25.message.IBandIdentifier;
@@ -6,25 +24,15 @@ import module.decode.p25.message.ldu.LDU1Message;
import module.decode.p25.message.tsbk.osp.control.SystemService; import module.decode.p25.message.tsbk.osp.control.SystemService;
import module.decode.p25.reference.LinkControlOpcode; import module.decode.p25.reference.LinkControlOpcode;
import org.slf4j.Logger; public class RFSSStatusBroadcast extends LDU1Message implements IdentifierReceiver
import org.slf4j.LoggerFactory;
public class RFSSStatusBroadcast extends LDU1Message
implements IdentifierReceiver
{ {
private final static Logger mLog =
LoggerFactory.getLogger( RFSSStatusBroadcast.class );
public static final int[] LRA = {364, 365, 366, 367, 372, 373, 374, 375}; public static final int[] LRA = {364, 365, 366, 367, 372, 373, 374, 375};
public static final int[] SYSTEM_ID = { 384,385,386,387,536,537,538,539,540, public static final int[] SYSTEM_ID = {384, 385, 386, 387, 536, 537, 538, 539, 540, 541, 546, 547};
541,546,547 };
public static final int[] RFSS_ID = {548, 549, 550, 551, 556, 557, 558, 559}; public static final int[] RFSS_ID = {548, 549, 550, 551, 556, 557, 558, 559};
public static final int[] SITE_ID = {560, 561, 566, 567, 568, 569, 570, 571}; public static final int[] SITE_ID = {560, 561, 566, 567, 568, 569, 570, 571};
public static final int[] IDENTIFIER = {720, 721, 722, 723}; public static final int[] IDENTIFIER = {720, 721, 722, 723};
public static final int[] CHANNEL = { 724,725,730,731,732,733,734,735,740, public static final int[] CHANNEL = {724, 725, 730, 731, 732, 733, 734, 735, 740, 741, 742, 743};
741,742,743 }; public static final int[] SYSTEM_SERVICE_CLASS = {744, 745, 750, 751, 752, 753, 754, 755};
public static final int[] SYSTEM_SERVICE_CLASS = { 744,745,750,751,752,753,
754,755 };
private IBandIdentifier mIdentifierUpdate; private IBandIdentifier mIdentifierUpdate;
@@ -119,12 +127,21 @@ public class RFSSStatusBroadcast extends LDU1Message
public long getDownlinkFrequency() public long getDownlinkFrequency()
{ {
return calculateDownlink( mIdentifierUpdate, getChannelNumber() ); if(mIdentifierUpdate != null)
{
return mIdentifierUpdate.getDownlinkFrequency(getChannelNumber());
}
return 0;
} }
public long getUplinkFrequency() public long getUplinkFrequency()
{ {
return calculateUplink( mIdentifierUpdate, getChannelNumber() ); if(mIdentifierUpdate != null)
{
return mIdentifierUpdate.getUplinkFrequency(getChannelNumber());
} }
return 0;
}
} }

View File

@@ -1,3 +1,21 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 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/>
*
******************************************************************************/
package module.decode.p25.message.ldu.lc; package module.decode.p25.message.ldu.lc;
import module.decode.p25.message.IBandIdentifier; import module.decode.p25.message.IBandIdentifier;
@@ -5,25 +23,18 @@ import module.decode.p25.message.IdentifierReceiver;
import module.decode.p25.message.ldu.LDU1Message; import module.decode.p25.message.ldu.LDU1Message;
import module.decode.p25.message.tsbk.osp.control.SystemService; import module.decode.p25.message.tsbk.osp.control.SystemService;
import module.decode.p25.reference.LinkControlOpcode; import module.decode.p25.reference.LinkControlOpcode;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
public class RFSSStatusBroadcastExplicit extends LDU1Message public class RFSSStatusBroadcastExplicit extends LDU1Message implements IdentifierReceiver
implements IdentifierReceiver
{ {
private final static Logger mLog =
LoggerFactory.getLogger( RFSSStatusBroadcastExplicit.class );
public static final int[] LRA = {364, 365, 366, 367, 372, 373, 374, 375}; public static final int[] LRA = {364, 365, 366, 367, 372, 373, 374, 375};
public static final int[] RECEIVE_IDENTIFIER = {376, 377, 382, 383}; public static final int[] RECEIVE_IDENTIFIER = {376, 377, 382, 383};
public static final int[] RECEIVE_CHANNEL = { 384,385,386,387,536,537,538, public static final int[] RECEIVE_CHANNEL = {384, 385, 386, 387, 536, 537, 538, 539, 540, 541, 546, 547};
539,540,541,546,547 };
public static final int[] RFSS_ID = {548, 549, 550, 551, 556, 557, 558, 559}; public static final int[] RFSS_ID = {548, 549, 550, 551, 556, 557, 558, 559};
public static final int[] SITE_ID = {560, 561, 566, 567, 568, 569, 570, 571}; public static final int[] SITE_ID = {560, 561, 566, 567, 568, 569, 570, 571};
public static final int[] TRANSMIT_IDENTIFIER = {720, 721, 722, 723}; public static final int[] TRANSMIT_IDENTIFIER = {720, 721, 722, 723};
public static final int[] TRANSMIT_CHANNEL = { 724,725,730,731,732,733,734, public static final int[] TRANSMIT_CHANNEL = {724, 725, 730, 731, 732, 733, 734, 735, 740, 741, 742, 743};
735,740,741,742,743 };
public static final int[] SYSTEM_SERVICE_CLASS = {744, 745, 750, 751, 752, 753, 754, 755}; public static final int[] SYSTEM_SERVICE_CLASS = {744, 745, 750, 751, 752, 753, 754, 755};
private IBandIdentifier mTransmitIdentifierUpdate; private IBandIdentifier mTransmitIdentifierUpdate;
@@ -139,12 +150,21 @@ public class RFSSStatusBroadcastExplicit extends LDU1Message
public long getDownlinkFrequency() public long getDownlinkFrequency()
{ {
return calculateDownlink( mTransmitIdentifierUpdate, getTransmitChannelNumber() ); if(mTransmitIdentifierUpdate != null)
{
return mTransmitIdentifierUpdate.getDownlinkFrequency(getTransmitChannelNumber());
}
return 0;
} }
public long getUplinkFrequency() public long getUplinkFrequency()
{ {
return calculateUplink( mReceiveIdentifierUpdate, getReceiveChannelNumber() ); if(mReceiveIdentifierUpdate != null)
{
return mReceiveIdentifierUpdate.getUplinkFrequency(getReceiveChannelNumber());
} }
return 0;
}
} }

View File

@@ -1,3 +1,21 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 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/>
*
******************************************************************************/
package module.decode.p25.message.ldu.lc; package module.decode.p25.message.ldu.lc;
import module.decode.p25.message.IBandIdentifier; import module.decode.p25.message.IBandIdentifier;
@@ -6,24 +24,15 @@ import module.decode.p25.message.ldu.LDU1Message;
import module.decode.p25.message.tsbk.osp.control.SystemService; import module.decode.p25.message.tsbk.osp.control.SystemService;
import module.decode.p25.reference.LinkControlOpcode; import module.decode.p25.reference.LinkControlOpcode;
import org.slf4j.Logger; public class SecondaryControlChannelBroadcast extends LDU1Message implements IdentifierReceiver
import org.slf4j.LoggerFactory;
public class SecondaryControlChannelBroadcast extends LDU1Message
implements IdentifierReceiver
{ {
private final static Logger mLog =
LoggerFactory.getLogger( SecondaryControlChannelBroadcast.class );
public static final int[] RFSS_ID = {364, 365, 366, 367, 372, 373, 374, 375}; public static final int[] RFSS_ID = {364, 365, 366, 367, 372, 373, 374, 375};
public static final int[] SITE_ID = {376, 377, 382, 383, 384, 385, 386, 387}; public static final int[] SITE_ID = {376, 377, 382, 383, 384, 385, 386, 387};
public static final int[] IDENTIFIER_A = {536, 537, 538, 539}; public static final int[] IDENTIFIER_A = {536, 537, 538, 539};
public static final int[] CHANNEL_A = { 540,541,546,547,548,549,550,551, public static final int[] CHANNEL_A = {540, 541, 546, 547, 548, 549, 550, 551, 556, 557, 558, 559};
556,557,558,559 };
public static final int[] SYSTEM_SERVICE_CLASS_A = {560, 561, 566, 567, 568, 569, 570, 571}; public static final int[] SYSTEM_SERVICE_CLASS_A = {560, 561, 566, 567, 568, 569, 570, 571};
public static final int[] IDENTIFIER_B = {720, 721, 722, 723}; public static final int[] IDENTIFIER_B = {720, 721, 722, 723};
public static final int[] CHANNEL_B = { 724,725,730,731,732,733,734,735,740, public static final int[] CHANNEL_B = {724, 725, 730, 731, 732, 733, 734, 735, 740, 741, 742, 743};
741,742,743 };
public static final int[] SYSTEM_SERVICE_CLASS_B = {744, 745, 750, 751, 752, 753, 754, 755}; public static final int[] SYSTEM_SERVICE_CLASS_B = {744, 745, 750, 751, 752, 753, 754, 755};
private IBandIdentifier mIdentifierProviderA; private IBandIdentifier mIdentifierProviderA;
@@ -136,21 +145,41 @@ public class SecondaryControlChannelBroadcast extends LDU1Message
public long getDownlinkFrequencyA() public long getDownlinkFrequencyA()
{ {
return calculateDownlink( mIdentifierProviderA, getChannelA() ); if(mIdentifierProviderA != null)
{
return mIdentifierProviderA.getDownlinkFrequency(getChannelA());
}
return 0;
} }
public long getUplinkFrequencyA() public long getUplinkFrequencyA()
{ {
return calculateUplink( mIdentifierProviderA, getChannelA() ); if(mIdentifierProviderA != null)
{
return mIdentifierProviderA.getUplinkFrequency(getChannelA());
}
return 0;
} }
public long getDownlinkFrequencyB() public long getDownlinkFrequencyB()
{ {
return calculateDownlink( mIdentifierProviderB, getChannelB() ); if(mIdentifierProviderB != null)
{
return mIdentifierProviderB.getDownlinkFrequency(getChannelB());
}
return 0;
} }
public long getUplinkFrequencyB() public long getUplinkFrequencyB()
{ {
return calculateUplink( mIdentifierProviderB, getChannelB() ); if(mIdentifierProviderB != null)
{
return mIdentifierProviderB.getUplinkFrequency(getChannelB());
}
return 0;
} }
} }

View File

@@ -1,3 +1,21 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 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/>
*
******************************************************************************/
package module.decode.p25.message.ldu.lc; package module.decode.p25.message.ldu.lc;
import module.decode.p25.message.IBandIdentifier; import module.decode.p25.message.IBandIdentifier;
@@ -6,25 +24,15 @@ import module.decode.p25.message.ldu.LDU1Message;
import module.decode.p25.message.tsbk.osp.control.SystemService; import module.decode.p25.message.tsbk.osp.control.SystemService;
import module.decode.p25.reference.LinkControlOpcode; import module.decode.p25.reference.LinkControlOpcode;
import org.slf4j.Logger; public class SecondaryControlChannelBroadcastExplicit extends LDU1Message implements IdentifierReceiver
import org.slf4j.LoggerFactory;
public class SecondaryControlChannelBroadcastExplicit
extends LDU1Message implements IdentifierReceiver
{ {
private final static Logger mLog =
LoggerFactory.getLogger( SecondaryControlChannelBroadcastExplicit.class );
public static final int[] RFSS_ID = {364, 365, 366, 367, 372, 373, 374, 375}; public static final int[] RFSS_ID = {364, 365, 366, 367, 372, 373, 374, 375};
public static final int[] SITE_ID = {376, 377, 382, 383, 384, 385, 386, 387}; public static final int[] SITE_ID = {376, 377, 382, 383, 384, 385, 386, 387};
public static final int[] TRANSMIT_IDENTIFIER = {536, 537, 538, 539}; public static final int[] TRANSMIT_IDENTIFIER = {536, 537, 538, 539};
public static final int[] TRANSMIT_CHANNEL = { 540,541,546,547,548,549,550, public static final int[] TRANSMIT_CHANNEL = {540, 541, 546, 547, 548, 549, 550, 551, 556, 557, 558, 559};
551,556,557,558,559 };
public static final int[] RECEIVE_IDENTIFIER = {560, 561, 566, 567}; public static final int[] RECEIVE_IDENTIFIER = {560, 561, 566, 567};
public static final int[] RECEIVE_CHANNEL = { 568,569,570,571,720,721,722, public static final int[] RECEIVE_CHANNEL = {568, 569, 570, 571, 720, 721, 722, 723, 724, 725, 730, 731};
723,724,725,730,731 }; public static final int[] SYSTEM_SERVICE_CLASS = {732, 733, 734, 735, 740, 741, 742, 743};
public static final int[] SYSTEM_SERVICE_CLASS = { 732,733,734,735,740,741,
742,743 };
private IBandIdentifier mTransmitIdentifierProvider; private IBandIdentifier mTransmitIdentifierProvider;
private IBandIdentifier mReceiveIdentifierProvider; private IBandIdentifier mReceiveIdentifierProvider;
@@ -129,13 +137,21 @@ public class SecondaryControlChannelBroadcastExplicit
public long getDownlinkFrequency() public long getDownlinkFrequency()
{ {
return calculateDownlink( mTransmitIdentifierProvider, if(mTransmitIdentifierProvider != null)
getTransmitChannelNumber() ); {
return mTransmitIdentifierProvider.getDownlinkFrequency(getTransmitChannelNumber());
}
return 0;
} }
public long getUplinkFrequency() public long getUplinkFrequency()
{ {
return calculateUplink( mReceiveIdentifierProvider, if(mReceiveIdentifierProvider != null)
getReceiveChannelNumber() ); {
return mReceiveIdentifierProvider.getUplinkFrequency(getReceiveChannelNumber());
}
return 0;
} }
} }

View File

@@ -1,14 +1,31 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 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/>
*
******************************************************************************/
package module.decode.p25.message.pdu; package module.decode.p25.message.pdu;
import module.decode.p25.message.IBandIdentifier;
import module.decode.p25.message.IdentifierReceiver;
import module.decode.p25.reference.DataUnitID;
import alias.AliasList; import alias.AliasList;
import bits.BinaryMessage; import bits.BinaryMessage;
import edac.CRCP25; import edac.CRCP25;
import module.decode.p25.message.IBandIdentifier;
import module.decode.p25.message.IdentifierReceiver;
import module.decode.p25.reference.DataUnitID;
public abstract class UnitToUnitChannelGrantExtended extends PDUMessage public abstract class UnitToUnitChannelGrantExtended extends PDUMessage implements IdentifierReceiver
implements IdentifierReceiver
{ {
/* Service Options */ /* Service Options */
public static final int EMERGENCY_FLAG = 128; public static final int EMERGENCY_FLAG = 128;
@@ -16,33 +33,27 @@ public abstract class UnitToUnitChannelGrantExtended extends PDUMessage
public static final int DUPLEX_MODE = 130; public static final int DUPLEX_MODE = 130;
public static final int SESSION_MODE = 131; public static final int SESSION_MODE = 131;
public static final int[] SOURCE_ADDRESS = { 88,89,90,91,92,93,94,95,96,97, public static final int[] SOURCE_ADDRESS = {88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104,
98,99,100,101,102,103,104,105,106,107,108,109,110,111 }; 105, 106, 107, 108, 109, 110, 111};
public static final int[] SERVICE_OPTIONS = { 128,129,130,131,132,133,134, public static final int[] SERVICE_OPTIONS = {128, 129, 130, 131, 132, 133, 134, 135};
135 }; public static final int[] SOURCE_WACN = {160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174,
public static final int[] SOURCE_WACN = { 160,161,162,163,164,165,166,167, 175, 176, 177, 178, 179};
168,169,170,171,172,173,174,175,176,177,178,179 }; public static final int[] SOURCE_SYSTEM_ID = {180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191};
public static final int[] SOURCE_SYSTEM_ID = { 180,181,182,183,184,185,186, public static final int[] SOURCE_ID = {192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206,
187,188,189,190,191 }; 207, 208, 209, 210, 211, 212, 213, 214, 215};
public static final int[] SOURCE_ID = { 192,193,194,195,196,197,198,199,200, public static final int[] TARGET_ADDRESS = {216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229,
201,202,203,204,205,206,207,208,209,210,211,212,213,214,215 }; 230, 231, 232, 233, 234, 235, 236, 237, 238, 239};
public static final int[] TARGET_ADDRESS = { 216,217,218,219,220,221,222,
223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239 };
public static final int[] TRANSMIT_IDENTIFIER = {240, 241, 242, 243}; public static final int[] TRANSMIT_IDENTIFIER = {240, 241, 242, 243};
public static final int[] TRANSMIT_NUMBER = { 244,245,246,247,248,249,250, public static final int[] TRANSMIT_NUMBER = {244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255};
251,252,253,254,255 };
public static final int[] RECEIVE_IDENTIFIER = {256, 257, 258, 259}; public static final int[] RECEIVE_IDENTIFIER = {256, 257, 258, 259};
public static final int[] RECEIVE_NUMBER = { 260,261,262,263,264,265,266, public static final int[] RECEIVE_NUMBER = {260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271};
267,268,269,270,271 }; public static final int[] MULTIPLE_BLOCK_CRC = {320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332,
public static final int[] MULTIPLE_BLOCK_CRC = { 320,321,322,323,324,325, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351};
326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,
343,344,345,346,347,348,349,350,351 };
private IBandIdentifier mTransmitIdentifierUpdate; private IBandIdentifier mTransmitIdentifierUpdate;
private IBandIdentifier mReceiveIdentifierUpdate; private IBandIdentifier mReceiveIdentifierUpdate;
public UnitToUnitChannelGrantExtended( BinaryMessage message, public UnitToUnitChannelGrantExtended(BinaryMessage message, DataUnitID duid, AliasList aliasList)
DataUnitID duid, AliasList aliasList )
{ {
super(message, duid, aliasList); super(message, duid, aliasList);
@@ -165,12 +176,22 @@ public abstract class UnitToUnitChannelGrantExtended extends PDUMessage
public long getDownlinkFrequency() public long getDownlinkFrequency()
{ {
return calculateDownlink( mTransmitIdentifierUpdate, getTransmitChannelNumber() ); if(mTransmitIdentifierUpdate != null)
{
return mTransmitIdentifierUpdate.getDownlinkFrequency(getTransmitChannelNumber());
}
return 0;
} }
public long getUplinkFrequency() public long getUplinkFrequency()
{ {
return calculateUplink( mReceiveIdentifierUpdate, getReceiveChannelNumber() ); if(mReceiveIdentifierUpdate != null)
{
return mReceiveIdentifierUpdate.getUplinkFrequency(getReceiveChannelNumber());
}
return 0;
} }
@Override @Override

View File

@@ -1,5 +1,26 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 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/>
*
******************************************************************************/
package module.decode.p25.message.pdu.osp.control; package module.decode.p25.message.pdu.osp.control;
import alias.AliasList;
import bits.BinaryMessage;
import edac.CRCP25;
import module.decode.p25.message.IAdjacentSite; import module.decode.p25.message.IAdjacentSite;
import module.decode.p25.message.IBandIdentifier; import module.decode.p25.message.IBandIdentifier;
import module.decode.p25.message.IdentifierReceiver; import module.decode.p25.message.IdentifierReceiver;
@@ -7,36 +28,25 @@ import module.decode.p25.message.pdu.PDUMessage;
import module.decode.p25.message.tsbk.osp.control.SystemService; import module.decode.p25.message.tsbk.osp.control.SystemService;
import module.decode.p25.reference.DataUnitID; import module.decode.p25.reference.DataUnitID;
import module.decode.p25.reference.Opcode; import module.decode.p25.reference.Opcode;
import alias.AliasList;
import bits.BinaryMessage;
import edac.CRCP25;
public class AdjacentStatusBroadcastExtended extends PDUMessage public class AdjacentStatusBroadcastExtended extends PDUMessage implements IdentifierReceiver, IAdjacentSite
implements IdentifierReceiver, IAdjacentSite
{ {
public static final int[] LRA = {88, 89, 90, 91, 92, 93, 94, 95}; public static final int[] LRA = {88, 89, 90, 91, 92, 93, 94, 95};
public static final int[] SYSTEM_ID = { 100,101,102,103,104,105,106,107,108, public static final int[] SYSTEM_ID = {100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111};
109,110,111 }; public static final int[] RF_SUBSYSTEM_ID = {128, 129, 130, 131, 132, 133, 134, 135};
public static final int[] RF_SUBSYSTEM_ID = { 128,129,130,131,132,133,134,
135 };
public static final int[] SITE_ID = {136, 137, 138, 139, 140, 141, 142, 143}; public static final int[] SITE_ID = {136, 137, 138, 139, 140, 141, 142, 143};
public static final int[] TRANSMIT_IDENTIFIER = {160, 161, 162, 163}; public static final int[] TRANSMIT_IDENTIFIER = {160, 161, 162, 163};
public static final int[] TRANSMIT_CHANNEL = { 164,165,166,167,168,169,170, public static final int[] TRANSMIT_CHANNEL = {164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175};
171,172,173,174,175 };
public static final int[] RECEIVE_IDENTIFIER = {176, 177, 178, 179}; public static final int[] RECEIVE_IDENTIFIER = {176, 177, 178, 179};
public static final int[] RECEIVE_CHANNEL = { 180,181,182,183,184,185,186, public static final int[] RECEIVE_CHANNEL = {180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191};
187,188,189,190,191 }; public static final int[] SYSTEM_SERVICE_CLASS = {192, 193, 194, 195, 196, 197, 198, 199};
public static final int[] SYSTEM_SERVICE_CLASS = { 192,193,194,195,196,197, public static final int[] MULTIPLE_BLOCK_CRC = {224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236,
198,199 }; 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255};
public static final int[] MULTIPLE_BLOCK_CRC = { 224,225,226,227,228,229,
230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,
248,249,250,251,252,253,254,255 };
private IBandIdentifier mTransmitIdentifierProvider; private IBandIdentifier mTransmitIdentifierProvider;
private IBandIdentifier mReceiveIdentifierProvider; private IBandIdentifier mReceiveIdentifierProvider;
public AdjacentStatusBroadcastExtended( BinaryMessage message, public AdjacentStatusBroadcastExtended(BinaryMessage message, DataUnitID duid, AliasList aliasList)
DataUnitID duid, AliasList aliasList )
{ {
super(message, duid, aliasList); super(message, duid, aliasList);
@@ -124,12 +134,22 @@ public class AdjacentStatusBroadcastExtended extends PDUMessage
public long getDownlinkFrequency() public long getDownlinkFrequency()
{ {
return calculateDownlink( mTransmitIdentifierProvider, getTransmitChannel() ); if(mTransmitIdentifierProvider != null)
{
return mTransmitIdentifierProvider.getDownlinkFrequency(getTransmitChannel());
}
return 0;
} }
public long getUplinkFrequency() public long getUplinkFrequency()
{ {
return calculateUplink( mReceiveIdentifierProvider, getReceiveChannel() ); if(mReceiveIdentifierProvider != null)
{
return mReceiveIdentifierProvider.getUplinkFrequency(getReceiveChannel());
}
return 0;
} }
@Override @Override

View File

@@ -1,5 +1,26 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 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/>
*
******************************************************************************/
package module.decode.p25.message.pdu.osp.control; package module.decode.p25.message.pdu.osp.control;
import alias.AliasList;
import bits.BinaryMessage;
import edac.CRCP25;
import module.decode.p25.message.IBandIdentifier; import module.decode.p25.message.IBandIdentifier;
import module.decode.p25.message.IdentifierReceiver; import module.decode.p25.message.IdentifierReceiver;
import module.decode.p25.message.pdu.PDUMessage; import module.decode.p25.message.pdu.PDUMessage;
@@ -7,35 +28,25 @@ import module.decode.p25.message.tsbk.osp.control.SystemService;
import module.decode.p25.reference.DataUnitID; import module.decode.p25.reference.DataUnitID;
import module.decode.p25.reference.Opcode; import module.decode.p25.reference.Opcode;
import module.decode.p25.reference.P25NetworkCallsign; import module.decode.p25.reference.P25NetworkCallsign;
import alias.AliasList;
import bits.BinaryMessage;
import edac.CRCP25;
public class NetworkStatusBroadcastExtended extends PDUMessage public class NetworkStatusBroadcastExtended extends PDUMessage implements IdentifierReceiver
implements IdentifierReceiver
{ {
public static final int[] LRA = {88, 89, 90, 91, 92, 93, 94, 95}; public static final int[] LRA = {88, 89, 90, 91, 92, 93, 94, 95};
public static final int[] SYSTEM_ID = { 100,101,102,103,104,105,106,107,108, public static final int[] SYSTEM_ID = {100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111};
109,110,111 }; public static final int[] WACN = {160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
public static final int[] WACN = { 160,161,162,163,164,165,166,167,168,169, 176, 177, 178, 179};
170,171,172,173,174,175,176,177,178,179 };
public static final int[] TRANSMIT_IDENTIFIER = {184, 185, 186, 187}; public static final int[] TRANSMIT_IDENTIFIER = {184, 185, 186, 187};
public static final int[] TRANSMIT_CHANNEL = { 188,189,190,191,192,193,194, public static final int[] TRANSMIT_CHANNEL = {188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199};
195,196,197,198,199 };
public static final int[] RECEIVE_IDENTIFIER = {200, 201, 202, 203}; public static final int[] RECEIVE_IDENTIFIER = {200, 201, 202, 203};
public static final int[] RECEIVE_CHANNEL = { 204,205,206,207,208,209,210, public static final int[] RECEIVE_CHANNEL = {204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215};
211,212,213,214,215 }; public static final int[] SYSTEM_SERVICE_CLASS = {216, 217, 218, 219, 220, 221, 222, 223};
public static final int[] SYSTEM_SERVICE_CLASS = { 216,217,218,219,220,221, public static final int[] MULTIPLE_BLOCK_CRC = {224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236,
222,223 }; 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255};
public static final int[] MULTIPLE_BLOCK_CRC = { 224,225,226,227,228,229,
230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,
248,249,250,251,252,253,254,255 };
private IBandIdentifier mTransmitIdentifierUpdate; private IBandIdentifier mTransmitIdentifierUpdate;
private IBandIdentifier mReceiveIdentifierUpdate; private IBandIdentifier mReceiveIdentifierUpdate;
public NetworkStatusBroadcastExtended( BinaryMessage message, public NetworkStatusBroadcastExtended(BinaryMessage message, DataUnitID duid, AliasList aliasList)
DataUnitID duid, AliasList aliasList )
{ {
super(message, duid, aliasList); super(message, duid, aliasList);
@@ -126,12 +137,22 @@ public class NetworkStatusBroadcastExtended extends PDUMessage
public long getDownlinkFrequency() public long getDownlinkFrequency()
{ {
return calculateDownlink( mTransmitIdentifierUpdate, getTransmitChannel() ); if(mTransmitIdentifierUpdate != null)
{
return mTransmitIdentifierUpdate.getDownlinkFrequency(getTransmitChannel());
}
return 0;
} }
public long getUplinkFrequency() public long getUplinkFrequency()
{ {
return calculateUplink( mReceiveIdentifierUpdate, getReceiveChannel() ); if(mReceiveIdentifierUpdate != null)
{
return mReceiveIdentifierUpdate.getUplinkFrequency(getReceiveChannel());
}
return 0;
} }
@Override @Override

View File

@@ -1,41 +1,52 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 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/>
*
******************************************************************************/
package module.decode.p25.message.pdu.osp.control; package module.decode.p25.message.pdu.osp.control;
import alias.AliasList;
import bits.BinaryMessage;
import edac.CRCP25;
import module.decode.p25.message.IBandIdentifier; import module.decode.p25.message.IBandIdentifier;
import module.decode.p25.message.IdentifierReceiver; import module.decode.p25.message.IdentifierReceiver;
import module.decode.p25.message.pdu.PDUMessage; import module.decode.p25.message.pdu.PDUMessage;
import module.decode.p25.message.tsbk.osp.control.SystemService; import module.decode.p25.message.tsbk.osp.control.SystemService;
import module.decode.p25.reference.DataUnitID; import module.decode.p25.reference.DataUnitID;
import module.decode.p25.reference.Opcode; import module.decode.p25.reference.Opcode;
import alias.AliasList;
import bits.BinaryMessage;
import edac.CRCP25;
public class RFSSStatusBroadcastExtended extends PDUMessage public class RFSSStatusBroadcastExtended extends PDUMessage implements IdentifierReceiver
implements IdentifierReceiver
{ {
public static final int[] LRA = {88, 89, 90, 91, 92, 93, 94, 95}; public static final int[] LRA = {88, 89, 90, 91, 92, 93, 94, 95};
public static final int ACTIVE_NETWORK_CONNECTION_INDICATOR = 99; public static final int ACTIVE_NETWORK_CONNECTION_INDICATOR = 99;
public static final int[] SYSTEM_ID = { 100,101,102,103,104,105,106,107,108, public static final int[] SYSTEM_ID = {100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111};
109,110,111 };
public static final int[] RFSS_ID = {160, 161, 162, 163, 164, 165, 166, 167}; public static final int[] RFSS_ID = {160, 161, 162, 163, 164, 165, 166, 167};
public static final int[] SITE_ID = {168, 169, 170, 171, 172, 173, 174, 175}; public static final int[] SITE_ID = {168, 169, 170, 171, 172, 173, 174, 175};
public static final int[] TRANSMIT_IDENTIFIER = {184, 185, 186, 187}; public static final int[] TRANSMIT_IDENTIFIER = {184, 185, 186, 187};
public static final int[] TRANSMIT_CHANNEL = { 188,189,190,191,192,193,194, public static final int[] TRANSMIT_CHANNEL = {188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199};
195,196,197,198,199 };
public static final int[] RECEIVE_IDENTIFIER = {200, 201, 202, 203}; public static final int[] RECEIVE_IDENTIFIER = {200, 201, 202, 203};
public static final int[] RECEIVE_CHANNEL = { 204,205,206,207,208,209,210, public static final int[] RECEIVE_CHANNEL = {204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215};
211,212,213,214,215 }; public static final int[] SYSTEM_SERVICE_CLASS = {216, 217, 218, 219, 220, 221, 222, 223};
public static final int[] SYSTEM_SERVICE_CLASS = { 216,217,218,219,220,221, public static final int[] MULTIPLE_BLOCK_CRC = {224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236,
222,223 }; 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255};
public static final int[] MULTIPLE_BLOCK_CRC = { 224,225,226,227,228,229,
230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,
248,249,250,251,252,253,254,255 };
private IBandIdentifier mTransmitIdentifierUpdate; private IBandIdentifier mTransmitIdentifierUpdate;
private IBandIdentifier mReceiveIdentifierUpdate; private IBandIdentifier mReceiveIdentifierUpdate;
public RFSSStatusBroadcastExtended( BinaryMessage message, public RFSSStatusBroadcastExtended(BinaryMessage message, DataUnitID duid, AliasList aliasList)
DataUnitID duid, AliasList aliasList )
{ {
super(message, duid, aliasList); super(message, duid, aliasList);
@@ -130,12 +141,22 @@ public class RFSSStatusBroadcastExtended extends PDUMessage
public long getDownlinkFrequency() public long getDownlinkFrequency()
{ {
return calculateDownlink( mTransmitIdentifierUpdate, getTransmitChannel() ); if(mTransmitIdentifierUpdate != null)
{
return mTransmitIdentifierUpdate.getDownlinkFrequency(getTransmitChannel());
}
return 0;
} }
public long getUplinkFrequency() public long getUplinkFrequency()
{ {
return calculateUplink( mReceiveIdentifierUpdate, getReceiveChannel() ); if(mReceiveIdentifierUpdate != null)
{
return mReceiveIdentifierUpdate.getUplinkFrequency(getReceiveChannel());
}
return 0;
} }
@Override @Override

View File

@@ -1,16 +1,33 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 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/>
*
******************************************************************************/
package module.decode.p25.message.pdu.osp.data; package module.decode.p25.message.pdu.osp.data;
import alias.AliasList;
import bits.BinaryMessage;
import edac.CRCP25;
import module.decode.p25.message.IBandIdentifier; import module.decode.p25.message.IBandIdentifier;
import module.decode.p25.message.IdentifierReceiver; import module.decode.p25.message.IdentifierReceiver;
import module.decode.p25.message.pdu.PDUMessage; import module.decode.p25.message.pdu.PDUMessage;
import module.decode.p25.reference.DataUnitID; import module.decode.p25.reference.DataUnitID;
import module.decode.p25.reference.Opcode; import module.decode.p25.reference.Opcode;
import alias.AliasList;
import bits.BinaryMessage;
import edac.CRCP25;
public class GroupDataChannelGrantExtended extends PDUMessage public class GroupDataChannelGrantExtended extends PDUMessage implements IdentifierReceiver
implements IdentifierReceiver
{ {
/* Service Options */ /* Service Options */
public static final int EMERGENCY_FLAG = 128; public static final int EMERGENCY_FLAG = 128;
@@ -18,27 +35,22 @@ public class GroupDataChannelGrantExtended extends PDUMessage
public static final int DUPLEX_MODE = 130; public static final int DUPLEX_MODE = 130;
public static final int SESSION_MODE = 131; public static final int SESSION_MODE = 131;
public static final int[] SOURCE_ADDRESS = { 88,89,90,91,92,93,94,95,96,97, public static final int[] SOURCE_ADDRESS = {88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103,
98,99,100,101,102,103,104,105,106,107,108,109,110,111 }; 104, 105, 106, 107, 108, 109, 110, 111};
public static final int[] SERVICE_OPTIONS = { 128,129,130,131,132,133,134, public static final int[] SERVICE_OPTIONS = {128, 129, 130, 131, 132, 133, 134, 135};
135 };
public static final int[] TRANSMIT_IDENTIFIER = {160, 161, 162, 163}; public static final int[] TRANSMIT_IDENTIFIER = {160, 161, 162, 163};
public static final int[] TRANSMIT_NUMBER = { 164,165,166,167,168,169,170, public static final int[] TRANSMIT_NUMBER = {164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175};
171,172,173,174,175 };
public static final int[] RECEIVE_IDENTIFIER = {176, 177, 178, 179}; public static final int[] RECEIVE_IDENTIFIER = {176, 177, 178, 179};
public static final int[] RECEIVE_NUMBER = { 180,181,182,183,184,185,186, public static final int[] RECEIVE_NUMBER = {180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191};
187,188,189,190,191 }; public static final int[] GROUP_ADDRESS = {192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205,
public static final int[] GROUP_ADDRESS = { 192,193,194,195,196,197,198,199, 206, 207};
200,201,202,203,204,205,206,207 }; public static final int[] MULTIPLE_BLOCK_CRC = {224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236,
public static final int[] MULTIPLE_BLOCK_CRC = { 224,225,226,227,228,229, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255};
230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,
248,249,250,251,252,253,254,255 };
private IBandIdentifier mTransmitIdentifierUpdate; private IBandIdentifier mTransmitIdentifierUpdate;
private IBandIdentifier mReceiveIdentifierUpdate; private IBandIdentifier mReceiveIdentifierUpdate;
public GroupDataChannelGrantExtended( BinaryMessage message, public GroupDataChannelGrantExtended(BinaryMessage message, DataUnitID duid, AliasList aliasList)
DataUnitID duid, AliasList aliasList )
{ {
super(message, duid, aliasList); super(message, duid, aliasList);
@@ -143,12 +155,22 @@ public class GroupDataChannelGrantExtended extends PDUMessage
public long getDownlinkFrequency() public long getDownlinkFrequency()
{ {
return calculateDownlink( mTransmitIdentifierUpdate, getTransmitChannelNumber() ); if(mTransmitIdentifierUpdate != null)
{
return mTransmitIdentifierUpdate.getDownlinkFrequency(getTransmitChannelNumber());
}
return 0;
} }
public long getUplinkFrequency() public long getUplinkFrequency()
{ {
return calculateUplink( mReceiveIdentifierUpdate, getReceiveChannelNumber() ); if(mReceiveIdentifierUpdate != null)
{
return mReceiveIdentifierUpdate.getUplinkFrequency(getReceiveChannelNumber());
}
return 0;
} }
@Override @Override

View File

@@ -1,16 +1,33 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 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/>
*
******************************************************************************/
package module.decode.p25.message.pdu.osp.voice; package module.decode.p25.message.pdu.osp.voice;
import alias.AliasList;
import bits.BinaryMessage;
import edac.CRCP25;
import module.decode.p25.message.IBandIdentifier; import module.decode.p25.message.IBandIdentifier;
import module.decode.p25.message.IdentifierReceiver; import module.decode.p25.message.IdentifierReceiver;
import module.decode.p25.message.pdu.PDUMessage; import module.decode.p25.message.pdu.PDUMessage;
import module.decode.p25.reference.DataUnitID; import module.decode.p25.reference.DataUnitID;
import module.decode.p25.reference.Opcode; import module.decode.p25.reference.Opcode;
import alias.AliasList;
import bits.BinaryMessage;
import edac.CRCP25;
public class GroupVoiceChannelGrantExplicit extends PDUMessage public class GroupVoiceChannelGrantExplicit extends PDUMessage implements IdentifierReceiver
implements IdentifierReceiver
{ {
/* Service Options */ /* Service Options */
public static final int EMERGENCY_FLAG = 128; public static final int EMERGENCY_FLAG = 128;
@@ -18,27 +35,22 @@ public class GroupVoiceChannelGrantExplicit extends PDUMessage
public static final int DUPLEX_MODE = 130; public static final int DUPLEX_MODE = 130;
public static final int SESSION_MODE = 131; public static final int SESSION_MODE = 131;
public static final int[] SOURCE_ADDRESS = { 88,89,90,91,92,93,94,95,96,97, public static final int[] SOURCE_ADDRESS = {88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104,
98,99,100,101,102,103,104,105,106,107,108,109,110,111 }; 105, 106, 107, 108, 109, 110, 111};
public static final int[] SERVICE_OPTIONS = { 128,129,130,131,132,133,134, public static final int[] SERVICE_OPTIONS = {128, 129, 130, 131, 132, 133, 134, 135};
135 };
public static final int[] TRANSMIT_IDENTIFIER = {176, 177, 178, 179}; public static final int[] TRANSMIT_IDENTIFIER = {176, 177, 178, 179};
public static final int[] TRANSMIT_NUMBER = { 180,181,182,183,184,185,186, public static final int[] TRANSMIT_NUMBER = {180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191};
187,188,189,190,191 };
public static final int[] RECEIVE_IDENTIFIER = {192, 193, 194, 195}; public static final int[] RECEIVE_IDENTIFIER = {192, 193, 194, 195};
public static final int[] RECEIVE_NUMBER = { 196,197,198,199,200,201,202, public static final int[] RECEIVE_NUMBER = {196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207};
203,204,205,206,207 }; public static final int[] GROUP_ADDRESS = {208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221,
public static final int[] GROUP_ADDRESS = { 208,209,210,211,212,213,214,215, 222, 223};
216,217,218,219,220,221,222,223 }; public static final int[] MULTIPLE_BLOCK_CRC = {224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236,
public static final int[] MULTIPLE_BLOCK_CRC = { 224,225,226,227,228,229, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255};
230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,
248,249,250,251,252,253,254,255 };
private IBandIdentifier mTransmitIdentifierUpdate; private IBandIdentifier mTransmitIdentifierUpdate;
private IBandIdentifier mReceiveIdentifierUpdate; private IBandIdentifier mReceiveIdentifierUpdate;
public GroupVoiceChannelGrantExplicit( BinaryMessage message, public GroupVoiceChannelGrantExplicit(BinaryMessage message, DataUnitID duid, AliasList aliasList)
DataUnitID duid, AliasList aliasList )
{ {
super(message, duid, aliasList); super(message, duid, aliasList);
@@ -143,12 +155,22 @@ public class GroupVoiceChannelGrantExplicit extends PDUMessage
public long getDownlinkFrequency() public long getDownlinkFrequency()
{ {
return calculateDownlink( mTransmitIdentifierUpdate, getTransmitChannelNumber() ); if(mTransmitIdentifierUpdate != null)
{
return mTransmitIdentifierUpdate.getDownlinkFrequency(getTransmitChannelNumber());
}
return 0;
} }
public long getUplinkFrequency() public long getUplinkFrequency()
{ {
return calculateUplink( mReceiveIdentifierUpdate, getReceiveChannelNumber() ); if(mReceiveIdentifierUpdate != null)
{
return mReceiveIdentifierUpdate.getUplinkFrequency(getReceiveChannelNumber());
}
return 0;
} }
@Override @Override

View File

@@ -1,18 +1,35 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 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/>
*
******************************************************************************/
package module.decode.p25.message.pdu.osp.voice; package module.decode.p25.message.pdu.osp.voice;
import java.util.Date; import alias.AliasList;
import bits.BinaryMessage;
import edac.CRCP25;
import module.decode.p25.message.IBandIdentifier; import module.decode.p25.message.IBandIdentifier;
import module.decode.p25.message.IdentifierReceiver; import module.decode.p25.message.IdentifierReceiver;
import module.decode.p25.message.pdu.PDUMessage; import module.decode.p25.message.pdu.PDUMessage;
import module.decode.p25.reference.DataUnitID; import module.decode.p25.reference.DataUnitID;
import module.decode.p25.reference.Opcode; import module.decode.p25.reference.Opcode;
import alias.AliasList;
import bits.BinaryMessage;
import edac.CRCP25;
public class TelephoneInterconnectChannelGrantExplicit extends PDUMessage import java.util.Date;
implements IdentifierReceiver
public class TelephoneInterconnectChannelGrantExplicit extends PDUMessage implements IdentifierReceiver
{ {
/* Service Options */ /* Service Options */
public static final int EMERGENCY_FLAG = 128; public static final int EMERGENCY_FLAG = 128;
@@ -20,27 +37,21 @@ public class TelephoneInterconnectChannelGrantExplicit extends PDUMessage
public static final int DUPLEX_MODE = 130; public static final int DUPLEX_MODE = 130;
public static final int SESSION_MODE = 131; public static final int SESSION_MODE = 131;
public static final int[] ADDRESS = { 88,89,90,91,92,93,94,95,96,97, public static final int[] ADDRESS = {88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105,
98,99,100,101,102,103,104,105,106,107,108,109,110,111 }; 106, 107, 108, 109, 110, 111};
public static final int[] SERVICE_OPTIONS = { 128,129,130,131,132,133,134, public static final int[] SERVICE_OPTIONS = {128, 129, 130, 131, 132, 133, 134, 135};
135 };
public static final int[] TRANSMIT_IDENTIFIER = {160, 161, 162, 163}; public static final int[] TRANSMIT_IDENTIFIER = {160, 161, 162, 163};
public static final int[] TRANSMIT_NUMBER = { 164,165,166,167,168,169,170, public static final int[] TRANSMIT_NUMBER = {164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175};
171,172,173,174,175 };
public static final int[] RECEIVE_IDENTIFIER = {176, 177, 178, 179}; public static final int[] RECEIVE_IDENTIFIER = {176, 177, 178, 179};
public static final int[] RECEIVE_NUMBER = { 180,181,182,183,184,185,186, public static final int[] RECEIVE_NUMBER = {180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191};
187,188,189,190,191 }; public static final int[] CALL_TIMER = {192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207};
public static final int[] CALL_TIMER = { 192,193,194,195,196,197,198,199, public static final int[] MULTIPLE_BLOCK_CRC = {224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236,
200,201,202,203,204,205,206,207 }; 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255};
public static final int[] MULTIPLE_BLOCK_CRC = { 224,225,226,227,228,229,
230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,
248,249,250,251,252,253,254,255 };
private IBandIdentifier mTransmitIdentifierUpdate; private IBandIdentifier mTransmitIdentifierUpdate;
private IBandIdentifier mReceiveIdentifierUpdate; private IBandIdentifier mReceiveIdentifierUpdate;
public TelephoneInterconnectChannelGrantExplicit( BinaryMessage message, public TelephoneInterconnectChannelGrantExplicit(BinaryMessage message, DataUnitID duid, AliasList aliasList)
DataUnitID duid, AliasList aliasList )
{ {
super(message, duid, aliasList); super(message, duid, aliasList);
@@ -150,12 +161,22 @@ public class TelephoneInterconnectChannelGrantExplicit extends PDUMessage
public long getDownlinkFrequency() public long getDownlinkFrequency()
{ {
return calculateDownlink( mTransmitIdentifierUpdate, getTransmitChannelNumber() ); if(mTransmitIdentifierUpdate != null)
{
return mTransmitIdentifierUpdate.getDownlinkFrequency(getTransmitChannelNumber());
}
return 0;
} }
public long getUplinkFrequency() public long getUplinkFrequency()
{ {
return calculateUplink( mReceiveIdentifierUpdate, getReceiveChannelNumber() ); if(mReceiveIdentifierUpdate != null)
{
return mReceiveIdentifierUpdate.getUplinkFrequency(getReceiveChannelNumber());
}
return 0;
} }
@Override @Override

View File

@@ -1,16 +1,33 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 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/>
*
******************************************************************************/
package module.decode.p25.message.pdu.osp.voice; package module.decode.p25.message.pdu.osp.voice;
import alias.AliasList;
import bits.BinaryMessage;
import edac.CRCP25;
import module.decode.p25.message.IBandIdentifier; import module.decode.p25.message.IBandIdentifier;
import module.decode.p25.message.IdentifierReceiver; import module.decode.p25.message.IdentifierReceiver;
import module.decode.p25.message.pdu.PDUMessage; import module.decode.p25.message.pdu.PDUMessage;
import module.decode.p25.reference.DataUnitID; import module.decode.p25.reference.DataUnitID;
import module.decode.p25.reference.Opcode; import module.decode.p25.reference.Opcode;
import alias.AliasList;
import bits.BinaryMessage;
import edac.CRCP25;
public class UnitToUnitVoiceChannelGrantUpdateExtended extends PDUMessage public class UnitToUnitVoiceChannelGrantUpdateExtended extends PDUMessage implements IdentifierReceiver
implements IdentifierReceiver
{ {
/* Service Options */ /* Service Options */
public static final int EMERGENCY_FLAG = 128; public static final int EMERGENCY_FLAG = 128;
@@ -18,33 +35,27 @@ public class UnitToUnitVoiceChannelGrantUpdateExtended extends PDUMessage
public static final int DUPLEX_MODE = 130; public static final int DUPLEX_MODE = 130;
public static final int SESSION_MODE = 131; public static final int SESSION_MODE = 131;
public static final int[] SOURCE_ADDRESS = { 88,89,90,91,92,93,94,95,96,97, public static final int[] SOURCE_ADDRESS = {88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104,
98,99,100,101,102,103,104,105,106,107,108,109,110,111 }; 105, 106, 107, 108, 109, 110, 111};
public static final int[] SERVICE_OPTIONS = { 128,129,130,131,132,133,134, public static final int[] SERVICE_OPTIONS = {128, 129, 130, 131, 132, 133, 134, 135};
135 }; public static final int[] SOURCE_WACN = {160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174,
public static final int[] SOURCE_WACN = { 160,161,162,163,164,165,166,167, 175, 176, 177, 178, 179};
168,169,170,171,172,173,174,175,176,177,178,179 }; public static final int[] SOURCE_SYSTEM_ID = {180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191};
public static final int[] SOURCE_SYSTEM_ID = { 180,181,182,183,184,185,186, public static final int[] SOURCE_ID = {192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206,
187,188,189,190,191 }; 207, 208, 209, 210, 211, 212, 213, 214, 215};
public static final int[] SOURCE_ID = { 192,193,194,195,196,197,198,199,200, public static final int[] TARGET_ADDRESS = {216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229,
201,202,203,204,205,206,207,208,209,210,211,212,213,214,215 }; 230, 231, 232, 233, 234, 235, 236, 237, 238, 239};
public static final int[] TARGET_ADDRESS = { 216,217,218,219,220,221,222,
223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239 };
public static final int[] TRANSMIT_IDENTIFIER = {240, 241, 242, 243}; public static final int[] TRANSMIT_IDENTIFIER = {240, 241, 242, 243};
public static final int[] TRANSMIT_NUMBER = { 244,245,246,247,248,249,250, public static final int[] TRANSMIT_NUMBER = {244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255};
251,252,253,254,255 };
public static final int[] RECEIVE_IDENTIFIER = {256, 257, 258, 259}; public static final int[] RECEIVE_IDENTIFIER = {256, 257, 258, 259};
public static final int[] RECEIVE_NUMBER = { 260,261,262,263,264,265,266, public static final int[] RECEIVE_NUMBER = {260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271};
267,268,269,270,271 }; public static final int[] MULTIPLE_BLOCK_CRC = {320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332,
public static final int[] MULTIPLE_BLOCK_CRC = { 320,321,322,323,324,325, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351};
326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,
343,344,345,346,347,348,349,350,351 };
private IBandIdentifier mTransmitIdentifierUpdate; private IBandIdentifier mTransmitIdentifierUpdate;
private IBandIdentifier mReceiveIdentifierUpdate; private IBandIdentifier mReceiveIdentifierUpdate;
public UnitToUnitVoiceChannelGrantUpdateExtended( BinaryMessage message, public UnitToUnitVoiceChannelGrantUpdateExtended(BinaryMessage message, DataUnitID duid, AliasList aliasList)
DataUnitID duid, AliasList aliasList )
{ {
super(message, duid, aliasList); super(message, duid, aliasList);
@@ -173,12 +184,22 @@ public class UnitToUnitVoiceChannelGrantUpdateExtended extends PDUMessage
public long getDownlinkFrequency() public long getDownlinkFrequency()
{ {
return calculateDownlink( mTransmitIdentifierUpdate, getTransmitChannelNumber() ); if(mTransmitIdentifierUpdate != null)
{
return mTransmitIdentifierUpdate.getDownlinkFrequency(getTransmitChannelNumber());
}
return 0;
} }
public long getUplinkFrequency() public long getUplinkFrequency()
{ {
return calculateUplink( mReceiveIdentifierUpdate, getReceiveChannelNumber() ); if(mReceiveIdentifierUpdate != null)
{
return mReceiveIdentifierUpdate.getUplinkFrequency(getReceiveChannelNumber());
}
return 0;
} }
@Override @Override

View File

@@ -1,3 +1,21 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 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/>
*
******************************************************************************/
package module.decode.p25.message.tdu.lc; package module.decode.p25.message.tdu.lc;
import module.decode.p25.message.IAdjacentSite; import module.decode.p25.message.IAdjacentSite;
@@ -6,19 +24,15 @@ import module.decode.p25.message.IdentifierReceiver;
import module.decode.p25.message.tsbk.osp.control.SystemService; import module.decode.p25.message.tsbk.osp.control.SystemService;
import module.decode.p25.reference.LinkControlOpcode; import module.decode.p25.reference.LinkControlOpcode;
public class AdjacentSiteStatusBroadcast extends TDULinkControlMessage public class AdjacentSiteStatusBroadcast extends TDULinkControlMessage implements IdentifierReceiver, IAdjacentSite
implements IdentifierReceiver, IAdjacentSite
{ {
public static final int[] LRA = {72, 73, 74, 75, 88, 89, 90, 91}; public static final int[] LRA = {72, 73, 74, 75, 88, 89, 90, 91};
public static final int[] SYSTEM_ID = { 96,97,98,99,112,113,114,115, public static final int[] SYSTEM_ID = {96, 97, 98, 99, 112, 113, 114, 115, 116, 117, 118, 119};
116,117,118,119 };
public static final int[] RFSS_ID = {120, 121, 122, 123, 136, 137, 138, 139}; public static final int[] RFSS_ID = {120, 121, 122, 123, 136, 137, 138, 139};
public static final int[] SITE_ID = {140, 141, 142, 143, 144, 145, 146, 147}; public static final int[] SITE_ID = {140, 141, 142, 143, 144, 145, 146, 147};
public static final int[] IDENTIFIER = {160, 161, 162, 163}; public static final int[] IDENTIFIER = {160, 161, 162, 163};
public static final int[] CHANNEL = { 164,165,166,167,168,169,170, public static final int[] CHANNEL = {164, 165, 166, 167, 168, 169, 170, 171, 184, 185, 186, 187};
171,184,185,186,187 }; public static final int[] SYSTEM_SERVICE_CLASS = {188, 189, 190, 191, 192, 193, 194, 195};
public static final int[] SYSTEM_SERVICE_CLASS = { 188,189,190,191,192,193,
194,195 };
private IBandIdentifier mIdentifierUpdate; private IBandIdentifier mIdentifierUpdate;
@@ -136,11 +150,21 @@ public class AdjacentSiteStatusBroadcast extends TDULinkControlMessage
public long getDownlinkFrequency() public long getDownlinkFrequency()
{ {
return calculateDownlink( mIdentifierUpdate, getChannelNumber() ); if(mIdentifierUpdate != null)
{
return mIdentifierUpdate.getDownlinkFrequency(getChannelNumber());
}
return 0;
} }
public long getUplinkFrequency() public long getUplinkFrequency()
{ {
return calculateUplink( mIdentifierUpdate, getChannelNumber() ); if(mIdentifierUpdate != null)
{
return mIdentifierUpdate.getUplinkFrequency(getChannelNumber());
}
return 0;
} }
} }

View File

@@ -1,3 +1,21 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 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/>
*
******************************************************************************/
package module.decode.p25.message.tdu.lc; package module.decode.p25.message.tdu.lc;
import module.decode.p25.message.IAdjacentSite; import module.decode.p25.message.IAdjacentSite;
@@ -5,8 +23,7 @@ import module.decode.p25.message.IBandIdentifier;
import module.decode.p25.message.IdentifierReceiver; import module.decode.p25.message.IdentifierReceiver;
import module.decode.p25.reference.LinkControlOpcode; import module.decode.p25.reference.LinkControlOpcode;
public class AdjacentSiteStatusBroadcastExplicit extends TDULinkControlMessage public class AdjacentSiteStatusBroadcastExplicit extends TDULinkControlMessage implements IdentifierReceiver, IAdjacentSite
implements IdentifierReceiver, IAdjacentSite
{ {
public static final int[] LRA = {72, 73, 74, 75, 88, 89, 90, 91}; public static final int[] LRA = {72, 73, 74, 75, 88, 89, 90, 91};
public static final int[] TRANSMIT_IDENTIFIER = {92, 93, 94, 95}; public static final int[] TRANSMIT_IDENTIFIER = {92, 93, 94, 95};
@@ -122,12 +139,22 @@ public class AdjacentSiteStatusBroadcastExplicit extends TDULinkControlMessage
public long getDownlinkFrequency() public long getDownlinkFrequency()
{ {
return calculateDownlink( mTransmitBand, getTransmitChannel() ); if(mTransmitBand != null)
{
return mTransmitBand.getDownlinkFrequency(getTransmitChannel());
}
return 0;
} }
public long getUplinkFrequency() public long getUplinkFrequency()
{ {
return calculateUplink( mReceiveBand, getReceiveChannel() ); if(mReceiveBand != null)
{
return mReceiveBand.getUplinkFrequency(getReceiveChannel());
}
return 0;
} }
@Override @Override

View File

@@ -1,10 +1,27 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 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/>
*
******************************************************************************/
package module.decode.p25.message.tdu.lc; package module.decode.p25.message.tdu.lc;
import module.decode.p25.message.IBandIdentifier; import module.decode.p25.message.IBandIdentifier;
import module.decode.p25.reference.LinkControlOpcode; import module.decode.p25.reference.LinkControlOpcode;
public class ChannelIdentifierUpdate extends TDULinkControlMessage public class ChannelIdentifierUpdate extends TDULinkControlMessage implements IBandIdentifier
implements IBandIdentifier
{ {
public static final int[] IDENTIFIER = {72, 73, 74, 75}; public static final int[] IDENTIFIER = {72, 73, 74, 75};
public static final int[] BANDWIDTH = {88, 89, 90, 91, 92, 93, 94, 95, 96}; public static final int[] BANDWIDTH = {88, 89, 90, 91, 92, 93, 94, 95, 96};
@@ -79,4 +96,22 @@ public class ChannelIdentifierUpdate extends TDULinkControlMessage
{ {
return -1 * mMessage.getLong(TRANSMIT_OFFSET) * 250000l; return -1 * mMessage.getLong(TRANSMIT_OFFSET) * 250000l;
} }
@Override
public long getDownlinkFrequency(int channelNumber)
{
return getBaseFrequency() + (channelNumber * getChannelSpacing());
}
@Override
public long getUplinkFrequency(int channelNumber)
{
return getDownlinkFrequency(channelNumber) + getTransmitOffset();
}
@Override
public boolean isTDMA()
{
return false;
}
} }

View File

@@ -1,20 +1,34 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 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/>
*
******************************************************************************/
package module.decode.p25.message.tdu.lc; package module.decode.p25.message.tdu.lc;
import module.decode.p25.message.IBandIdentifier; import module.decode.p25.message.IBandIdentifier;
import module.decode.p25.reference.LinkControlOpcode; import module.decode.p25.reference.LinkControlOpcode;
public class ChannelIdentifierUpdateExplicit extends TDULinkControlMessage public class ChannelIdentifierUpdateExplicit extends TDULinkControlMessage implements IBandIdentifier
implements IBandIdentifier
{ {
public static final int[] IDENTIFIER = {72, 73, 74, 75}; public static final int[] IDENTIFIER = {72, 73, 74, 75};
public static final int[] BANDWIDTH = {88, 89, 90, 91}; public static final int[] BANDWIDTH = {88, 89, 90, 91};
public static final int[] TRANSMIT_OFFSET = { 92,93,94,95,96,97,98,99,112, public static final int[] TRANSMIT_OFFSET = {92, 93, 94, 95, 96, 97, 98, 99, 112, 113, 114, 115, 116, 117};
113,114,115,116,117 }; public static final int[] CHANNEL_SPACING = {118, 119, 120, 121, 122, 123, 136, 137, 138, 139};
public static final int[] CHANNEL_SPACING = { 118,119,120,121,122, public static final int[] BASE_FREQUENCY = {140, 141, 142, 143, 144, 145, 146, 147, 160, 161, 162, 163, 164, 165,
123,136,137,138,139 }; 166, 167, 168, 169, 170, 171, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195};
public static final int[] BASE_FREQUENCY = { 140,141,142,143,144,145,146,
147,160,161,162,163,164,165,166,167,168,169,170,171,184,185,186,
187,188,189,190,191,192,193,194,195 };
public ChannelIdentifierUpdateExplicit(TDULinkControlMessage source) public ChannelIdentifierUpdateExplicit(TDULinkControlMessage source)
{ {
@@ -79,4 +93,22 @@ public class ChannelIdentifierUpdateExplicit extends TDULinkControlMessage
{ {
return -1 * mMessage.getLong(TRANSMIT_OFFSET) * 250000l; return -1 * mMessage.getLong(TRANSMIT_OFFSET) * 250000l;
} }
@Override
public long getDownlinkFrequency(int channelNumber)
{
return getBaseFrequency() + (channelNumber * getChannelSpacing());
}
@Override
public long getUplinkFrequency(int channelNumber)
{
return getDownlinkFrequency(channelNumber) + getTransmitOffset();
}
@Override
public boolean isTDMA()
{
return false;
}
} }

View File

@@ -1,30 +1,40 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 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/>
*
******************************************************************************/
package module.decode.p25.message.tdu.lc; package module.decode.p25.message.tdu.lc;
import java.util.Set;
import java.util.TreeSet;
import module.decode.p25.message.IBandIdentifier; import module.decode.p25.message.IBandIdentifier;
import module.decode.p25.message.IdentifierReceiver; import module.decode.p25.message.IdentifierReceiver;
import module.decode.p25.reference.LinkControlOpcode; import module.decode.p25.reference.LinkControlOpcode;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
public class GroupVoiceChannelUpdate extends TDULinkControlMessage import java.util.Set;
implements IdentifierReceiver import java.util.TreeSet;
{
private final static Logger mLog =
LoggerFactory.getLogger( GroupVoiceChannelUpdate.class );
public class GroupVoiceChannelUpdate extends TDULinkControlMessage implements IdentifierReceiver
{
public static final int[] IDENTIFIER_A = {72, 73, 74, 75}; public static final int[] IDENTIFIER_A = {72, 73, 74, 75};
public static final int[] CHANNEL_A = {88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99}; public static final int[] CHANNEL_A = {88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99};
public static final int[] GROUP_ADDRESS_A = { 112,113,114,115,116,117,118, public static final int[] GROUP_ADDRESS_A = {112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 136, 137, 138, 139};
119,120,121,122,123,136,137,138,139 };
public static final int[] IDENTIFIER_B = {140, 141, 142, 143}; public static final int[] IDENTIFIER_B = {140, 141, 142, 143};
public static final int[] CHANNEL_B = { 144,145,146,147,160,161,162,163,164, public static final int[] CHANNEL_B = {144, 145, 146, 147, 160, 161, 162, 163, 164, 165, 166, 167};
165,166,167 }; public static final int[] GROUP_ADDRESS_B = {168, 169, 170, 171, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195};
public static final int[] GROUP_ADDRESS_B = { 168,169,170,171,184,185,186,
187,188,189,190,191,192,193,194,195 };
private IBandIdentifier mIdentifierUpdateA; private IBandIdentifier mIdentifierUpdateA;
private IBandIdentifier mIdentifierUpdateB; private IBandIdentifier mIdentifierUpdateB;
@@ -108,6 +118,7 @@ public class GroupVoiceChannelUpdate extends TDULinkControlMessage
/** /**
* Returns a sorted list of addresses contained in the A and B fields * Returns a sorted list of addresses contained in the A and B fields
*
* @return * @return
*/ */
public Set<String> getAddresses() public Set<String> getAddresses()
@@ -156,21 +167,41 @@ public class GroupVoiceChannelUpdate extends TDULinkControlMessage
public long getDownlinkFrequencyA() public long getDownlinkFrequencyA()
{ {
return calculateDownlink( mIdentifierUpdateA, getChannelNumberA() ); if(mIdentifierUpdateA != null)
{
return mIdentifierUpdateA.getDownlinkFrequency(getChannelNumberA());
}
return 0;
} }
public long getUplinkFrequencyA() public long getUplinkFrequencyA()
{ {
return calculateUplink( mIdentifierUpdateA, getChannelNumberA() ); if(mIdentifierUpdateA != null)
{
return mIdentifierUpdateA.getUplinkFrequency(getChannelNumberA());
}
return 0;
} }
public long getDownlinkFrequencyB() public long getDownlinkFrequencyB()
{ {
return calculateDownlink( mIdentifierUpdateB, getChannelNumberA() ); if(mIdentifierUpdateB != null)
{
return mIdentifierUpdateB.getDownlinkFrequency(getChannelNumberB());
}
return 0;
} }
public long getUplinkFrequencyB() public long getUplinkFrequencyB()
{ {
return calculateUplink( mIdentifierUpdateB, getChannelNumberA() ); if(mIdentifierUpdateB != null)
{
return mIdentifierUpdateB.getUplinkFrequency(getChannelNumberB());
}
return 0;
} }
} }

View File

@@ -1,9 +1,26 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 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/>
*
******************************************************************************/
package module.decode.p25.message.tdu.lc; package module.decode.p25.message.tdu.lc;
import module.decode.p25.message.IBandIdentifier; import module.decode.p25.message.IBandIdentifier;
import module.decode.p25.message.IdentifierReceiver; import module.decode.p25.message.IdentifierReceiver;
import module.decode.p25.reference.LinkControlOpcode; import module.decode.p25.reference.LinkControlOpcode;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -17,14 +34,11 @@ public class GroupVoiceChannelUpdateExplicit extends TDULinkControlMessage
public static final int ENCRYPTED_CHANNEL_FLAG = 93; public static final int ENCRYPTED_CHANNEL_FLAG = 93;
public static final int DUPLEX_MODE = 94; public static final int DUPLEX_MODE = 94;
public static final int SESSION_MODE = 95; public static final int SESSION_MODE = 95;
public static final int[] GROUP_ADDRESS = { 112,113,114,115,116,117,118, public static final int[] GROUP_ADDRESS = {112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 136, 137, 138, 139};
119,120,121,122,123,136,137,138,139 };
public static final int[] TRANSMIT_IDENTIFIER = {140, 141, 142, 143}; public static final int[] TRANSMIT_IDENTIFIER = {140, 141, 142, 143};
public static final int[] TRANSMIT_CHANNEL = { 144,145,146,147,160,161,162, public static final int[] TRANSMIT_CHANNEL = {144, 145, 146, 147, 160, 161, 162, 163, 164, 165, 166, 167};
163,164,165,166,167 };
public static final int[] RECEIVE_IDENTIFIER = {168, 169, 170, 171}; public static final int[] RECEIVE_IDENTIFIER = {168, 169, 170, 171};
public static final int[] RECEIVE_CHANNEL = { 184,185,186,187,188,189,190, public static final int[] RECEIVE_CHANNEL = {184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199};
191,192,193,194,195,196,197,198,199 };
private IBandIdentifier mTransmitIdentifierUpdate; private IBandIdentifier mTransmitIdentifierUpdate;
private IBandIdentifier mReceiveIdentifierUpdate; private IBandIdentifier mReceiveIdentifierUpdate;
@@ -142,13 +156,21 @@ public class GroupVoiceChannelUpdateExplicit extends TDULinkControlMessage
public long getDownlinkFrequency() public long getDownlinkFrequency()
{ {
return calculateDownlink( mTransmitIdentifierUpdate, if(mTransmitIdentifierUpdate != null)
getTransmitChannelNumber() ); {
return mTransmitIdentifierUpdate.getDownlinkFrequency(getTransmitChannelNumber());
}
return 0;
} }
public long getUplinkFrequency() public long getUplinkFrequency()
{ {
return calculateUplink( mReceiveIdentifierUpdate, if(mReceiveIdentifierUpdate != null)
getReceiveChannelNumber() ); {
return mReceiveIdentifierUpdate.getUplinkFrequency(getReceiveChannelNumber());
}
return 0;
} }
} }

View File

@@ -1,3 +1,21 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 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/>
*
******************************************************************************/
package module.decode.p25.message.tdu.lc; package module.decode.p25.message.tdu.lc;
import module.decode.p25.message.IBandIdentifier; import module.decode.p25.message.IBandIdentifier;
@@ -5,24 +23,14 @@ import module.decode.p25.message.IdentifierReceiver;
import module.decode.p25.reference.LinkControlOpcode; import module.decode.p25.reference.LinkControlOpcode;
import module.decode.p25.reference.Service; import module.decode.p25.reference.Service;
import org.slf4j.Logger; public class NetworkStatusBroadcast extends TDULinkControlMessage implements IdentifierReceiver
import org.slf4j.LoggerFactory;
public class NetworkStatusBroadcast extends TDULinkControlMessage
implements IdentifierReceiver
{ {
private final static Logger mLog = public static final int[] WACN = {72, 73, 74, 75, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 112, 113, 114,
LoggerFactory.getLogger( NetworkStatusBroadcast.class ); 115, 116, 117, 118, 119, 120, 121, 122, 123};
public static final int[] SYSTEM = {136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147};
public static final int[] WACN = { 72,73,74,75,88,89,90,91,92,93,94,95,96,
97,98,99,112,113,114,115,116,117,118,119,120,121,122,123 };
public static final int[] SYSTEM = { 136,137,138,139,140,141,142,143,144,
145,146,147 };
public static final int[] IDENTIFIER = {160, 161, 162, 163}; public static final int[] IDENTIFIER = {160, 161, 162, 163};
public static final int[] CHANNEL = { 164,165,166,167,168,169,170,171,184, public static final int[] CHANNEL = {164, 165, 166, 167, 168, 169, 170, 171, 184, 185, 186, 187};
185,186,187 }; public static final int[] SYSTEM_SERVICE_CLASS = {188, 189, 190, 191, 192, 193, 194, 195};
public static final int[] SYSTEM_SERVICE_CLASS = { 188,189,190,191,192,193,
194,195 };
private IBandIdentifier mIdentifierUpdate; private IBandIdentifier mIdentifierUpdate;
@@ -100,11 +108,21 @@ public class NetworkStatusBroadcast extends TDULinkControlMessage
public long getDownlinkFrequency() public long getDownlinkFrequency()
{ {
return calculateDownlink( mIdentifierUpdate, getChannelNumber() ); if(mIdentifierUpdate != null)
{
return mIdentifierUpdate.getDownlinkFrequency(getChannelNumber());
}
return 0;
} }
public long getUplinkFrequency() public long getUplinkFrequency()
{ {
return calculateUplink( mIdentifierUpdate, getChannelNumber() ); if(mIdentifierUpdate != null)
{
return mIdentifierUpdate.getUplinkFrequency(getChannelNumber());
}
return 0;
} }
} }

View File

@@ -1,28 +1,35 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 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/>
*
******************************************************************************/
package module.decode.p25.message.tdu.lc; package module.decode.p25.message.tdu.lc;
import module.decode.p25.message.IBandIdentifier; import module.decode.p25.message.IBandIdentifier;
import module.decode.p25.message.IdentifierReceiver; import module.decode.p25.message.IdentifierReceiver;
import module.decode.p25.reference.LinkControlOpcode; import module.decode.p25.reference.LinkControlOpcode;
import org.slf4j.Logger; public class NetworkStatusBroadcastExplicit extends TDULinkControlMessage implements IdentifierReceiver
import org.slf4j.LoggerFactory;
public class NetworkStatusBroadcastExplicit extends TDULinkControlMessage
implements IdentifierReceiver
{ {
private final static Logger mLog = public static final int[] WACN = {72, 73, 74, 75, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 112, 113, 114, 115};
LoggerFactory.getLogger( NetworkStatusBroadcastExplicit.class ); public static final int[] SYSTEM = {116, 117, 118, 119, 120, 121, 122, 123, 136, 137, 138, 139};
public static final int[] WACN = { 72,73,74,75,88,89,90,91,92,93,94,95,96,
97,98,99,112,113,114,115 };
public static final int[] SYSTEM = { 116,117,118,119,120,121,122,123,136,
137,138,139 };
public static final int[] TRANSMIT_IDENTIFIER = {140, 141, 142, 143}; public static final int[] TRANSMIT_IDENTIFIER = {140, 141, 142, 143};
public static final int[] TRANSMIT_CHANNEL = { 144,145,146,147,160,161,162, public static final int[] TRANSMIT_CHANNEL = {144, 145, 146, 147, 160, 161, 162, 163, 164, 165, 166, 167};
163,164,165,166,167 };
public static final int[] RECEIVE_IDENTIFIER = {168, 169, 170, 171}; public static final int[] RECEIVE_IDENTIFIER = {168, 169, 170, 171};
public static final int[] RECEIVE_CHANNEL = { 184,185,186,187,188,189,190, public static final int[] RECEIVE_CHANNEL = {184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195};
191,192,193,194,195 };
private IBandIdentifier mTransmitIdentifierUpdate; private IBandIdentifier mTransmitIdentifierUpdate;
private IBandIdentifier mReceiveIdentifierUpdate; private IBandIdentifier mReceiveIdentifierUpdate;
@@ -119,13 +126,21 @@ public class NetworkStatusBroadcastExplicit extends TDULinkControlMessage
public long getDownlinkFrequency() public long getDownlinkFrequency()
{ {
return calculateDownlink( mTransmitIdentifierUpdate, if(mTransmitIdentifierUpdate != null)
getTransmitChannelNumber() ); {
return mTransmitIdentifierUpdate.getDownlinkFrequency(getTransmitChannelNumber());
}
return 0;
} }
public long getUplinkFrequency() public long getUplinkFrequency()
{ {
return calculateUplink( mReceiveIdentifierUpdate, if(mReceiveIdentifierUpdate != null)
getReceiveChannelNumber() ); {
return mReceiveIdentifierUpdate.getUplinkFrequency(getReceiveChannelNumber());
}
return 0;
} }
} }

View File

@@ -1,3 +1,21 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 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/>
*
******************************************************************************/
package module.decode.p25.message.tdu.lc; package module.decode.p25.message.tdu.lc;
import module.decode.p25.message.IBandIdentifier; import module.decode.p25.message.IBandIdentifier;
@@ -5,28 +23,15 @@ import module.decode.p25.message.IdentifierReceiver;
import module.decode.p25.message.tsbk.osp.control.SystemService; import module.decode.p25.message.tsbk.osp.control.SystemService;
import module.decode.p25.reference.LinkControlOpcode; import module.decode.p25.reference.LinkControlOpcode;
import org.slf4j.Logger; public class RFSSStatusBroadcast extends TDULinkControlMessage implements IdentifierReceiver
import org.slf4j.LoggerFactory;
public class RFSSStatusBroadcast extends TDULinkControlMessage
implements IdentifierReceiver
{ {
private final static Logger mLog = public static final int[] LRA = {72, 73, 74, 75, 88, 89, 90, 91};
LoggerFactory.getLogger( RFSSStatusBroadcast.class ); public static final int[] SYSTEM_ID = {96, 97, 98, 99, 112, 113, 114, 115, 116, 117, 118, 119};
public static final int[] RFSS_ID = {120, 121, 122, 123, 136, 137, 138, 139};
public static final int[] LRA = { 72,73,74,75,88,89,
90,91 };
public static final int[] SYSTEM_ID = { 96,97,98,99,112,113,114,115,116,117,
118,119 };
public static final int[] RFSS_ID = { 120,121,122,123,136,137,138,
139 };
public static final int[] SITE_ID = {140, 141, 142, 143, 144, 145, 146, 147}; public static final int[] SITE_ID = {140, 141, 142, 143, 144, 145, 146, 147};
public static final int[] IDENTIFIER = {160, 161, 162, 163}; public static final int[] IDENTIFIER = {160, 161, 162, 163};
public static final int[] CHANNEL = { 164,165,166,167,168,169,170, public static final int[] CHANNEL = {164, 165, 166, 167, 168, 169, 170, 171, 184, 185, 186, 187};
171,184,185,186,187 }; public static final int[] SYSTEM_SERVICE_CLASS = {188, 189, 190, 191, 192, 193, 194, 195};
public static final int[] SYSTEM_SERVICE_CLASS = { 188,189,190,191,192,193,
194,195 };
private IBandIdentifier mIdentifierUpdate; private IBandIdentifier mIdentifierUpdate;
@@ -121,12 +126,21 @@ public class RFSSStatusBroadcast extends TDULinkControlMessage
public long getDownlinkFrequency() public long getDownlinkFrequency()
{ {
return calculateDownlink( mIdentifierUpdate, getChannelNumber() ); if(mIdentifierUpdate != null)
{
return mIdentifierUpdate.getDownlinkFrequency(getChannelNumber());
}
return 0;
} }
public long getUplinkFrequency() public long getUplinkFrequency()
{ {
return calculateUplink( mIdentifierUpdate, getChannelNumber() ); if(mIdentifierUpdate != null)
{
return mIdentifierUpdate.getUplinkFrequency(getChannelNumber());
} }
return 0;
}
} }

View File

@@ -1,32 +1,42 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 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/>
*
******************************************************************************/
package module.decode.p25.message.tdu.lc; package module.decode.p25.message.tdu.lc;
import module.decode.p25.message.IBandIdentifier; import module.decode.p25.message.IBandIdentifier;
import module.decode.p25.message.IdentifierReceiver; import module.decode.p25.message.IdentifierReceiver;
import module.decode.p25.message.tsbk.osp.control.SystemService; import module.decode.p25.message.tsbk.osp.control.SystemService;
import module.decode.p25.reference.LinkControlOpcode; import module.decode.p25.reference.LinkControlOpcode;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
public class RFSSStatusBroadcastExplicit extends TDULinkControlMessage public class RFSSStatusBroadcastExplicit extends TDULinkControlMessage implements IdentifierReceiver
implements IdentifierReceiver
{ {
private final static Logger mLog = private final static Logger mLog = LoggerFactory.getLogger(RFSSStatusBroadcastExplicit.class);
LoggerFactory.getLogger( RFSSStatusBroadcastExplicit.class );
public static final int[] LRA = {72, 73, 74, 75, 88, 89, 90, 91}; public static final int[] LRA = {72, 73, 74, 75, 88, 89, 90, 91};
public static final int[] RECEIVE_IDENTIFIER = {92, 93, 94, 95}; public static final int[] RECEIVE_IDENTIFIER = {92, 93, 94, 95};
public static final int[] RECEIVE_CHANNEL = { 96,97,98,99,112,113,114,115, public static final int[] RECEIVE_CHANNEL = {96, 97, 98, 99, 112, 113, 114, 115, 116, 117, 118, 119};
116,117,118,119 }; public static final int[] RFSS_ID = {120, 121, 122, 123, 136, 137, 138, 139};
public static final int[] RFSS_ID = { 120,121,122,123,136,137,138,
139 };
public static final int[] SITE_ID = {140, 141, 142, 143, 144, 145, 146, 147}; public static final int[] SITE_ID = {140, 141, 142, 143, 144, 145, 146, 147};
public static final int[] TRANSMIT_IDENTIFIER = {160, 161, 162, 163}; public static final int[] TRANSMIT_IDENTIFIER = {160, 161, 162, 163};
public static final int[] TRANSMIT_CHANNEL = { 164,165,166,167,168,169,170, public static final int[] TRANSMIT_CHANNEL = {164, 165, 166, 167, 168, 169, 170, 171, 184, 185, 186, 187};
171,184,185,186,187 }; public static final int[] SYSTEM_SERVICE_CLASS = {188, 189, 190, 191, 192, 193, 194, 195};
public static final int[] SYSTEM_SERVICE_CLASS = { 188,189,190,191,192,193,
194,195 };
private IBandIdentifier mTransmitIdentifierUpdate; private IBandIdentifier mTransmitIdentifierUpdate;
private IBandIdentifier mReceiveIdentifierUpdate; private IBandIdentifier mReceiveIdentifierUpdate;
@@ -141,12 +151,21 @@ public class RFSSStatusBroadcastExplicit extends TDULinkControlMessage
public long getDownlinkFrequency() public long getDownlinkFrequency()
{ {
return calculateDownlink( mTransmitIdentifierUpdate, getTransmitChannelNumber() ); if(mTransmitIdentifierUpdate != null)
{
return mTransmitIdentifierUpdate.getDownlinkFrequency(getTransmitChannelNumber());
}
return 0;
} }
public long getUplinkFrequency() public long getUplinkFrequency()
{ {
return calculateUplink( mReceiveIdentifierUpdate, getReceiveChannelNumber() ); if(mReceiveIdentifierUpdate != null)
{
return mReceiveIdentifierUpdate.getUplinkFrequency(getReceiveChannelNumber());
} }
return 0;
}
} }

View File

@@ -1,3 +1,21 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 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/>
*
******************************************************************************/
package module.decode.p25.message.tdu.lc; package module.decode.p25.message.tdu.lc;
import module.decode.p25.message.IBandIdentifier; import module.decode.p25.message.IBandIdentifier;
@@ -5,29 +23,16 @@ import module.decode.p25.message.IdentifierReceiver;
import module.decode.p25.message.tsbk.osp.control.SystemService; import module.decode.p25.message.tsbk.osp.control.SystemService;
import module.decode.p25.reference.LinkControlOpcode; import module.decode.p25.reference.LinkControlOpcode;
import org.slf4j.Logger; public class SecondaryControlChannelBroadcast extends TDULinkControlMessage implements IdentifierReceiver
import org.slf4j.LoggerFactory;
public class SecondaryControlChannelBroadcast extends TDULinkControlMessage
implements IdentifierReceiver
{ {
private final static Logger mLog =
LoggerFactory.getLogger( SecondaryControlChannelBroadcast.class );
public static final int[] RFSS_ID = {72, 73, 74, 75, 88, 89, 90, 91}; public static final int[] RFSS_ID = {72, 73, 74, 75, 88, 89, 90, 91};
public static final int[] SITE_ID = {92, 93, 94, 95, 96, 97, 98, 99}; public static final int[] SITE_ID = {92, 93, 94, 95, 96, 97, 98, 99};
public static final int[] IDENTIFIER_A = {112, 113, 114, 115}; public static final int[] IDENTIFIER_A = {112, 113, 114, 115};
public static final int[] CHANNEL_A = { 116,117,118,119,120,121,122, public static final int[] CHANNEL_A = {116, 117, 118, 119, 120, 121, 122, 123, 136, 137, 138, 139};
123,136,137,138,139 }; public static final int[] SYSTEM_SERVICE_CLASS_A = {140, 141, 142, 143, 144, 145, 146, 147};
public static final int[] SYSTEM_SERVICE_CLASS_A = { 140,141,142,143,144,
145,146,147 };
public static final int[] IDENTIFIER_B = {160, 161, 162, 163}; public static final int[] IDENTIFIER_B = {160, 161, 162, 163};
public static final int[] CHANNEL_B = { 164,165,166,167,168,169,170, public static final int[] CHANNEL_B = {164, 165, 166, 167, 168, 169, 170, 171, 184, 185, 186, 187};
171,184,185,186,187 }; public static final int[] SYSTEM_SERVICE_CLASS_B = {188, 189, 190, 191, 192, 193, 194, 195};
public static final int[] SYSTEM_SERVICE_CLASS_B = { 188,189,190,191,192,
193,194,195 };
private IBandIdentifier mIdentifierProviderA; private IBandIdentifier mIdentifierProviderA;
private IBandIdentifier mIdentifierProviderB; private IBandIdentifier mIdentifierProviderB;
@@ -139,21 +144,41 @@ public class SecondaryControlChannelBroadcast extends TDULinkControlMessage
public long getDownlinkFrequencyA() public long getDownlinkFrequencyA()
{ {
return calculateDownlink( mIdentifierProviderA, getChannelA() ); if(mIdentifierProviderA != null)
{
return mIdentifierProviderA.getDownlinkFrequency(getChannelA());
}
return 0;
} }
public long getUplinkFrequencyA() public long getUplinkFrequencyA()
{ {
return calculateUplink( mIdentifierProviderA, getChannelA() ); if(mIdentifierProviderA != null)
{
return mIdentifierProviderA.getUplinkFrequency(getChannelA());
}
return 0;
} }
public long getDownlinkFrequencyB() public long getDownlinkFrequencyB()
{ {
return calculateDownlink( mIdentifierProviderB, getChannelB() ); if(mIdentifierProviderB != null)
{
return mIdentifierProviderB.getDownlinkFrequency(getChannelB());
}
return 0;
} }
public long getUplinkFrequencyB() public long getUplinkFrequencyB()
{ {
return calculateUplink( mIdentifierProviderB, getChannelB() ); if(mIdentifierProviderB != null)
{
return mIdentifierProviderB.getUplinkFrequency(getChannelB());
}
return 0;
} }
} }

View File

@@ -1,3 +1,21 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 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/>
*
******************************************************************************/
package module.decode.p25.message.tdu.lc; package module.decode.p25.message.tdu.lc;
import module.decode.p25.message.IBandIdentifier; import module.decode.p25.message.IBandIdentifier;
@@ -5,25 +23,15 @@ import module.decode.p25.message.IdentifierReceiver;
import module.decode.p25.message.tsbk.osp.control.SystemService; import module.decode.p25.message.tsbk.osp.control.SystemService;
import module.decode.p25.reference.LinkControlOpcode; import module.decode.p25.reference.LinkControlOpcode;
import org.slf4j.Logger; public class SecondaryControlChannelBroadcastExplicit extends TDULinkControlMessage implements IdentifierReceiver
import org.slf4j.LoggerFactory;
public class SecondaryControlChannelBroadcastExplicit
extends TDULinkControlMessage implements IdentifierReceiver
{ {
private final static Logger mLog =
LoggerFactory.getLogger( SecondaryControlChannelBroadcastExplicit.class );
public static final int[] RFSS_ID = {72, 73, 74, 75, 88, 89, 90, 91}; public static final int[] RFSS_ID = {72, 73, 74, 75, 88, 89, 90, 91};
public static final int[] SITE_ID = {92, 93, 94, 95, 96, 97, 98, 99}; public static final int[] SITE_ID = {92, 93, 94, 95, 96, 97, 98, 99};
public static final int[] TRANSMIT_IDENTIFIER = {112, 113, 114, 115}; public static final int[] TRANSMIT_IDENTIFIER = {112, 113, 114, 115};
public static final int[] TRANSMIT_CHANNEL = { 116,117,118,119,120,121,122, public static final int[] TRANSMIT_CHANNEL = {116, 117, 118, 119, 120, 121, 122, 123, 136, 137, 138, 139};
123,136,137,138,139 };
public static final int[] RECEIVE_IDENTIFIER = {140, 141, 142, 143}; public static final int[] RECEIVE_IDENTIFIER = {140, 141, 142, 143};
public static final int[] RECEIVE_CHANNEL = { 144,145,146,147,160,161,162, public static final int[] RECEIVE_CHANNEL = {144, 145, 146, 147, 160, 161, 162, 163, 164, 165, 166, 167};
163,164,165,166,167 }; public static final int[] SYSTEM_SERVICE_CLASS = {168, 169, 170, 171, 184, 185, 186, 187};
public static final int[] SYSTEM_SERVICE_CLASS = { 168,169,170,171,184,
185,186,187 };
private IBandIdentifier mTransmitIdentifierProvider; private IBandIdentifier mTransmitIdentifierProvider;
private IBandIdentifier mReceiveIdentifierProvider; private IBandIdentifier mReceiveIdentifierProvider;
@@ -128,13 +136,21 @@ public class SecondaryControlChannelBroadcastExplicit
public long getDownlinkFrequency() public long getDownlinkFrequency()
{ {
return calculateDownlink( mTransmitIdentifierProvider, if(mTransmitIdentifierProvider != null)
getTransmitChannelNumber() ); {
return mTransmitIdentifierProvider.getDownlinkFrequency(getTransmitChannelNumber());
}
return 0;
} }
public long getUplinkFrequency() public long getUplinkFrequency()
{ {
return calculateUplink( mReceiveIdentifierProvider, if(mReceiveIdentifierProvider != null)
getReceiveChannelNumber() ); {
return mReceiveIdentifierProvider.getUplinkFrequency(getReceiveChannelNumber());
}
return 0;
} }
} }

View File

@@ -1,28 +1,55 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 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/>
*
******************************************************************************/
package module.decode.p25.message.tsbk; package module.decode.p25.message.tsbk;
import alias.AliasList;
import bits.BinaryMessage;
import module.decode.p25.message.IBandIdentifier; import module.decode.p25.message.IBandIdentifier;
import module.decode.p25.message.IdentifierReceiver; import module.decode.p25.message.IdentifierReceiver;
import module.decode.p25.reference.DataUnitID; import module.decode.p25.reference.DataUnitID;
import alias.AliasList;
import bits.BinaryMessage;
public abstract class ChannelGrant extends ServiceMessage public abstract class ChannelGrant extends ServiceMessage implements IdentifierReceiver
implements IdentifierReceiver
{ {
public static final int[] PRIORITY = {85, 86, 87}; public static final int[] PRIORITY = {85, 86, 87};
public static final int[] CHANNEL_IDENTIFIER = {88, 89, 90, 91}; public static final int[] CHANNEL_IDENTIFIER = {88, 89, 90, 91};
public static final int[] CHANNEL_NUMBER = { 92,93,94,95,96,97,98,99,100, public static final int[] CHANNEL_NUMBER = {92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103};
101,102,103 };
private IBandIdentifier mIdentifierUpdate; private IBandIdentifier mIdentifierUpdate;
public ChannelGrant( BinaryMessage message, public ChannelGrant(BinaryMessage message, DataUnitID duid, AliasList aliasList)
DataUnitID duid,
AliasList aliasList )
{ {
super(message, duid, aliasList); super(message, duid, aliasList);
} }
/**
* Indicates if this channel grant is for a TDMA channel
*/
public boolean isTDMAChannel()
{
if(mIdentifierUpdate != null)
{
return mIdentifierUpdate.isTDMA();
}
return false;
}
/** /**
* 1 = Lowest, 4 = Default, 7 = Highest * 1 = Lowest, 4 = Default, 7 = Highest
*/ */
@@ -63,12 +90,21 @@ public abstract class ChannelGrant extends ServiceMessage
public long getDownlinkFrequency() public long getDownlinkFrequency()
{ {
return calculateDownlink( mIdentifierUpdate, getChannelNumber() ); if(mIdentifierUpdate != null)
{
return mIdentifierUpdate.getDownlinkFrequency(getChannelNumber());
}
return 0;
} }
public long getUplinkFrequency() public long getUplinkFrequency()
{ {
return calculateUplink( mIdentifierUpdate, getChannelNumber() ); if(mIdentifierUpdate != null)
{
return mIdentifierUpdate.getUplinkFrequency(getChannelNumber());
} }
return 0;
}
} }

View File

@@ -1,31 +1,56 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 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/>
*
******************************************************************************/
package module.decode.p25.message.tsbk; package module.decode.p25.message.tsbk;
import module.decode.p25.message.IBandIdentifier;
import module.decode.p25.reference.DataUnitID;
import alias.AliasList; import alias.AliasList;
import bits.BinaryMessage; import bits.BinaryMessage;
import module.decode.p25.message.IBandIdentifier;
import module.decode.p25.reference.DataUnitID;
public abstract class GroupChannelGrantExplicit extends ChannelGrant public abstract class GroupChannelGrantExplicit extends ChannelGrant
{ {
public static final int[] TRANSMIT_IDENTIFIER = {96, 97, 98, 99}; public static final int[] TRANSMIT_IDENTIFIER = {96, 97, 98, 99};
public static final int[] TRANSMIT_NUMBER = { 100,101,102,103, public static final int[] TRANSMIT_NUMBER = {100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111};
104,105,106,107,108,109,110,111 };
public static final int[] RECEIVE_IDENTIFIER = {112, 113, 114, 115}; public static final int[] RECEIVE_IDENTIFIER = {112, 113, 114, 115};
public static final int[] RECEIVE_NUMBER = { 116,117,118,119, public static final int[] RECEIVE_NUMBER = {116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127};
120,121,122,123,124,125,126,127 }; public static final int[] GROUP_ADDRESS = {128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141,
public static final int[] GROUP_ADDRESS = { 128,129,130,131,132,133,134,135, 142, 143};
136,137,138,139,140,141,142,143 };
private IBandIdentifier mTransmitIdentifierUpdate; private IBandIdentifier mTransmitIdentifierUpdate;
private IBandIdentifier mReceiveIdentifierUpdate; private IBandIdentifier mReceiveIdentifierUpdate;
public GroupChannelGrantExplicit( BinaryMessage message, public GroupChannelGrantExplicit(BinaryMessage message, DataUnitID duid, AliasList aliasList)
DataUnitID duid,
AliasList aliasList )
{ {
super(message, duid, aliasList); super(message, duid, aliasList);
} }
@Override
public boolean isTDMAChannel()
{
if(mTransmitIdentifierUpdate != null)
{
return mTransmitIdentifierUpdate.isTDMA();
}
return false;
}
public String getMessage() public String getMessage()
{ {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
@@ -110,11 +135,21 @@ public abstract class GroupChannelGrantExplicit extends ChannelGrant
public long getDownlinkFrequency() public long getDownlinkFrequency()
{ {
return calculateDownlink( mTransmitIdentifierUpdate, getTransmitChannelNumber() ); if(mTransmitIdentifierUpdate != null)
{
return mTransmitIdentifierUpdate.getDownlinkFrequency(getTransmitChannelNumber());
}
return 0;
} }
public long getUplinkFrequency() public long getUplinkFrequency()
{ {
return calculateUplink( mReceiveIdentifierUpdate, getReceiveChannelNumber() ); if(mReceiveIdentifierUpdate != null)
{
return mReceiveIdentifierUpdate.getUplinkFrequency(getReceiveChannelNumber());
}
return 0;
} }
} }

View File

@@ -1,32 +1,42 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 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/>
*
******************************************************************************/
package module.decode.p25.message.tsbk; package module.decode.p25.message.tsbk;
import alias.AliasList;
import bits.BinaryMessage;
import module.decode.p25.message.IBandIdentifier; import module.decode.p25.message.IBandIdentifier;
import module.decode.p25.message.IdentifierReceiver; import module.decode.p25.message.IdentifierReceiver;
import module.decode.p25.reference.DataUnitID; import module.decode.p25.reference.DataUnitID;
import alias.AliasList;
import bits.BinaryMessage;
public abstract class GroupMultiChannelGrant extends ChannelGrant public abstract class GroupMultiChannelGrant extends ChannelGrant implements IdentifierReceiver
implements IdentifierReceiver
{ {
public static final int[] CHANNEL_IDENTIFIER_1 = {80, 81, 82, 83}; public static final int[] CHANNEL_IDENTIFIER_1 = {80, 81, 82, 83};
public static final int[] CHANNEL_NUMBER_1 = { 84,85,86,87, public static final int[] CHANNEL_NUMBER_1 = {84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95};
88,89,90,91,92,93,94,95 }; public static final int[] GROUP_ADDRESS_1 = {96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111};
public static final int[] GROUP_ADDRESS_1 = { 96,97,98,99,100,101,102,103,
104,105,106,107,108,109,110,111 };
public static final int[] CHANNEL_IDENTIFIER_2 = {112, 113, 114, 115}; public static final int[] CHANNEL_IDENTIFIER_2 = {112, 113, 114, 115};
public static final int[] CHANNEL_NUMBER_2 = { 116,117,118,119,120,121,122, public static final int[] CHANNEL_NUMBER_2 = {116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127};
123,124,125,126,127 }; public static final int[] GROUP_ADDRESS_2 = {128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143};
public static final int[] GROUP_ADDRESS_2 = { 128,129,130,131,132,133,134,
135,136,137,138,139,140,141,142,143 };
private IBandIdentifier mIdentifierUpdate1; private IBandIdentifier mIdentifierUpdate1;
private IBandIdentifier mIdentifierUpdate2; private IBandIdentifier mIdentifierUpdate2;
public GroupMultiChannelGrant( BinaryMessage message, public GroupMultiChannelGrant(BinaryMessage message, DataUnitID duid, AliasList aliasList)
DataUnitID duid,
AliasList aliasList )
{ {
super(message, duid, aliasList); super(message, duid, aliasList);
} }
@@ -149,22 +159,62 @@ public abstract class GroupMultiChannelGrant extends ChannelGrant
public long getDownlinkFrequency1() public long getDownlinkFrequency1()
{ {
return calculateDownlink( mIdentifierUpdate1, getChannelNumber1() ); if(mIdentifierUpdate1 != null)
{
return mIdentifierUpdate1.getDownlinkFrequency(getChannelNumber1());
}
return 0;
}
public boolean isTDMAChannel1()
{
if(mIdentifierUpdate1 != null)
{
return mIdentifierUpdate1.isTDMA();
}
return false;
} }
public long getUplinkFrequency1() public long getUplinkFrequency1()
{ {
return calculateUplink( mIdentifierUpdate1, getChannelNumber1() ); if(mIdentifierUpdate1 != null)
{
return mIdentifierUpdate1.getUplinkFrequency(getChannelNumber1());
}
return 0;
} }
public long getDownlinkFrequency2() public long getDownlinkFrequency2()
{ {
return calculateDownlink( mIdentifierUpdate2, getChannelNumber2() ); if(mIdentifierUpdate2 != null)
{
return mIdentifierUpdate2.getDownlinkFrequency(getChannelNumber2());
}
return 0;
}
public boolean isTDMAChannel2()
{
if(mIdentifierUpdate2 != null)
{
return mIdentifierUpdate2.isTDMA();
}
return false;
} }
public long getUplinkFrequency2() public long getUplinkFrequency2()
{ {
return calculateUplink( mIdentifierUpdate2, getChannelNumber2() ); if(mIdentifierUpdate2 != null)
{
return mIdentifierUpdate2.getUplinkFrequency(getChannelNumber2());
}
return 0;
} }
} }

View File

@@ -1,21 +1,36 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 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/>
*
******************************************************************************/
package module.decode.p25.message.tsbk; package module.decode.p25.message.tsbk;
import module.decode.p25.reference.DataUnitID;
import alias.Alias; import alias.Alias;
import alias.AliasList; import alias.AliasList;
import bits.BinaryMessage; import bits.BinaryMessage;
import module.decode.p25.reference.DataUnitID;
public abstract class UnitChannelGrant extends ChannelGrant public abstract class UnitChannelGrant extends ChannelGrant
{ {
public static final int[] TARGET_ADDRESS = { 96,97,98,99,100,101,102,103, public static final int[] TARGET_ADDRESS = {96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110,
104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119 }; 111, 112, 113, 114, 115, 116, 117, 118, 119};
public static final int[] SOURCE_ADDRESS = {120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133,
134, 135, 136, 137, 138, 139, 140, 141, 142, 143};
public static final int[] SOURCE_ADDRESS = { 120,121,122,123,124,125,126, public UnitChannelGrant(BinaryMessage message, DataUnitID duid, AliasList aliasList)
127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 };
public UnitChannelGrant( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{ {
super(message, duid, aliasList); super(message, duid, aliasList);
} }

View File

@@ -1,13 +1,30 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 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/>
*
******************************************************************************/
package module.decode.p25.message.tsbk.motorola; package module.decode.p25.message.tsbk.motorola;
import alias.AliasList;
import bits.BinaryMessage;
import module.decode.p25.message.IBandIdentifier; import module.decode.p25.message.IBandIdentifier;
import module.decode.p25.message.IdentifierReceiver; import module.decode.p25.message.IdentifierReceiver;
import module.decode.p25.reference.DataUnitID; import module.decode.p25.reference.DataUnitID;
import alias.AliasList;
import bits.BinaryMessage;
public class ControlChannelBaseStationIdentification extends MotorolaTSBKMessage public class ControlChannelBaseStationIdentification extends MotorolaTSBKMessage implements IdentifierReceiver
implements IdentifierReceiver
{ {
public static final int[] CHARACTER_1 = {80, 81, 82, 83, 84, 85}; public static final int[] CHARACTER_1 = {80, 81, 82, 83, 84, 85};
public static final int[] CHARACTER_2 = {86, 87, 88, 89, 90, 91}; public static final int[] CHARACTER_2 = {86, 87, 88, 89, 90, 91};
@@ -19,14 +36,11 @@ public class ControlChannelBaseStationIdentification extends MotorolaTSBKMessage
public static final int[] CHARACTER_8 = {122, 123, 124, 125, 126, 127}; public static final int[] CHARACTER_8 = {122, 123, 124, 125, 126, 127};
public static final int[] IDENTIFIER = {128, 129, 130, 131}; public static final int[] IDENTIFIER = {128, 129, 130, 131};
public static final int[] CHANNEL = { 132,133,134,135,136,137,138,139,140, public static final int[] CHANNEL = {132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143};
141,142,143 };
private IBandIdentifier mIdentifierUpdate; private IBandIdentifier mIdentifierUpdate;
public ControlChannelBaseStationIdentification( BinaryMessage message, public ControlChannelBaseStationIdentification(BinaryMessage message, DataUnitID duid, AliasList aliasList)
DataUnitID duid,
AliasList aliasList )
{ {
super(message, duid, aliasList); super(message, duid, aliasList);
} }
@@ -95,12 +109,22 @@ public class ControlChannelBaseStationIdentification extends MotorolaTSBKMessage
public long getUplinkFrequency() public long getUplinkFrequency()
{ {
return calculateUplink( mIdentifierUpdate, getChannel() ); if(mIdentifierUpdate != null)
{
mIdentifierUpdate.getUplinkFrequency(getChannel());
}
return 0;
} }
public long getDownlinkFrequency() public long getDownlinkFrequency()
{ {
return calculateDownlink( mIdentifierUpdate, getChannel() ); if(mIdentifierUpdate != null)
{
mIdentifierUpdate.getDownlinkFrequency(getChannel());
}
return 0;
} }
@Override @Override

View File

@@ -1,13 +1,30 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 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/>
*
******************************************************************************/
package module.decode.p25.message.tsbk.motorola; package module.decode.p25.message.tsbk.motorola;
import alias.AliasList;
import bits.BinaryMessage;
import module.decode.p25.message.IBandIdentifier; import module.decode.p25.message.IBandIdentifier;
import module.decode.p25.message.IdentifierReceiver; import module.decode.p25.message.IdentifierReceiver;
import module.decode.p25.reference.DataUnitID; import module.decode.p25.reference.DataUnitID;
import alias.AliasList;
import bits.BinaryMessage;
public class PatchGroupVoiceChannelGrant extends MotorolaTSBKMessage public class PatchGroupVoiceChannelGrant extends MotorolaTSBKMessage implements IdentifierReceiver
implements IdentifierReceiver
{ {
/* Service Options */ /* Service Options */
public static final int EMERGENCY_FLAG = 80; public static final int EMERGENCY_FLAG = 80;
@@ -18,19 +35,28 @@ public class PatchGroupVoiceChannelGrant extends MotorolaTSBKMessage
public static final int[] PRIORITY = {85, 86, 87}; public static final int[] PRIORITY = {85, 86, 87};
public static final int[] IDENTIFIER = {88, 89, 90, 91}; public static final int[] IDENTIFIER = {88, 89, 90, 91};
public static final int[] CHANNEL = {92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103}; public static final int[] CHANNEL = {92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103};
public static final int[] PATCH_GROUP_ADDRESS = { 104,105,106,107,108,109, public static final int[] PATCH_GROUP_ADDRESS = {104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
110,111,112,113,114,115,116,117,118,119 }; 117, 118, 119};
public static final int[] SOURCE_ADDRESS = { 120,121,122,123,124,125,126, public static final int[] SOURCE_ADDRESS = {120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133,
127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 }; 134, 135, 136, 137, 138, 139, 140, 141, 142, 143};
private IBandIdentifier mIdentifierUpdate; private IBandIdentifier mIdentifierUpdate;
public PatchGroupVoiceChannelGrant( BinaryMessage message, DataUnitID duid, public PatchGroupVoiceChannelGrant(BinaryMessage message, DataUnitID duid, AliasList aliasList)
AliasList aliasList )
{ {
super(message, duid, aliasList); super(message, duid, aliasList);
} }
public boolean isTDMAChannel()
{
if(mIdentifierUpdate != null)
{
return mIdentifierUpdate.isTDMA();
}
return false;
}
@Override @Override
public String getEventType() public String getEventType()
{ {
@@ -140,12 +166,22 @@ public class PatchGroupVoiceChannelGrant extends MotorolaTSBKMessage
public long getDownlinkFrequency() public long getDownlinkFrequency()
{ {
return calculateDownlink( mIdentifierUpdate, getChannelNumber() ); if(mIdentifierUpdate != null)
{
return mIdentifierUpdate.getDownlinkFrequency(getChannelNumber());
}
return 0;
} }
public long getUplinkFrequency() public long getUplinkFrequency()
{ {
return calculateUplink( mIdentifierUpdate, getChannelNumber() ); if(mIdentifierUpdate != null)
{
return mIdentifierUpdate.getUplinkFrequency(getChannelNumber());
}
return 0;
} }
} }

View File

@@ -1,30 +1,42 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 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/>
*
******************************************************************************/
package module.decode.p25.message.tsbk.motorola; package module.decode.p25.message.tsbk.motorola;
import alias.AliasList;
import bits.BinaryMessage;
import module.decode.p25.message.IBandIdentifier; import module.decode.p25.message.IBandIdentifier;
import module.decode.p25.message.IdentifierReceiver; import module.decode.p25.message.IdentifierReceiver;
import module.decode.p25.reference.DataUnitID; import module.decode.p25.reference.DataUnitID;
import alias.AliasList;
import bits.BinaryMessage;
public class PatchGroupVoiceChannelGrantUpdate extends MotorolaTSBKMessage public class PatchGroupVoiceChannelGrantUpdate extends MotorolaTSBKMessage implements IdentifierReceiver
implements IdentifierReceiver
{ {
public static final int[] IDENTIFIER_1 = {80, 81, 82, 83}; public static final int[] IDENTIFIER_1 = {80, 81, 82, 83};
public static final int[] CHANNEL_1 = { 84,85,86,87,88,89,90,91,92,93,94, public static final int[] CHANNEL_1 = {84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95};
95 }; public static final int[] PATCH_GROUP_ADDRESS_1 = {96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111};
public static final int[] PATCH_GROUP_ADDRESS_1 = { 96,97,98,99,100,101,102,
103,104,105,106,107,108,109,110,111 };
public static final int[] IDENTIFIER_2 = {112, 113, 114, 115}; public static final int[] IDENTIFIER_2 = {112, 113, 114, 115};
public static final int[] CHANNEL_2 = { 116,117,118,119,120,121,122,123, public static final int[] CHANNEL_2 = {116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127};
124,125,126,127 }; public static final int[] PATCH_GROUP_ADDRESS_2 = {128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143};
public static final int[] PATCH_GROUP_ADDRESS_2 = { 128,129,130,131,132,133,
134,135,136,137,138,139,140,141,142,143 };
private IBandIdentifier mIdentifierUpdate1; private IBandIdentifier mIdentifierUpdate1;
private IBandIdentifier mIdentifierUpdate2; private IBandIdentifier mIdentifierUpdate2;
public PatchGroupVoiceChannelGrantUpdate( BinaryMessage message, public PatchGroupVoiceChannelGrantUpdate(BinaryMessage message, DataUnitID duid, AliasList aliasList)
DataUnitID duid, AliasList aliasList )
{ {
super(message, duid, aliasList); super(message, duid, aliasList);
} }
@@ -125,22 +137,61 @@ public class PatchGroupVoiceChannelGrantUpdate extends MotorolaTSBKMessage
public long getDownlinkFrequency1() public long getDownlinkFrequency1()
{ {
return calculateDownlink( mIdentifierUpdate1, getChannelNumber1() ); if(mIdentifierUpdate1 != null)
{
return mIdentifierUpdate1.getDownlinkFrequency(getChannelNumber1());
}
return 0;
}
public boolean isTDMAChannel1()
{
if(mIdentifierUpdate1 != null)
{
return mIdentifierUpdate1.isTDMA();
}
return false;
} }
public long getUplinkFrequency1() public long getUplinkFrequency1()
{ {
return calculateUplink( mIdentifierUpdate1, getChannelNumber1() ); if(mIdentifierUpdate1 != null)
{
return mIdentifierUpdate1.getUplinkFrequency(getChannelNumber1());
}
return 0;
} }
public long getDownlinkFrequency2() public long getDownlinkFrequency2()
{ {
return calculateDownlink( mIdentifierUpdate2, getChannelNumber2() ); if(mIdentifierUpdate2 != null)
{
return mIdentifierUpdate2.getDownlinkFrequency(getChannelNumber2());
}
return 0;
}
public boolean isTDMAChannel2()
{
if(mIdentifierUpdate2 != null)
{
return mIdentifierUpdate2.isTDMA();
}
return false;
} }
public long getUplinkFrequency2() public long getUplinkFrequency2()
{ {
return calculateUplink( mIdentifierUpdate2, getChannelNumber2() ); if(mIdentifierUpdate2 != null)
{
return mIdentifierUpdate2.getUplinkFrequency(getChannelNumber2());
} }
return 0;
}
} }

View File

@@ -1,38 +1,49 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 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/>
*
******************************************************************************/
package module.decode.p25.message.tsbk.osp.control; package module.decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BinaryMessage;
import module.decode.p25.message.IAdjacentSite; import module.decode.p25.message.IAdjacentSite;
import module.decode.p25.message.IBandIdentifier; import module.decode.p25.message.IBandIdentifier;
import module.decode.p25.message.IdentifierReceiver; import module.decode.p25.message.IdentifierReceiver;
import module.decode.p25.message.tsbk.TSBKMessage; import module.decode.p25.message.tsbk.TSBKMessage;
import module.decode.p25.reference.DataUnitID; import module.decode.p25.reference.DataUnitID;
import module.decode.p25.reference.Opcode; import module.decode.p25.reference.Opcode;
import alias.AliasList;
import bits.BinaryMessage;
public class AdjacentStatusBroadcast extends TSBKMessage public class AdjacentStatusBroadcast extends TSBKMessage implements IdentifierReceiver, IAdjacentSite
implements IdentifierReceiver, IAdjacentSite
{ {
public static final int[] LOCATION_REGISTRATION_AREA = { 80,81,82,83,84,85, public static final int[] LOCATION_REGISTRATION_AREA = {80, 81, 82, 83, 84, 85, 86, 87};
86,87 };
public static final int CONVENTIONAL_CHANNEL_FLAG = 88; public static final int CONVENTIONAL_CHANNEL_FLAG = 88;
public static final int SITE_FAILURE_CONDITION_FLAG = 89; public static final int SITE_FAILURE_CONDITION_FLAG = 89;
public static final int VALID_FLAG = 90; public static final int VALID_FLAG = 90;
public static final int ACTIVE_NETWORK_CONNECTION_FLAG = 91; public static final int ACTIVE_NETWORK_CONNECTION_FLAG = 91;
public static final int[] SYSTEM_ID = { 92,93,94,95,96,97,98,99,100,101, public static final int[] SYSTEM_ID = {92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103};
102,103 };
public static final int[] RFSS_ID = {104, 105, 106, 107, 108, 109, 110, 111}; public static final int[] RFSS_ID = {104, 105, 106, 107, 108, 109, 110, 111};
public static final int[] SITE_ID = {112, 113, 114, 115, 116, 117, 118, 119}; public static final int[] SITE_ID = {112, 113, 114, 115, 116, 117, 118, 119};
public static final int[] IDENTIFIER = {120, 121, 122, 123}; public static final int[] IDENTIFIER = {120, 121, 122, 123};
public static final int[] CHANNEL = { 124,125,126,127,128,129,130,131,132, public static final int[] CHANNEL = {124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135};
133,134,135 }; public static final int[] SYSTEM_SERVICE_CLASS = {136, 137, 138, 139, 140, 141, 142, 143};
public static final int[] SYSTEM_SERVICE_CLASS = { 136,137,138,139,140,141,
142,143 };
private IBandIdentifier mIdentifierUpdate; private IBandIdentifier mIdentifierUpdate;
public AdjacentStatusBroadcast( BinaryMessage message, public AdjacentStatusBroadcast(BinaryMessage message, DataUnitID duid, AliasList aliasList)
DataUnitID duid,
AliasList aliasList )
{ {
super(message, duid, aliasList); super(message, duid, aliasList);
} }
@@ -168,12 +179,22 @@ public class AdjacentStatusBroadcast extends TSBKMessage
public long getDownlinkFrequency() public long getDownlinkFrequency()
{ {
return calculateDownlink( mIdentifierUpdate, getChannel() ); if(mIdentifierUpdate != null)
{
return mIdentifierUpdate.getDownlinkFrequency(getChannel());
}
return 0;
} }
public long getUplinkFrequency() public long getUplinkFrequency()
{ {
return calculateUplink( mIdentifierUpdate, getChannel() ); if(mIdentifierUpdate != null)
{
return mIdentifierUpdate.getUplinkFrequency(getChannel());
}
return 0;
} }

View File

@@ -1,3 +1,21 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 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/>
*
******************************************************************************/
package module.decode.p25.message.tsbk.osp.control; package module.decode.p25.message.tsbk.osp.control;
import module.decode.p25.message.IBandIdentifier; import module.decode.p25.message.IBandIdentifier;
@@ -6,8 +24,7 @@ import module.decode.p25.reference.DataUnitID;
import alias.AliasList; import alias.AliasList;
import bits.BinaryMessage; import bits.BinaryMessage;
public abstract class IdentifierUpdate extends TSBKMessage public abstract class IdentifierUpdate extends TSBKMessage implements IBandIdentifier
implements IBandIdentifier
{ {
public static final int[] IDENTIFIER = { 80,81,82,83 }; public static final int[] IDENTIFIER = { 80,81,82,83 };
@@ -45,4 +62,22 @@ public abstract class IdentifierUpdate extends TSBKMessage
@Override @Override
public abstract long getTransmitOffset(); public abstract long getTransmitOffset();
@Override
public long getDownlinkFrequency(int channelNumber)
{
return getBaseFrequency() + ( channelNumber * getChannelSpacing() );
}
@Override
public long getUplinkFrequency(int channelNumber)
{
return getDownlinkFrequency(channelNumber) + getTransmitOffset();
}
@Override
public boolean isTDMA()
{
return false;
}
} }

View File

@@ -81,6 +81,25 @@ public class IdentifierUpdateTDMA extends IdentifierUpdate
} }
} }
@Override
public long getDownlinkFrequency(int channelNumber)
{
if(isTDMA())
{
return getBaseFrequency() + ( (channelNumber / getChannelType().getSlotsPerCarrier()) * getChannelSpacing() );
}
else
{
return super.getDownlinkFrequency(channelNumber);
}
}
@Override
public boolean isTDMA()
{
return getChannelType().getAccessType() == AccessType.TDMA;
}
public enum ChannelType public enum ChannelType
{ {
TYPE_0( AccessType.FDMA, 12500, 1, Vocoder.HALF_RATE ), TYPE_0( AccessType.FDMA, 12500, 1, Vocoder.HALF_RATE ),

View File

@@ -1,33 +1,44 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 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/>
*
******************************************************************************/
package module.decode.p25.message.tsbk.osp.control; package module.decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BinaryMessage;
import module.decode.p25.message.IBandIdentifier; import module.decode.p25.message.IBandIdentifier;
import module.decode.p25.message.IdentifierReceiver; import module.decode.p25.message.IdentifierReceiver;
import module.decode.p25.message.tsbk.TSBKMessage; import module.decode.p25.message.tsbk.TSBKMessage;
import module.decode.p25.reference.DataUnitID; import module.decode.p25.reference.DataUnitID;
import module.decode.p25.reference.Opcode; import module.decode.p25.reference.Opcode;
import module.decode.p25.reference.P25NetworkCallsign; import module.decode.p25.reference.P25NetworkCallsign;
import alias.AliasList;
import bits.BinaryMessage;
public class NetworkStatusBroadcast extends TSBKMessage implements IdentifierReceiver public class NetworkStatusBroadcast extends TSBKMessage implements IdentifierReceiver
{ {
public static final int[] LOCATION_REGISTRATION_AREA = { 80,81,82,83,84,85, public static final int[] LOCATION_REGISTRATION_AREA = {80, 81, 82, 83, 84, 85, 86, 87};
86,87 }; public static final int[] WACN = {88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107};
public static final int[] WACN = { 88,89,90,91,92,93,94,95,96,97,98,99,100, public static final int[] SYSTEM_ID = {108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119};
101,102,103,104,105,106,107 };
public static final int[] SYSTEM_ID = { 108,109,110,111,112,113,114,115,116,
117,118,119 };
public static final int[] IDENTIFIER = {120, 121, 122, 123}; public static final int[] IDENTIFIER = {120, 121, 122, 123};
public static final int[] CHANNEL = { 124,125,126,127,128,129,130,131,132, public static final int[] CHANNEL = {124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135};
133,134,135 }; public static final int[] SYSTEM_SERVICE_CLASS = {136, 137, 138, 139, 140, 141, 142, 143};
public static final int[] SYSTEM_SERVICE_CLASS = { 136,137,138,139,140,141,
142,143 };
private IBandIdentifier mIdentifierUpdate; private IBandIdentifier mIdentifierUpdate;
public NetworkStatusBroadcast( BinaryMessage message, public NetworkStatusBroadcast(BinaryMessage message, DataUnitID duid, AliasList aliasList)
DataUnitID duid,
AliasList aliasList )
{ {
super(message, duid, aliasList); super(message, duid, aliasList);
} }
@@ -100,12 +111,22 @@ public class NetworkStatusBroadcast extends TSBKMessage implements IdentifierRec
public long getDownlinkFrequency() public long getDownlinkFrequency()
{ {
return calculateDownlink( mIdentifierUpdate, getChannel() ); if(mIdentifierUpdate != null)
{
return mIdentifierUpdate.getDownlinkFrequency(getChannel());
}
return 0;
} }
public long getUplinkFrequency() public long getUplinkFrequency()
{ {
return calculateUplink( mIdentifierUpdate, getChannel() ); if(mIdentifierUpdate != null)
{
return mIdentifierUpdate.getUplinkFrequency(getChannel());
}
return 0;
} }
@Override @Override

View File

@@ -1,33 +1,45 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 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/>
*
******************************************************************************/
package module.decode.p25.message.tsbk.osp.control; package module.decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BinaryMessage;
import module.decode.p25.message.IBandIdentifier; import module.decode.p25.message.IBandIdentifier;
import module.decode.p25.message.IdentifierReceiver; import module.decode.p25.message.IdentifierReceiver;
import module.decode.p25.message.tsbk.TSBKMessage; import module.decode.p25.message.tsbk.TSBKMessage;
import module.decode.p25.reference.DataUnitID; import module.decode.p25.reference.DataUnitID;
import module.decode.p25.reference.Opcode; import module.decode.p25.reference.Opcode;
import alias.AliasList;
import bits.BinaryMessage;
public class RFSSStatusBroadcast extends TSBKMessage implements IdentifierReceiver public class RFSSStatusBroadcast extends TSBKMessage implements IdentifierReceiver
{ {
public static final int[] LOCATION_REGISTRATION_AREA = { 80,81,82,83,84,85, public static final int[] LOCATION_REGISTRATION_AREA = {80, 81, 82, 83, 84, 85, 86, 87};
86,87 };
public static final int ACTIVE_NETWORK_CONNECTION_FLAG = 91; public static final int ACTIVE_NETWORK_CONNECTION_FLAG = 91;
public static final int[] SYSTEM_ID = { 92,93,94,95,96,97,98,99,100,101, public static final int[] SYSTEM_ID = {92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103};
102,103 };
public static final int[] RFSS_ID = {104, 105, 106, 107, 108, 109, 110, 111}; public static final int[] RFSS_ID = {104, 105, 106, 107, 108, 109, 110, 111};
public static final int[] SITE_ID = {112, 113, 114, 115, 116, 117, 118, 119}; public static final int[] SITE_ID = {112, 113, 114, 115, 116, 117, 118, 119};
public static final int[] IDENTIFIER = {120, 121, 122, 123}; public static final int[] IDENTIFIER = {120, 121, 122, 123};
public static final int[] CHANNEL = { 124,125,126,127,128,129,130,131,132, public static final int[] CHANNEL = {124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135};
133,134,135 }; public static final int[] SYSTEM_SERVICE_CLASS = {136, 137, 138, 139, 140, 141, 142, 143};
public static final int[] SYSTEM_SERVICE_CLASS = { 136,137,138,139,140,141,
142,143 };
private IBandIdentifier mIdentifierUpdate; private IBandIdentifier mIdentifierUpdate;
public RFSSStatusBroadcast( BinaryMessage message, public RFSSStatusBroadcast(BinaryMessage message, DataUnitID duid, AliasList aliasList)
DataUnitID duid,
AliasList aliasList )
{ {
super(message, duid, aliasList); super(message, duid, aliasList);
} }
@@ -110,12 +122,22 @@ public class RFSSStatusBroadcast extends TSBKMessage implements IdentifierReceiv
public long getDownlinkFrequency() public long getDownlinkFrequency()
{ {
return calculateDownlink( mIdentifierUpdate, getChannel() ); if(mIdentifierUpdate != null)
{
return mIdentifierUpdate.getDownlinkFrequency(getChannel());
}
return 0;
} }
public long getUplinkFrequency() public long getUplinkFrequency()
{ {
return calculateUplink( mIdentifierUpdate, getChannel() ); if(mIdentifierUpdate != null)
{
return mIdentifierUpdate.getUplinkFrequency(getChannel());
}
return 0;
} }
@Override @Override

View File

@@ -1,3 +1,21 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 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/>
*
******************************************************************************/
package module.decode.p25.message.tsbk.osp.control; package module.decode.p25.message.tsbk.osp.control;
import alias.AliasList; import alias.AliasList;
@@ -7,38 +25,21 @@ import module.decode.p25.message.IdentifierReceiver;
import module.decode.p25.message.tsbk.TSBKMessage; import module.decode.p25.message.tsbk.TSBKMessage;
import module.decode.p25.reference.DataUnitID; import module.decode.p25.reference.DataUnitID;
import module.decode.p25.reference.Opcode; import module.decode.p25.reference.Opcode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class SecondaryControlChannelBroadcast extends TSBKMessage public class SecondaryControlChannelBroadcast extends TSBKMessage implements IdentifierReceiver, Comparable<SecondaryControlChannelBroadcast>
implements IdentifierReceiver, Comparable<SecondaryControlChannelBroadcast>
{ {
private final static Logger mLog =
LoggerFactory.getLogger(SecondaryControlChannelBroadcast.class);
public static final int[] RFSS_ID = {80, 81, 82, 83, 84, 85, 86, 87}; public static final int[] RFSS_ID = {80, 81, 82, 83, 84, 85, 86, 87};
public static final int[] SITE_ID = {88, 89, 90, 91, 92, 93, 94, 95}; public static final int[] SITE_ID = {88, 89, 90, 91, 92, 93, 94, 95};
public static final int[] IDENTIFIER_1 = {96, 97, 98, 99}; public static final int[] IDENTIFIER_1 = {96, 97, 98, 99};
public static final int[] CHANNEL_1 = {100, 101, 102, 103, 104, 105, 106, 107, 108, public static final int[] CHANNEL_1 = {100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111};
109, 110, 111}; public static final int[] SYSTEM_SERVICE_CLASS_1 = {112, 113, 114, 115, 116, 117, 118, 119};
public static final int[] SYSTEM_SERVICE_CLASS_1 = {112, 113, 114, 115, 116,
117, 118, 119};
public static final int[] IDENTIFIER_2 = {120, 121, 122, 123}; public static final int[] IDENTIFIER_2 = {120, 121, 122, 123};
public static final int[] CHANNEL_2 = {124, 125, 126, 127, 128, 129, 130, 131, 132, public static final int[] CHANNEL_2 = {124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135};
133, 134, 135}; public static final int[] SYSTEM_SERVICE_CLASS_2 = {136, 137, 138, 139, 140, 141, 142, 143};
public static final int[] SYSTEM_SERVICE_CLASS_2 = {136, 137, 138, 139, 140,
141, 142, 143};
private IBandIdentifier mIdentifierUpdate1; private IBandIdentifier mIdentifierUpdate1;
private IBandIdentifier mIdentifierUpdate2; private IBandIdentifier mIdentifierUpdate2;
private int mRFSS;
private int mSite;
private int mIdent1;
private int mIdent2;
private int mChan1;
private int mChan2;
public SecondaryControlChannelBroadcast(BinaryMessage message, public SecondaryControlChannelBroadcast(BinaryMessage message,
DataUnitID duid, DataUnitID duid,
AliasList aliasList) AliasList aliasList)
@@ -66,8 +67,7 @@ public class SecondaryControlChannelBroadcast extends TSBKMessage
sb.append(" UP1:" + getUplinkFrequency1()); sb.append(" UP1:" + getUplinkFrequency1());
sb.append(" SVC1:" + sb.append(" SVC1:" + SystemService.toString(getSystemServiceClass1()));
SystemService.toString(getSystemServiceClass1()));
if(hasChannel2()) if(hasChannel2())
{ {
@@ -77,8 +77,7 @@ public class SecondaryControlChannelBroadcast extends TSBKMessage
sb.append(" UP2:" + getUplinkFrequency2()); sb.append(" UP2:" + getUplinkFrequency2());
sb.append(" SVC2:" + sb.append(" SVC2:" + SystemService.toString(getSystemServiceClass2()));
SystemService.toString(getSystemServiceClass2()));
} }
return sb.toString(); return sb.toString();
@@ -132,22 +131,42 @@ public class SecondaryControlChannelBroadcast extends TSBKMessage
public long getDownlinkFrequency1() public long getDownlinkFrequency1()
{ {
return calculateDownlink(mIdentifierUpdate1, getChannel1()); if(mIdentifierUpdate1 != null)
{
return mIdentifierUpdate1.getDownlinkFrequency(getChannel1());
}
return 0;
} }
public long getUplinkFrequency1() public long getUplinkFrequency1()
{ {
return calculateUplink(mIdentifierUpdate1, getChannel1()); if(mIdentifierUpdate1 != null)
{
return mIdentifierUpdate1.getUplinkFrequency(getChannel1());
}
return 0;
} }
public long getDownlinkFrequency2() public long getDownlinkFrequency2()
{ {
return calculateDownlink(mIdentifierUpdate2, getChannel2()); if(mIdentifierUpdate2 != null)
{
return mIdentifierUpdate2.getDownlinkFrequency(getChannel2());
}
return 0;
} }
public long getUplinkFrequency2() public long getUplinkFrequency2()
{ {
return calculateUplink(mIdentifierUpdate2, getChannel2()); if(mIdentifierUpdate2 != null)
{
return mIdentifierUpdate2.getUplinkFrequency(getChannel2());
}
return 0;
} }
@Override @Override

View File

@@ -1,17 +1,33 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 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/>
*
******************************************************************************/
package module.decode.p25.message.tsbk.osp.data; package module.decode.p25.message.tsbk.osp.data;
import alias.AliasList;
import bits.BinaryMessage;
import module.decode.p25.message.tsbk.GroupChannelGrant; import module.decode.p25.message.tsbk.GroupChannelGrant;
import module.decode.p25.reference.DataUnitID; import module.decode.p25.reference.DataUnitID;
import module.decode.p25.reference.Opcode; import module.decode.p25.reference.Opcode;
import alias.AliasList;
import bits.BinaryMessage;
public class GroupDataChannelGrant extends GroupChannelGrant public class GroupDataChannelGrant extends GroupChannelGrant
{ {
public GroupDataChannelGrant( BinaryMessage message, public GroupDataChannelGrant(BinaryMessage message, DataUnitID duid, AliasList aliasList)
DataUnitID duid,
AliasList aliasList )
{ {
super(message, duid, aliasList); super(message, duid, aliasList);
} }

View File

@@ -1,16 +1,33 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 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/>
*
******************************************************************************/
package module.decode.p25.message.tsbk.osp.data; package module.decode.p25.message.tsbk.osp.data;
import alias.AliasList;
import bits.BinaryMessage;
import module.decode.p25.message.IBandIdentifier; import module.decode.p25.message.IBandIdentifier;
import module.decode.p25.message.IdentifierReceiver; import module.decode.p25.message.IdentifierReceiver;
import module.decode.p25.reference.DataUnitID; import module.decode.p25.reference.DataUnitID;
import alias.AliasList;
import bits.BinaryMessage;
public class SNDCPDataChannelAnnouncementExplicit extends SNDCPData implements IdentifierReceiver public class SNDCPDataChannelAnnouncementExplicit extends SNDCPData implements IdentifierReceiver
{ {
public static final int AUTONOMOUS_ACCESS_AVAILABLE_INDICATOR = 88; public static final int AUTONOMOUS_ACCESS_AVAILABLE_INDICATOR = 88;
public static final int REQUESTED_ACCESS_AVAILABLE_INDICATOR = 89; public static final int REQUESTED_ACCESS_AVAILABLE_INDICATOR = 89;
public static final int[] TRANSMIT_IDENTIFIER = {96, 97, 98, 99}; public static final int[] TRANSMIT_IDENTIFIER = {96, 97, 98, 99};
public static final int[] TRANSMIT_NUMBER = {100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111}; public static final int[] TRANSMIT_NUMBER = {100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111};
public static final int[] RECEIVE_IDENTIFIER = {112, 113, 114, 115}; public static final int[] RECEIVE_IDENTIFIER = {112, 113, 114, 115};
@@ -141,11 +158,21 @@ public class SNDCPDataChannelAnnouncementExplicit extends SNDCPData implements I
public long getDownlinkFrequency() public long getDownlinkFrequency()
{ {
return calculateDownlink( mIdentifierUpdateTransmit, getTransmitChannelNumber() ); if(mIdentifierUpdateTransmit != null)
{
return mIdentifierUpdateTransmit.getDownlinkFrequency(getTransmitChannelNumber());
}
return 0;
} }
public long getUplinkFrequency() public long getUplinkFrequency()
{ {
return calculateUplink( mIdentifierUpdateReceive, getReceiveChannelNumber() ); if(mIdentifierUpdateReceive != null)
{
mIdentifierUpdateReceive.getUplinkFrequency(getReceiveChannelNumber());
}
return 0;
} }
} }

View File

@@ -1,33 +1,56 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 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/>
*
******************************************************************************/
package module.decode.p25.message.tsbk.osp.data; package module.decode.p25.message.tsbk.osp.data;
import alias.AliasList;
import bits.BinaryMessage;
import module.decode.p25.message.IBandIdentifier; import module.decode.p25.message.IBandIdentifier;
import module.decode.p25.message.IdentifierReceiver; import module.decode.p25.message.IdentifierReceiver;
import module.decode.p25.reference.DataUnitID; import module.decode.p25.reference.DataUnitID;
import alias.AliasList;
import bits.BinaryMessage;
public class SNDCPDataChannelGrant extends SNDCPData implements IdentifierReceiver public class SNDCPDataChannelGrant extends SNDCPData implements IdentifierReceiver
{ {
public static final int[] TRANSMIT_IDENTIFIER = {88, 89, 90, 91}; public static final int[] TRANSMIT_IDENTIFIER = {88, 89, 90, 91};
public static final int[] TRANSMIT_NUMBER = { 92,93,94,95,96,97,98,99,100, public static final int[] TRANSMIT_NUMBER = {92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103};
101,102,103 };
public static final int[] RECEIVE_IDENTIFIER = {104, 105, 106, 107}; public static final int[] RECEIVE_IDENTIFIER = {104, 105, 106, 107};
public static final int[] RECEIVE_NUMBER = { 108,109,110,111,112,113,114, public static final int[] RECEIVE_NUMBER = {108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119};
115,116,117,118,119 }; public static final int[] TARGET_ADDRESS = {120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133,
134, 135, 136, 137, 138, 139, 140, 141, 142, 143};
public static final int[] TARGET_ADDRESS = { 120,121,122,123,124,125,126,
127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 };
private IBandIdentifier mIdentifierUpdateTransmit; private IBandIdentifier mIdentifierUpdateTransmit;
private IBandIdentifier mIdentifierUpdateReceive; private IBandIdentifier mIdentifierUpdateReceive;
public SNDCPDataChannelGrant( BinaryMessage message, public SNDCPDataChannelGrant(BinaryMessage message, DataUnitID duid, AliasList aliasList)
DataUnitID duid,
AliasList aliasList )
{ {
super(message, duid, aliasList); super(message, duid, aliasList);
} }
public boolean isTDMAChannel()
{
if(mIdentifierUpdateTransmit != null)
{
return mIdentifierUpdateTransmit.isTDMA();
}
return false;
}
public String getMessage() public String getMessage()
{ {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
@@ -121,11 +144,21 @@ public class SNDCPDataChannelGrant extends SNDCPData implements IdentifierReceiv
public long getDownlinkFrequency() public long getDownlinkFrequency()
{ {
return calculateDownlink( mIdentifierUpdateTransmit, getTransmitChannelNumber() ); if(mIdentifierUpdateTransmit != null)
{
return mIdentifierUpdateTransmit.getDownlinkFrequency(getTransmitChannelNumber());
}
return 0;
} }
public long getUplinkFrequency() public long getUplinkFrequency()
{ {
return calculateUplink( mIdentifierUpdateReceive, getReceiveChannelNumber() ); if(mIdentifierUpdateReceive != null)
{
return mIdentifierUpdateReceive.getUplinkFrequency(getReceiveChannelNumber());
}
return 0;
} }
} }