diff --git a/src/main/java/io/github/dsheirer/module/decode/dmr/DMRDecoderState.java b/src/main/java/io/github/dsheirer/module/decode/dmr/DMRDecoderState.java index d1124b2b..dc3a34de 100644 --- a/src/main/java/io/github/dsheirer/module/decode/dmr/DMRDecoderState.java +++ b/src/main/java/io/github/dsheirer/module/decode/dmr/DMRDecoderState.java @@ -39,6 +39,7 @@ import io.github.dsheirer.identifier.talkgroup.TalkgroupIdentifier; import io.github.dsheirer.log.LoggingSuppressor; import io.github.dsheirer.message.IMessage; import io.github.dsheirer.module.decode.DecoderType; +import io.github.dsheirer.module.decode.dmr.channel.DMRAbsoluteChannel; import io.github.dsheirer.module.decode.dmr.channel.DMRChannel; import io.github.dsheirer.module.decode.dmr.channel.DMRLsn; import io.github.dsheirer.module.decode.dmr.event.DMRDecodeEvent; @@ -645,6 +646,10 @@ public class DMRDecoderState extends TimeslotDecoderState closeCurrentCallEvent(message.getTimestamp()); getIdentifierCollection().remove(IdentifierClass.USER); broadcast(new DecoderStateEvent(this, Event.CONTINUATION, State.ACTIVE, getTimeslot())); + if(mNetworkConfigurationMonitor != null) + { + mNetworkConfigurationMonitor.process(message); + } break; case TLC: if(message instanceof Terminator) @@ -1394,6 +1399,12 @@ public class DMRDecoderState extends TimeslotDecoderState { Event event = (mCurrentCallEvent == null ? Event.START : Event.CONTINUATION); + //Create a repeater channel descriptor if we don't have one + if(mCurrentChannel == null && mCurrentFrequency > 0) + { + mCurrentChannel = new DMRAbsoluteChannel(getTimeslot(), getTimeslot(), mCurrentFrequency, 0); + } + if(mCurrentCallEvent == null) { mCurrentCallEvent = DMRDecodeEvent.builder(type, timestamp) diff --git a/src/main/java/io/github/dsheirer/module/decode/dmr/channel/DMRAbsoluteChannel.java b/src/main/java/io/github/dsheirer/module/decode/dmr/channel/DMRAbsoluteChannel.java index cb50a841..4304d603 100644 --- a/src/main/java/io/github/dsheirer/module/decode/dmr/channel/DMRAbsoluteChannel.java +++ b/src/main/java/io/github/dsheirer/module/decode/dmr/channel/DMRAbsoluteChannel.java @@ -1,6 +1,6 @@ /* * ***************************************************************************** - * Copyright (C) 2014-2023 Dennis Sheirer + * Copyright (C) 2014-2024 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 @@ -69,7 +69,6 @@ public class DMRAbsoluteChannel extends DMRChannel StringBuilder sb = new StringBuilder(); sb.append(getValue()); - sb.append(" TS:").append(getTimeslot()); sb.append(" ").append(getDownlinkFrequency() / 1E6d); return sb.toString();