Skip to content

Commit 649d1f6

Browse files
DSheirerDennis Sheirer
andauthored
#2043 DMR Tier 3 Capacity Max talkgroups were parsing incorrectly. (#2044)
Co-authored-by: Dennis Sheirer <[email protected]>
1 parent 215e406 commit 649d1f6

File tree

1 file changed

+21
-2
lines changed

1 file changed

+21
-2
lines changed

src/main/java/io/github/dsheirer/module/decode/dmr/message/data/lc/full/motorola/CapacityMaxVoiceChannelUser.java

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
/*
2+
* *****************************************************************************
3+
* Copyright (C) 2014-2024 Dennis Sheirer
4+
*
5+
* This program is free software: you can redistribute it and/or modify
6+
* it under the terms of the GNU General Public License as published by
7+
* the Free Software Foundation, either version 3 of the License, or
8+
* (at your option) any later version.
9+
*
10+
* This program is distributed in the hope that it will be useful,
11+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
* GNU General Public License for more details.
14+
*
15+
* You should have received a copy of the GNU General Public License
16+
* along with this program. If not, see <http://www.gnu.org/licenses/>
17+
* ****************************************************************************
18+
*/
19+
120
package io.github.dsheirer.module.decode.dmr.message.data.lc.full.motorola;
221

322
import io.github.dsheirer.bits.CorrectedBinaryMessage;
@@ -6,7 +25,6 @@
625
import io.github.dsheirer.identifier.talkgroup.TalkgroupIdentifier;
726
import io.github.dsheirer.module.decode.dmr.identifier.DMRRadio;
827
import io.github.dsheirer.module.decode.dmr.identifier.DMRTalkgroup;
9-
1028
import java.util.ArrayList;
1129
import java.util.List;
1230

@@ -15,7 +33,8 @@
1533
*/
1634
public class CapacityMaxVoiceChannelUser extends CapacityPlusVoiceChannelUser
1735
{
18-
private static final int[] TALKGROUP = new int[]{32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47};
36+
private static final int[] TALKGROUP = new int[]{24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
37+
41, 42, 43, 44, 45, 46, 47};
1938
private static final int[] RADIO = new int[]{48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
2039
66, 67, 68, 69, 70, 71};
2140

0 commit comments

Comments
 (0)