From a12040be5c94836fa4fcb3a9b7e4cedb8a6ae642 Mon Sep 17 00:00:00 2001 From: Dennis Sheirer Date: Sat, 2 Nov 2024 06:58:23 -0400 Subject: [PATCH] Revert "#2076 DMR CapMax Network and Site vales off by one. (#2077)" This reverts commit e4be7dc5f438ba0284276f053e8f41e6540c31bd. --- .../dmr/message/type/SystemIdentityCode.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/io/github/dsheirer/module/decode/dmr/message/type/SystemIdentityCode.java b/src/main/java/io/github/dsheirer/module/decode/dmr/message/type/SystemIdentityCode.java index 897ad0c1..7b596979 100644 --- a/src/main/java/io/github/dsheirer/module/decode/dmr/message/type/SystemIdentityCode.java +++ b/src/main/java/io/github/dsheirer/module/decode/dmr/message/type/SystemIdentityCode.java @@ -1,6 +1,6 @@ /* * ***************************************************************************** - * Copyright (C) 2014-2024 Dennis Sheirer + * Copyright (C) 2014-2020 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 @@ -97,16 +97,16 @@ public class SystemIdentityCode extends AbstractStructure switch(getModel()) { case TINY: - mNetwork = new DMRNetwork(getMessage().getInt(TINY_NET, getOffset()) + 1); + mNetwork = new DMRNetwork(getMessage().getInt(TINY_NET, getOffset())); break; case SMALL: - mNetwork = new DMRNetwork(getMessage().getInt(SMALL_NET, getOffset()) + 1); + mNetwork = new DMRNetwork(getMessage().getInt(SMALL_NET, getOffset())); break; case LARGE: - mNetwork = new DMRNetwork(getMessage().getInt(LARGE_NET, getOffset()) + 1); + mNetwork = new DMRNetwork(getMessage().getInt(LARGE_NET, getOffset())); break; case HUGE: - mNetwork = new DMRNetwork(getMessage().getInt(HUGE_NET, getOffset()) + 1); + mNetwork = new DMRNetwork(getMessage().getInt(HUGE_NET, getOffset())); break; } } @@ -124,16 +124,16 @@ public class SystemIdentityCode extends AbstractStructure switch(getModel()) { case TINY: - mSite = new DMRSite(getMessage().getInt(TINY_SITE, getOffset()) + 1); + mSite = new DMRSite(getMessage().getInt(TINY_SITE, getOffset())); break; case SMALL: - mSite = new DMRSite(getMessage().getInt(SMALL_SITE, getOffset()) + 1); + mSite = new DMRSite(getMessage().getInt(SMALL_SITE, getOffset())); break; case LARGE: - mSite = new DMRSite(getMessage().getInt(LARGE_SITE, getOffset()) + 1); + mSite = new DMRSite(getMessage().getInt(LARGE_SITE, getOffset())); break; case HUGE: - mSite = new DMRSite(getMessage().getInt(HUGE_SITE, getOffset()) + 1); + mSite = new DMRSite(getMessage().getInt(HUGE_SITE, getOffset())); break; } }