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

#2435 Radio reference editor now creates NXDN repeater channel configurations from non-trunked county entries (#2446)

Browse Source 
Co-authored-by: denny <dennis.sheirer@gmail.com>
This commit is contained in:
Denny Sheirer
2026-07-29 03:49:55 -04:00
committed by GitHub
parent d60720aab7
commit 3e21887d27
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/io/github/dsheirer/gui/playlist/radioreference/FrequencyEditor.java
View File

@@ -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 * 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
@@ -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.DecoderFactory;
import io.github.dsheirer.module.decode.config.DecodeConfiguration; import io.github.dsheirer.module.decode.config.DecodeConfiguration;
import io.github.dsheirer.module.decode.nbfm.DecodeConfigNBFM; 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.DecodeConfigP25Phase1;
import io.github.dsheirer.module.decode.p25.phase1.Modulation; import io.github.dsheirer.module.decode.p25.phase1.Modulation;
import io.github.dsheirer.playlist.PlaylistManager; import io.github.dsheirer.playlist.PlaylistManager;
@@ -422,6 +424,18 @@ public class FrequencyEditor extends VBox
{ {
((DecodeConfigP25Phase1)decodeConfiguration).setModulation(Modulation.C4FM); ((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); channel.setDecodeConfiguration(decodeConfiguration);
return channel; return channel;
} }

4
src/main/java/io/github/dsheirer/gui/playlist/radioreference/ModeDecoderType.java
View File

@@ -35,7 +35,8 @@ public enum ModeDecoderType
DSTAR("d-star", null), DSTAR("d-star", null),
FM("fm", DecoderType.NBFM), FM("fm", DecoderType.NBFM),
FMN("fmn", DecoderType.NBFM), FMN("fmn", DecoderType.NBFM),
NXDN("nxdn", DecoderType.NXDN), NXDN48("nxdn48", DecoderType.NXDN),
NXDN96("nxdn96", DecoderType.NXDN),
TELM("telm", null), TELM("telm", null),
USB("usb", null), USB("usb", null),
LSB("lsb", null), LSB("lsb", null),
@@ -70,6 +71,7 @@ public enum ModeDecoderType
/** /**
* Lookup the entry that matches the mode * Lookup the entry that matches the mode
*
* @param mode to match * @param mode to match
* @return matching entry or UNKNOWN * @return matching entry or UNKNOWN
*/ */