mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-16 18:47:33 -05:00
#2577 NXDN Talkgroup Range accepts zero value and the display text for talkgroup zero no longer includes the 'NULL TALKGROUP' appendage. (#2577)
Co-authored-by: sheirerd <sheirerd@ainfosec.com>
This commit is contained in:
@@ -292,10 +292,10 @@ public class RadioIdRangeEditor extends IdentifierEditor<RadioRange>
|
|||||||
new IntegerFormatter(0,0xFFFFFF), "Format: 0 - 16777215"));
|
new IntegerFormatter(0,0xFFFFFF), "Format: 0 - 16777215"));
|
||||||
details.add(new RadioIdDetail(Protocol.APCO25, IntegerFormat.HEXADECIMAL, new HexFormatter(0,0xFFFFFF),
|
details.add(new RadioIdDetail(Protocol.APCO25, IntegerFormat.HEXADECIMAL, new HexFormatter(0,0xFFFFFF),
|
||||||
new HexFormatter(0,0xFFFFFF), "Format: 0 - FFFFFF"));
|
new HexFormatter(0,0xFFFFFF), "Format: 0 - FFFFFF"));
|
||||||
details.add(new RadioIdDetail(Protocol.NXDN, IntegerFormat.DECIMAL, new IntegerFormatter(0,0xFFFF),
|
details.add(new RadioIdDetail(Protocol.NXDN, IntegerFormat.DECIMAL, new IntegerFormatter(1,0xFFFF),
|
||||||
new IntegerFormatter(0,0xFFFF),"Format: 1 - 65,535"));
|
new IntegerFormatter(1,0xFFFF),"Format: 1 - 65,535"));
|
||||||
details.add(new RadioIdDetail(Protocol.NXDN, IntegerFormat.HEXADECIMAL, new HexFormatter(0,0xFFFF),
|
details.add(new RadioIdDetail(Protocol.NXDN, IntegerFormat.HEXADECIMAL, new HexFormatter(1,0xFFFF),
|
||||||
new HexFormatter(0,0xFFFF),"Format: 1 - FFFF"));
|
new HexFormatter(1,0xFFFF),"Format: 1 - FFFF"));
|
||||||
details.add(new RadioIdDetail(Protocol.PASSPORT, IntegerFormat.DECIMAL, new IntegerFormatter(0,0x7FFFFF),
|
details.add(new RadioIdDetail(Protocol.PASSPORT, IntegerFormat.DECIMAL, new IntegerFormatter(0,0x7FFFFF),
|
||||||
new IntegerFormatter(0,0x7FFFFF), "Format: 0 - 8388607"));
|
new IntegerFormatter(0,0x7FFFFF), "Format: 0 - 8388607"));
|
||||||
details.add(new RadioIdDetail(Protocol.PASSPORT, IntegerFormat.HEXADECIMAL, new HexFormatter(0,0x7FFFFF),
|
details.add(new RadioIdDetail(Protocol.PASSPORT, IntegerFormat.HEXADECIMAL, new HexFormatter(0,0x7FFFFF),
|
||||||
|
|||||||
@@ -220,7 +220,7 @@ public class TalkgroupRangeEditor extends IdentifierEditor<TalkgroupRange>
|
|||||||
if(mMaxTalkgroupField == null)
|
if(mMaxTalkgroupField == null)
|
||||||
{
|
{
|
||||||
mMaxTalkgroupField = new TextField();
|
mMaxTalkgroupField = new TextField();
|
||||||
mMaxTalkgroupField.setTextFormatter(mMinIntegerTextFormatter);
|
mMaxTalkgroupField.setTextFormatter(mMaxIntegerTextFormatter);
|
||||||
}
|
}
|
||||||
|
|
||||||
return mMaxTalkgroupField;
|
return mMaxTalkgroupField;
|
||||||
@@ -301,7 +301,7 @@ public class TalkgroupRangeEditor extends IdentifierEditor<TalkgroupRange>
|
|||||||
details.add(new TalkgroupDetail(Protocol.DMR, IntegerFormat.DECIMAL, new IntegerFormatter(1,16777215),
|
details.add(new TalkgroupDetail(Protocol.DMR, IntegerFormat.DECIMAL, new IntegerFormatter(1,16777215),
|
||||||
new IntegerFormatter(1,16777215), "Format: 1 - 16777215"));
|
new IntegerFormatter(1,16777215), "Format: 1 - 16777215"));
|
||||||
details.add(new TalkgroupDetail(Protocol.DMR, IntegerFormat.HEXADECIMAL, new HexFormatter(1,0XFFFFFF),
|
details.add(new TalkgroupDetail(Protocol.DMR, IntegerFormat.HEXADECIMAL, new HexFormatter(1,0XFFFFFF),
|
||||||
new HexFormatter(1, 0xFFFFFF), "Format: 0 - FFFFFF"));
|
new HexFormatter(1, 0xFFFFFF), "Format: 1 - FFFFFF"));
|
||||||
details.add(new TalkgroupDetail(Protocol.FLEETSYNC, IntegerFormat.FORMATTED,
|
details.add(new TalkgroupDetail(Protocol.FLEETSYNC, IntegerFormat.FORMATTED,
|
||||||
new PrefixIdentFormatter(0,0xFFFFF), new PrefixIdentFormatter(0,0xFFFFF),
|
new PrefixIdentFormatter(0,0xFFFFF), new PrefixIdentFormatter(0,0xFFFFF),
|
||||||
"Format: PPP-IIII = Prefix (0-127), Ident (0-8191)"));
|
"Format: PPP-IIII = Prefix (0-127), Ident (0-8191)"));
|
||||||
@@ -318,10 +318,10 @@ public class TalkgroupRangeEditor extends IdentifierEditor<TalkgroupRange>
|
|||||||
new IntegerFormatter(0,65535), "Format 0 - 65535"));
|
new IntegerFormatter(0,65535), "Format 0 - 65535"));
|
||||||
details.add(new TalkgroupDetail(Protocol.NBFM, IntegerFormat.HEXADECIMAL, new HexFormatter(0,65535),
|
details.add(new TalkgroupDetail(Protocol.NBFM, IntegerFormat.HEXADECIMAL, new HexFormatter(0,65535),
|
||||||
new HexFormatter(0,65535), "Format 0 - FFFF"));
|
new HexFormatter(0,65535), "Format 0 - FFFF"));
|
||||||
details.add(new TalkgroupDetail(Protocol.NXDN, IntegerFormat.DECIMAL, new IntegerFormatter(1,0xFFFF),
|
details.add(new TalkgroupDetail(Protocol.NXDN, IntegerFormat.DECIMAL, new IntegerFormatter(0,0xFFFF),
|
||||||
new IntegerFormatter(1,0xFFFF),"Format: 1 - 65,535"));
|
new IntegerFormatter(0,0xFFFF),"Format: 0 - 65,535"));
|
||||||
details.add(new TalkgroupDetail(Protocol.NXDN, IntegerFormat.HEXADECIMAL, new HexFormatter(1,0xFFFF),
|
details.add(new TalkgroupDetail(Protocol.NXDN, IntegerFormat.HEXADECIMAL, new HexFormatter(0,0xFFFF),
|
||||||
new HexFormatter(1,0xFFFF),"Format: 1 - FFFF"));
|
new HexFormatter(0,0xFFFF),"Format: 0 - FFFF"));
|
||||||
details.add(new TalkgroupDetail(Protocol.PASSPORT, IntegerFormat.DECIMAL, new IntegerFormatter(0,0xFFFF),
|
details.add(new TalkgroupDetail(Protocol.PASSPORT, IntegerFormat.DECIMAL, new IntegerFormatter(0,0xFFFF),
|
||||||
new IntegerFormatter(0,0xFFFF), "Format: 0 - 65535"));
|
new IntegerFormatter(0,0xFFFF), "Format: 0 - 65535"));
|
||||||
details.add(new TalkgroupDetail(Protocol.PASSPORT, IntegerFormat.HEXADECIMAL, new HexFormatter(0,0xFFFF),
|
details.add(new TalkgroupDetail(Protocol.PASSPORT, IntegerFormat.HEXADECIMAL, new HexFormatter(0,0xFFFF),
|
||||||
|
|||||||
@@ -91,7 +91,6 @@ public class NXDNTalkgroupIdentifier extends TalkgroupIdentifier
|
|||||||
return getValue() & 0x7FF;
|
return getValue() & 0x7FF;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString()
|
public String toString()
|
||||||
{
|
{
|
||||||
@@ -100,13 +99,7 @@ public class NXDNTalkgroupIdentifier extends TalkgroupIdentifier
|
|||||||
return REPEATER_FORMAT.format(getTypeDHomeRepeater()) + "-" + TALKGROUP_FORMAT.format(getTypeDTalkgroup());
|
return REPEATER_FORMAT.format(getTypeDHomeRepeater()) + "-" + TALKGROUP_FORMAT.format(getTypeDTalkgroup());
|
||||||
}
|
}
|
||||||
|
|
||||||
return switch(getValue())
|
return super.toString();
|
||||||
{
|
|
||||||
case 0x0 -> "0x0000 NULL GROUP";
|
|
||||||
case 0xFFF0 -> "0xFFF0 RESERVED GROUP";
|
|
||||||
case 0xFFFF -> "0xFFFF ALL GROUPS";
|
|
||||||
default -> super.toString();
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user