GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-15 10:07:26 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

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.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

10
src/decode/mpt1327/MPT1327CallEvent.java
View File

@@ -24,14 +24,14 @@ import decode.DecoderType;
public class MPT1327CallEvent extends CallEvent
{
private int mChannel;
private String mChannel;
private long mFrequency;
public MPT1327CallEvent( CallEventType callEventType,
AliasList aliasList,
String fromID,
String toID,
int channel,
String channel,
long frequency,
String details )
{
@@ -65,7 +65,7 @@ public class MPT1327CallEvent extends CallEvent
}
@Override
public int getChannel()
public String getChannel()
{
return mChannel;
}
@@ -86,7 +86,7 @@ public class MPT1327CallEvent extends CallEvent
private String mFromID;
private String mToID;
private String mDetails;
private int mChannel;
private String mChannel;
private long mFrequency;
public Builder( CallEventType callEventType )
@@ -106,7 +106,7 @@ public class MPT1327CallEvent extends CallEvent
return this;
}
public Builder channel( int channel )
public Builder channel( String channel )
{
mChannel = channel;
return this;

12
src/decode/mpt1327/MPT1327ChannelState.java
View File

@@ -115,7 +115,7 @@ public class MPT1327ChannelState extends ChannelState
mCallEventModel.add(
new MPT1327CallEvent.Builder( CallEventType.REGISTER )
.aliasList( getProcessingChain().getAliasList() )
.channel( mChannelNumber )
.channel( String.valueOf( mChannelNumber ) )
.details( "REGISTERED ON NETWORK" )
.frequency( mChannelMap.getFrequency( mChannelNumber ) )
.from( mpt.getToID() )
@@ -127,7 +127,7 @@ public class MPT1327ChannelState extends ChannelState
mCallEventModel.add(
new MPT1327CallEvent.Builder( CallEventType.ACKNOWLEDGE )
.aliasList( getProcessingChain().getAliasList() )
.channel( mChannelNumber )
.channel( String.valueOf( mChannelNumber ) )
.details( "ACK " + identType.getLabel() )
.frequency( mChannelMap.getFrequency( mChannelNumber ) )
.from( mpt.getFromID() )
@@ -139,7 +139,7 @@ public class MPT1327ChannelState extends ChannelState
mCallEventModel.add(
new MPT1327CallEvent.Builder( CallEventType.REQUEST )
.aliasList( getProcessingChain().getAliasList() )
.channel( mChannelNumber )
.channel( String.valueOf( mChannelNumber ) )
.details( ( (MPT1327Message) message ).getRequestString() )
.frequency( mChannelMap.getFrequency( mChannelNumber ) )
.from( mpt.getFromID() )
@@ -150,7 +150,7 @@ public class MPT1327ChannelState extends ChannelState
mCallEventModel.add(
new MPT1327CallEvent.Builder( CallEventType.STATUS )
.aliasList( getProcessingChain().getAliasList() )
.channel( mChannelNumber )
.channel( String.valueOf( mChannelNumber ) )
.details( mpt.getStatusMessage() )
.frequency( mChannelMap.getFrequency( mChannelNumber ) )
.from( mpt.getFromID() )
@@ -233,7 +233,7 @@ public class MPT1327ChannelState extends ChannelState
MPT1327CallEvent callStartEvent =
new MPT1327CallEvent.Builder( type )
.aliasList( traffic.getProcessingChain().getAliasList() )
.channel( channelNumber )
.channel( String.valueOf( channelNumber ) )
.frequency( mChannelMap.getFrequency( channelNumber ) )
.from( mpt.getFromID() )
.to( mpt.getToID() )
@@ -293,7 +293,7 @@ public class MPT1327ChannelState extends ChannelState
mCallEventModel.add(
new MPT1327CallEvent.Builder( type )
.aliasList( getAliasList() )
.channel( mChannelNumber )
.channel( String.valueOf( mChannelNumber ) )
.frequency( mChannelMap.getFrequency( mChannelNumber ) )
.from( mFromTalkgroup )
.to( mToTalkgroup )