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

Jump to bottom

#1760 Update DMR vendor enumeration. #1764

Merged
merged 1 commit into from
Dec 14, 2023
Merged

#1760 Update DMR vendor enumeration. #1764

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
39 changes: 33 additions & 6 deletions src/main/java/io/github/dsheirer/module/decode/dmr/message/type/Vendor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* *****************************************************************************
* Copyright (C) 2014-2020 Dennis Sheirer
* Copyright (C) 2014-2023 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -33,43 +33,70 @@ public enum Vendor
MOTOROLA_CONNECT_PLUS(6, "MOTOROLA CON+"),
RADIO_DATA_GMBH(7, "RADIO DATA GMBH"),
HYTERA_8(8, "HYTERA"),
ASELSAN(9, "ASELSAN"),
KIRISUN(10, "KIRISUN"),
DMR_ASSOCIATION(11, "DMR ASSOCIATION"),
SEPURA(12, "SEPURA"),
ITALIA_RED_CROSS(13, "ITALIA RED CROSS"),
MOTOROLA_CAPACITY_PLUS(16, "MOTOROLA CAP+"),
EMC_SPA_19(19, "EMC SPA"),
EMC_SPA_28(28, "EMC SPA"),
RADIO_ACTIVITY_SRL_51(51, "RADIO ACTIVITY SRL"),
RADIO_ACTIVITY_SRL_60(60, "RADIO ACTIVITY SRL"),
MINISTERO_DELL_INTERNO(19, "ITALY MIN INTERIOR"),
EMC_COMM_SRL_28(28, "EMC COMM SRL 28"),
EMC_COMM_SRL_32(32, "EMC COMM SRL 32"),
JVC_KENWOOD(51, "JVC-KENWOOD"),
RADIO_ACTIVITY_SRL(60, "RADIO ACTIVITY SRL"),
ZTE_TRUNKING(84, "ZTE TRUNKING"),
TAIT(88, "TAIT"),
HYTERA_68(104, "HYTERA"),
VERTEX_STANDARD(119, "VERTEX STANDARD"),
SIMOCO(120, "SIMOCO"),
TEST(121, "TEST"),
HYTERA_88(136, "HYTERA"),
UNKNOWN(-1, "UNKNOWN");

private int mValue;
private String mLabel;

/**
* Constructs an instance
* @param value decimal for the vendor
* @param label for pretty print
*/
Vendor(int value, String label)
{
mValue = value;
mLabel = label;
}

/**
* Vendor ID value
* @return value
*/
public int getValue()
{
return mValue;
}

/**
* Pretty print label
* @return label
*/
public String getLabel()
{
return mLabel;
}

/**
* Overrides default to use the label value instead.
* @return string representation.
*/
@Override
public String toString()
{
return getLabel();
}

/**
* Map of integer values to corresponding vendor entries
* Quick lookup map of integer values to corresponding vendor entries
*/
private static final Map<Integer,Vendor> LOOKUP_MAP = new TreeMap<>();

Expand Down