#7 NXDN Decoder support. Redesigns tuner and channel frequency error management. (#2431)

Closes #7 NXDN Decoder * Implements: NXDN4800, NXDN9600, Type-C and Type-D decoding and trunk tracking. * Redesigns tuner and channel frequency error management.
2026-11-12 16:47:31 -05:00 · 2026-07-08 03:44:08 -04:00
parent a053315675
commit 7945f0ce63
445 changed files with 30854 additions and 2053 deletions
--- a/src/main/java/io/github/dsheirer/channel/IBandChannelDescriptor.java
+++ b/src/main/java/io/github/dsheirer/channel/IBandChannelDescriptor.java
@@ -0,0 +1,40 @@
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2025 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ * ****************************************************************************
+ */
+package io.github.dsheirer.channel;
+
+import io.github.dsheirer.module.decode.p25.phase1.message.IFrequencyBand;
+
+/**
+ * Frequency band channel descriptor
+ */
+public interface IBandChannelDescriptor extends IChannelDescriptor
+{
+
+    /**
+     * Frequency band identifiers (0 - 15)
+     */
+    int[] getFrequencyBandIdentifiers();
+
+    /**
+     * Assigns the frequency band message to the channel to use in calculating the up/downlink frequencies
+     * @param bandIdentifier
+     */
+    void setFrequencyBand(IFrequencyBand bandIdentifier);
+
+}
--- a/src/main/java/io/github/dsheirer/channel/IChannelDescriptor.java
+++ b/src/main/java/io/github/dsheirer/channel/IChannelDescriptor.java
@@ -1,7 +1,6 @@
 /*
- * ******************************************************************************
- * sdrtrunk
- * Copyright (C) 2014-2019 Dennis Sheirer
+ * *****************************************************************************
+ * Copyright (C) 2014-2025 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
@@ -15,41 +14,29 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>
- * *****************************************************************************
+ * ****************************************************************************
 */
+
 package io.github.dsheirer.channel;

-import io.github.dsheirer.module.decode.p25.phase1.message.IFrequencyBand;
 import io.github.dsheirer.protocol.Protocol;

-/**
- * Channel descriptor
- */
 public interface IChannelDescriptor
 {
    /**
     * Downlink frequency for the channel
+     *
     * @return frequency in hertz
     */
    long getDownlinkFrequency();

    /**
     * Uplink frequency for the channel
+     *
     * @return frequency in hertz
     */
    long getUplinkFrequency();

-    /**
-     * Frequency band identifiers (0 - 15)
-     */
-    int[] getFrequencyBandIdentifiers();
-
-    /**
-     * Assigns the frequency band message to the channel to use in calculating the up/downlink frequencies
-     * @param bandIdentifier
-     */
-    void setFrequencyBand(IFrequencyBand bandIdentifier);
-
    /**
     * Indicates if the timeslot count is greater than 1;
     */
--- a/src/main/java/io/github/dsheirer/channel/state/DecoderState.java
+++ b/src/main/java/io/github/dsheirer/channel/state/DecoderState.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- * Copyright (C) 2014-2024 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
--- a/src/main/java/io/github/dsheirer/channel/state/MultiChannelState.java
+++ b/src/main/java/io/github/dsheirer/channel/state/MultiChannelState.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- * Copyright (C) 2014-2024 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
@@ -523,19 +523,6 @@ public class MultiChannelState extends AbstractChannelState implements IDecoderS
                            FrequencyConfigurationIdentifier.create(frequency), IdentifierUpdateNotification.Operation.SILENT_ADD, timeslot));
                    }

