GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-14 09:37:36 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

#1841 DMR call events include channel and frequency (#1842)

Browse Source 
Co-authored-by: Dennis Sheirer <dsheirer@github.com>
This commit is contained in:
Denny Sheirer
2024-02-10 08:04:25 -05:00
committed by GitHub
parent 8a5b31f143
commit 1df29b62eb
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/io/github/dsheirer/module/decode/dmr/DMRDecoderState.java
View File

@@ -39,6 +39,7 @@ import io.github.dsheirer.identifier.talkgroup.TalkgroupIdentifier;
import io.github.dsheirer.log.LoggingSuppressor; import io.github.dsheirer.log.LoggingSuppressor;
import io.github.dsheirer.message.IMessage; import io.github.dsheirer.message.IMessage;
import io.github.dsheirer.module.decode.DecoderType; 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.DMRChannel;
import io.github.dsheirer.module.decode.dmr.channel.DMRLsn; import io.github.dsheirer.module.decode.dmr.channel.DMRLsn;
import io.github.dsheirer.module.decode.dmr.event.DMRDecodeEvent; import io.github.dsheirer.module.decode.dmr.event.DMRDecodeEvent;
@@ -645,6 +646,10 @@ public class DMRDecoderState extends TimeslotDecoderState
closeCurrentCallEvent(message.getTimestamp()); closeCurrentCallEvent(message.getTimestamp());
getIdentifierCollection().remove(IdentifierClass.USER); getIdentifierCollection().remove(IdentifierClass.USER);
broadcast(new DecoderStateEvent(this, Event.CONTINUATION, State.ACTIVE, getTimeslot())); broadcast(new DecoderStateEvent(this, Event.CONTINUATION, State.ACTIVE, getTimeslot()));
if(mNetworkConfigurationMonitor != null)
{
mNetworkConfigurationMonitor.process(message);
}
break; break;
case TLC: case TLC:
if(message instanceof Terminator) if(message instanceof Terminator)
@@ -1394,6 +1399,12 @@ public class DMRDecoderState extends TimeslotDecoderState
{ {
Event event = (mCurrentCallEvent == null ? Event.START : Event.CONTINUATION); 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) if(mCurrentCallEvent == null)
{ {
mCurrentCallEvent = DMRDecodeEvent.builder(type, timestamp) mCurrentCallEvent = DMRDecodeEvent.builder(type, timestamp)

3
src/main/java/io/github/dsheirer/module/decode/dmr/channel/DMRAbsoluteChannel.java
View File

@@ -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 * 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 * 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(); StringBuilder sb = new StringBuilder();
sb.append(getValue()); sb.append(getValue());
sb.append(" TS:").append(getTimeslot());
sb.append(" ").append(getDownlinkFrequency() / 1E6d); sb.append(" ").append(getDownlinkFrequency() / 1E6d);
return sb.toString(); return sb.toString();