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

#1977 P25 FQSUID handling improvements. P25 fully qualified radio/talkgroup identifiers we're being flagged as invalid when ISSI patch assigned a local address/ID of zero. Changes format of FQSUID and FQTGID to use a value of zero for the local alias when the call type is an ISSI patch and suppress display of the 0 alias value. If the identifier represents a roaming user, then the local address value is displayed with the FQSUID appended in parenthesis. (#1978)

Browse Source 
Co-authored-by: Dennis Sheirer <dsheirer@github.com>
This commit is contained in:
Denny Sheirer
2024-09-15 05:37:01 -04:00
committed by GitHub
parent b9068da99c
commit 8bb59d581f
10 changed files with 141 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/io/github/dsheirer/identifier/radio/FullyQualifiedRadioIdentifier.java
View File

@@ -72,12 +72,22 @@ public abstract class FullyQualifiedRadioIdentifier extends RadioIdentifier
}
/**
* Indicates if the radio identify is aliased with a persona value that is different from the radio ID.
* Indicates if the radio identity is aliased with a persona value that is different from the radio ID.
* @return true if aliased.
*/
public boolean isAliased()
{
return getValue() != mRadio;
return getValue() != 0 && getValue() != mRadio;
}
/**
* Override the default behavior of RadioIdentifier.isValid() to allow for fully qualified SUID's with a local
* ID of zero which indicates an ISSI patch.
*/
@Override
public boolean isValid()
{
return true;
}
@Override

14
src/main/java/io/github/dsheirer/identifier/talkgroup/FullyQualifiedTalkgroupIdentifier.java
View File

@@ -71,12 +71,22 @@ public abstract class FullyQualifiedTalkgroupIdentifier extends TalkgroupIdentif
}
/**
* Indicates if the talkgroup identify is aliased with a persona value that is different from the talkgroup ID.
* Indicates if the talkgroup identity is aliased with a persona value that is different from the talkgroup ID.
* @return true if aliased.
*/
public boolean isAliased()
{
return getValue() != mTalkgroup;
return getValue() != 0 && getValue() != mTalkgroup;
}
/**
* Override the default behavior of TalkgroupIdentifier.isValid() to allow for fully qualified TGID's with a local
* ID of zero which indicates an ISSI patch.
*/
@Override
public boolean isValid()
{
return true;
}
@Override