-                    break;
-                case NOTIFICATION_MEASURED_FREQUENCY_ERROR:
-                    //Rebroadcast frequency error measurements to external listener if we're currently
-                    //in an active (ie sync locked) state.
-                    for(int timeslot: mTimeslots)
-                    {
-                        if(State.MULTI_CHANNEL_ACTIVE_STATES.contains(mStateMachineMap.get(timeslot).getState()))
-                        {
-                            broadcast(SourceEvent.frequencyErrorMeasurementSyncLocked(sourceEvent.getValue().longValue(),
-                                getChannel().getChannelType().name()));
-                            return;
-                        }
-                    }
                    break;
            }
        }
--- a/src/main/java/io/github/dsheirer/channel/state/SingleChannelState.java
+++ b/src/main/java/io/github/dsheirer/channel/state/SingleChannelState.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- * Copyright (C) 2014-2024 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
@@ -392,15 +392,6 @@ public class SingleChannelState extends AbstractChannelState implements IDecoder
                    mIdentifierUpdateNotificationProxy.receive(new IdentifierUpdateNotification(
                        FrequencyConfigurationIdentifier.create(frequency), IdentifierUpdateNotification.Operation.SILENT_ADD, 0));
                    break;
-                case NOTIFICATION_MEASURED_FREQUENCY_ERROR:
-                    //Rebroadcast frequency error measurements to external listener if we're currently
-                    //in an active (ie sync locked) state.
-                    if(State.SINGLE_CHANNEL_ACTIVE_STATES.contains(mStateMachine.getState()))
-                    {
-                        broadcast(SourceEvent.frequencyErrorMeasurementSyncLocked(sourceEvent.getValue().longValue(),
-                            getChannel().getChannelType().name()));
-                    }
-                    break;
            }
        }
    }
@@ -421,9 +412,8 @@ public class SingleChannelState extends AbstractChannelState implements IDecoder
                        mSquelchController.setSquelchLock(true);
                        break;
                    case REQUEST_CHANGE_CALL_TIMEOUT:
-                        if(event instanceof ChangeChannelTimeoutEvent)
+                        if(event instanceof ChangeChannelTimeoutEvent timeout)
                        {
-                            ChangeChannelTimeoutEvent timeout = (ChangeChannelTimeoutEvent)event;
                            mStateMachine.setFadeTimeoutBufferMilliseconds(timeout.getCallTimeoutMilliseconds());
                        }
                    case CONTINUATION:
@@ -471,7 +461,7 @@ public class SingleChannelState extends AbstractChannelState implements IDecoder
     * Proxy between the internal identifier collection and the external update notification listener.  This proxy
     * enables access to internal components to broadcast silent identifier update notifications externally.
     */
-    public class IdentifierUpdateNotificationProxy implements Listener<IdentifierUpdateNotification>
+    public static class IdentifierUpdateNotificationProxy implements Listener<IdentifierUpdateNotification>
    {
        private Listener<IdentifierUpdateNotification> mIdentifierUpdateNotificationListener;

--- a/src/main/java/io/github/dsheirer/channel/state/TimeslotDecoderState.java
+++ b/src/main/java/io/github/dsheirer/channel/state/TimeslotDecoderState.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- * Copyright (C) 2014-2024 Dennis Sheirer
+ * Copyright (C) 2014-2025 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
@@ -19,7 +19,7 @@

 package io.github.dsheirer.channel.state;

-import io.github.dsheirer.channel.IChannelDescriptor;
+import io.github.dsheirer.channel.IBandChannelDescriptor;
 import io.github.dsheirer.identifier.Form;
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.identifier.IdentifierClass;
@@ -89,9 +89,9 @@ public abstract class TimeslotDecoderState extends DecoderState
                    {
                        setCurrentChannel(((ChannelDescriptorConfigurationIdentifier)identifier).getValue());
                    }
-                    else if(identifier instanceof IChannelDescriptor)
+                    else if(identifier instanceof IBandChannelDescriptor)
                    {
-                        setCurrentChannel((IChannelDescriptor)identifier);
+                        setCurrentChannel((IBandChannelDescriptor)identifier);
                    }
                    else if(identifier instanceof FrequencyConfigurationIdentifier fci)
                    {