GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-14 01:27:34 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

#2002 P25 fully qualified identifiers now formatted correctly in now playing window. (#2003)

Browse Source 
Co-authored-by: Dennis Sheirer <dsheirer@github.com>
This commit is contained in:
Denny Sheirer
2024-10-05 05:06:51 -04:00
committed by GitHub
parent 3c8cd0386d
commit c97e355349
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/io/github/dsheirer/preference/identifier/talkgroup/APCO25TalkgroupFormatter.java
View File

@@ -115,14 +115,14 @@ public class APCO25TalkgroupFormatter extends AbstractIntegerFormatter
case DECIMAL: case DECIMAL:
case FORMATTED: case FORMATTED:
sb.append(id); sb.append(id);
sb.append("(").append(toHex(wacn, WACN_HEXADECIMAL_WIDTH)); sb.append("(").append(toHex(wacn));
sb.append(".").append(toHex(system, SYSTEM_HEXADECIMAL_WIDTH)); sb.append(".").append(toHex(system));
sb.append(".").append(talkgroup).append(")"); sb.append(".").append(talkgroup).append(")");
return sb.toString(); return sb.toString();
case HEXADECIMAL: case HEXADECIMAL:
sb.append(toHex(id)); sb.append(toHex(id));
sb.append("(").append(toHex(wacn, WACN_HEXADECIMAL_WIDTH)); sb.append("(").append(toHex(wacn));
sb.append(".").append(toHex(system, SYSTEM_HEXADECIMAL_WIDTH)); sb.append(".").append(toHex(system));
sb.append(".").append(toHex(talkgroup)).append(")"); sb.append(".").append(toHex(talkgroup)).append(")");
return sb.toString(); return sb.toString();
default: default:
@@ -266,8 +266,8 @@ public class APCO25TalkgroupFormatter extends AbstractIntegerFormatter
{ {
sb.append(id).append(" ("); sb.append(id).append(" (");
} }
sb.append("(").append(toHex(wacn, WACN_HEXADECIMAL_WIDTH)); sb.append(toHex(wacn));
sb.append(".").append(toHex(system, SYSTEM_HEXADECIMAL_WIDTH)); sb.append(".").append(toHex(system));
sb.append(".").append(radio); sb.append(".").append(radio);
if(id > 0) if(id > 0)
{ {
@@ -279,8 +279,8 @@ public class APCO25TalkgroupFormatter extends AbstractIntegerFormatter
{ {
sb.append(toHex(id)).append(" ("); sb.append(toHex(id)).append(" (");
} }
sb.append(toHex(wacn, WACN_HEXADECIMAL_WIDTH)); sb.append(toHex(wacn));
sb.append(".").append(toHex(system, SYSTEM_HEXADECIMAL_WIDTH)); sb.append(".").append(toHex(system));
sb.append(".").append(toHex(radio)); sb.append(".").append(toHex(radio));
if(id > 0) if(id > 0)
{ {