mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-19 20:17:25 -05:00
#1393 Updates DMR Talkgroup and Radio ID editors to use correct formatting. Patch submitted by @hockeyref2 (#1425)
Co-authored-by: Denny Sheirer <sheirerd@ainfosec.com>
This commit is contained in:
@@ -217,6 +217,9 @@ public class RadioIdEditor extends IdentifierEditor<Radio>
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
mLog.warn("Unable to find radio id editor for protocol [" + protocol + "] and format [" + integerFormat +
|
||||||
|
"] - using default editor");
|
||||||
|
|
||||||
//Use a default instance
|
//Use a default instance
|
||||||
for(RadioDetail detail: mRadioDetails)
|
for(RadioDetail detail: mRadioDetails)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -267,6 +267,9 @@ public class RadioIdRangeEditor extends IdentifierEditor<RadioRange>
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
mLog.warn("Unable to find radio id range editor for protocol [" + protocol + "] and format [" + integerFormat +
|
||||||
|
"] - using default editor");
|
||||||
|
|
||||||
//Use a default instance
|
//Use a default instance
|
||||||
for(RadioIdDetail detail: mRadioDetails)
|
for(RadioIdDetail detail: mRadioDetails)
|
||||||
{
|
{
|
||||||
@@ -300,7 +303,10 @@ public class RadioIdRangeEditor extends IdentifierEditor<RadioRange>
|
|||||||
new IntegerFormatter(0,16777215), "Format: 0 - FFFFFF"));
|
new IntegerFormatter(0,16777215), "Format: 0 - FFFFFF"));
|
||||||
details.add(new RadioIdDetail(Protocol.UNKNOWN, IntegerFormat.HEXADECIMAL, new HexFormatter(0,16777215),
|
details.add(new RadioIdDetail(Protocol.UNKNOWN, IntegerFormat.HEXADECIMAL, new HexFormatter(0,16777215),
|
||||||
new HexFormatter(0,16777215), "Format: 0 - FFFFFF"));
|
new HexFormatter(0,16777215), "Format: 0 - FFFFFF"));
|
||||||
|
details.add(new RadioIdDetail(Protocol.DMR, IntegerFormat.DECIMAL, new IntegerFormatter(0,16777215),
|
||||||
|
new IntegerFormatter(0,16777215), "Format: 0 - 16777215"));
|
||||||
|
details.add(new RadioIdDetail(Protocol.DMR, IntegerFormat.HEXADECIMAL, new HexFormatter(0,16777215),
|
||||||
|
new HexFormatter(0,16777215), "Format: 0 - FFFFFF"));
|
||||||
return details;
|
return details;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -219,6 +219,9 @@ public class TalkgroupEditor extends IdentifierEditor<Talkgroup>
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
mLog.warn("Unable to find talkgroup editor for protocol [" + protocol + "] and format [" + integerFormat +
|
||||||
|
"] - using default editor");
|
||||||
|
|
||||||
//Use a default instance
|
//Use a default instance
|
||||||
for(TalkgroupDetail detail: mTalkgroupDetails)
|
for(TalkgroupDetail detail: mTalkgroupDetails)
|
||||||
{
|
{
|
||||||
@@ -239,10 +242,10 @@ public class TalkgroupEditor extends IdentifierEditor<Talkgroup>
|
|||||||
"Format: 0 - 65535"));
|
"Format: 0 - 65535"));
|
||||||
mTalkgroupDetails.add(new TalkgroupDetail(Protocol.APCO25, IntegerFormat.HEXADECIMAL, new HexFormatter(0,65535),
|
mTalkgroupDetails.add(new TalkgroupDetail(Protocol.APCO25, IntegerFormat.HEXADECIMAL, new HexFormatter(0,65535),
|
||||||
"Format: 0 - FFFF"));
|
"Format: 0 - FFFF"));
|
||||||
mTalkgroupDetails.add(new TalkgroupDetail(Protocol.DMR, IntegerFormat.DECIMAL, new IntegerFormatter(0,0xFFFFFF),
|
mTalkgroupDetails.add(new TalkgroupDetail(Protocol.DMR, IntegerFormat.DECIMAL, new IntegerFormatter(1,0xFFFFFF),
|
||||||
"Format: 0 - 16,777,215"));
|
"Format: 1 - 16,777,215"));
|
||||||
mTalkgroupDetails.add(new TalkgroupDetail(Protocol.DMR, IntegerFormat.HEXADECIMAL, new HexFormatter(0,0xFFFFFF),
|
mTalkgroupDetails.add(new TalkgroupDetail(Protocol.DMR, IntegerFormat.HEXADECIMAL, new HexFormatter(1,0xFFFFFF),
|
||||||
"Format: 0 - FFFFFF"));
|
"Format: 1 - FFFFFF"));
|
||||||
mTalkgroupDetails.add(new TalkgroupDetail(Protocol.FLEETSYNC, IntegerFormat.FORMATTED,
|
mTalkgroupDetails.add(new TalkgroupDetail(Protocol.FLEETSYNC, IntegerFormat.FORMATTED,
|
||||||
new PrefixIdentFormatter(0,0xFFFFF), "Format: PPP-IIII = Prefix (0-127), Ident (0-8191)"));
|
new PrefixIdentFormatter(0,0xFFFFF), "Format: PPP-IIII = Prefix (0-127), Ident (0-8191)"));
|
||||||
mTalkgroupDetails.add(new TalkgroupDetail(Protocol.LTR, IntegerFormat.FORMATTED, new LtrFormatter(0,0x3FFF),
|
mTalkgroupDetails.add(new TalkgroupDetail(Protocol.LTR, IntegerFormat.FORMATTED, new LtrFormatter(0,0x3FFF),
|
||||||
|
|||||||
@@ -269,6 +269,9 @@ public class TalkgroupRangeEditor extends IdentifierEditor<TalkgroupRange>
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
mLog.warn("Unable to find talkgroup range editor for protocol [" + protocol + "] and format [" + integerFormat +
|
||||||
|
"] - using default editor");
|
||||||
|
|
||||||
//Use a default instance
|
//Use a default instance
|
||||||
for(TalkgroupDetail detail: mTalkgroupDetails)
|
for(TalkgroupDetail detail: mTalkgroupDetails)
|
||||||
{
|
{
|
||||||
@@ -309,11 +312,15 @@ public class TalkgroupRangeEditor extends IdentifierEditor<TalkgroupRange>
|
|||||||
details.add(new TalkgroupDetail(Protocol.PASSPORT, IntegerFormat.HEXADECIMAL, new HexFormatter(0,0xFFFF),
|
details.add(new TalkgroupDetail(Protocol.PASSPORT, IntegerFormat.HEXADECIMAL, new HexFormatter(0,0xFFFF),
|
||||||
new HexFormatter(0,0xFFFF), "Format: 0 - FFFF"));
|
new HexFormatter(0,0xFFFF), "Format: 0 - FFFF"));
|
||||||
details.add(new TalkgroupDetail(Protocol.UNKNOWN, IntegerFormat.DECIMAL, new IntegerFormatter(0,16777215),
|
details.add(new TalkgroupDetail(Protocol.UNKNOWN, IntegerFormat.DECIMAL, new IntegerFormatter(0,16777215),
|
||||||
new IntegerFormatter(0,16777215), "Format: 0 - FFFFFF"));
|
new IntegerFormatter(0,16777215), "Format: 0 - 16777215"));
|
||||||
details.add(new TalkgroupDetail(Protocol.UNKNOWN, IntegerFormat.FORMATTED, new IntegerFormatter(0,16777215),
|
details.add(new TalkgroupDetail(Protocol.UNKNOWN, IntegerFormat.FORMATTED, new IntegerFormatter(0,16777215),
|
||||||
new IntegerFormatter(0,16777215), "Format: 0 - FFFFFF"));
|
new IntegerFormatter(0,16777215), "Format: 0 - FFFFFF"));
|
||||||
details.add(new TalkgroupDetail(Protocol.UNKNOWN, IntegerFormat.HEXADECIMAL, new HexFormatter(0,16777215),
|
details.add(new TalkgroupDetail(Protocol.UNKNOWN, IntegerFormat.HEXADECIMAL, new HexFormatter(0,16777215),
|
||||||
new HexFormatter(0,16777215), "Format: 0 - FFFFFF"));
|
new HexFormatter(0,16777215), "Format: 0 - FFFFFF"));
|
||||||
|
details.add(new TalkgroupDetail(Protocol.DMR, IntegerFormat.DECIMAL, new IntegerFormatter(1,16777215),
|
||||||
|
new IntegerFormatter(1,16777215), "Format: 1 - 16777215"));
|
||||||
|
details.add(new TalkgroupDetail(Protocol.DMR, IntegerFormat.HEXADECIMAL, new HexFormatter(1,0XFFFFFF),
|
||||||
|
new HexFormatter(1, 0xFFFFFF), "Format: 0 - FFFFFF"));
|
||||||
|
|
||||||
return details;
|
return details;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user