Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#2035 P25P1 Harris Patched Talkgroup Values Incorrect #2036

Merged
merged 1 commit into from
Oct 19, 2024
+4 −3
Merged

#2035 P25P1 Harris Patched Talkgroup Values Incorrect #2036

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions ...ode/p25/phase1/message/tsbk/harris/osp/L3HarrisGroupRegroupExplicitEncryptionCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ public class L3HarrisGroupRegroupExplicitEncryptionCommand extends VendorOSPMess
private static final IntField REGROUP_OPTIONS = IntField.length8(OCTET_2_BIT_16);
private static final IntField SUPERGROUP_ADDRESS = IntField.length16(OCTET_3_BIT_24);
private static final IntField ENCRYPTION_KEY_ID = IntField.length16(OCTET_5_BIT_40);
private static final IntField TARGET_ADDRESS = IntField.length24(OCTET_7_BIT_56);
private static final IntField TARGET_RADIO_ADDRESS = IntField.length24(OCTET_7_BIT_56);
private static final IntField TARGET_TALKGROUP_ADDRESS = IntField.length16(OCTET_8_BIT_64);

private TalkgroupIdentifier mSuperGroupIdentifier;
private APCO25PatchGroup mPatchGroup;
Expand Down Expand Up @@ -128,11 +129,11 @@ public Identifier getTargetAddress()
{
if(getRegroupOptions().isTalkgroupAddress())
{
mPatchedIdentifier = APCO25Talkgroup.create(getInt(TARGET_ADDRESS));
mPatchedIdentifier = APCO25Talkgroup.create(getInt(TARGET_TALKGROUP_ADDRESS));
}
else
{
mPatchedIdentifier = APCO25RadioIdentifier.createTo(getInt(TARGET_ADDRESS));
mPatchedIdentifier = APCO25RadioIdentifier.createTo(getInt(TARGET_RADIO_ADDRESS));
}
}

Expand Down
Loading