GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-15 01:57:39 -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/passport/PassportCallEvent.java
View File

@@ -24,7 +24,7 @@ import decode.DecoderType;
public class PassportCallEvent extends CallEvent
{
private int mChannel;
private String mChannel;
private long mFrequency;
private int mValidCallMessages = 1;
@@ -32,7 +32,7 @@ public class PassportCallEvent extends CallEvent
AliasList aliasList,
String fromID,
String toID,
int channel,
String channel,
long frequency,
String details )
{
@@ -99,7 +99,7 @@ public class PassportCallEvent extends CallEvent
}
@Override
public int getChannel()
public String getChannel()
{
return mChannel;
}
@@ -120,7 +120,7 @@ public class PassportCallEvent extends CallEvent
private String mFromID;
private String mToID;
private String mDetails;
private int mChannel;
private String mChannel;
private long mFrequency;
public Builder( CallEventType callEventType )
@@ -140,7 +140,7 @@ public class PassportCallEvent extends CallEvent
return this;
}
public Builder channel( int channel )
public Builder channel( String channel )
{
mChannel = channel;
return this;

6
src/decode/passport/PassportChannelState.java
View File

@@ -146,7 +146,7 @@ public class PassportChannelState extends ChannelState
mCurrentCallEvent = new PassportCallEvent
.Builder( CallEventType.CALL )
.aliasList( mAliasList )
.channel( mChannelNumber )
.channel( String.valueOf( mChannelNumber ) )
.frequency( passport.getLCNFrequency() )
.to( String.valueOf( passport.getTalkgroupID() ) )
.build();
@@ -179,7 +179,7 @@ public class PassportChannelState extends ChannelState
PassportCallEvent event = new PassportCallEvent
.Builder( CallEventType.CALL_DETECT )
.aliasList( mAliasList )
.channel( lcn )
.channel( String.valueOf( lcn ) )
.details( "Site: " + passport.getSite() )
.frequency( passport.getLCNFrequency() )
.to( tg )
@@ -220,7 +220,7 @@ public class PassportChannelState extends ChannelState
mCallEventModel.add( new PassportCallEvent
.Builder( CallEventType.REGISTER )
.aliasList( mAliasList )
.channel( passport.getLCN() )
.channel( String.valueOf( passport.getLCN() ) )
.frequency( passport.getLCNFrequency() )
.to( passport.getToID() )
.build() );