mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-16 10:37:26 -05:00
P25 work in progress
This commit is contained in:
@@ -222,6 +222,8 @@ public class CRCP25
|
|||||||
0x20000000l, 0x40000000l, 0x80000000l
|
0x20000000l, 0x40000000l, 0x80000000l
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Performs CRC check and corrects single-bit errors against the message.
|
* Performs CRC check and corrects single-bit errors against the message.
|
||||||
* @param message - bitsetbuffer containing a message of at least 64 bits.
|
* @param message - bitsetbuffer containing a message of at least 64 bits.
|
||||||
|
|||||||
@@ -67,7 +67,7 @@ public enum DecoderType
|
|||||||
DecoderType.LTR_STANDARD,
|
DecoderType.LTR_STANDARD,
|
||||||
DecoderType.MPT1327,
|
DecoderType.MPT1327,
|
||||||
DecoderType.NBFM,
|
DecoderType.NBFM,
|
||||||
// DecoderType.P25_PHASE1,
|
DecoderType.P25_PHASE1,
|
||||||
DecoderType.PASSPORT );
|
DecoderType.PASSPORT );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -22,6 +22,9 @@ import java.util.HashMap;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import message.Message;
|
import message.Message;
|
||||||
import alias.Alias;
|
import alias.Alias;
|
||||||
import alias.AliasList;
|
import alias.AliasList;
|
||||||
@@ -92,8 +95,14 @@ import decode.p25.reference.Vendor;
|
|||||||
|
|
||||||
public class P25ChannelState extends ChannelState
|
public class P25ChannelState extends ChannelState
|
||||||
{
|
{
|
||||||
|
private final static Logger mLog = LoggerFactory.getLogger( P25ChannelState.class );
|
||||||
|
|
||||||
private HashMap<String,Long> mRegistrations = new HashMap<String,Long>();
|
private HashMap<String,Long> mRegistrations = new HashMap<String,Long>();
|
||||||
|
private String mLastCommandEventID;
|
||||||
|
private String mLastPageEventID;
|
||||||
|
private String mLastQueryEventID;
|
||||||
private String mLastRegistrationEventID;
|
private String mLastRegistrationEventID;
|
||||||
|
private String mLastResponseEventID;
|
||||||
|
|
||||||
private ArrayList<ActiveCall> mActiveCalls = new ArrayList<ActiveCall>();
|
private ArrayList<ActiveCall> mActiveCalls = new ArrayList<ActiveCall>();
|
||||||
|
|
||||||
@@ -269,68 +278,100 @@ public class P25ChannelState extends ChannelState
|
|||||||
|
|
||||||
private void processCommand( TSBKMessage message )
|
private void processCommand( TSBKMessage message )
|
||||||
{
|
{
|
||||||
|
CallEvent event = null;
|
||||||
|
|
||||||
switch( message.getOpcode() )
|
switch( message.getOpcode() )
|
||||||
{
|
{
|
||||||
case AUTHENTICATION_COMMAND:
|
case AUTHENTICATION_COMMAND:
|
||||||
AuthenticationCommand ac = (AuthenticationCommand)message;
|
AuthenticationCommand ac = (AuthenticationCommand)message;
|
||||||
|
|
||||||
mCallEventModel.add(
|
if( mLastCommandEventID == null || !mLastCommandEventID
|
||||||
new P25CallEvent.Builder( CallEventType.COMMAND )
|
.contentEquals( ac.getFullTargetID() ))
|
||||||
|
{
|
||||||
|
event = new P25CallEvent.Builder( CallEventType.COMMAND )
|
||||||
.aliasList( mAliasList )
|
.aliasList( mAliasList )
|
||||||
.details( "AUTHENTICATE" )
|
.details( "AUTHENTICATE" )
|
||||||
.to( ac.getWACN() + "-" + ac.getSystemID() + "-" +
|
.to( ac.getWACN() + "-" + ac.getSystemID() + "-" +
|
||||||
ac.getTargetID() )
|
ac.getTargetID() )
|
||||||
.build() );
|
.build();
|
||||||
|
|
||||||
|
mLastCommandEventID = ac.getFullTargetID();
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case EXTENDED_FUNCTION_COMMAND:
|
case EXTENDED_FUNCTION_COMMAND:
|
||||||
ExtendedFunctionCommand efc = (ExtendedFunctionCommand)message;
|
ExtendedFunctionCommand efc = (ExtendedFunctionCommand)message;
|
||||||
|
|
||||||
mCallEventModel.add(
|
if( mLastCommandEventID == null || !mLastCommandEventID
|
||||||
new P25CallEvent.Builder( CallEventType.FUNCTION )
|
.contentEquals( efc.getTargetAddress() ) )
|
||||||
.aliasList( mAliasList )
|
{
|
||||||
.details( "EXTENDED FUNCTION: " +
|
event = new P25CallEvent.Builder( CallEventType.FUNCTION )
|
||||||
efc.getExtendedFunction().getLabel() )
|
.aliasList( mAliasList )
|
||||||
.from( efc.getSourceAddress() )
|
.details( "EXTENDED FUNCTION: " +
|
||||||
.to( efc.getTargetAddress() )
|
efc.getExtendedFunction().getLabel() )
|
||||||
.build() );
|
.from( efc.getSourceAddress() )
|
||||||
|
.to( efc.getTargetAddress() )
|
||||||
|
.build();
|
||||||
|
|
||||||
|
mLastCommandEventID = efc.getTargetAddress();
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case RADIO_UNIT_MONITOR_COMMAND:
|
case RADIO_UNIT_MONITOR_COMMAND:
|
||||||
RadioUnitMonitorCommand rumc = (RadioUnitMonitorCommand)message;
|
RadioUnitMonitorCommand rumc = (RadioUnitMonitorCommand)message;
|
||||||
|
|
||||||
mCallEventModel.add(
|
if( mLastCommandEventID == null || !mLastCommandEventID
|
||||||
new P25CallEvent.Builder( CallEventType.COMMAND )
|
.contentEquals( rumc.getTargetAddress() ) )
|
||||||
|
{
|
||||||
|
event = new P25CallEvent.Builder( CallEventType.COMMAND )
|
||||||
.aliasList( mAliasList )
|
.aliasList( mAliasList )
|
||||||
.details( "RADIO UNIT MONITOR" )
|
.details( "RADIO UNIT MONITOR" )
|
||||||
.from( rumc.getSourceAddress() )
|
.from( rumc.getSourceAddress() )
|
||||||
.to( rumc.getTargetAddress() )
|
.to( rumc.getTargetAddress() )
|
||||||
.build() );
|
.build();
|
||||||
|
|
||||||
|
mLastCommandEventID = rumc.getTargetAddress();
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case ROAMING_ADDRESS_COMMAND:
|
case ROAMING_ADDRESS_COMMAND:
|
||||||
RoamingAddressCommand rac = (RoamingAddressCommand)message;
|
RoamingAddressCommand rac = (RoamingAddressCommand)message;
|
||||||
|
|
||||||
mCallEventModel.add(
|
if( mLastCommandEventID == null || !mLastCommandEventID
|
||||||
new P25CallEvent.Builder( CallEventType.COMMAND )
|
.contentEquals( rac.getTargetID() ) )
|
||||||
.aliasList( mAliasList )
|
{
|
||||||
.details( rac.getStackOperation().name() +
|
event = new P25CallEvent.Builder( CallEventType.COMMAND )
|
||||||
" ROAMING ADDRESS " + rac.getWACN() + "-" +
|
.aliasList( mAliasList )
|
||||||
rac.getSystemID() )
|
.details( rac.getStackOperation().name() +
|
||||||
.to( rac.getTargetID() )
|
" ROAMING ADDRESS " + rac.getWACN() + "-" +
|
||||||
.build() );
|
rac.getSystemID() )
|
||||||
|
.to( rac.getTargetID() )
|
||||||
|
.build();
|
||||||
|
|
||||||
|
mLastCommandEventID = rac.getTargetID();
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case UNIT_REGISTRATION_COMMAND:
|
case UNIT_REGISTRATION_COMMAND:
|
||||||
UnitRegistrationCommand urc = (UnitRegistrationCommand)message;
|
UnitRegistrationCommand urc = (UnitRegistrationCommand)message;
|
||||||
|
|
||||||
mCallEventModel.add(
|
if( mLastCommandEventID == null || !mLastCommandEventID
|
||||||
new P25CallEvent.Builder( CallEventType.COMMAND )
|
.contentEquals( urc.getTargetAddress() ) )
|
||||||
.aliasList( mAliasList )
|
{
|
||||||
.details( "REGISTER" )
|
event = new P25CallEvent.Builder( CallEventType.COMMAND )
|
||||||
.from( urc.getSourceAddress() )
|
.aliasList( mAliasList )
|
||||||
.to( urc.getTargetAddress() )
|
.details( "REGISTER" )
|
||||||
.build() );
|
.from( urc.getSourceAddress() )
|
||||||
|
.to( urc.getTargetAddress() )
|
||||||
|
.build();
|
||||||
|
|
||||||
|
mLastCommandEventID = urc.getTargetAddress();
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if( event != null )
|
||||||
|
{
|
||||||
|
mCallEventModel.add( event );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void processMessage( TSBKMessage message )
|
private void processMessage( TSBKMessage message )
|
||||||
@@ -366,120 +407,159 @@ public class P25ChannelState extends ChannelState
|
|||||||
|
|
||||||
private void processQuery( TSBKMessage message )
|
private void processQuery( TSBKMessage message )
|
||||||
{
|
{
|
||||||
|
CallEvent event = null;
|
||||||
|
|
||||||
switch( message.getOpcode() )
|
switch( message.getOpcode() )
|
||||||
{
|
{
|
||||||
case GROUP_AFFILIATION_QUERY:
|
case GROUP_AFFILIATION_QUERY:
|
||||||
GroupAffiliationQuery gaq = (GroupAffiliationQuery)message;
|
GroupAffiliationQuery gaq = (GroupAffiliationQuery)message;
|
||||||
|
|
||||||
CallEvent event =
|
if( mLastQueryEventID == null || !mLastQueryEventID
|
||||||
new P25CallEvent.Builder( CallEventType.QUERY )
|
.contentEquals( gaq.getTargetAddress() ) )
|
||||||
.aliasList( mAliasList )
|
{
|
||||||
.details( "GROUP AFFILIATION" )
|
event = new P25CallEvent.Builder( CallEventType.QUERY )
|
||||||
.from( gaq.getSourceAddress() )
|
.aliasList( mAliasList )
|
||||||
.to( gaq.getTargetAddress() )
|
.details( "GROUP AFFILIATION" )
|
||||||
.build();
|
.from( gaq.getSourceAddress() )
|
||||||
|
.to( gaq.getTargetAddress() )
|
||||||
mCallEventModel.add( event );
|
.build();
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case STATUS_QUERY:
|
case STATUS_QUERY:
|
||||||
StatusQuery sq = (StatusQuery)message;
|
StatusQuery sq = (StatusQuery)message;
|
||||||
|
|
||||||
mCallEventModel.add(
|
if( mLastQueryEventID == null || !mLastQueryEventID
|
||||||
new P25CallEvent.Builder( CallEventType.QUERY )
|
.contentEquals( sq.getTargetAddress() ) )
|
||||||
.aliasList( mAliasList )
|
{
|
||||||
.details( "STATUS QUERY" )
|
mCallEventModel.add(
|
||||||
.from( sq.getSourceAddress() )
|
new P25CallEvent.Builder( CallEventType.QUERY )
|
||||||
.to( sq.getTargetAddress() )
|
.aliasList( mAliasList )
|
||||||
.build() );
|
.details( "STATUS QUERY" )
|
||||||
|
.from( sq.getSourceAddress() )
|
||||||
|
.to( sq.getTargetAddress() )
|
||||||
|
.build() );
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if( event != null )
|
||||||
|
{
|
||||||
|
mCallEventModel.add( event );
|
||||||
|
|
||||||
|
mLastQueryEventID = event.getToID();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void processQuery( PDUMessage message )
|
private void processQuery( PDUMessage message )
|
||||||
{
|
{
|
||||||
|
CallEvent event = null;
|
||||||
|
|
||||||
switch( message.getOpcode() )
|
switch( message.getOpcode() )
|
||||||
{
|
{
|
||||||
case GROUP_AFFILIATION_QUERY:
|
case GROUP_AFFILIATION_QUERY:
|
||||||
GroupAffiliationQueryExtended gaqe =
|
GroupAffiliationQueryExtended gaqe =
|
||||||
(GroupAffiliationQueryExtended)message;
|
(GroupAffiliationQueryExtended)message;
|
||||||
|
|
||||||
CallEvent event =
|
if( mLastQueryEventID == null || !gaqe.getTargetAddress()
|
||||||
new P25CallEvent.Builder( CallEventType.QUERY )
|
.contentEquals( mLastQueryEventID ) )
|
||||||
.aliasList( mAliasList )
|
{
|
||||||
.details( "GROUP AFFILIATION" )
|
event = new P25CallEvent.Builder( CallEventType.QUERY )
|
||||||
.from( gaqe.getWACN() + "-" + gaqe.getSystemID() +
|
.aliasList( mAliasList )
|
||||||
"-" + gaqe.getSourceID() )
|
.details( "GROUP AFFILIATION" )
|
||||||
.to( gaqe.getTargetAddress() )
|
.from( gaqe.getWACN() + "-" + gaqe.getSystemID() +
|
||||||
.build();
|
"-" + gaqe.getSourceID() )
|
||||||
|
.to( gaqe.getTargetAddress() )
|
||||||
mCallEventModel.add( event );
|
.build();
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case STATUS_QUERY:
|
case STATUS_QUERY:
|
||||||
StatusQueryExtended sq = (StatusQueryExtended)message;
|
StatusQueryExtended sq = (StatusQueryExtended)message;
|
||||||
|
|
||||||
mCallEventModel.add(
|
if( mLastQueryEventID == null || !sq.getTargetAddress()
|
||||||
new P25CallEvent.Builder( CallEventType.QUERY )
|
.contentEquals( mLastQueryEventID ) )
|
||||||
.aliasList( mAliasList )
|
{
|
||||||
.details( "STATUS QUERY" )
|
event = new P25CallEvent.Builder( CallEventType.QUERY )
|
||||||
.from( sq.getSourceWACN() + "-" +
|
.aliasList( mAliasList )
|
||||||
sq.getSourceSystemID() + "-" +
|
.details( "STATUS QUERY" )
|
||||||
sq.getSourceID() )
|
.from( sq.getSourceWACN() + "-" +
|
||||||
.to( sq.getTargetAddress() )
|
sq.getSourceSystemID() + "-" +
|
||||||
.build() );
|
sq.getSourceID() )
|
||||||
|
.to( sq.getTargetAddress() )
|
||||||
|
.build();
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if( event != null )
|
||||||
|
{
|
||||||
|
mCallEventModel.add( event );
|
||||||
|
|
||||||
|
mLastQueryEventID = event.getToID();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void processResponse( TSBKMessage message )
|
private void processResponse( TSBKMessage message )
|
||||||
{
|
{
|
||||||
|
CallEvent event = null;
|
||||||
|
|
||||||
switch( message.getOpcode() )
|
switch( message.getOpcode() )
|
||||||
{
|
{
|
||||||
case ACKNOWLEDGE_RESPONSE:
|
case ACKNOWLEDGE_RESPONSE:
|
||||||
AcknowledgeResponse ar = (AcknowledgeResponse)message;
|
AcknowledgeResponse ar = (AcknowledgeResponse)message;
|
||||||
|
|
||||||
CallEvent event =
|
if( mLastResponseEventID == null || !ar.getTargetAddress()
|
||||||
new P25CallEvent.Builder( CallEventType.RESPONSE )
|
.contentEquals( mLastResponseEventID ) )
|
||||||
.aliasList( mAliasList )
|
|
||||||
.details( "ACKNOWLEDGE" )
|
|
||||||
.to( ar.getTargetAddress() )
|
|
||||||
.build();
|
|
||||||
|
|
||||||
if( ar.hasAdditionalInformation() )
|
|
||||||
{
|
{
|
||||||
if( ar.hasExtendedAddress() )
|
event = new P25CallEvent.Builder( CallEventType.RESPONSE )
|
||||||
{
|
.aliasList( mAliasList )
|
||||||
event.setToID( ar.getWACN() + "-" + ar.getSystemID() + "-" +
|
.details( "ACKNOWLEDGE" )
|
||||||
ar.getTargetAddress() );
|
.to( ar.getTargetAddress() )
|
||||||
}
|
.build();
|
||||||
else
|
|
||||||
{
|
|
||||||
event.setFromID( ar.getFromID() );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
mCallEventModel.add( event );
|
if( ar.hasAdditionalInformation() )
|
||||||
|
{
|
||||||
|
if( ar.hasExtendedAddress() )
|
||||||
|
{
|
||||||
|
event.setToID( ar.getWACN() + "-" + ar.getSystemID() + "-" +
|
||||||
|
ar.getTargetAddress() );
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
event.setFromID( ar.getFromID() );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
mLastResponseEventID = ar.getTargetAddress();
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case DENY_RESPONSE:
|
case DENY_RESPONSE:
|
||||||
DenyResponse dr = (DenyResponse)message;
|
DenyResponse dr = (DenyResponse)message;
|
||||||
|
|
||||||
mCallEventModel.add(
|
if( mLastResponseEventID == null || !dr.getTargetAddress()
|
||||||
new P25CallEvent.Builder( CallEventType.RESPONSE )
|
.contentEquals( mLastResponseEventID ) )
|
||||||
.aliasList( mAliasList )
|
{
|
||||||
.details( "DENY REASON: " + dr.getReason().name() +
|
event = new P25CallEvent.Builder( CallEventType.RESPONSE )
|
||||||
" REQUESTED: " + dr.getServiceType().name() )
|
.aliasList( mAliasList )
|
||||||
.from( dr.getSourceAddress() )
|
.details( "DENY REASON: " + dr.getReason().name() +
|
||||||
.to( dr.getTargetAddress() )
|
" REQUESTED: " + dr.getServiceType().name() )
|
||||||
.build() );
|
.from( dr.getSourceAddress() )
|
||||||
|
.to( dr.getTargetAddress() )
|
||||||
|
.build();
|
||||||
|
|
||||||
|
mLastResponseEventID = dr.getTargetAddress();
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case GROUP_AFFILIATION_RESPONSE:
|
case GROUP_AFFILIATION_RESPONSE:
|
||||||
GroupAffiliationResponse gar = (GroupAffiliationResponse)message;
|
GroupAffiliationResponse gar = (GroupAffiliationResponse)message;
|
||||||
|
|
||||||
mCallEventModel.add(
|
if( mLastResponseEventID == null || !gar.getTargetAddress()
|
||||||
new P25CallEvent.Builder( CallEventType.RESPONSE )
|
.contentEquals( mLastResponseEventID ) )
|
||||||
|
{
|
||||||
|
event = new P25CallEvent.Builder( CallEventType.RESPONSE )
|
||||||
.aliasList( mAliasList )
|
.aliasList( mAliasList )
|
||||||
.details( "AFFILIATION:" + gar.getResponse().name() +
|
.details( "AFFILIATION:" + gar.getResponse().name() +
|
||||||
" FOR " + gar.getAffiliationScope() +
|
" FOR " + gar.getAffiliationScope() +
|
||||||
@@ -487,8 +567,10 @@ public class P25ChannelState extends ChannelState
|
|||||||
" ANNOUNCEMENT GROUP:" +
|
" ANNOUNCEMENT GROUP:" +
|
||||||
gar.getAnnouncementGroupAddress() )
|
gar.getAnnouncementGroupAddress() )
|
||||||
.to( gar.getTargetAddress() )
|
.to( gar.getTargetAddress() )
|
||||||
.build() );
|
.build();
|
||||||
|
|
||||||
|
mLastResponseEventID = gar.getTargetAddress();
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case LOCATION_REGISTRATION_RESPONSE:
|
case LOCATION_REGISTRATION_RESPONSE:
|
||||||
LocationRegistrationResponse lrr =
|
LocationRegistrationResponse lrr =
|
||||||
@@ -500,7 +582,7 @@ public class P25ChannelState extends ChannelState
|
|||||||
System.currentTimeMillis() );
|
System.currentTimeMillis() );
|
||||||
}
|
}
|
||||||
|
|
||||||
if( mLastRegistrationEventID != null &&
|
if( mLastRegistrationEventID == null ||
|
||||||
!mLastRegistrationEventID.contentEquals( lrr.getTargetAddress() ) )
|
!mLastRegistrationEventID.contentEquals( lrr.getTargetAddress() ) )
|
||||||
{
|
{
|
||||||
mCallEventModel.add(
|
mCallEventModel.add(
|
||||||
@@ -512,45 +594,61 @@ public class P25ChannelState extends ChannelState
|
|||||||
.from( lrr.getTargetAddress() )
|
.from( lrr.getTargetAddress() )
|
||||||
.to( lrr.getGroupAddress() )
|
.to( lrr.getGroupAddress() )
|
||||||
.build() );
|
.build() );
|
||||||
}
|
|
||||||
|
|
||||||
mLastRegistrationEventID = lrr.getTargetAddress();
|
mLastRegistrationEventID = lrr.getTargetAddress();
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case PROTECTION_PARAMETER_UPDATE:
|
case PROTECTION_PARAMETER_UPDATE:
|
||||||
ProtectionParameterUpdate ppu = (ProtectionParameterUpdate)message;
|
ProtectionParameterUpdate ppu = (ProtectionParameterUpdate)message;
|
||||||
|
|
||||||
mCallEventModel.add(
|
if( mLastResponseEventID == null || !ppu.getTargetAddress()
|
||||||
new P25CallEvent.Builder( CallEventType.RESPONSE )
|
.contentEquals( mLastResponseEventID ) )
|
||||||
.aliasList( mAliasList )
|
{
|
||||||
.details( "USE ENCRYPTION ALGORITHM:" +
|
event = new P25CallEvent.Builder( CallEventType.RESPONSE )
|
||||||
ppu.getAlgorithm().name() + " KEY:" +
|
.aliasList( mAliasList )
|
||||||
ppu.getKeyID() )
|
.details( "USE ENCRYPTION ALGORITHM:" +
|
||||||
.to( ppu.getTargetAddress() )
|
ppu.getAlgorithm().name() + " KEY:" +
|
||||||
.build() );
|
ppu.getKeyID() )
|
||||||
|
.to( ppu.getTargetAddress() )
|
||||||
|
.build();
|
||||||
|
|
||||||
|
mLastResponseEventID = ppu.getTargetAddress();
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case QUEUED_RESPONSE:
|
case QUEUED_RESPONSE:
|
||||||
QueuedResponse qr = (QueuedResponse)message;
|
QueuedResponse qr = (QueuedResponse)message;
|
||||||
|
|
||||||
mCallEventModel.add(
|
if( mLastResponseEventID == null || !qr.getTargetAddress()
|
||||||
new P25CallEvent.Builder( CallEventType.RESPONSE )
|
.contentEquals( mLastResponseEventID ) )
|
||||||
.aliasList( mAliasList )
|
{
|
||||||
.details( "QUEUED REASON: " + qr.getReason().name() +
|
event = new P25CallEvent.Builder( CallEventType.RESPONSE )
|
||||||
" REQUESTED: " + qr.getServiceType().name() )
|
.aliasList( mAliasList )
|
||||||
.from( qr.getSourceAddress() )
|
.details( "QUEUED REASON: " + qr.getReason().name() +
|
||||||
.to( qr.getTargetAddress() )
|
" REQUESTED: " + qr.getServiceType().name() )
|
||||||
.build() );
|
.from( qr.getSourceAddress() )
|
||||||
|
.to( qr.getTargetAddress() )
|
||||||
|
.build();
|
||||||
|
|
||||||
|
mLastResponseEventID = qr.getTargetAddress();
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case STATUS_UPDATE:
|
case STATUS_UPDATE:
|
||||||
StatusUpdate su = (StatusUpdate)message;
|
StatusUpdate su = (StatusUpdate)message;
|
||||||
|
|
||||||
mCallEventModel.add(
|
if( mLastResponseEventID == null || !su.getTargetAddress()
|
||||||
new P25CallEvent.Builder( CallEventType.RESPONSE )
|
.contentEquals( mLastResponseEventID ) )
|
||||||
.aliasList( mAliasList )
|
{
|
||||||
.details( "STATUS USER: " + su.getUserStatus() +
|
event = new P25CallEvent.Builder( CallEventType.RESPONSE )
|
||||||
" UNIT: " + su.getUnitStatus() )
|
.aliasList( mAliasList )
|
||||||
.from( su.getSourceAddress() )
|
.details( "STATUS USER: " + su.getUserStatus() +
|
||||||
.to( su.getTargetAddress() )
|
" UNIT: " + su.getUnitStatus() )
|
||||||
.build() );
|
.from( su.getSourceAddress() )
|
||||||
|
.to( su.getTargetAddress() )
|
||||||
|
.build();
|
||||||
|
|
||||||
|
mLastResponseEventID = su.getTargetAddress();
|
||||||
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
case UNIT_REGISTRATION_RESPONSE:
|
case UNIT_REGISTRATION_RESPONSE:
|
||||||
UnitRegistrationResponse urr = (UnitRegistrationResponse)message;
|
UnitRegistrationResponse urr = (UnitRegistrationResponse)message;
|
||||||
@@ -561,26 +659,26 @@ public class P25ChannelState extends ChannelState
|
|||||||
System.currentTimeMillis() );
|
System.currentTimeMillis() );
|
||||||
}
|
}
|
||||||
|
|
||||||
if( mLastRegistrationEventID != null &&
|
if( mLastRegistrationEventID == null ||
|
||||||
!mLastRegistrationEventID.contentEquals( urr.getSourceAddress() ) )
|
!mLastRegistrationEventID.contentEquals( urr.getSourceAddress() ) )
|
||||||
{
|
{
|
||||||
mCallEventModel.add(
|
mCallEventModel.add(
|
||||||
new P25CallEvent.Builder( CallEventType.REGISTER )
|
new P25CallEvent.Builder( CallEventType.REGISTER )
|
||||||
.aliasList( mAliasList )
|
.aliasList( mAliasList )
|
||||||
.details( "REGISTRATION:" + urr.getResponse().name() +
|
.details( "REGISTRATION:" + urr.getResponse().name() +
|
||||||
" SYSTEM: " + urr.getSystemID() + "-" +
|
" SYSTEM: " + urr.getSystemID() +
|
||||||
" SOURCE ID: " + urr.getSourceID() )
|
" SOURCE ID: " + urr.getSourceID() )
|
||||||
.from( urr.getSourceAddress() )
|
.from( urr.getSourceAddress() )
|
||||||
.build() );
|
.build() );
|
||||||
}
|
|
||||||
|
|
||||||
mLastRegistrationEventID = urr.getSourceAddress();
|
mLastRegistrationEventID = urr.getSourceAddress();
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case UNIT_DEREGISTRATION_ACKNOWLEDGE:
|
case UNIT_DEREGISTRATION_ACKNOWLEDGE:
|
||||||
UnitDeregistrationAcknowledge udr =
|
UnitDeregistrationAcknowledge udr =
|
||||||
(UnitDeregistrationAcknowledge)message;
|
(UnitDeregistrationAcknowledge)message;
|
||||||
|
|
||||||
if( mLastRegistrationEventID != null &&
|
if( mLastRegistrationEventID == null ||
|
||||||
!mLastRegistrationEventID.contentEquals( udr.getSourceID() ) )
|
!mLastRegistrationEventID.contentEquals( udr.getSourceID() ) )
|
||||||
{
|
{
|
||||||
|
|
||||||
@@ -605,38 +703,48 @@ public class P25ChannelState extends ChannelState
|
|||||||
{
|
{
|
||||||
mRegistrations.remove( key );
|
mRegistrations.remove( key );
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
mLastRegistrationEventID = udr.getSourceID();
|
mLastRegistrationEventID = udr.getSourceID();
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if( event != null )
|
||||||
|
{
|
||||||
|
mCallEventModel.add( event );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void processResponse( PDUMessage message )
|
private void processResponse( PDUMessage message )
|
||||||
{
|
{
|
||||||
|
CallEvent event = null;
|
||||||
|
|
||||||
switch( message.getOpcode() )
|
switch( message.getOpcode() )
|
||||||
{
|
{
|
||||||
case GROUP_AFFILIATION_RESPONSE:
|
case GROUP_AFFILIATION_RESPONSE:
|
||||||
GroupAffiliationResponseExtended gar =
|
GroupAffiliationResponseExtended gar =
|
||||||
(GroupAffiliationResponseExtended)message;
|
(GroupAffiliationResponseExtended)message;
|
||||||
|
|
||||||
CallEvent event =
|
if( mLastResponseEventID == null || !gar.getTargetAddress()
|
||||||
new P25CallEvent.Builder( CallEventType.RESPONSE )
|
.contentEquals( mLastResponseEventID ) )
|
||||||
.aliasList( mAliasList )
|
{
|
||||||
.details( "AFFILIATION:" + gar.getResponse().name() +
|
event = new P25CallEvent.Builder( CallEventType.RESPONSE )
|
||||||
" FOR GROUP:" + gar.getGroupWACN() + "-" +
|
.aliasList( mAliasList )
|
||||||
gar.getGroupSystemID() + "-" +
|
.details( "AFFILIATION:" + gar.getResponse().name() +
|
||||||
gar.getGroupID() + " ANNOUNCEMENT GROUP:" +
|
" FOR GROUP:" + gar.getGroupWACN() + "-" +
|
||||||
gar.getAnnouncementGroupID() )
|
gar.getGroupSystemID() + "-" +
|
||||||
.from( gar.getSourceWACN() + "-" +
|
gar.getGroupID() + " ANNOUNCEMENT GROUP:" +
|
||||||
gar.getSourceSystemID() + "-" +
|
gar.getAnnouncementGroupID() )
|
||||||
gar.getSourceID() )
|
.from( gar.getSourceWACN() + "-" +
|
||||||
.to( gar.getTargetAddress() )
|
gar.getSourceSystemID() + "-" +
|
||||||
.build();
|
gar.getSourceID() )
|
||||||
|
.to( gar.getTargetAddress() )
|
||||||
|
.build();
|
||||||
|
|
||||||
mCallEventModel.add( event );
|
mLastResponseEventID = gar.getTargetAddress();
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case ROAMING_ADDRESS_UPDATE:
|
case ROAMING_ADDRESS_UPDATE:
|
||||||
RoamingAddressUpdateExtended raue =
|
RoamingAddressUpdateExtended raue =
|
||||||
@@ -666,27 +774,31 @@ public class P25ChannelState extends ChannelState
|
|||||||
sb.append( raue.getWACNG() + "-" + raue.getSystemIDG() );
|
sb.append( raue.getWACNG() + "-" + raue.getSystemIDG() );
|
||||||
}
|
}
|
||||||
|
|
||||||
mCallEventModel.add(
|
event = new P25CallEvent.Builder( CallEventType.RESPONSE )
|
||||||
new P25CallEvent.Builder( CallEventType.RESPONSE )
|
|
||||||
.aliasList( mAliasList )
|
.aliasList( mAliasList )
|
||||||
.details( sb.toString() )
|
.details( sb.toString() )
|
||||||
.from( raue.getSourceID() )
|
.from( raue.getSourceID() )
|
||||||
.to( raue.getTargetAddress() )
|
.to( raue.getTargetAddress() )
|
||||||
.build() );
|
.build();
|
||||||
break;
|
break;
|
||||||
case STATUS_UPDATE:
|
case STATUS_UPDATE:
|
||||||
StatusUpdateExtended su = (StatusUpdateExtended)message;
|
StatusUpdateExtended su = (StatusUpdateExtended)message;
|
||||||
|
|
||||||
mCallEventModel.add(
|
if( mLastResponseEventID == null || !mLastResponseEventID
|
||||||
new P25CallEvent.Builder( CallEventType.RESPONSE )
|
.contentEquals( su.getTargetAddress() ) )
|
||||||
.aliasList( mAliasList )
|
{
|
||||||
.details( "STATUS USER: " + su.getUserStatus() +
|
event = new P25CallEvent.Builder( CallEventType.RESPONSE )
|
||||||
" UNIT: " + su.getUnitStatus() )
|
.aliasList( mAliasList )
|
||||||
.from( su.getSourceWACN() + "-" +
|
.details( "STATUS USER: " + su.getUserStatus() +
|
||||||
su.getSourceSystemID() + "-" +
|
" UNIT: " + su.getUnitStatus() )
|
||||||
su.getSourceID() )
|
.from( su.getSourceWACN() + "-" +
|
||||||
.to( su.getTargetAddress() )
|
su.getSourceSystemID() + "-" +
|
||||||
.build() );
|
su.getSourceID() )
|
||||||
|
.to( su.getTargetAddress() )
|
||||||
|
.build();
|
||||||
|
|
||||||
|
mLastResponseEventID = su.getTargetAddress();
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case UNIT_REGISTRATION_RESPONSE:
|
case UNIT_REGISTRATION_RESPONSE:
|
||||||
UnitRegistrationResponseExtended urr =
|
UnitRegistrationResponseExtended urr =
|
||||||
@@ -698,11 +810,10 @@ public class P25ChannelState extends ChannelState
|
|||||||
System.currentTimeMillis() );
|
System.currentTimeMillis() );
|
||||||
}
|
}
|
||||||
|
|
||||||
if( mLastRegistrationEventID != null &&
|
if( mLastRegistrationEventID == null || !mLastRegistrationEventID
|
||||||
!mLastRegistrationEventID.contentEquals( urr.getAssignedSourceAddress() ) )
|
.contentEquals( urr.getAssignedSourceAddress() ) )
|
||||||
{
|
{
|
||||||
mCallEventModel.add(
|
event = new P25CallEvent.Builder( CallEventType.REGISTER )
|
||||||
new P25CallEvent.Builder( CallEventType.REGISTER )
|
|
||||||
.aliasList( mAliasList )
|
.aliasList( mAliasList )
|
||||||
.details( "REGISTRATION:" + urr.getResponse().name() +
|
.details( "REGISTRATION:" + urr.getResponse().name() +
|
||||||
" FOR EXTERNAL SYSTEM ADDRESS: " +
|
" FOR EXTERNAL SYSTEM ADDRESS: " +
|
||||||
@@ -711,14 +822,19 @@ public class P25ChannelState extends ChannelState
|
|||||||
urr.getSourceAddress() +
|
urr.getSourceAddress() +
|
||||||
" SOURCE ID: " + urr.getSourceID() )
|
" SOURCE ID: " + urr.getSourceID() )
|
||||||
.from( urr.getAssignedSourceAddress() )
|
.from( urr.getAssignedSourceAddress() )
|
||||||
.build() );
|
.build();
|
||||||
}
|
|
||||||
|
|
||||||
mLastRegistrationEventID = urr.getAssignedSourceAddress();
|
mLastRegistrationEventID = urr.getAssignedSourceAddress();
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if( event != null )
|
||||||
|
{
|
||||||
|
mCallEventModel.add( event );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void processRFSSStatus( RFSSStatusBroadcast message )
|
private void processRFSSStatus( RFSSStatusBroadcast message )
|
||||||
@@ -818,9 +934,8 @@ public class P25ChannelState extends ChannelState
|
|||||||
new P25CallEvent.Builder( CallEventType.DATA_CALL )
|
new P25CallEvent.Builder( CallEventType.DATA_CALL )
|
||||||
.aliasList( mAliasList )
|
.aliasList( mAliasList )
|
||||||
.channel( gdcge.getTransmitChannel() )
|
.channel( gdcge.getTransmitChannel() )
|
||||||
.details( "GROUP DATA CHANNEL GRANT EXTENDED" )
|
.details( ( gdcge.isEncrypted() ? "ENCRYPTED" : "" ) +
|
||||||
// .details( ( gdcg.isEncrypted() ? "ENCRYPTED" : "" ) +
|
( gdcge.isEmergency() ? " EMERGENCY" : "") )
|
||||||
// ( gdcg.isEmergency() ? " EMERGENCY" : "") )
|
|
||||||
.frequency( gdcge.getDownlinkFrequency() )
|
.frequency( gdcge.getDownlinkFrequency() )
|
||||||
.from( gdcge.getSourceAddress() )
|
.from( gdcge.getSourceAddress() )
|
||||||
.to( gdcge.getGroupAddress() )
|
.to( gdcge.getGroupAddress() )
|
||||||
@@ -845,9 +960,8 @@ public class P25ChannelState extends ChannelState
|
|||||||
new P25CallEvent.Builder( CallEventType.CALL )
|
new P25CallEvent.Builder( CallEventType.CALL )
|
||||||
.aliasList( mAliasList )
|
.aliasList( mAliasList )
|
||||||
.channel( gvcge.getTransmitChannel() )
|
.channel( gvcge.getTransmitChannel() )
|
||||||
.details( "GROUP_VOICE_CHANNEL_GRANT" )
|
.details( ( gvcge.isEncrypted() ? "ENCRYPTED" : "" ) +
|
||||||
// .details( ( gvcg.isEncrypted() ? "ENCRYPTED" : "" ) +
|
( gvcge.isEmergency() ? " EMERGENCY" : "") )
|
||||||
// ( gvcg.isEmergency() ? " EMERGENCY" : "") )
|
|
||||||
.frequency( gvcge.getDownlinkFrequency() )
|
.frequency( gvcge.getDownlinkFrequency() )
|
||||||
.from( gvcge.getSourceAddress() )
|
.from( gvcge.getSourceAddress() )
|
||||||
.to( gvcge.getGroupAddress() )
|
.to( gvcge.getGroupAddress() )
|
||||||
@@ -872,9 +986,8 @@ public class P25ChannelState extends ChannelState
|
|||||||
new P25CallEvent.Builder( CallEventType.DATA_CALL )
|
new P25CallEvent.Builder( CallEventType.DATA_CALL )
|
||||||
.aliasList( mAliasList )
|
.aliasList( mAliasList )
|
||||||
.channel( idcge.getTransmitChannel() )
|
.channel( idcge.getTransmitChannel() )
|
||||||
.details( "INDIV DATA CHANNEL GRANT EXTENDED" )
|
.details( ( idcge.isEncrypted() ? "ENCRYPTED" : "" ) +
|
||||||
// .details( ( idcg.isEncrypted() ? "ENCRYPTED" : "" ) +
|
( idcge.isEmergency() ? " EMERGENCY" : "") )
|
||||||
// ( idcg.isEmergency() ? " EMERGENCY" : "") )
|
|
||||||
.frequency( idcge.getDownlinkFrequency() )
|
.frequency( idcge.getDownlinkFrequency() )
|
||||||
.from( idcge.getSourceWACN() + "-" +
|
.from( idcge.getSourceWACN() + "-" +
|
||||||
idcge.getSourceSystemID() + "-" +
|
idcge.getSourceSystemID() + "-" +
|
||||||
@@ -927,9 +1040,8 @@ public class P25ChannelState extends ChannelState
|
|||||||
new P25CallEvent.Builder( CallEventType.CALL )
|
new P25CallEvent.Builder( CallEventType.CALL )
|
||||||
.aliasList( mAliasList )
|
.aliasList( mAliasList )
|
||||||
.channel( uuvcge.getTransmitChannel() )
|
.channel( uuvcge.getTransmitChannel() )
|
||||||
.details( "UNIT_TO_UNIT_VOICE_CHANNEL_GRANT" )
|
.details( ( uuvcge.isEncrypted() ? "ENCRYPTED" : "" ) +
|
||||||
// .details( ( uuvcge.isEncrypted() ? "ENCRYPTED" : "" ) +
|
( uuvcge.isEmergency() ? " EMERGENCY" : "") )
|
||||||
// ( uuvcge.isEmergency() ? " EMERGENCY" : "") )
|
|
||||||
.frequency( uuvcge.getDownlinkFrequency() )
|
.frequency( uuvcge.getDownlinkFrequency() )
|
||||||
.from( uuvcge.getSourceWACN() + "-" +
|
.from( uuvcge.getSourceWACN() + "-" +
|
||||||
uuvcge.getSourceSystemID() + "-" +
|
uuvcge.getSourceSystemID() + "-" +
|
||||||
@@ -958,9 +1070,8 @@ public class P25ChannelState extends ChannelState
|
|||||||
new P25CallEvent.Builder( CallEventType.CALL )
|
new P25CallEvent.Builder( CallEventType.CALL )
|
||||||
.aliasList( mAliasList )
|
.aliasList( mAliasList )
|
||||||
.channel( uuvcgue.getTransmitChannel() )
|
.channel( uuvcgue.getTransmitChannel() )
|
||||||
.details( "UNIT_TO_UNIT_VOICE_CHANNEL_GRANT" )
|
.details( ( uuvcgue.isEncrypted() ? "ENCRYPTED" : "" ) +
|
||||||
// .details( ( uuvcge.isEncrypted() ? "ENCRYPTED" : "" ) +
|
( uuvcgue.isEmergency() ? " EMERGENCY" : "") )
|
||||||
// ( uuvcge.isEmergency() ? " EMERGENCY" : "") )
|
|
||||||
.frequency( uuvcgue.getDownlinkFrequency() )
|
.frequency( uuvcgue.getDownlinkFrequency() )
|
||||||
.from( uuvcgue.getSourceWACN() + "-" +
|
.from( uuvcgue.getSourceWACN() + "-" +
|
||||||
uuvcgue.getSourceSystemID() + "-" +
|
uuvcgue.getSourceSystemID() + "-" +
|
||||||
@@ -1011,9 +1122,8 @@ public class P25ChannelState extends ChannelState
|
|||||||
new P25CallEvent.Builder( CallEventType.DATA_CALL )
|
new P25CallEvent.Builder( CallEventType.DATA_CALL )
|
||||||
.aliasList( mAliasList )
|
.aliasList( mAliasList )
|
||||||
.channel( gdca.getChannel1() )
|
.channel( gdca.getChannel1() )
|
||||||
.details( "GROUP DATA CHANNEL ANNOUNCEMENT" )
|
.details( ( gdca.isEncrypted() ? "ENCRYPTED" : "" ) +
|
||||||
// .details( ( gdca.isEncrypted() ? "ENCRYPTED" : "" ) +
|
( gdca.isEmergency() ? " EMERGENCY" : "") )
|
||||||
// ( gdca.isEmergency() ? " EMERGENCY" : "") )
|
|
||||||
.frequency( gdca.getDownlinkFrequency1() )
|
.frequency( gdca.getDownlinkFrequency1() )
|
||||||
.to( gdca.getGroupAddress1() )
|
.to( gdca.getGroupAddress1() )
|
||||||
.build();
|
.build();
|
||||||
@@ -1035,9 +1145,8 @@ public class P25ChannelState extends ChannelState
|
|||||||
new P25CallEvent.Builder( CallEventType.DATA_CALL )
|
new P25CallEvent.Builder( CallEventType.DATA_CALL )
|
||||||
.aliasList( mAliasList )
|
.aliasList( mAliasList )
|
||||||
.channel( gdca.getChannel2() )
|
.channel( gdca.getChannel2() )
|
||||||
.details( "GROUP DATA CHANNEL ANNOUNCEMENT" )
|
.details( ( gdca.isEncrypted() ? "ENCRYPTED" : "" ) +
|
||||||
// .details( ( gdca.isEncrypted() ? "ENCRYPTED" : "" ) +
|
( gdca.isEmergency() ? " EMERGENCY" : "") )
|
||||||
// ( gdca.isEmergency() ? " EMERGENCY" : "") )
|
|
||||||
.frequency( gdca.getDownlinkFrequency2() )
|
.frequency( gdca.getDownlinkFrequency2() )
|
||||||
.to( gdca.getGroupAddress2() )
|
.to( gdca.getGroupAddress2() )
|
||||||
.build();
|
.build();
|
||||||
@@ -1062,9 +1171,8 @@ public class P25ChannelState extends ChannelState
|
|||||||
new P25CallEvent.Builder( CallEventType.DATA_CALL )
|
new P25CallEvent.Builder( CallEventType.DATA_CALL )
|
||||||
.aliasList( mAliasList )
|
.aliasList( mAliasList )
|
||||||
.channel( gdcae.getTransmitChannel() )
|
.channel( gdcae.getTransmitChannel() )
|
||||||
.details( "GROUP DATA CHANNEL ANNOUNCEMENT EXPLICIT" )
|
.details( ( gdcae.isEncrypted() ? "ENCRYPTED" : "" ) +
|
||||||
// .details( ( gdca.isEncrypted() ? "ENCRYPTED" : "" ) +
|
( gdcae.isEmergency() ? " EMERGENCY" : "") )
|
||||||
// ( gdca.isEmergency() ? " EMERGENCY" : "") )
|
|
||||||
.frequency( gdcae.getDownlinkFrequency() )
|
.frequency( gdcae.getDownlinkFrequency() )
|
||||||
.to( gdcae.getGroupAddress() )
|
.to( gdcae.getGroupAddress() )
|
||||||
.build();
|
.build();
|
||||||
@@ -1087,9 +1195,8 @@ public class P25ChannelState extends ChannelState
|
|||||||
new P25CallEvent.Builder( CallEventType.DATA_CALL )
|
new P25CallEvent.Builder( CallEventType.DATA_CALL )
|
||||||
.aliasList( mAliasList )
|
.aliasList( mAliasList )
|
||||||
.channel( gdcg.getChannel() )
|
.channel( gdcg.getChannel() )
|
||||||
.details( "GROUP DATA CHANNEL GRANT" )
|
.details( ( gdcg.isEncrypted() ? "ENCRYPTED" : "" ) +
|
||||||
// .details( ( gdcg.isEncrypted() ? "ENCRYPTED" : "" ) +
|
( gdcg.isEmergency() ? " EMERGENCY" : "") )
|
||||||
// ( gdcg.isEmergency() ? " EMERGENCY" : "") )
|
|
||||||
.frequency( gdcg.getDownlinkFrequency() )
|
.frequency( gdcg.getDownlinkFrequency() )
|
||||||
.from( gdcg.getSourceAddress() )
|
.from( gdcg.getSourceAddress() )
|
||||||
.to( gdcg.getGroupAddress() )
|
.to( gdcg.getGroupAddress() )
|
||||||
@@ -1113,9 +1220,8 @@ public class P25ChannelState extends ChannelState
|
|||||||
new P25CallEvent.Builder( CallEventType.CALL )
|
new P25CallEvent.Builder( CallEventType.CALL )
|
||||||
.aliasList( mAliasList )
|
.aliasList( mAliasList )
|
||||||
.channel( gvcg.getChannel() )
|
.channel( gvcg.getChannel() )
|
||||||
.details( "GROUP_VOICE_CHANNEL_GRANT" )
|
.details( ( gvcg.isEncrypted() ? "ENCRYPTED" : "" ) +
|
||||||
// .details( ( gvcg.isEncrypted() ? "ENCRYPTED" : "" ) +
|
( gvcg.isEmergency() ? " EMERGENCY" : "") )
|
||||||
// ( gvcg.isEmergency() ? " EMERGENCY" : "") )
|
|
||||||
.frequency( gvcg.getDownlinkFrequency() )
|
.frequency( gvcg.getDownlinkFrequency() )
|
||||||
.from( gvcg.getSourceAddress() )
|
.from( gvcg.getSourceAddress() )
|
||||||
.to( gvcg.getGroupAddress() )
|
.to( gvcg.getGroupAddress() )
|
||||||
@@ -1140,9 +1246,8 @@ public class P25ChannelState extends ChannelState
|
|||||||
new P25CallEvent.Builder( CallEventType.CALL )
|
new P25CallEvent.Builder( CallEventType.CALL )
|
||||||
.aliasList( mAliasList )
|
.aliasList( mAliasList )
|
||||||
.channel( gvcgu.getChannel1() )
|
.channel( gvcgu.getChannel1() )
|
||||||
.details( "1-GROUP_VOICE_CHANNEL_GRANT_UPDATE" )
|
.details( ( gvcgu.isEncrypted() ? "ENCRYPTED" : "" ) +
|
||||||
// .details( ( gvcgu.isEncrypted() ? "ENCRYPTED" : "" ) +
|
( gvcgu.isEmergency() ? " EMERGENCY" : "") )
|
||||||
// ( gvcgu.isEmergency() ? " EMERGENCY" : "") )
|
|
||||||
.frequency( gvcgu.getDownlinkFrequency1() )
|
.frequency( gvcgu.getDownlinkFrequency1() )
|
||||||
.to( gvcgu.getGroupAddress1() )
|
.to( gvcgu.getGroupAddress1() )
|
||||||
.build();
|
.build();
|
||||||
@@ -1164,9 +1269,8 @@ public class P25ChannelState extends ChannelState
|
|||||||
new P25CallEvent.Builder( CallEventType.CALL )
|
new P25CallEvent.Builder( CallEventType.CALL )
|
||||||
.aliasList( mAliasList )
|
.aliasList( mAliasList )
|
||||||
.channel( gvcgu.getChannel2() )
|
.channel( gvcgu.getChannel2() )
|
||||||
.details( "2-GROUP_VOICE_CHANNEL_GRANT_UPDATE" )
|
.details( ( gvcgu.isEncrypted() ? "ENCRYPTED" : "" ) +
|
||||||
// .details( ( gvcgu.isEncrypted() ? "ENCRYPTED" : "" ) +
|
( gvcgu.isEmergency() ? " EMERGENCY" : "") )
|
||||||
// ( gvcgu.isEmergency() ? " EMERGENCY" : "") )
|
|
||||||
.frequency( gvcgu.getDownlinkFrequency2() )
|
.frequency( gvcgu.getDownlinkFrequency2() )
|
||||||
.to( gvcgu.getGroupAddress2() )
|
.to( gvcgu.getGroupAddress2() )
|
||||||
.build();
|
.build();
|
||||||
@@ -1186,9 +1290,8 @@ public class P25ChannelState extends ChannelState
|
|||||||
.aliasList( mAliasList )
|
.aliasList( mAliasList )
|
||||||
.channel( gvcgue.getTransmitChannelIdentifier() + "-" +
|
.channel( gvcgue.getTransmitChannelIdentifier() + "-" +
|
||||||
gvcgue.getTransmitChannelNumber() )
|
gvcgue.getTransmitChannelNumber() )
|
||||||
.details( "GROUP_VOICE_CHANNEL_GRANT_UPDATE_EXPLICIT")
|
.details( ( gvcgue.isEncrypted() ? "ENCRYPTED" : "" ) +
|
||||||
// .details( ( gvcgue.isEncrypted() ? "ENCRYPTED" : "" ) +
|
( gvcgue.isEmergency() ? " EMERGENCY" : "") )
|
||||||
// ( gvcgue.isEmergency() ? " EMERGENCY" : "") )
|
|
||||||
.frequency( gvcgue.getDownlinkFrequency() )
|
.frequency( gvcgue.getDownlinkFrequency() )
|
||||||
.to( gvcgue.getGroupAddress() )
|
.to( gvcgue.getGroupAddress() )
|
||||||
.build() );
|
.build() );
|
||||||
@@ -1206,9 +1309,8 @@ public class P25ChannelState extends ChannelState
|
|||||||
new P25CallEvent.Builder( CallEventType.DATA_CALL )
|
new P25CallEvent.Builder( CallEventType.DATA_CALL )
|
||||||
.aliasList( mAliasList )
|
.aliasList( mAliasList )
|
||||||
.channel( idcg.getChannel() )
|
.channel( idcg.getChannel() )
|
||||||
.details( "INDIV DATA CHANNEL GRANT" )
|
.details( ( idcg.isEncrypted() ? "ENCRYPTED" : "" ) +
|
||||||
// .details( ( idcg.isEncrypted() ? "ENCRYPTED" : "" ) +
|
( idcg.isEmergency() ? " EMERGENCY" : "") )
|
||||||
// ( idcg.isEmergency() ? " EMERGENCY" : "") )
|
|
||||||
.frequency( idcg.getDownlinkFrequency() )
|
.frequency( idcg.getDownlinkFrequency() )
|
||||||
.from( idcg.getSourceAddress() )
|
.from( idcg.getSourceAddress() )
|
||||||
.to( idcg.getTargetAddress() )
|
.to( idcg.getTargetAddress() )
|
||||||
@@ -1222,18 +1324,25 @@ public class P25ChannelState extends ChannelState
|
|||||||
case SNDCP_DATA_CHANNEL_GRANT:
|
case SNDCP_DATA_CHANNEL_GRANT:
|
||||||
SNDCPDataChannelGrant sdcg = (SNDCPDataChannelGrant)message;
|
SNDCPDataChannelGrant sdcg = (SNDCPDataChannelGrant)message;
|
||||||
|
|
||||||
CallEvent event =
|
if( isActiveCall( sdcg.getTransmitChannel(), sdcg.getTargetAddress() ) )
|
||||||
new P25CallEvent.Builder( CallEventType.DATA_CALL )
|
{
|
||||||
.aliasList( mAliasList )
|
updateCall( sdcg.getTransmitChannel(), sdcg.getTargetAddress() );
|
||||||
.channel( sdcg.getTransmitChannel() )
|
}
|
||||||
.details( "SNDCP DATA NSAPI:" + sdcg.getNSAPI() )
|
else
|
||||||
.frequency( sdcg.getDownlinkFrequency() )
|
{
|
||||||
.to( sdcg.getTargetAddress() )
|
CallEvent event =
|
||||||
.build();
|
new P25CallEvent.Builder( CallEventType.DATA_CALL )
|
||||||
|
.aliasList( mAliasList )
|
||||||
|
.channel( sdcg.getTransmitChannel() )
|
||||||
|
.details( "SNDCP DATA NSAPI:" + sdcg.getNSAPI() )
|
||||||
|
.frequency( sdcg.getDownlinkFrequency() )
|
||||||
|
.to( sdcg.getTargetAddress() )
|
||||||
|
.build();
|
||||||
|
|
||||||
mCallEventModel.add( event );
|
mCallEventModel.add( event );
|
||||||
|
|
||||||
addCall( event );
|
addCall( event );
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case TELEPHONE_INTERCONNECT_VOICE_CHANNEL_GRANT:
|
case TELEPHONE_INTERCONNECT_VOICE_CHANNEL_GRANT:
|
||||||
TelephoneInterconnectVoiceChannelGrant tivcg =
|
TelephoneInterconnectVoiceChannelGrant tivcg =
|
||||||
@@ -1276,9 +1385,8 @@ public class P25ChannelState extends ChannelState
|
|||||||
.aliasList( mAliasList )
|
.aliasList( mAliasList )
|
||||||
.channel( tivcgu.getChannelIdentifier() + "-" +
|
.channel( tivcgu.getChannelIdentifier() + "-" +
|
||||||
tivcgu.getChannelNumber() )
|
tivcgu.getChannelNumber() )
|
||||||
.details( "TELEPHONE_INTERCONNECT_VOICE_CHANNEL_GRANT_UPDATE" )
|
.details( ( tivcgu.isEncrypted() ? "ENCRYPTED" : "" ) +
|
||||||
// .details( ( tivcgu.isEncrypted() ? "ENCRYPTED" : "" ) +
|
( tivcgu.isEmergency() ? " EMERGENCY" : "") )
|
||||||
// ( tivcgu.isEmergency() ? " EMERGENCY" : "") )
|
|
||||||
.frequency( tivcgu.getDownlinkFrequency() )
|
.frequency( tivcgu.getDownlinkFrequency() )
|
||||||
.from( tivcgu.getAddress() )
|
.from( tivcgu.getAddress() )
|
||||||
.build();
|
.build();
|
||||||
@@ -1303,9 +1411,8 @@ public class P25ChannelState extends ChannelState
|
|||||||
.aliasList( mAliasList )
|
.aliasList( mAliasList )
|
||||||
.channel( uuvcg.getChannelIdentifier() + "-" +
|
.channel( uuvcg.getChannelIdentifier() + "-" +
|
||||||
uuvcg.getChannelNumber() )
|
uuvcg.getChannelNumber() )
|
||||||
.details( "UNIT_TO_UNIT_VOICE_CHANNEL_GRANT" )
|
.details( ( uuvcg.isEncrypted() ? "ENCRYPTED" : "" ) +
|
||||||
// .details( ( uuvcg.isEncrypted() ? "ENCRYPTED" : "" ) +
|
( uuvcg.isEmergency() ? " EMERGENCY" : "") )
|
||||||
// ( uuvcg.isEmergency() ? " EMERGENCY" : "") )
|
|
||||||
.frequency( uuvcg.getDownlinkFrequency() )
|
.frequency( uuvcg.getDownlinkFrequency() )
|
||||||
.from( uuvcg.getSourceAddress() )
|
.from( uuvcg.getSourceAddress() )
|
||||||
.to( uuvcg.getTargetAddress() )
|
.to( uuvcg.getTargetAddress() )
|
||||||
@@ -1332,9 +1439,8 @@ public class P25ChannelState extends ChannelState
|
|||||||
.aliasList( mAliasList )
|
.aliasList( mAliasList )
|
||||||
.channel( uuvcgu.getChannelIdentifier() + "-" +
|
.channel( uuvcgu.getChannelIdentifier() + "-" +
|
||||||
uuvcgu.getChannelNumber() )
|
uuvcgu.getChannelNumber() )
|
||||||
.details( "UNIT_TO_UNIT_VOICE_CHANNEL_GRANT_UPDATE" )
|
.details( ( uuvcgu.isEncrypted() ? "ENCRYPTED" : "" ) +
|
||||||
// .details( ( uuvcgu.isEncrypted() ? "ENCRYPTED" : "" ) +
|
( uuvcgu.isEmergency() ? " EMERGENCY" : "") )
|
||||||
// ( uuvcgu.isEmergency() ? " EMERGENCY" : "") )
|
|
||||||
.frequency( uuvcgu.getDownlinkFrequency() )
|
.frequency( uuvcgu.getDownlinkFrequency() )
|
||||||
.from( uuvcgu.getSourceAddress() )
|
.from( uuvcgu.getSourceAddress() )
|
||||||
.to( uuvcgu.getTargetAddress() )
|
.to( uuvcgu.getTargetAddress() )
|
||||||
@@ -1388,46 +1494,68 @@ public class P25ChannelState extends ChannelState
|
|||||||
*/
|
*/
|
||||||
private void processPage( TSBKMessage message )
|
private void processPage( TSBKMessage message )
|
||||||
{
|
{
|
||||||
|
CallEvent event = null;
|
||||||
|
|
||||||
switch( message.getOpcode() )
|
switch( message.getOpcode() )
|
||||||
{
|
{
|
||||||
case UNIT_TO_UNIT_ANSWER_REQUEST:
|
case UNIT_TO_UNIT_ANSWER_REQUEST:
|
||||||
UnitToUnitAnswerRequest utuar = (UnitToUnitAnswerRequest)message;
|
UnitToUnitAnswerRequest utuar = (UnitToUnitAnswerRequest)message;
|
||||||
|
|
||||||
mCallEventModel.add(
|
if( mLastPageEventID == null || !mLastPageEventID
|
||||||
new P25CallEvent.Builder( CallEventType.PAGE )
|
.contentEquals( utuar.getTargetAddress() ) )
|
||||||
.aliasList( mAliasList )
|
{
|
||||||
.details( ( utuar.isEmergency() ? "EMERGENCY" : "" ) )
|
event = new P25CallEvent.Builder( CallEventType.PAGE )
|
||||||
.from( utuar.getSourceAddress() )
|
.aliasList( mAliasList )
|
||||||
.to( utuar.getTargetAddress() )
|
.details( ( utuar.isEmergency() ? "EMERGENCY" : "" ) )
|
||||||
.build() );
|
.from( utuar.getSourceAddress() )
|
||||||
|
.to( utuar.getTargetAddress() )
|
||||||
|
.build();
|
||||||
|
|
||||||
|
mLastPageEventID = utuar.getTargetAddress();
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case SNDCP_DATA_PAGE_REQUEST:
|
case SNDCP_DATA_PAGE_REQUEST:
|
||||||
SNDCPDataPageRequest sdpr = (SNDCPDataPageRequest)message;
|
SNDCPDataPageRequest sdpr = (SNDCPDataPageRequest)message;
|
||||||
|
|
||||||
mCallEventModel.add(
|
if( mLastPageEventID == null || !mLastPageEventID
|
||||||
new P25CallEvent.Builder( CallEventType.PAGE )
|
.contentEquals( sdpr.getTargetAddress() ) )
|
||||||
.aliasList( mAliasList )
|
{
|
||||||
.details( "SNDCP DATA DAC: " +
|
event = new P25CallEvent.Builder( CallEventType.PAGE )
|
||||||
sdpr.getDataAccessControl() +
|
.aliasList( mAliasList )
|
||||||
" NSAPI:" + sdpr.getNSAPI() )
|
.details( "SNDCP DATA DAC: " +
|
||||||
.to( sdpr.getTargetAddress() )
|
sdpr.getDataAccessControl() +
|
||||||
.build() );
|
" NSAPI:" + sdpr.getNSAPI() )
|
||||||
|
.to( sdpr.getTargetAddress() )
|
||||||
|
.build();
|
||||||
|
|
||||||
|
mLastPageEventID = sdpr.getTargetAddress();
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case TELEPHONE_INTERCONNECT_ANSWER_REQUEST:
|
case TELEPHONE_INTERCONNECT_ANSWER_REQUEST:
|
||||||
TelephoneInterconnectAnswerRequest tiar =
|
TelephoneInterconnectAnswerRequest tiar =
|
||||||
(TelephoneInterconnectAnswerRequest)message;
|
(TelephoneInterconnectAnswerRequest)message;
|
||||||
|
|
||||||
mCallEventModel.add(
|
if( mLastPageEventID == null || !mLastPageEventID
|
||||||
new P25CallEvent.Builder( CallEventType.PAGE )
|
.contentEquals( tiar.getTargetAddress() ) )
|
||||||
|
{
|
||||||
|
event = new P25CallEvent.Builder( CallEventType.PAGE )
|
||||||
.aliasList( mAliasList )
|
.aliasList( mAliasList )
|
||||||
.details( ( "TELEPHONE INTERCONNECT" ) )
|
.details( ( "TELEPHONE INTERCONNECT" ) )
|
||||||
.from( tiar.getTelephoneNumber() )
|
.from( tiar.getTelephoneNumber() )
|
||||||
.to( tiar.getTargetAddress() )
|
.to( tiar.getTargetAddress() )
|
||||||
.build() );
|
.build();
|
||||||
|
|
||||||
|
mLastPageEventID = tiar.getTargetAddress();
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if( event != null )
|
||||||
|
{
|
||||||
|
mCallEventModel.add( event );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void processPage( PDUMessage message )
|
private void processPage( PDUMessage message )
|
||||||
@@ -1437,15 +1565,21 @@ public class P25ChannelState extends ChannelState
|
|||||||
UnitToUnitAnswerRequestExplicit utuare =
|
UnitToUnitAnswerRequestExplicit utuare =
|
||||||
(UnitToUnitAnswerRequestExplicit)message;
|
(UnitToUnitAnswerRequestExplicit)message;
|
||||||
|
|
||||||
mCallEventModel.add(
|
if( mLastPageEventID == null || !mLastPageEventID
|
||||||
new P25CallEvent.Builder( CallEventType.PAGE )
|
.contentEquals( utuare.getTargetAddress() ) )
|
||||||
.aliasList( mAliasList )
|
{
|
||||||
.details( ( utuare.isEmergency() ? "EMERGENCY" : "" ) )
|
mCallEventModel.add(
|
||||||
.from( utuare.getSourceID() )
|
new P25CallEvent.Builder( CallEventType.PAGE )
|
||||||
.to( utuare.getWACN() + "-" +
|
.aliasList( mAliasList )
|
||||||
utuare.getSystemID() + "-" +
|
.details( ( utuare.isEmergency() ? "EMERGENCY" : "" ) )
|
||||||
utuare.getTargetAddress() )
|
.from( utuare.getWACN() + "-" +
|
||||||
.build() );
|
utuare.getSystemID() + "-" +
|
||||||
|
utuare.getSourceID() )
|
||||||
|
.to( utuare.getTargetAddress() )
|
||||||
|
.build() );
|
||||||
|
|
||||||
|
mLastPageEventID = utuare.getTargetAddress();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ package decode.p25;
|
|||||||
|
|
||||||
import instrument.Instrumentable;
|
import instrument.Instrumentable;
|
||||||
import instrument.tap.Tap;
|
import instrument.tap.Tap;
|
||||||
|
import instrument.tap.stream.DibitTap;
|
||||||
import instrument.tap.stream.FloatTap;
|
import instrument.tap.stream.FloatTap;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
@@ -36,9 +37,9 @@ import dsp.agc.RealAutomaticGainControl;
|
|||||||
import dsp.filter.ComplexFIRFilter;
|
import dsp.filter.ComplexFIRFilter;
|
||||||
import dsp.filter.FilterFactory;
|
import dsp.filter.FilterFactory;
|
||||||
import dsp.filter.Window.WindowType;
|
import dsp.filter.Window.WindowType;
|
||||||
import dsp.fsk.P25MessageFramer;
|
|
||||||
import dsp.fsk.C4FMSlicer;
|
import dsp.fsk.C4FMSlicer;
|
||||||
import dsp.fsk.C4FMSymbolFilter;
|
import dsp.fsk.C4FMSymbolFilter;
|
||||||
|
import dsp.fsk.P25MessageFramer;
|
||||||
import dsp.nbfm.FMDiscriminator;
|
import dsp.nbfm.FMDiscriminator;
|
||||||
|
|
||||||
public class P25Decoder extends Decoder implements Instrumentable
|
public class P25Decoder extends Decoder implements Instrumentable
|
||||||
@@ -49,6 +50,7 @@ public class P25Decoder extends Decoder implements Instrumentable
|
|||||||
private static final String INSTRUMENT_INPUT_TO_AGC = "Tap Point: Input to AGC";
|
private static final String INSTRUMENT_INPUT_TO_AGC = "Tap Point: Input to AGC";
|
||||||
private static final String INSTRUMENT_AGC_TO_SYMBOL_FILTER = "Tap Point: AGC to Symbol Filter";
|
private static final String INSTRUMENT_AGC_TO_SYMBOL_FILTER = "Tap Point: AGC to Symbol Filter";
|
||||||
private static final String INSTRUMENT_SYMBOL_FILTER_TO_SLICER = "Tap Point: Symbol Filter to Slicer";
|
private static final String INSTRUMENT_SYMBOL_FILTER_TO_SLICER = "Tap Point: Symbol Filter to Slicer";
|
||||||
|
private static final String INSTRUMENT_SLICER_OUTPUT = "Tap Point: Slicer Output";
|
||||||
private List<Tap> mAvailableTaps;
|
private List<Tap> mAvailableTaps;
|
||||||
|
|
||||||
private ComplexFIRFilter mBasebandFilter = new ComplexFIRFilter(
|
private ComplexFIRFilter mBasebandFilter = new ComplexFIRFilter(
|
||||||
@@ -125,6 +127,7 @@ public class P25Decoder extends Decoder implements Instrumentable
|
|||||||
mAvailableTaps.add( new FloatTap( INSTRUMENT_INPUT_TO_AGC, 0, 1.0f ) );
|
mAvailableTaps.add( new FloatTap( INSTRUMENT_INPUT_TO_AGC, 0, 1.0f ) );
|
||||||
mAvailableTaps.add( new FloatTap( INSTRUMENT_AGC_TO_SYMBOL_FILTER, 0, 1.0f ) );
|
mAvailableTaps.add( new FloatTap( INSTRUMENT_AGC_TO_SYMBOL_FILTER, 0, 1.0f ) );
|
||||||
mAvailableTaps.add( new FloatTap( INSTRUMENT_SYMBOL_FILTER_TO_SLICER, 0, 0.1f ) );
|
mAvailableTaps.add( new FloatTap( INSTRUMENT_SYMBOL_FILTER_TO_SLICER, 0, 0.1f ) );
|
||||||
|
mAvailableTaps.add( new DibitTap( INSTRUMENT_SLICER_OUTPUT, 0, 0.1f ) );
|
||||||
|
|
||||||
mAvailableTaps.addAll( mSymbolFilter.getTaps() );
|
mAvailableTaps.addAll( mSymbolFilter.getTaps() );
|
||||||
}
|
}
|
||||||
@@ -155,6 +158,10 @@ public class P25Decoder extends Decoder implements Instrumentable
|
|||||||
mSymbolFilter.setListener( symbolSlicer );
|
mSymbolFilter.setListener( symbolSlicer );
|
||||||
symbolSlicer.setListener( mSlicer );
|
symbolSlicer.setListener( mSlicer );
|
||||||
break;
|
break;
|
||||||
|
case INSTRUMENT_SLICER_OUTPUT:
|
||||||
|
DibitTap slicer = (DibitTap)tap;
|
||||||
|
mSlicer.addListener( slicer );
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -176,6 +183,10 @@ public class P25Decoder extends Decoder implements Instrumentable
|
|||||||
case INSTRUMENT_SYMBOL_FILTER_TO_SLICER:
|
case INSTRUMENT_SYMBOL_FILTER_TO_SLICER:
|
||||||
mSymbolFilter.setListener( mSlicer );
|
mSymbolFilter.setListener( mSlicer );
|
||||||
break;
|
break;
|
||||||
|
case INSTRUMENT_SLICER_OUTPUT:
|
||||||
|
DibitTap slicerTap = (DibitTap)tap;
|
||||||
|
mSlicer.removeListener( slicerTap );
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
44
src/decode/p25/message/hdu/HDUMessage.java
Normal file
44
src/decode/p25/message/hdu/HDUMessage.java
Normal file
@@ -0,0 +1,44 @@
|
|||||||
|
package decode.p25.message.hdu;
|
||||||
|
|
||||||
|
import alias.AliasList;
|
||||||
|
import bits.BitSetBuffer;
|
||||||
|
import crc.CRC;
|
||||||
|
import decode.p25.message.P25Message;
|
||||||
|
import decode.p25.reference.DataUnitID;
|
||||||
|
|
||||||
|
public class HDUMessage extends P25Message
|
||||||
|
{
|
||||||
|
public HDUMessage( BitSetBuffer message, DataUnitID duid,
|
||||||
|
AliasList aliasList )
|
||||||
|
{
|
||||||
|
super( message, duid, aliasList );
|
||||||
|
|
||||||
|
/* NID CRC is checked in the message framer, thus a constructed message
|
||||||
|
* means it passed the CRC */
|
||||||
|
mCRC = new CRC[ 2 ];
|
||||||
|
mCRC[ 0 ] = CRC.PASSED;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getMessage()
|
||||||
|
{
|
||||||
|
StringBuilder sb = new StringBuilder();
|
||||||
|
|
||||||
|
sb.append( "NAC:" );
|
||||||
|
sb.append( getNAC() );
|
||||||
|
sb.append( " " );
|
||||||
|
sb.append( getDUID().getLabel() );
|
||||||
|
sb.append( " " );
|
||||||
|
|
||||||
|
sb.append( mMessage.toString() );
|
||||||
|
|
||||||
|
return sb.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Temporary override */
|
||||||
|
public boolean isValid()
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
44
src/decode/p25/message/ldu/LDU1Message.java
Normal file
44
src/decode/p25/message/ldu/LDU1Message.java
Normal file
@@ -0,0 +1,44 @@
|
|||||||
|
package decode.p25.message.ldu;
|
||||||
|
|
||||||
|
import alias.AliasList;
|
||||||
|
import bits.BitSetBuffer;
|
||||||
|
import crc.CRC;
|
||||||
|
import decode.p25.message.P25Message;
|
||||||
|
import decode.p25.reference.DataUnitID;
|
||||||
|
|
||||||
|
public class LDU1Message extends P25Message
|
||||||
|
{
|
||||||
|
public LDU1Message( BitSetBuffer message, DataUnitID duid,
|
||||||
|
AliasList aliasList )
|
||||||
|
{
|
||||||
|
super( message, duid, aliasList );
|
||||||
|
|
||||||
|
/* NID CRC is checked in the message framer, thus a constructed message
|
||||||
|
* means it passed the CRC */
|
||||||
|
mCRC = new CRC[ 2 ];
|
||||||
|
mCRC[ 0 ] = CRC.PASSED;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getMessage()
|
||||||
|
{
|
||||||
|
StringBuilder sb = new StringBuilder();
|
||||||
|
|
||||||
|
sb.append( "NAC:" );
|
||||||
|
sb.append( getNAC() );
|
||||||
|
sb.append( " " );
|
||||||
|
sb.append( getDUID().getLabel() );
|
||||||
|
sb.append( " " );
|
||||||
|
|
||||||
|
sb.append( mMessage.toString() );
|
||||||
|
|
||||||
|
return sb.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Temporary override */
|
||||||
|
public boolean isValid()
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
44
src/decode/p25/message/ldu/LDU2Message.java
Normal file
44
src/decode/p25/message/ldu/LDU2Message.java
Normal file
@@ -0,0 +1,44 @@
|
|||||||
|
package decode.p25.message.ldu;
|
||||||
|
|
||||||
|
import alias.AliasList;
|
||||||
|
import bits.BitSetBuffer;
|
||||||
|
import crc.CRC;
|
||||||
|
import decode.p25.message.P25Message;
|
||||||
|
import decode.p25.reference.DataUnitID;
|
||||||
|
|
||||||
|
public class LDU2Message extends P25Message
|
||||||
|
{
|
||||||
|
public LDU2Message( BitSetBuffer message, DataUnitID duid,
|
||||||
|
AliasList aliasList )
|
||||||
|
{
|
||||||
|
super( message, duid, aliasList );
|
||||||
|
|
||||||
|
/* NID CRC is checked in the message framer, thus a constructed message
|
||||||
|
* means it passed the CRC */
|
||||||
|
mCRC = new CRC[ 2 ];
|
||||||
|
mCRC[ 0 ] = CRC.PASSED;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getMessage()
|
||||||
|
{
|
||||||
|
StringBuilder sb = new StringBuilder();
|
||||||
|
|
||||||
|
sb.append( "NAC:" );
|
||||||
|
sb.append( getNAC() );
|
||||||
|
sb.append( " " );
|
||||||
|
sb.append( getDUID().getLabel() );
|
||||||
|
sb.append( " " );
|
||||||
|
|
||||||
|
sb.append( mMessage.toString() );
|
||||||
|
|
||||||
|
return sb.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Temporary override */
|
||||||
|
public boolean isValid()
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -92,7 +92,7 @@ public abstract class UnitToUnitChannelGrantExtended extends PDUMessage
|
|||||||
return mMessage.get( EMERGENCY_FLAG );
|
return mMessage.get( EMERGENCY_FLAG );
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isEncryptedChannel()
|
public boolean isEncrypted()
|
||||||
{
|
{
|
||||||
return mMessage.get( ENCRYPTED_CHANNEL_FLAG );
|
return mMessage.get( ENCRYPTED_CHANNEL_FLAG );
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -86,7 +86,7 @@ public class GroupDataChannelGrantExtended extends PDUMessage
|
|||||||
return mMessage.get( EMERGENCY_FLAG );
|
return mMessage.get( EMERGENCY_FLAG );
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isEncryptedChannel()
|
public boolean isEncrypted()
|
||||||
{
|
{
|
||||||
return mMessage.get( ENCRYPTED_CHANNEL_FLAG );
|
return mMessage.get( ENCRYPTED_CHANNEL_FLAG );
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -84,7 +84,7 @@ public class GroupVoiceChannelGrantExplicit extends PDUMessage
|
|||||||
return mMessage.get( EMERGENCY_FLAG );
|
return mMessage.get( EMERGENCY_FLAG );
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isEncryptedChannel()
|
public boolean isEncrypted()
|
||||||
{
|
{
|
||||||
return mMessage.get( ENCRYPTED_CHANNEL_FLAG );
|
return mMessage.get( ENCRYPTED_CHANNEL_FLAG );
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -99,7 +99,7 @@ public class UnitToUnitVoiceChannelGrantUpdateExtended extends PDUMessage
|
|||||||
return mMessage.get( EMERGENCY_FLAG );
|
return mMessage.get( EMERGENCY_FLAG );
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isEncryptedChannel()
|
public boolean isEncrypted()
|
||||||
{
|
{
|
||||||
return mMessage.get( ENCRYPTED_CHANNEL_FLAG );
|
return mMessage.get( ENCRYPTED_CHANNEL_FLAG );
|
||||||
}
|
}
|
||||||
|
|||||||
44
src/decode/p25/message/tdu/TDULCMessage.java
Normal file
44
src/decode/p25/message/tdu/TDULCMessage.java
Normal file
@@ -0,0 +1,44 @@
|
|||||||
|
package decode.p25.message.tdu;
|
||||||
|
|
||||||
|
import alias.AliasList;
|
||||||
|
import bits.BitSetBuffer;
|
||||||
|
import crc.CRC;
|
||||||
|
import decode.p25.message.P25Message;
|
||||||
|
import decode.p25.reference.DataUnitID;
|
||||||
|
|
||||||
|
public class TDULCMessage extends P25Message
|
||||||
|
{
|
||||||
|
public TDULCMessage( BitSetBuffer message, DataUnitID duid,
|
||||||
|
AliasList aliasList )
|
||||||
|
{
|
||||||
|
super( message, duid, aliasList );
|
||||||
|
|
||||||
|
/* NID CRC is checked in the message framer, thus a constructed message
|
||||||
|
* means it passed the CRC */
|
||||||
|
mCRC = new CRC[ 2 ];
|
||||||
|
mCRC[ 0 ] = CRC.PASSED;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getMessage()
|
||||||
|
{
|
||||||
|
StringBuilder sb = new StringBuilder();
|
||||||
|
|
||||||
|
sb.append( "NAC:" );
|
||||||
|
sb.append( getNAC() );
|
||||||
|
sb.append( " " );
|
||||||
|
sb.append( getDUID().getLabel() );
|
||||||
|
sb.append( " " );
|
||||||
|
|
||||||
|
sb.append( mMessage.toString() );
|
||||||
|
|
||||||
|
return sb.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Temporary override */
|
||||||
|
public boolean isValid()
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -20,6 +20,7 @@ import decode.p25.message.tsbk.osp.control.LocationRegistrationResponse;
|
|||||||
import decode.p25.message.tsbk.osp.control.MessageUpdate;
|
import decode.p25.message.tsbk.osp.control.MessageUpdate;
|
||||||
import decode.p25.message.tsbk.osp.control.NetworkStatusBroadcast;
|
import decode.p25.message.tsbk.osp.control.NetworkStatusBroadcast;
|
||||||
import decode.p25.message.tsbk.osp.control.ProtectionParameterUpdate;
|
import decode.p25.message.tsbk.osp.control.ProtectionParameterUpdate;
|
||||||
|
import decode.p25.message.tsbk.osp.control.QueuedResponse;
|
||||||
import decode.p25.message.tsbk.osp.control.RFSSStatusBroadcast;
|
import decode.p25.message.tsbk.osp.control.RFSSStatusBroadcast;
|
||||||
import decode.p25.message.tsbk.osp.control.RadioUnitMonitorCommand;
|
import decode.p25.message.tsbk.osp.control.RadioUnitMonitorCommand;
|
||||||
import decode.p25.message.tsbk.osp.control.RoamingAddressCommand;
|
import decode.p25.message.tsbk.osp.control.RoamingAddressCommand;
|
||||||
@@ -125,6 +126,8 @@ public class TSBKMessageFactory
|
|||||||
case NETWORK_STATUS_BROADCAST:
|
case NETWORK_STATUS_BROADCAST:
|
||||||
return new NetworkStatusBroadcast( message, duid,
|
return new NetworkStatusBroadcast( message, duid,
|
||||||
aliasList );
|
aliasList );
|
||||||
|
case QUEUED_RESPONSE:
|
||||||
|
return new QueuedResponse( message, duid, aliasList );
|
||||||
case PROTECTION_PARAMETER_UPDATE:
|
case PROTECTION_PARAMETER_UPDATE:
|
||||||
return new ProtectionParameterUpdate( message, duid,
|
return new ProtectionParameterUpdate( message, duid,
|
||||||
aliasList );
|
aliasList );
|
||||||
|
|||||||
@@ -56,6 +56,19 @@ public class AuthenticationCommand extends TSBKMessage
|
|||||||
return mMessage.getHex( TARGET_ID, 6 );
|
return mMessage.getHex( TARGET_ID, 6 );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getFullTargetID()
|
||||||
|
{
|
||||||
|
StringBuilder sb = new StringBuilder();
|
||||||
|
|
||||||
|
sb.append( getWACN() );
|
||||||
|
sb.append( "-" );
|
||||||
|
sb.append( getSystemID() );
|
||||||
|
sb.append( "-" );
|
||||||
|
sb.append( getTargetID() );
|
||||||
|
|
||||||
|
return sb.toString();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getToID()
|
public String getToID()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ public enum DataUnitID
|
|||||||
PDU1 ( 12, 356, false, "PDU1 ", "Packet Data Unit" ),
|
PDU1 ( 12, 356, false, "PDU1 ", "Packet Data Unit" ),
|
||||||
PDU2 ( 12, 452, false, "PDU2 ", "Packet Data Unit" ),
|
PDU2 ( 12, 452, false, "PDU2 ", "Packet Data Unit" ),
|
||||||
PDU3 ( 12, 548, false, "PDU3 ", "Packet Data Unit" ),
|
PDU3 ( 12, 548, false, "PDU3 ", "Packet Data Unit" ),
|
||||||
TDULC( 15, 372, false, "TDULC", "Terminator Data Unit With Link Control" ),
|
TDULC( 15, 352, false, "TDULC", "Terminator Data Unit With Link Control" ),
|
||||||
UNKN ( -1, 0, false, "UNKWN", "Unknown" );
|
UNKN ( -1, 0, false, "UNKWN", "Unknown" );
|
||||||
|
|
||||||
private int mValue;
|
private int mValue;
|
||||||
|
|||||||
@@ -17,8 +17,12 @@ import crc.CRCP25;
|
|||||||
import decode.p25.P25Interleave;
|
import decode.p25.P25Interleave;
|
||||||
import decode.p25.TrellisHalfRate;
|
import decode.p25.TrellisHalfRate;
|
||||||
import decode.p25.message.P25Message;
|
import decode.p25.message.P25Message;
|
||||||
|
import decode.p25.message.hdu.HDUMessage;
|
||||||
|
import decode.p25.message.ldu.LDU1Message;
|
||||||
|
import decode.p25.message.ldu.LDU2Message;
|
||||||
import decode.p25.message.pdu.PDUMessage;
|
import decode.p25.message.pdu.PDUMessage;
|
||||||
import decode.p25.message.pdu.PDUMessageFactory;
|
import decode.p25.message.pdu.PDUMessageFactory;
|
||||||
|
import decode.p25.message.tdu.TDULCMessage;
|
||||||
import decode.p25.message.tdu.TDUMessage;
|
import decode.p25.message.tdu.TDUMessage;
|
||||||
import decode.p25.message.tsbk.TSBKMessage;
|
import decode.p25.message.tsbk.TSBKMessage;
|
||||||
import decode.p25.message.tsbk.TSBKMessageFactory;
|
import decode.p25.message.tsbk.TSBKMessageFactory;
|
||||||
@@ -246,15 +250,15 @@ public class P25MessageFramer implements Listener<Dibit>
|
|||||||
break;
|
break;
|
||||||
case HDU:
|
case HDU:
|
||||||
mComplete = true;
|
mComplete = true;
|
||||||
dispatch( new P25Message( mMessage.copy(), mDUID, mAliasList ) );
|
dispatch( new HDUMessage( mMessage.copy(), mDUID, mAliasList ) );
|
||||||
break;
|
break;
|
||||||
case LDU1:
|
case LDU1:
|
||||||
mComplete = true;
|
mComplete = true;
|
||||||
dispatch( new P25Message( mMessage.copy(), mDUID, mAliasList ) );
|
dispatch( new LDU1Message( mMessage.copy(), mDUID, mAliasList ) );
|
||||||
break;
|
break;
|
||||||
case LDU2:
|
case LDU2:
|
||||||
mComplete = true;
|
mComplete = true;
|
||||||
dispatch( new P25Message( mMessage.copy(), mDUID, mAliasList ) );
|
dispatch( new LDU2Message( mMessage.copy(), mDUID, mAliasList ) );
|
||||||
break;
|
break;
|
||||||
case PDU0:
|
case PDU0:
|
||||||
/* Remove interleaving */
|
/* Remove interleaving */
|
||||||
@@ -368,7 +372,7 @@ public class P25MessageFramer implements Listener<Dibit>
|
|||||||
mComplete = true;
|
mComplete = true;
|
||||||
break;
|
break;
|
||||||
case TDULC:
|
case TDULC:
|
||||||
dispatch( new P25Message( mMessage.copy(), mDUID, mAliasList ) );
|
dispatch( new TDULCMessage( mMessage.copy(), mDUID, mAliasList ) );
|
||||||
mComplete = true;
|
mComplete = true;
|
||||||
break;
|
break;
|
||||||
case TSBK1:
|
case TSBK1:
|
||||||
|
|||||||
@@ -22,6 +22,8 @@ import instrument.tap.Tap;
|
|||||||
import instrument.tap.TapViewPanel;
|
import instrument.tap.TapViewPanel;
|
||||||
import instrument.tap.stream.BinaryTap;
|
import instrument.tap.stream.BinaryTap;
|
||||||
import instrument.tap.stream.BinaryTapViewPanel;
|
import instrument.tap.stream.BinaryTapViewPanel;
|
||||||
|
import instrument.tap.stream.DibitTap;
|
||||||
|
import instrument.tap.stream.DibitTapViewPanel;
|
||||||
import instrument.tap.stream.FloatTap;
|
import instrument.tap.stream.FloatTap;
|
||||||
import instrument.tap.stream.FloatTapViewPanel;
|
import instrument.tap.stream.FloatTapViewPanel;
|
||||||
import instrument.tap.stream.SymbolEventTap;
|
import instrument.tap.stream.SymbolEventTap;
|
||||||
@@ -166,6 +168,9 @@ public class DecoderViewFrame extends JInternalFrame
|
|||||||
break;
|
break;
|
||||||
case STREAM_COMPLEX:
|
case STREAM_COMPLEX:
|
||||||
break;
|
break;
|
||||||
|
case STREAM_DIBIT:
|
||||||
|
panel = new DibitTapViewPanel( (DibitTap)tap );
|
||||||
|
break;
|
||||||
case STREAM_FLOAT:
|
case STREAM_FLOAT:
|
||||||
panel = new FloatTapViewPanel( (FloatTap)tap );
|
panel = new FloatTapViewPanel( (FloatTap)tap );
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ public enum TapType
|
|||||||
EVENT_SYNC_DETECT,
|
EVENT_SYNC_DETECT,
|
||||||
STREAM_BINARY,
|
STREAM_BINARY,
|
||||||
STREAM_COMPLEX,
|
STREAM_COMPLEX,
|
||||||
|
STREAM_DIBIT,
|
||||||
STREAM_FLOAT,
|
STREAM_FLOAT,
|
||||||
STREAM_SYMBOL;
|
STREAM_SYMBOL;
|
||||||
}
|
}
|
||||||
|
|||||||
60
src/instrument/tap/stream/DibitTap.java
Normal file
60
src/instrument/tap/stream/DibitTap.java
Normal file
@@ -0,0 +1,60 @@
|
|||||||
|
/*******************************************************************************
|
||||||
|
* SDR Trunk
|
||||||
|
* Copyright (C) 2014 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 instrument.tap.stream;
|
||||||
|
|
||||||
|
import instrument.tap.TapListener;
|
||||||
|
import instrument.tap.TapType;
|
||||||
|
import sample.Listener;
|
||||||
|
import dsp.fsk.Dibit;
|
||||||
|
|
||||||
|
public class DibitTap extends StreamTap implements Listener<Dibit>
|
||||||
|
|
||||||
|
{
|
||||||
|
private Listener<Dibit> mListener;
|
||||||
|
|
||||||
|
public DibitTap( String name,
|
||||||
|
int delay,
|
||||||
|
float sampleRateRatio )
|
||||||
|
{
|
||||||
|
super( TapType.STREAM_DIBIT, name, delay, sampleRateRatio );
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void receive( Dibit dibit )
|
||||||
|
{
|
||||||
|
if( mListener != null )
|
||||||
|
{
|
||||||
|
mListener.receive( dibit );
|
||||||
|
}
|
||||||
|
|
||||||
|
for( TapListener listener: mListeners )
|
||||||
|
{
|
||||||
|
listener.receive( dibit );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setListener( Listener<Dibit> listener )
|
||||||
|
{
|
||||||
|
mListener = listener;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void removeListener( Listener<Dibit> listener )
|
||||||
|
{
|
||||||
|
mListener = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
190
src/instrument/tap/stream/DibitTapViewPanel.java
Normal file
190
src/instrument/tap/stream/DibitTapViewPanel.java
Normal file
@@ -0,0 +1,190 @@
|
|||||||
|
/*******************************************************************************
|
||||||
|
* SDR Trunk
|
||||||
|
* Copyright (C) 2014 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 instrument.tap.stream;
|
||||||
|
|
||||||
|
import instrument.gui.SampleModel;
|
||||||
|
import instrument.tap.Tap;
|
||||||
|
import instrument.tap.TapViewPanel;
|
||||||
|
|
||||||
|
import java.awt.Color;
|
||||||
|
import java.awt.FontMetrics;
|
||||||
|
import java.awt.Graphics;
|
||||||
|
import java.awt.Graphics2D;
|
||||||
|
import java.awt.geom.Path2D;
|
||||||
|
import java.awt.geom.Rectangle2D;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Observable;
|
||||||
|
|
||||||
|
import dsp.fsk.Dibit;
|
||||||
|
|
||||||
|
public class DibitTapViewPanel extends TapViewPanel
|
||||||
|
{
|
||||||
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
|
private Tap mTap;
|
||||||
|
private List<Dibit> mSamples;
|
||||||
|
private int mSampleCount;
|
||||||
|
private int mOffset = 0;
|
||||||
|
|
||||||
|
public DibitTapViewPanel( DibitTap tap )
|
||||||
|
{
|
||||||
|
super( new SampleModel<Dibit>(), tap.getName() );
|
||||||
|
|
||||||
|
mTap = tap;
|
||||||
|
mTap.addListener( getModel() );
|
||||||
|
|
||||||
|
getModel().setSampleCount(
|
||||||
|
(int)( getModel().getSampleCount() * tap.getSampleRateRatio() ) );
|
||||||
|
|
||||||
|
getModel().setDelay( tap.getDelay() );
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void update( Observable arg0, Object arg1 )
|
||||||
|
{
|
||||||
|
mSamples = (List<Dibit>)getModel().getSamples();
|
||||||
|
mSampleCount = getModel().getSampleCount();
|
||||||
|
repaint();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void paintComponent( Graphics g )
|
||||||
|
{
|
||||||
|
super.paintComponent( g );
|
||||||
|
|
||||||
|
Graphics2D g2 = (Graphics2D)g;
|
||||||
|
|
||||||
|
int height = getHeight();
|
||||||
|
int width = getWidth();
|
||||||
|
|
||||||
|
g2.setColor( Color.DARK_GRAY );
|
||||||
|
|
||||||
|
float middle = (float)height / 2.0f;
|
||||||
|
|
||||||
|
g2.drawLine( 0, (int)middle, width, (int)middle );
|
||||||
|
|
||||||
|
if( mSamples != null && mSamples.size() > 0 )
|
||||||
|
{
|
||||||
|
g2.setColor( getForeground() );
|
||||||
|
|
||||||
|
g2.drawString( mLabel, 5 , 15 );
|
||||||
|
|
||||||
|
for( int x = 1; x < mSamples.size(); x++ )
|
||||||
|
{
|
||||||
|
paintDibit( g, x, mSamples.get( x ) );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
g2.dispose();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Paints a polyline representing a boolean value with a 0 or 1 label in
|
||||||
|
* the middle of it
|
||||||
|
*
|
||||||
|
* @param graphics
|
||||||
|
* @param index - index of the sample int the sample buffer
|
||||||
|
* @param value - bit value, 0 or 1
|
||||||
|
*/
|
||||||
|
private void paintDibit( Graphics graphics, int index, Dibit value )
|
||||||
|
{
|
||||||
|
Graphics2D g2 = (Graphics2D)graphics;
|
||||||
|
|
||||||
|
Path2D.Float polyline =
|
||||||
|
new Path2D.Float( Path2D.Float.WIND_EVEN_ODD, mSamples.size() );
|
||||||
|
|
||||||
|
float middleY = ( (float)getHeight() / 2.0f );
|
||||||
|
|
||||||
|
float indexWidth = (float)( getWidth() ) / (float)mSampleCount;
|
||||||
|
|
||||||
|
float startX = (float)index * indexWidth;
|
||||||
|
float stopX = (float)(index + 1 ) * indexWidth;
|
||||||
|
float fivePercent = indexWidth * .05f;
|
||||||
|
float leftX = startX + fivePercent;
|
||||||
|
float rightX = stopX - fivePercent;
|
||||||
|
|
||||||
|
/* Start */
|
||||||
|
polyline.moveTo( startX, middleY );
|
||||||
|
|
||||||
|
/* Left horizonal segment */
|
||||||
|
polyline.lineTo( leftX, middleY );
|
||||||
|
|
||||||
|
float y = middleY;
|
||||||
|
|
||||||
|
switch( value )
|
||||||
|
{
|
||||||
|
case D01_PLUS_3:
|
||||||
|
y = middleY - ( middleY * 0.75f);
|
||||||
|
break;
|
||||||
|
case D00_PLUS_1:
|
||||||
|
y = middleY - ( middleY * 0.25f);
|
||||||
|
break;
|
||||||
|
case D10_MINUS_1:
|
||||||
|
y = middleY + ( middleY * 0.25f);
|
||||||
|
break;
|
||||||
|
case D11_MINUS_3:
|
||||||
|
y = middleY + ( middleY * 0.75f);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Left vertical segment */
|
||||||
|
polyline.lineTo( leftX, y );
|
||||||
|
|
||||||
|
/* Middle horizontal segment */
|
||||||
|
polyline.lineTo( rightX, y );
|
||||||
|
|
||||||
|
/* Right vertical segment */
|
||||||
|
polyline.lineTo( rightX, middleY );
|
||||||
|
|
||||||
|
/* Right horizontal segment */
|
||||||
|
polyline.lineTo( stopX, middleY );
|
||||||
|
|
||||||
|
g2.draw( polyline );
|
||||||
|
|
||||||
|
/* Draw the bit value label */
|
||||||
|
String bit = null;
|
||||||
|
|
||||||
|
switch( value )
|
||||||
|
{
|
||||||
|
case D00_PLUS_1:
|
||||||
|
bit = "+1";
|
||||||
|
break;
|
||||||
|
case D01_PLUS_3:
|
||||||
|
bit = "+3";
|
||||||
|
break;
|
||||||
|
case D10_MINUS_1:
|
||||||
|
bit = "-1";
|
||||||
|
break;
|
||||||
|
case D11_MINUS_3:
|
||||||
|
bit = "-3";
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
FontMetrics fontMetrics = graphics.getFontMetrics( this.getFont() );
|
||||||
|
|
||||||
|
Rectangle2D label = fontMetrics.getStringBounds( bit, graphics );
|
||||||
|
|
||||||
|
float offsetX = (float)label.getWidth() / 2.0f;
|
||||||
|
float offsetY = (float)label.getWidth() / 2.0f;
|
||||||
|
|
||||||
|
float middleX = startX + ( indexWidth / 2.0f );
|
||||||
|
|
||||||
|
graphics.drawString( bit,
|
||||||
|
(int)( middleX - offsetX ),
|
||||||
|
(int)( middleY - offsetY ) );
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user