From 9bd650734206b8f33ac20dbe527bec75a3f903b0 Mon Sep 17 00:00:00 2001 From: Denny Sheirer Date: Sat, 2 May 2020 11:27:45 +0000 Subject: [PATCH] #770 Resolves issue with correct display of P25 uplink channel frequency values. (#774) Co-authored-by: Denny --- .../phase1/message/tsbk/standard/osp/FrequencyBandUpdate.java | 2 +- .../message/tsbk/standard/osp/FrequencyBandUpdateTDMA.java | 2 +- .../p25/phase2/message/mac/structure/FrequencyBandUpdate.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/tsbk/standard/osp/FrequencyBandUpdate.java b/src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/tsbk/standard/osp/FrequencyBandUpdate.java index 5e083f92..043b0d1f 100644 --- a/src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/tsbk/standard/osp/FrequencyBandUpdate.java +++ b/src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/tsbk/standard/osp/FrequencyBandUpdate.java @@ -91,7 +91,7 @@ public class FrequencyBandUpdate extends OSPMessage implements IFrequencyBand @Override public long getTransmitOffset() { - long offset = getMessage().getLong(TRANSMIT_OFFSET) * getChannelSpacing(); + long offset = getMessage().getLong(TRANSMIT_OFFSET) * 250000; if(!getMessage().get(TRANSMIT_OFFSET_SIGN)) { diff --git a/src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/tsbk/standard/osp/FrequencyBandUpdateTDMA.java b/src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/tsbk/standard/osp/FrequencyBandUpdateTDMA.java index 4703e477..64c16eb5 100644 --- a/src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/tsbk/standard/osp/FrequencyBandUpdateTDMA.java +++ b/src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/tsbk/standard/osp/FrequencyBandUpdateTDMA.java @@ -105,7 +105,7 @@ public class FrequencyBandUpdateTDMA extends OSPMessage implements IFrequencyBan @Override public long getTransmitOffset() { - long offset = getMessage().getLong(TRANSMIT_OFFSET) * getChannelType().getBandwidth(); + long offset = getMessage().getLong(TRANSMIT_OFFSET) * getChannelSpacing(); if(!getMessage().get(TRANSMIT_OFFSET_SIGN)) { diff --git a/src/main/java/io/github/dsheirer/module/decode/p25/phase2/message/mac/structure/FrequencyBandUpdate.java b/src/main/java/io/github/dsheirer/module/decode/p25/phase2/message/mac/structure/FrequencyBandUpdate.java index 34b0ee3a..ba00e567 100644 --- a/src/main/java/io/github/dsheirer/module/decode/p25/phase2/message/mac/structure/FrequencyBandUpdate.java +++ b/src/main/java/io/github/dsheirer/module/decode/p25/phase2/message/mac/structure/FrequencyBandUpdate.java @@ -96,7 +96,7 @@ public class FrequencyBandUpdate extends MacStructure implements IFrequencyBand @Override public long getTransmitOffset() { - long offset = getMessage().getLong(TRANSMIT_OFFSET, getOffset()) * getChannelSpacing(); + long offset = getMessage().getLong(TRANSMIT_OFFSET, getOffset()) * 250000; if(!getMessage().get(TRANSMIT_OFFSET_SIGN + getOffset())) {