GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-12 16:47:31 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

#78 patch group alias and call event management. Adds new PatchGroupAlias which is a temporary alias group that is added to the alias list by the decoder state. The P25 decoder state maintains a mapping of patch group identifier to patched talkgroups and creates the patch group alias. This allows audio recording and audio streaming of patched talkgroups, according to the aliases corresponding to the group of patched aliases contained in the patch group alias.

Browse Source 
Event logging is now pared down to only logging events when the internal patch group mapping is updated.
This commit is contained in:
Denny
2017-01-08 07:54:48 -05:00
parent de9c51c228
commit 6bfe98dae6
5 changed files with 3811 additions and 3416 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6852
src/module/decode/p25/P25DecoderState.java
View File

File diff suppressed because it is too large Load Diff

47
src/module/decode/p25/message/tsbk/motorola/PatchGroup.java
View File

@@ -4,6 +4,10 @@ import module.decode.p25.reference.DataUnitID;
import alias.AliasList;
import bits.BinaryMessage;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
public abstract class PatchGroup extends MotorolaTSBKMessage
{
public static final int[] PATCH_GROUP_ADDRESS = { 80,81,82,83,84,85,86,87,
@@ -15,6 +19,8 @@ public abstract class PatchGroup extends MotorolaTSBKMessage
public static final int[] GROUP_ADDRESS_3 = { 128,129,130,131,132,133,134,
135,136,137,138,139,140,141,142,143 };
private List<String> mPatchedTalkgroups;
public PatchGroup( BinaryMessage message, DataUnitID duid,
AliasList aliasList )
{
@@ -28,15 +34,11 @@ public abstract class PatchGroup extends MotorolaTSBKMessage
sb.append( getMessageStub() );
sb.append( " PATCH GROUP:" );
sb.append( " " );
sb.append( getPatchGroupAddress() );
sb.append( " GRP1:" );
sb.append( getGroupAddress1() );
sb.append( " GRP2:" );
sb.append( getGroupAddress2() );
sb.append( " GRP3:" );
sb.append( getGroupAddress3() );
sb.append(" ");
sb.append(getPatchedTalkgroups());
return sb.toString();
}
@@ -44,6 +46,35 @@ public abstract class PatchGroup extends MotorolaTSBKMessage
{
return mMessage.getHex( PATCH_GROUP_ADDRESS, 4 );
}
/**
* List of de-deplicated patched talkgroups contained in this message
*/
public List<String> getPatchedTalkgroups()
{
if(mPatchedTalkgroups == null)
{
mPatchedTalkgroups = new ArrayList<>();
mPatchedTalkgroups.add(getGroupAddress1());
String group2 = getGroupAddress2();
if(!mPatchedTalkgroups.contains(group2))
{
mPatchedTalkgroups.add(group2);
}
String group3 = getGroupAddress3();
if(!mPatchedTalkgroups.contains(group3))
{
mPatchedTalkgroups.add(group3);
}
}
return mPatchedTalkgroups;
}
public String getGroupAddress1()
{