From 3e21887d27ecddbbe42bb6c7436851be5dc56cbc Mon Sep 17 00:00:00 2001 From: Denny Sheirer Date: Wed, 29 Jul 2026 03:49:55 -0400 Subject: [PATCH] #2435 Radio reference editor now creates NXDN repeater channel configurations from non-trunked county entries (#2446) Co-authored-by: denny --- .../playlist/radioreference/FrequencyEditor.java | 16 +++++++++++++++- .../playlist/radioreference/ModeDecoderType.java | 4 +++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/main/java/io/github/dsheirer/gui/playlist/radioreference/FrequencyEditor.java b/src/main/java/io/github/dsheirer/gui/playlist/radioreference/FrequencyEditor.java index 66a5cf6e..8b028c7c 100644 --- a/src/main/java/io/github/dsheirer/gui/playlist/radioreference/FrequencyEditor.java +++ b/src/main/java/io/github/dsheirer/gui/playlist/radioreference/FrequencyEditor.java @@ -1,6 +1,6 @@ /* * ***************************************************************************** - * Copyright (C) 2014-2025 Dennis Sheirer + * Copyright (C) 2014-2026 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 @@ -25,6 +25,8 @@ import io.github.dsheirer.gui.playlist.channel.ViewChannelRequest; import io.github.dsheirer.module.decode.DecoderFactory; import io.github.dsheirer.module.decode.config.DecodeConfiguration; import io.github.dsheirer.module.decode.nbfm.DecodeConfigNBFM; +import io.github.dsheirer.module.decode.nxdn.DecodeConfigNXDN; +import io.github.dsheirer.module.decode.nxdn.layer3.type.TransmissionMode; import io.github.dsheirer.module.decode.p25.phase1.DecodeConfigP25Phase1; import io.github.dsheirer.module.decode.p25.phase1.Modulation; import io.github.dsheirer.playlist.PlaylistManager; @@ -422,6 +424,18 @@ public class FrequencyEditor extends VBox { ((DecodeConfigP25Phase1)decodeConfiguration).setModulation(Modulation.C4FM); } + else if(decodeConfiguration instanceof DecodeConfigNXDN nxdn) + { + if(modeDecoderType == ModeDecoderType.NXDN48) + { + nxdn.setTransmissionMode(TransmissionMode.M4800); + } + else if(modeDecoderType == ModeDecoderType.NXDN96) + { + nxdn.setTransmissionMode(TransmissionMode.M9600); + } + } + channel.setDecodeConfiguration(decodeConfiguration); return channel; } diff --git a/src/main/java/io/github/dsheirer/gui/playlist/radioreference/ModeDecoderType.java b/src/main/java/io/github/dsheirer/gui/playlist/radioreference/ModeDecoderType.java index ef7ad35d..6fd88728 100644 --- a/src/main/java/io/github/dsheirer/gui/playlist/radioreference/ModeDecoderType.java +++ b/src/main/java/io/github/dsheirer/gui/playlist/radioreference/ModeDecoderType.java @@ -35,7 +35,8 @@ public enum ModeDecoderType DSTAR("d-star", null), FM("fm", DecoderType.NBFM), FMN("fmn", DecoderType.NBFM), - NXDN("nxdn", DecoderType.NXDN), + NXDN48("nxdn48", DecoderType.NXDN), + NXDN96("nxdn96", DecoderType.NXDN), TELM("telm", null), USB("usb", null), LSB("lsb", null), @@ -70,6 +71,7 @@ public enum ModeDecoderType /** * Lookup the entry that matches the mode + * * @param mode to match * @return matching entry or UNKNOWN */