From a2ab5bfa95937fa51cd8b5a973b434c56070c03e Mon Sep 17 00:00:00 2001 From: Denny Date: Thu, 23 Mar 2017 20:55:42 +0000 Subject: [PATCH] Resolves #230 - P25 Phase II TDMA frequency bands are now displayed in the channel details summary. --- src/module/decode/p25/P25DecoderState.java | 1 + .../p25/message/tsbk/osp/control/IdentifierUpdateTDMA.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/module/decode/p25/P25DecoderState.java b/src/module/decode/p25/P25DecoderState.java index dbd7e596..ccc66272 100644 --- a/src/module/decode/p25/P25DecoderState.java +++ b/src/module/decode/p25/P25DecoderState.java @@ -1557,6 +1557,7 @@ public class P25DecoderState extends DecoderState break; case IDENTIFIER_UPDATE_NON_VUHF: case IDENTIFIER_UPDATE_VHF_UHF_BANDS: + case IDENTIFIER_UPDATE_TDMA: IdentifierUpdate iu = (IdentifierUpdate)tsbk; if(!mBands.containsKey(iu.getIdentifier())) diff --git a/src/module/decode/p25/message/tsbk/osp/control/IdentifierUpdateTDMA.java b/src/module/decode/p25/message/tsbk/osp/control/IdentifierUpdateTDMA.java index 5a4ab33d..fc3b2d95 100644 --- a/src/module/decode/p25/message/tsbk/osp/control/IdentifierUpdateTDMA.java +++ b/src/module/decode/p25/message/tsbk/osp/control/IdentifierUpdateTDMA.java @@ -41,7 +41,7 @@ public class IdentifierUpdateTDMA extends IdentifierUpdate sb.append( " ID:" + getIdentifier() ); sb.append( " BASE:" + getBaseFrequency() ); - sb.append( " BW:" + getBandwidth() ); + sb.append( " BANDWIDTH:" + getBandwidth() ); sb.append( " SPACING:" + getChannelSpacing() ); sb.append( " OFFSET:" + getTransmitOffset() ); sb.append( " TYPE:" + getChannelType().toString() ); @@ -137,7 +137,7 @@ public class IdentifierUpdateTDMA extends IdentifierUpdate sb.append( mAccessType.name() ); sb.append( " BANDWIDTH:" + mBandwidth ); - sb.append( " SLOT/CARRIER:" + mSlotsPerCarrier ); + sb.append( " TIMESLOTS PER CARRIER:" + mSlotsPerCarrier ); sb.append( " VOCODER:" + mVocoder.name() ); return sb.toString();