P25 Work in progress. Adds CRC checking to NID/DUID. Adds limiter to trellis decoder to prevent it from decoding an excessive error message. Updates channel state with initial handling/generation of call events.

This commit is contained in:
dennis.sheirer
2014-12-14 02:34:19 +00:00
parent 0d8da161e1
commit 170688b95e
42 changed files with 1099 additions and 390 deletions

View File

@@ -52,7 +52,7 @@ public class LocationRegistrationResponse extends TSBKMessage
public String getGroupAddress()
{
return mMessage.getHex( GROUP_ADDRESS, 6 );
return mMessage.getHex( GROUP_ADDRESS, 4 );
}
public String getRFSSID()

View File

@@ -54,7 +54,8 @@ public class TimeAndDateAnnouncement extends TSBKMessage
{
sb.append( " DATE-TIME:" );
}
sb.append( " " );
sb.append( mTimeFormatter.format( new Date( getDateTimestamp() ) ) );
return sb.toString();

View File

@@ -20,4 +20,5 @@ public class GroupVoiceChannelGrant extends GroupChannelGrant
{
return Opcode.GROUP_VOICE_CHANNEL_GRANT.getDescription();
}
}

View File

@@ -30,7 +30,7 @@ public class TelephoneInterconnectVoiceChannelGrant extends UnitChannelGrant
}
sb.append( " CHAN:" );
sb.append( getChannelID() + "/" + getChannelNumber() );
sb.append( getChannelIdentifier() + "/" + getChannel() );
sb.append( " CALL TIMER:" );
sb.append( getCallTimer() );

View File

@@ -3,6 +3,7 @@ package decode.p25.message.tsbk.osp.voice;
import alias.AliasList;
import bits.BitSetBuffer;
import decode.p25.message.tsbk.UnitChannelGrant;
import decode.p25.message.tsbk.osp.control.IdentifierUpdate;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -20,4 +21,28 @@ public class UnitToUnitVoiceChannelGrant extends UnitChannelGrant
{
return Opcode.UNIT_TO_UNIT_VOICE_CHANNEL_GRANT.getDescription();
}
public String getMessage()
{
StringBuilder sb = new StringBuilder();
sb.append( getMessageStub() );
if( isEmergency() )
{
sb.append( " EMERGENCY" );
}
sb.append( " SOURCE UNIT:" );
sb.append( getSourceAddress() );
sb.append( " TARGET UNIT:" );
sb.append( getTargetAddress() );
sb.append( " CHAN:" + getChannelIdentifier() + "-" + getChannel() );
sb.append( " DN:" + getDownlinkFrequency() );
sb.append( " UP:" + getUplinkFrequency() );
return sb.toString();
}
}