Resolves issue with build script where OS-specific JavaFX libraries were not included in build images.

- Adding jitpack to import libs directly from the git repos
 - Removing binary imports from repo
 - Fixing Gradle 7 upgrade warnings

build.gradle

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -30,9 +30,10 @@ plugins {
 repositories {
     jcenter()
     mavenCentral()
+    maven { url "https://jitpack.io" }
 }
 
-version = '0.4.0-beta.2'
+version = '0.4.0-beta.5'
 sourceCompatibility = '11'
 
 sourceSets {
@@ -41,28 +42,42 @@ sourceSets {
 }
 
 dependencies {
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.assertj:assertj-core:3.8.0'
-    compile fileTree(dir: 'imports', include: '*.jar')
-    compile 'ch.qos.logback:logback-core:1.2.3'
-    compile 'ch.qos.logback:logback-classic:1.2.3'
-    compile 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.9.8'
-    compile 'com.fazecast:jSerialComm:2.5.0'
-    compile 'com.github.jiconfont:jiconfont-font_awesome:4.7.0.1'
-    compile 'com.github.jiconfont:jiconfont-javafx:1.0.0'
-    compile 'com.github.jiconfont:jiconfont-swing:1.0.1'
-    compile 'com.github.wendykierp:JTransforms:3.1'
-    compile 'com.google.guava:guava:27.0.1-jre'
-    compile 'com.jidesoft:jide-oss:3.6.18'
-    compile 'com.miglayout:miglayout-swing:5.2'
-    compile 'eu.hansolo:charts:1.0.5'
-    compile 'io.github.dsheirer:radio-reference-api:15.1.2'
-    compile 'javax.usb:usb-api:1.0.2'
-    compile 'net.coderazzi:tablefilter-swing:5.4.0'
-    compile 'org.apache.commons:commons-lang3:3.8.1'
-    compile 'org.apache.commons:commons-io:1.3.2'
-    compile 'org.apache.mina:mina-core:2.0.19'
-    compile 'org.apache.mina:mina-http:2.0.19'
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'org.assertj:assertj-core:3.8.0'
+
+    //Jitpack imports
+    implementation 'com.github.nwaldispuehl:java-lame:v3.98.4'
+    implementation 'com.github.dnault:libresample4j:master'
+    implementation 'com.github.DSheirer.jmbe:jmbe-api:1.0.0'
+
+    //mavenCentral/jcenter imports
+    implementation 'org.apache.commons:commons-math3:3.6.1'
+    implementation 'ch.qos.logback:logback-core:1.2.3'
+    implementation 'ch.qos.logback:logback-classic:1.2.3'
+    implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.9.8'
+    implementation 'com.fazecast:jSerialComm:2.5.0'
+    implementation 'com.github.jiconfont:jiconfont-font_awesome:4.7.0.1'
+    implementation 'com.github.jiconfont:jiconfont-javafx:1.0.0'
+    implementation 'com.github.jiconfont:jiconfont-swing:1.0.1'
+    implementation 'com.github.wendykierp:JTransforms:3.1'
+    implementation 'com.google.guava:guava:27.0.1-jre'
+    implementation 'com.jidesoft:jide-oss:3.6.18'
+    implementation 'com.miglayout:miglayout-swing:5.2'
+    implementation 'eu.hansolo:charts:1.0.5'
+    implementation 'io.github.dsheirer:radio-reference-api:15.1.2'
+    implementation 'javax.usb:usb-api:1.0.2'
+    implementation 'net.coderazzi:tablefilter-swing:5.4.0'
+    implementation 'org.apache.commons:commons-lang3:3.8.1'
+    implementation 'org.apache.commons:commons-io:1.3.2'
+    implementation 'org.apache.mina:mina-core:2.0.19'
+    implementation 'org.apache.mina:mina-http:2.0.19'
+    implementation 'org.slf4j:slf4j-api:1.7.25'
+    implementation 'org.usb4java:libusb4java:1.3.0'
+    implementation 'org.usb4java:usb4java:1.3.0'
+    implementation 'org.usb4java:usb4java-javax:1.3.0'
+    implementation 'pl.edu.icm:JLargeArrays:1.6'
+
+    //The must remain as compile options to ensure they are included in the build to produce multi-OS images
     compile "org.openjfx:javafx-base:11:win"
     compile "org.openjfx:javafx-base:11:linux"
     compile "org.openjfx:javafx-base:11:mac"
@@ -75,11 +90,6 @@ dependencies {
     compile "org.openjfx:javafx-swing:11.0.2:win"
     compile "org.openjfx:javafx-swing:11.0.2:linux"
     compile "org.openjfx:javafx-swing:11.0.2:mac"
-    compile 'org.slf4j:slf4j-api:1.7.25'
-    compile 'org.usb4java:libusb4java:1.3.0'
-    compile 'org.usb4java:usb4java:1.3.0'
-    compile 'org.usb4java:usb4java-javax:1.3.0'
-    compile 'pl.edu.icm:JLargeArrays:1.6'
 }
 
 application {
@@ -100,128 +110,110 @@ javafx {
 jar {
     manifest {
         attributes (
-            'Implementation-Title'  : 'sdrtrunk project',
-            'Implementation-Version' : archiveVersion,
-            'Class-Path'            : 'jmbe-1.0.1.jar',
-            'Created-By'            : "Gradle ${gradle.gradleVersion}",
-            'Build-Timestamp'       : new java.text.SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ").format(new Date()),
-            'Build-JDK'             : "${System.properties['java.version']} (${System.properties['java.vendor']} ${System.properties['java.vm.version']}",
-            'Build-OS'              : "${System.properties['os.name']} (${System.properties['os.arch']} ${System.properties['os.version']}"
+                'Implementation-Title'  : 'sdrtrunk project',
+                'Implementation-Version' : archiveVersion,
+                'Class-Path'            : 'jmbe-1.0.1.jar',
+                'Created-By'            : "Gradle ${gradle.gradleVersion}",
+                'Build-Timestamp'       : new java.text.SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ").format(new Date()),
+                'Build-JDK'             : "${System.properties['java.version']} (${System.properties['java.vendor']} ${System.properties['java.vm.version']}",
+                'Build-OS'              : "${System.properties['os.name']} (${System.properties['os.arch']} ${System.properties['os.version']}"
         )
     }
 }
 
 /**
- * Java Development Kit (JDK) locations.  These paths must point to the 'bin' directory
- * within a JDK for each of the specified architectures.  These JDKs are used by the 
- * runtime and runtimeZip tasks to produce platform-specific builds
+ * Java Development Kit (JDK) locations.  In order to build OS-specific images, these paths must point to the 'bin' 
+ * directory within a JDK for each of the specified architectures.  These JDKs are used by the runtime and runtimeZip
+ * tasks to produce platform-specific builds.  If none of these paths exists, then an image will be created for the
+ * host OS using the installed JDK.
  */
-def jdkLinux_x64 = '/media/denny/WD250GB/java/bellsoft/linux-x64/jdk-13.0.1'
-def jdkLinux_x86 = '/media/denny/WD250GB/java/bellsoft/linux-x86/jdk-13.0.1'
-def jdkOsx_x64 = '/media/denny/WD250GB/java/bellsoft/osx-x64/jdk-13.0.1.jdk'
-def jdkWindows_x64 = '/media/denny/WD250GB/java/bellsoft/windows-x64/jdk-13.0.1'
-def jdkWindows_x86 = '/media/denny/WD250GB/java/bellsoft/windows-x86/jdk-13.0.1'
-//def jdkLinux_aarch64 = '/media/denny/WD250GB/java/bellsoft/linux-aarch64/jdk-11.0.2'
-//def jdkLinux_arm32 = '/media/denny/WD250GB/java/bellsoft/linux-arm32/jdk-11.0.2'
-//def jfxLinux_arm32 = '/media/denny/WD250GB/java/bellsoft/linux-arm32/armv6hf-sdk/lib'
+def jdk_linux_x86_64 = '/media/denny/WD250GB/java/bellsoft/linux-x64/jdk-13.0.1'
+def jdk_linux_x86_32 = '/media/denny/WD250GB/java/bellsoft/linux-x86/jdk-13.0.1'
+def jdk_osx_x86_64 = '/media/denny/WD250GB/java/bellsoft/osx-x64/jdk-13.0.1.jdk'
+def jdk_windows_x86_64 = '/media/denny/WD250GB/java/bellsoft/windows-x64/jdk-13.0.1'
+def jdk_windows_x86_32 = '/media/denny/WD250GB/java/bellsoft/windows-x86/jdk-13.0.1'
+
+def file_jdk_linux_x86_64 = new File(jdk_linux_x86_64)
+def file_jdk_linux_x86_32 = new File(jdk_linux_x86_32)
+def file_jdk_osx_x86_64 = new File(jdk_osx_x86_64)
+def file_jdk_windows_x86_64 = new File(jdk_windows_x86_64)
+def file_jdk_windows_x86_32 = new File(jdk_windows_x86_32)
+
+def hasTargetJdk = file_jdk_linux_x86_32.exists() ||
+        file_jdk_linux_x86_64.exists() ||
+        file_jdk_osx_x86_64.exists() ||
+        file_jdk_windows_x86_32.exists() ||
+        file_jdk_windows_x86_64.exists()
 
 runtime {
-    targetPlatform('linux-x86_64', jdkLinux_x64)
-    targetPlatform('linux-x86_32', jdkLinux_x86)
-    targetPlatform('osx-x86_64', jdkOsx_x64)
-    targetPlatform('windows-x86_64', jdkWindows_x64)
-    targetPlatform('windows-x86_32', jdkWindows_x86)
-//    targetPlatform('linux-aarch64', jdkLinux_aarch64)
-//    targetPlatform('linux-arm32', jdkLinux_arm32)
+    if(file_jdk_linux_x86_64.exists())
+    {
+        targetPlatform('linux-x86_64-v' + version, jdk_linux_x86_64)
+    }
+
+    if(file_jdk_linux_x86_32.exists())
+    {
+        targetPlatform('linux-x86_32-v' + version, jdk_linux_x86_32)
+    }
+
+    if(file_jdk_osx_x86_64.exists())
+    {
+        targetPlatform('osx-x86_64-v' + version, jdk_osx_x86_64)
+    }
+
+    if(file_jdk_windows_x86_64.exists())
+    {
+        targetPlatform('windows-x86_64-v' + version, jdk_windows_x86_64)
+    }
+
+    if(file_jdk_windows_x86_32.exists())
+    {
+        targetPlatform('windows-x86_32-v' + version, jdk_windows_x86_32)
+    }
 
     options = ['--strip-debug', '--compress', '2', '--no-header-files', '--no-man-pages']
-    modules = ['java.desktop', 'java.naming', 'jdk.unsupported', 'jdk.unsupported.desktop']
-    imageZip = file("$buildDir/image/sdr-trunk-" + version + ".zip")
+    modules = ['java.desktop', 'java.naming', 'jdk.unsupported', 'jdk.unsupported.desktop', 'java.net.http']
+    imageZip = hasTargetJdk ? file("$buildDir/image/sdr-trunk.zip") : file("$buildDir/image/sdr-trunk-" + version + ".zip")
 }
 
 /**
  * Check for existence of JDK folders for each supported platform before creating runtime images
  */
 tasks.runtime.doFirst {
-    def linux_x64 = new File(jdkLinux_x64)
 
-    if(!linux_x64.exists())
+    if(!file_jdk_linux_x86_64.exists())
     {
-        println("Linux x64 JDK was not found at " + jdkLinux_x64)
-        throw new GradleException("Cannot find Java Development Kit (JDK) for linux-x64 architecture.  " +
-                "Please update the build.gradle script to provide the correct path")
+        println("Skipping OS Image - Linux x86 64-bit JDK was not found at " + jdk_linux_x86_64)
     }
 
-    def linux_x86 = new File(jdkLinux_x86)
-
-    if(!linux_x86.exists())
+    if(!file_jdk_linux_x86_32.exists())
     {
-        println("Linux x86 JDK was not found at " + jdkLinux_x86)
-        throw new GradleException("Cannot find Java Development Kit (JDK) for linux-x86 32-bit architecture.  " +
-                "Please update the build.gradle script to provide the correct path")
+        println("Skipping OS Image - Linux x86 32-bit JDK was not found at " + jdk_linux_x86_32)
     }
 
-    def osx_x64 = new File(jdkOsx_x64)
-
-    if(!osx_x64.exists())
+    if(!file_jdk_osx_x86_64.exists())
     {
-        println("OSX x64 JDK was not found at " + jdkOsx_x64);
-        throw new GradleException("Cannot find Java Development Kit (JDK) for osx-x64 architecture.  " +
-                "Please update the build.gradle script to provide the correct path")
+        println("Skipping OS Image - OSX x86 64-bit JDK was not found at " + jdk_osx_x86_64);
     }
 
-    def windows_x64 = new File(jdkWindows_x64)
-
-    if(!windows_x64.exists())
+    if(!file_jdk_windows_x86_64.exists())
     {
-        println("Windows x64 JDK was not found at " + jdkWindows_x64)
-        throw new GradleException("Cannot find Java Development Kit (JDK) for windows-x64 architecture.  " +
-                "Please update the build.gradle script to provide the correct path")
+        println("Skipping OS Image - Windows x86 64-bit JDK was not found at " + jdk_windows_x86_64)
     }
 
-    def windows_x86 = new File(jdkWindows_x86)
-
-    if(!windows_x86.exists())
+    if(!file_jdk_windows_x86_32.exists())
     {
-        println("Windows x86 32-bit JDK was not found at " + jdkWindows_x86)
-        throw new GradleException("Cannot find Java Development Kit (JDK) for windows-x64 architecture.  " +
-                "Please update the build.gradle script to provide the correct path")
+        println("Skipping OS Image - Windows x86 32-bit JDK was not found at " + jdk_windows_x86_32)
     }
-
-//    def linux_aarch64 = new File(jdkLinux_aarch64)
-//
-//    if(!linux_aarch64.exists())
-//    {
-//        println("Linux aarch64 JDK was not found at " + jdkLinux_aarch64)
-//        throw new GradleException("Cannot find Java Development Kit (JDK) for linux-aarch64 architecture.  " +
-//                "Please update the build.gradle script to provide the correct path")
-//    }
-//
-//    def linux_arm32 = new File(jdkLinux_arm32)
-//
-//    if(!linux_arm32.exists())
-//    {
-//        println("Linux arm32 JDK was not found at " + jdkLinux_arm32)
-//        throw new GradleException("Cannot find Java Development Kit (JDK) for linux-arm32 architecture.  " +
-//                "Please update the build.gradle script to provide the correct path")
-//    }
 }
 
 /**
- * Since we have to list each of the platform-specific JavaFX libraries as dependencies, 
- * remove them from each build image
+ * Remove unused JavaFX OS-specific libraries from each platform target directory
  */
 tasks.runtime.doLast {
-    delete(fileTree('build/image/sdr-trunk-linux-x86_64/lib').include { it.name ==~ /javafx.*-(win|mac)\.jar/ })
-    delete(fileTree('build/image/sdr-trunk-linux-x86_32/lib').include { it.name ==~ /javafx.*-(win|mac)\.jar/ })
-    delete(fileTree('build/image/sdr-trunk-osx-x86_64/lib').include { it.name ==~ /javafx.*-(win|linux)\.jar/ })
-    delete(fileTree('build/image/sdr-trunk-windows-x86_64/lib').include { it.name ==~ /javafx.*-(linux|mac)\.jar/ })
-    delete(fileTree('build/image/sdr-trunk-windows-x86_32/lib').include { it.name ==~ /javafx.*-(linux|mac)\.jar/ })
-
-//    delete(fileTree('build/image/sdr-trunk-linux-aarch64/lib').include { it.name ==~ /javafx.*-(win|mac)\.jar/ })
-//    delete(fileTree('build/image/sdr-trunk-linux-arm32/lib').include { it.name ==~ /javafx.*-(win|mac)\.jar/ })
-//    copy {
-//        from(jfxLinux_arm32).exclude("src.zip")
-//        into 'build/image/sdr-trunk-linux-arm32/lib'
-//    }
+    delete(fileTree('build/image/sdr-trunk-linux-x86_64-v' + version + '/lib').include { it.name ==~ /javafx.*-(win|mac)\.jar/ })
+    delete(fileTree('build/image/sdr-trunk-linux-x86_32-v' + version + '/lib').include { it.name ==~ /javafx.*-(win|mac)\.jar/ })
+    delete(fileTree('build/image/sdr-trunk-osx-x86_64-v' + version + '/lib').include { it.name ==~ /javafx.*-(win|linux)\.jar/ })
+    delete(fileTree('build/image/sdr-trunk-windows-x86_64-v' + version + '/lib').include { it.name ==~ /javafx.*-(linux|mac)\.jar/ })
+    delete(fileTree('build/image/sdr-trunk-windows-x86_32-v' + version + '/lib').include { it.name ==~ /javafx.*-(linux|mac)\.jar/ })
 }

src/main/java/io/github/dsheirer/alias/id/radio/RadioFormat.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -34,8 +34,8 @@ import io.github.dsheirer.protocol.Protocol;
  */
 public enum RadioFormat
 {
-    APCO25("********", 1, 0xFFFFFF, "1 to 16,777,215",
-        "<html>APCO25 valid range is 1 to 16,777,215"),
+    APCO25("********", 0, 0xFFFFFF, "0 to 16,777,215",
+        "<html>APCO25 valid range is 0 to 16,777,215"),
     UNKNOWN("********", 1, 0xFFFFFF, "1 to 16,777,215",
         "Unknown protocol valid value range is 1-16,777,215");
 

src/main/java/io/github/dsheirer/alias/id/talkgroup/TalkgroupFormat.java

@@ -1,21 +1,23 @@
 /*
- * ******************************************************************************
- * sdrtrunk
- * Copyright (C) 2014-2019 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.
+ *  * ******************************************************************************
+ *  * Copyright (C) 2014-2020 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/>
+ *  * *****************************************************************************
  *
- * 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.alias.id.talkgroup;
@@ -32,8 +34,8 @@ import io.github.dsheirer.protocol.Protocol;
  */
 public enum TalkgroupFormat
 {
-    APCO25("********", 1, 0xFFFFFF, "1 to 16,777,215",
-        "<html>APCO25 valid range is 1 to 65,535(talkgroup)<br>or 1 to 16,777,215 (radio ID)"),
+    APCO25("********", 0, 0xFFFFFF, "0 to 65,535",
+        "<html>APCO25 talkgroup valid range is 0 to 65,535"),
     FLEETSYNC("###-####", 1, 0x7FFFFF, "001-0001 to 127-8192",
         "<html>Fleetsync valid ranges are 1-127(prefix)<br>and 1-8192(ident) (ie. 001-0001 to 127-8192)"),
     LTR("##-###", 257, 5375, "01-001 to 20-255",

src/main/java/io/github/dsheirer/audio/broadcast/AudioBroadcaster.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -204,6 +204,10 @@ public abstract class AudioBroadcaster implements Listener<AudioRecording>
             mAudioRecordingQueue.offer(recording);
             broadcast(new BroadcastEvent(this, BroadcastEvent.Event.BROADCASTER_QUEUE_CHANGE));
         }
+        else
+        {
+            recording.removePendingReplay();
+        }
     }
 
     /**

src/main/java/io/github/dsheirer/audio/broadcast/icecast/IcecastBroadcastMetadataUpdater.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -178,6 +178,15 @@ public class IcecastBroadcastMetadataUpdater implements IBroadcastMetadataUpdate
                 to = identifierCollection.getIdentifier(IdentifierClass.USER, Form.TALKGROUP, Role.TO);
             }
 
+            if(to == null)
+            {
+                List<Identifier> toIdentifiers = identifierCollection.getIdentifiers(Role.TO);
+                if(!toIdentifiers.isEmpty())
+                {
+                    to = toIdentifiers.get(0);
+                }
+            }
+
             if(to != null)
             {
                 sb.append("TO:").append(to);
@@ -194,7 +203,17 @@ public class IcecastBroadcastMetadataUpdater implements IBroadcastMetadataUpdate
                 sb.append("TO:UNKNOWN");
             }
 
-            Identifier from = identifierCollection.getIdentifier(IdentifierClass.USER, Form.TALKGROUP, Role.FROM);
+            Identifier from = identifierCollection.getIdentifier(IdentifierClass.USER, Form.RADIO, Role.FROM);
+
+            if(from == null)
+            {
+                List<Identifier> fromIdentifiers = identifierCollection.getIdentifiers(Role.FROM);
+
+                if(!fromIdentifiers.isEmpty())
+                {
+                    from = fromIdentifiers.get(0);
+                }
+            }
 
             if(from != null)
             {

src/main/java/io/github/dsheirer/audio/broadcast/shoutcast/v1/ShoutcastV1BroadcastMetadataUpdater.java

@@ -1,21 +1,23 @@
 /*
- * ******************************************************************************
- * sdrtrunk
- * Copyright (C) 2014-2018 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.
+ *  * ******************************************************************************
+ *  * Copyright (C) 2014-2020 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/>
+ *  * *****************************************************************************
  *
- * 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.audio.broadcast.shoutcast.v1;
 
@@ -203,6 +205,15 @@ public class ShoutcastV1BroadcastMetadataUpdater implements IBroadcastMetadataUp
                 to = identifierCollection.getIdentifier(IdentifierClass.USER, Form.TALKGROUP, Role.TO);
             }
 
+            if(to == null)
+            {
+                List<Identifier> toIdentifiers = identifierCollection.getIdentifiers(Role.TO);
+                if(!toIdentifiers.isEmpty())
+                {
+                    to = toIdentifiers.get(0);
+                }
+            }
+
             if(to != null)
             {
                 sb.append("TO:").append(to);
@@ -219,7 +230,17 @@ public class ShoutcastV1BroadcastMetadataUpdater implements IBroadcastMetadataUp
                 sb.append("TO:UNKNOWN");
             }
 
-            Identifier from = identifierCollection.getIdentifier(IdentifierClass.USER, Form.TALKGROUP, Role.FROM);
+            Identifier from = identifierCollection.getIdentifier(IdentifierClass.USER, Form.RADIO, Role.FROM);
+
+            if(from == null)
+            {
+                List<Identifier> fromIdentifiers = identifierCollection.getIdentifiers(Role.FROM);
+
+                if(!fromIdentifiers.isEmpty())
+                {
+                    from = fromIdentifiers.get(0);
+                }
+            }
 
             if(from != null)
             {

src/main/java/io/github/dsheirer/audio/broadcast/shoutcast/v2/ShoutcastV2AudioBroadcaster.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -291,6 +291,16 @@ public class ShoutcastV2AudioBroadcaster extends AudioBroadcaster implements IBr
                     to = identifierCollection.getIdentifier(IdentifierClass.USER, Form.TALKGROUP, Role.TO);
                 }
 
+                if(to == null)
+                {
+                    List<Identifier> toIdentifiers = identifierCollection.getIdentifiers(Role.TO);
+
+                    if(!toIdentifiers.isEmpty())
+                    {
+                        to = toIdentifiers.get(0);
+                    }
+                }
+
                 if(to != null)
                 {
                     sbTitle2.append("TO:").append(to);
@@ -307,7 +317,17 @@ public class ShoutcastV2AudioBroadcaster extends AudioBroadcaster implements IBr
                     sbTitle2.append("TO:UNKNOWN");
                 }
 
-                Identifier from = identifierCollection.getIdentifier(IdentifierClass.USER, Form.TALKGROUP, Role.FROM);
+                Identifier from = identifierCollection.getIdentifier(IdentifierClass.USER, Form.RADIO, Role.FROM);
+
+                if(from == null)
+                {
+                    List<Identifier> fromIdentifiers = identifierCollection.getIdentifiers(Role.FROM);
+
+                    if(!fromIdentifiers.isEmpty())
+                    {
+                        from = fromIdentifiers.get(0);
+                    }
+                }
 
                 if(from != null)
                 {

src/main/java/io/github/dsheirer/bits/MultiSyncPatternMatcher.java

@@ -1,18 +1,24 @@
-/*******************************************************************************
- * sdr-trunk
- * Copyright (C) 2014-2018 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.
+ *  * ******************************************************************************
+ *  * Copyright (C) 2014-2020 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/>
+ *  * *****************************************************************************
  *
- * 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.bits;
 
 import io.github.dsheirer.dsp.symbol.ISyncDetectListener;
@@ -94,8 +100,8 @@ public class MultiSyncPatternMatcher
 
         if(mBitCount > mSyncLossThreshold)
         {
+            mSyncDetectListener.syncLost(mBitCount);
             mBitCount = 0;
-            mSyncDetectListener.syncLost();
         }
     }
 

src/main/java/io/github/dsheirer/channel/metadata/ChannelMetadata.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -261,7 +261,12 @@ public class ChannelMetadata implements Listener<IdentifierUpdateNotification>,
     @Override
     public void receive(IdentifierUpdateNotification update)
     {
-//        mLog.debug("Received update: " + update + " class:" + update.getIdentifier().getClass());
+//        mLog.debug("Received update: " + update +
+//            " class:" + update.getIdentifier().getIdentifierClass() +
+//            " form:" + update.getIdentifier().getForm() +
+//            " role:" + update.getIdentifier().getRole() +
+//            " class:" + update.getIdentifier().getClass());
+
         Identifier identifier = update.getIdentifier();
 
         switch(identifier.getIdentifierClass())

src/main/java/io/github/dsheirer/channel/metadata/ChannelMetadataModel.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -199,7 +199,8 @@ public class ChannelMetadataModel extends AbstractTableModel implements IChannel
                         }
                         else
                         {
-                            return id.getValue() + " TS:" + channelMetadata.getTimeslot();
+                            String value = id.getValue().replace(" TS0", "").replace(" TS1", "");
+                            return value + " TS:" + channelMetadata.getTimeslot();
                         }
                     }
                     else

src/main/java/io/github/dsheirer/controller/channel/ChannelProcessingManager.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -47,6 +47,7 @@ import io.github.dsheirer.sample.Broadcaster;
 import io.github.dsheirer.sample.Listener;
 import io.github.dsheirer.sample.buffer.ReusableAudioPacket;
 import io.github.dsheirer.source.Source;
+import io.github.dsheirer.source.SourceEvent;
 import io.github.dsheirer.source.SourceException;
 import io.github.dsheirer.source.SourceManager;
 import org.slf4j.Logger;
@@ -262,6 +263,30 @@ public class ChannelProcessingManager implements Listener<ChannelEvent>
                 processingChain.addDecodeEventListener(listener);
             }
 
+            //Add a listener to detect source error state that indicates the channel should be shutdown
+            processingChain.addSourceEventListener(sourceEvent ->
+            {
+                if(sourceEvent.getEvent() == SourceEvent.Event.NOTIFICATION_ERROR_STATE && sourceEvent.getSource() != null)
+                {
+                    Channel toShutdown = null;
+
+                    for(Map.Entry<Channel,ProcessingChain> entry: mProcessingChains.entrySet())
+                    {
+                        if(entry.getValue().hasSource(sourceEvent.getSource()))
+                        {
+                            toShutdown = entry.getKey();
+                            break;
+                        }
+                    }
+
+                    if(toShutdown != null)
+                    {
+                        mLog.info("Channel source error detected - stopping channel [" + toShutdown.getName() + "]");
+                        stopProcessing(toShutdown, true);
+                    }
+                }
+            });
+
             //Register this manager to receive channel events from traffic channel manager modules within
             //the processing chain
             processingChain.addChannelEventListener(this);

src/main/java/io/github/dsheirer/dsp/filter/channelizer/PolyphaseChannelManager.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -126,6 +126,18 @@ public class PolyphaseChannelManager implements ISourceEventProcessor
         this(tunerController, tunerController.getFrequency(), tunerController.getSampleRate());
     }
 
+    /**
+     * Signals to all provisioned tuner channel sources that the source complex buffer provider has an error and can
+     * no longer provide channels, so that the tuner channel source can notify the consumer of the error state.
+     */
+    public void setErrorMessage(String errorMessage)
+    {
+        for(TunerChannelSource tunerChannelSource: mChannelSources)
+        {
+            tunerChannelSource.setError(errorMessage);
+        }
+    }
+
     /**
      * Current channel sample rate which is (2 * channel bandwidth).
      */

src/main/java/io/github/dsheirer/dsp/fsk/LTRDecoder.java

@@ -1,21 +1,23 @@
 /*
- * ******************************************************************************
- * sdrtrunk
- * Copyright (C) 2014-2018 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.
+ *  * ******************************************************************************
+ *  * Copyright (C) 2014-2020 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/>
+ *  * *****************************************************************************
  *
- * 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.dsp.fsk;
 
@@ -139,7 +141,7 @@ public class LTRDecoder implements Listener<ReusableFloatBuffer>, ISyncDetectLis
     }
 
     @Override
-    public void syncLost()
+    public void syncLost(int bitsProcessed)
     {
         //no-op
     }

src/main/java/io/github/dsheirer/dsp/fsk/SynchronizationMonitor.java

@@ -1,18 +1,24 @@
-/*******************************************************************************
- * sdr-trunk
- * Copyright (C) 2014-2018 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.
+ *  * ******************************************************************************
+ *  * Copyright (C) 2014-2020 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/>
+ *  * *****************************************************************************
  *
- * 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.dsp.fsk;
 
 import io.github.dsheirer.dsp.symbol.ISyncDetectListener;
@@ -129,7 +135,7 @@ public class SynchronizationMonitor implements ISyncDetectListener
     }
 
     @Override
-    public void syncLost()
+    public void syncLost(int bitsProcessed)
     {
         //no-op
     }

src/main/java/io/github/dsheirer/dsp/psk/pll/AdaptivePLLBandwidthMonitor.java

@@ -0,0 +1,125 @@
+/*
+ *
+ *  * ******************************************************************************
+ *  * Copyright (C) 2014-2020 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.dsp.psk.pll;
+
+import io.github.dsheirer.dsp.symbol.ISyncDetectListener;
+import io.github.dsheirer.module.decode.FeedbackDecoder;
+import io.github.dsheirer.source.SourceEvent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Monitors decode sync events to adaptively control PLL loop gain.
+ */
+public class AdaptivePLLBandwidthMonitor implements ISyncDetectListener, IFrequencyErrorProcessor
+{
+    private final static Logger mLog = LoggerFactory.getLogger(AdaptivePLLBandwidthMonitor.class);
+
+    private static final int MAX_SYNC_COUNT = PLLBandwidth.BW_200.getRangeEnd();
+    private CostasLoop mCostasLoop;
+    private FeedbackDecoder mFeedbackDecoder;
+    private PLLBandwidth mPLLBandwidth = PLLBandwidth.BW_400;
+    private int mSyncCount;
+
+    /**
+     * Constructs an adaptive monitor to monitor the sync state of a decoder and adjust the gain
+     * level of the costas loop accordingly.
+     *
+     * @param costasLoop to receive adaptive gain updates.
+     * @param feedbackDecoder to rebroadcast frequency error source events
+     */
+    public AdaptivePLLBandwidthMonitor(CostasLoop costasLoop, FeedbackDecoder feedbackDecoder)
+    {
+        mCostasLoop = costasLoop;
+        mCostasLoop.setPLLBandwidth(mPLLBandwidth);
+        mCostasLoop.setFrequencyErrorProcessor(this);
+        mFeedbackDecoder = feedbackDecoder;
+    }
+
+    /**
+     * Sync detection event.  Updates the running sync count and updates the PLL gain level.
+     */
+    @Override
+    public void syncDetected(int bitErrors)
+    {
+        mSyncCount++;
+        update();
+    }
+
+    /**
+     * Sync loss event.  Updates the running sync count and updates the PLL gain level.
+     */
+    @Override
+    public void syncLost(int bitsProcessed)
+    {
+        mSyncCount -= 2;
+        update();
+    }
+
+    /**
+     * Updates the gain state for a sync detect or sync loss
+     */
+    private void update()
+    {
+        if(mSyncCount < 0)
+        {
+            mSyncCount = 0;
+            return;
+        }
+
+        if(mSyncCount > MAX_SYNC_COUNT)
+        {
+            mSyncCount = MAX_SYNC_COUNT;
+            return;
+        }
+
+        PLLBandwidth gain = PLLBandwidth.fromSyncCount(mSyncCount);
+
+        //Only update the costas loop if the gain value changes
+        if(gain != mPLLBandwidth)
+        {
+            mPLLBandwidth = gain;
+            mCostasLoop.setPLLBandwidth(mPLLBandwidth);
+        }
+    }
+
+    /**
+     * Resets the monitor and commands the PLL to use the highest gain level.
+     */
+    public void reset()
+    {
+        mSyncCount = 0;
+        mPLLBandwidth = PLLBandwidth.BW_400;
+        mCostasLoop.setPLLBandwidth(mPLLBandwidth);
+    }
+
+    @Override
+    public void processFrequencyError(long frequencyError)
+    {
+        //Only rebroadcast the costas loop frequency error if the gain level has progressed above
+        //a bandwidth of 300, meaning that we have received at least 4 sync events
+        if(mPLLBandwidth != PLLBandwidth.BW_400 && mPLLBandwidth != PLLBandwidth.BW_300)
+        {
+            mFeedbackDecoder.broadcast(SourceEvent.frequencyErrorMeasurement(frequencyError));
+        }
+    }
+}

src/main/java/io/github/dsheirer/dsp/psk/pll/AdaptivePLLGainMonitor.java

@@ -1,123 +0,0 @@
-/*
- * ******************************************************************************
- * sdrtrunk
- * Copyright (C) 2014-2019 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.dsp.psk.pll;
-
-import io.github.dsheirer.dsp.symbol.ISyncDetectListener;
-import io.github.dsheirer.module.decode.p25.phase1.P25P1Decoder;
-import io.github.dsheirer.source.SourceEvent;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Monitors decode sync events to adaptively control PLL loop gain.
- */
-public class AdaptivePLLGainMonitor implements ISyncDetectListener, IFrequencyErrorProcessor
-{
-    private final static Logger mLog = LoggerFactory.getLogger(AdaptivePLLGainMonitor.class);
-
-    private static final int MAX_SYNC_COUNT = 6;
-    private CostasLoop mCostasLoop;
-    private P25P1Decoder mP25P1Decoder;
-    private PLLGain mPLLGain = PLLGain.LEVEL_1;
-    private int mSyncCount;
-
-    /**
-     * Constructs an adaptive monitor to monitor the sync state of a decoder and adjust the gain
-     * level of the costas loop accordingly.
-     *
-     * @param costasLoop to receive adaptive gain updates.
-     * @param p25P1Decoder to receive frequency error source events
-     */
-    public AdaptivePLLGainMonitor(CostasLoop costasLoop, P25P1Decoder p25P1Decoder)
-    {
-        mCostasLoop = costasLoop;
-        mCostasLoop.setPLLGain(mPLLGain);
-        mCostasLoop.setFrequencyErrorProcessor(this);
-        mP25P1Decoder = p25P1Decoder;
-    }
-
-    /**
-     * Sync detection event.  Updates the running sync count and updates the PLL gain level.
-     */
-    @Override
-    public void syncDetected(int bitErrors)
-    {
-        mSyncCount++;
-        update();
-    }
-
-    /**
-     * Sync loss event.  Updates the running sync count and updates the PLL gain level.
-     */
-    @Override
-    public void syncLost()
-    {
-        mSyncCount -= 2;
-        update();
-    }
-
-    /**
-     * Updates the gain state for a sync detect or sync loss
-     */
-    private void update()
-    {
-        if(mSyncCount < 0)
-        {
-            mSyncCount = 0;
-            return;
-        }
-
-        if(mSyncCount > MAX_SYNC_COUNT)
-        {
-            mSyncCount = MAX_SYNC_COUNT;
-            return;
-        }
-
-        PLLGain gain = PLLGain.fromSyncCount(mSyncCount);
-
-        //Only update the costas loop if the gain value changes
-        if(gain != mPLLGain)
-        {
-            mPLLGain = gain;
-            mCostasLoop.setPLLGain(mPLLGain);
-        }
-    }
-
-    /**
-     * Resets the monitor and commands the PLL to use the highest gain level.
-     */
-    public void reset()
-    {
-        mSyncCount = 0;
-        mPLLGain = PLLGain.LEVEL_1;
-        mCostasLoop.setPLLGain(mPLLGain);
-    }
-
-    @Override
-    public void processFrequencyError(long frequencyError)
-    {
-        //Only rebroadcast the costas loop frequency error if the gain level has progressed above the
-        //default gain of 1, meaning that we have received at least 2 sync events
-        if(mPLLGain != PLLGain.LEVEL_1)
-        {
-            mP25P1Decoder.broadcast(SourceEvent.frequencyErrorMeasurement(frequencyError));
-        }
-    }
-}

src/main/java/io/github/dsheirer/dsp/psk/pll/CostasLoop.java

@@ -1,18 +1,24 @@
-/*******************************************************************************
- * sdr-trunk
- * Copyright (C) 2014-2018 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.
+ *  * ******************************************************************************
+ *  * Copyright (C) 2014-2020 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/>
+ *  * *****************************************************************************
  *
- * 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.dsp.psk.pll;
 
 import io.github.dsheirer.sample.complex.Complex;
@@ -41,7 +47,7 @@ public class CostasLoop implements IPhaseLockedLoop
     private double mDamping = Math.sqrt(2.0) / 2.0;
     private double mAlphaGain;
     private double mBetaGain;
-    private PLLGain mPLLGain = PLLGain.LEVEL_1;
+    private PLLBandwidth mPLLBandwidth = PLLBandwidth.BW_400;
     private double mSymbolRate;
     private double mSampleRate;
     private IFrequencyErrorProcessor mFrequencyErrorProcessor;
@@ -63,8 +69,7 @@ public class CostasLoop implements IPhaseLockedLoop
     }
 
     /**
-     * Registers the listener to receive the measured frequency error as tracked by the PLL at one
-     * second intervals.
+     * Registers the listener to receive the measured frequency error as tracked by the PLL once per second
      *
      * @param listener to receive frequency error measurement.
      */
@@ -102,22 +107,25 @@ public class CostasLoop implements IPhaseLockedLoop
      */
     private void updateLoopBandwidth()
     {
-        double bandwidth = TWO_PI / mPLLGain.getLoopBandwidth();
+        double bandwidth = TWO_PI / mPLLBandwidth.getLoopBandwidth();
 
         mAlphaGain = (4.0 * mDamping * bandwidth) / (1.0 + (2.0 * mDamping * bandwidth) + (bandwidth * bandwidth));
         mBetaGain = (4.0 * bandwidth * bandwidth) / (1.0 + (2.0 * mDamping * bandwidth) + (bandwidth * bandwidth));
     }
 
     /**
-     * Sets the PLLGain state for this costas loop.  The PLLGain state affects the aggressiveness of the alpha/beta
+     * Sets the PLLBandwidth state for this costas loop.  The bandwidth affects the aggressiveness of the alpha/beta
      * gain values in synchronizing with the signal carrier.
      *
-     * @param PLLGain
+     * @param pllBandwidth
      */
-    public void setPLLGain(PLLGain PLLGain)
+    public void setPLLBandwidth(PLLBandwidth pllBandwidth)
     {
-        mPLLGain = PLLGain;
-        updateLoopBandwidth();
+        if(mPLLBandwidth != pllBandwidth)
+        {
+            mPLLBandwidth = pllBandwidth;
+            updateLoopBandwidth();
+        }
     }
 
     /**
@@ -162,8 +170,7 @@ public class CostasLoop implements IPhaseLockedLoop
     }
 
     /**
-     * Updates the costas loop frequency and phase to adjust for the phase
-     * error value
+     * Updates the costas loop frequency and phase to adjust for the phase error value
      *
      * @param phaseError - (-)= late and (+)= early
      */

src/main/java/io/github/dsheirer/dsp/psk/pll/FrequencyCorrectionSyncMonitor.java

@@ -0,0 +1,110 @@
+/*
+ *
+ *  * ******************************************************************************
+ *  * Copyright (C) 2014-2020 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.dsp.psk.pll;
+
+import io.github.dsheirer.dsp.symbol.ISyncDetectListener;
+import io.github.dsheirer.module.decode.FeedbackDecoder;
+import io.github.dsheirer.source.SourceEvent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Monitors decode sync events to adaptively control frequency correction broadcasts.
+ */
+public class FrequencyCorrectionSyncMonitor implements ISyncDetectListener, IFrequencyErrorProcessor
+{
+    private final static Logger mLog = LoggerFactory.getLogger(FrequencyCorrectionSyncMonitor.class);
+
+    private static final int MAX_SYNC_COUNT = PLLBandwidth.BW_200.getRangeEnd();
+    private FeedbackDecoder mFeedbackDecoder;
+    private CostasLoop mCostasLoop;
+    private int mSyncCount;
+
+    /**
+     * Constructs an adaptive monitor to monitor the sync state of a decoder
+     *
+     * @param costasLoop to receive adaptive gain updates.
+     * @param feedbackDecoder to rebroadcast frequency error source events
+     */
+    public FrequencyCorrectionSyncMonitor(CostasLoop costasLoop, FeedbackDecoder feedbackDecoder)
+    {
+        mCostasLoop = costasLoop;
+        mCostasLoop.setFrequencyErrorProcessor(this);
+        mFeedbackDecoder = feedbackDecoder;
+    }
+
+    /**
+     * Sync detection event.  Updates the running sync count and updates the PLL gain level.
+     */
+    @Override
+    public void syncDetected(int bitErrors)
+    {
+        mSyncCount++;
+        update();
+    }
+
+    /**
+     * Sync loss event.  Updates the running sync count and updates the PLL gain level.
+     */
+    @Override
+    public void syncLost(int bitsProcessed)
+    {
+        mSyncCount -= 2;
+        update();
+    }
+
+    /**
+     * Updates the sync count
+     */
+    private void update()
+    {
+        if(mSyncCount < 0)
+        {
+            mSyncCount = 0;
+            return;
+        }
+
+        if(mSyncCount > MAX_SYNC_COUNT)
+        {
+            mSyncCount = MAX_SYNC_COUNT;
+            return;
+        }
+    }
+
+    /**
+     * Resets the monitor
+     */
+    public void reset()
+    {
+        mSyncCount = 0;
+    }
+
+    @Override
+    public void processFrequencyError(long frequencyError)
+    {
+        //Only rebroadcast the frequency error if the sync count is more than 2
+        if(mSyncCount > 2)
+        {
+            mFeedbackDecoder.broadcast(SourceEvent.frequencyErrorMeasurement(frequencyError));
+        }
+    }
+}

src/main/java/io/github/dsheirer/dsp/psk/pll/PLLBandwidth.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -21,37 +21,45 @@
  */
 package io.github.dsheirer.dsp.psk.pll;
 
+import java.util.Map;
+import java.util.TreeMap;
+
 /**
  * Phase Locked Loop (PLL) tracking bandwidth - controls how fast/slow the PLL tracks the carrier frequency
  */
-public enum PLLGain
+public enum PLLBandwidth
 {
-    //NOTE: static gain level of 200 produced the best results for releases prior to 0.3.4b2
+    //NOTE: static bandwidth of 200 produced the best results for P25P1 releases prior to 0.3.4b2
 
-    LEVEL_0(100.0, 0, 0),
-    LEVEL_1(150.0, 0, 1),
-    LEVEL_2(170.0, 2, 4),
-    LEVEL_3(190.0, 5, 6),
-    LEVEL_4(200.0, 7, 8),
-    LEVEL_5(200.0, 9, 10),
-    LEVEL_6(250.0, 11, 12),
-    LEVEL_7(275.0, 12,13),
-    LEVEL_8(325.0, 14, 15),
-    LEVEL_9(350.0, 16,17),
-    LEVEL_10(375.0, 18, 19),
-    LEVEL_11(400.0, 19,20);
+    BW_400(400.0, 0, 1),
+    BW_300(300.0, 2, 3),
+    BW_250(250.0, 4, 5),
+    BW_200(200.0, 6, 7);
 
     private double mLoopBandwidth;
     private int mRangeStart;
     private int mRangeEnd;
 
-    PLLGain(double loopBandwidth, int start, int end)
+    PLLBandwidth(double loopBandwidth, int start, int end)
     {
         mLoopBandwidth = loopBandwidth;
         mRangeStart = start;
         mRangeEnd = end;
     }
 
+    private static Map<Integer,PLLBandwidth> LOOKUP_MAP = new TreeMap<>();
+
+    static
+    {
+        for(PLLBandwidth pllBandwidth : PLLBandwidth.values())
+        {
+            for(int x = pllBandwidth.getRangeStart(); x <= pllBandwidth.getRangeEnd(); x++)
+            {
+                LOOKUP_MAP.put(x, pllBandwidth);
+            }
+        }
+    }
+
     /**
      * Loop bandwidth setting
      */
@@ -76,27 +84,13 @@ public enum PLLGain
      * @param syncCount 0-10
      * @return PLL gain appropriate for the sync detection value
      */
-    public static PLLGain fromSyncCount(int syncCount)
+    public static PLLBandwidth fromSyncCount(int syncCount)
     {
-        if(syncCount <= LEVEL_1.getRangeEnd())
+        if(LOOKUP_MAP.containsKey(syncCount))
         {
-            return LEVEL_1;
-        }
-        else if(syncCount <= LEVEL_2.getRangeEnd())
-        {
-            return LEVEL_2;
-        }
-        else if(syncCount <= LEVEL_3.getRangeEnd())
-        {
-            return LEVEL_3;
-        }
-        else if(syncCount <= LEVEL_4.getRangeEnd())
-        {
-            return LEVEL_4;
-        }
-        else
-        {
-            return LEVEL_5;
+            return LOOKUP_MAP.get(syncCount);
         }
+
+        return BW_200;
     }
 }

src/main/java/io/github/dsheirer/dsp/psk/pll/QPSKPhaseInversionCalculator.java

@@ -0,0 +1,133 @@
+/*
+ *
+ *  * ******************************************************************************
+ *  * Copyright (C) 2014-2020 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.dsp.psk.pll;
+
+import io.github.dsheirer.dsp.symbol.Dibit;
+
+/**
+ * Utility for calculating phase inverted sync pattern derivatives for QPSK constellations
+ */
+public class QPSKPhaseInversionCalculator
+{
+    public static void main(String[] args)
+    {
+
+        //DMR sync patterns
+//        String[] syncs = {"755FD7DF75F7", "DFF57D75DF5D", "7F7D5DD57DFD", "D5D7F77FD757", "77D55F7DFD77",
+//            "5D577F7757FF", "F7FDD5DDFD55", "7DFFD5F55D5F", "D7557F5FF7F5", "DD7FF5D757DD"};
+
+        //P25 Phase 2 sync pattern
+        String[] syncs = {"575D57F7FF"};
+
+        //P25 Phase 1 sync pattern
+//        String[] syncs = {"5575F5FF77FF"};
+
+
+        for(String sync: syncs)
+        {
+            StringBuilder sbNorm = new StringBuilder();
+            StringBuilder sbP90 = new StringBuilder();
+            StringBuilder sbM90 = new StringBuilder();
+            StringBuilder sb180 = new StringBuilder();
+
+            for(char letter: sync.toCharArray())
+            {
+                int value;
+
+                if(Character.isAlphabetic(letter))
+                {
+                    value = letter - 55;
+                }
+                else
+                {
+                    value = letter - 48;
+                }
+
+                sbNorm.append(letter);
+                sbP90.append(rotate(value, Dibit.Rotation.PLUS90));
+                sbM90.append(rotate(value, Dibit.Rotation.MINUS90));
+                sb180.append(rotate(value, Dibit.Rotation.INVERT));
+            }
+
+            System.out.println("NORMAL: " + sync);
+            System.out.println("   +90: " + sbP90.toString());
+            System.out.println("   -90: " + sbM90.toString());
+            System.out.println("   180: " + sb180.toString());
+        }
+    }
+
+    /**
+     * Converts the hexadecimal value to an integer, decomposes it into high and low order dibits, rotates the dibits
+     * in the specified direction, and recombines the rotated dibits into a 4-bit value, returned as a hex character.
+     * @param value to rotate
+     * @param direction direction
+     * @return rotated hex character
+     */
+    public static String rotate(int value, Dibit.Rotation direction)
+    {
+        try
+        {
+            Dibit dibitHigh = getHighDibit(value);
+            Dibit dibitLow = getLowDibit(value);
+            return getHex(dibitHigh.rotate(direction), dibitLow.rotate(direction));
+        }
+        catch(Exception e)
+        {
+            //ignore
+        }
+
+        return "-";
+    }
+
+    /**
+     * Combines the bit values from the two dibits and converts the integer value to a hex character
+     * @param d1 containing the high order bits
+     * @param d2 containing the low order bits
+     * @return string hex character representing the value of these dibits combined
+     */
+    public static String getHex(Dibit d1, Dibit d2)
+    {
+        int value = d1.getHighValue() + d2.getLowValue();
+        return Integer.toHexString(value).toUpperCase();
+    }
+
+    /**
+     * Calculates the dibit that represents the bits in the 0x8 and 0x4 bit positions of the value
+     * @param value
+     * @return a dibit
+     */
+    public static Dibit getHighDibit(int value)
+    {
+        return Dibit.fromValue((value >> 2) & 3);
+    }
+
+    /**
+     * Calculates the dibit that represents the bits in the 0x2 and 0x1 bit positions of the value
+     * @param value
+     * @return a dibit
+     */
+    public static Dibit getLowDibit(int value)
+    {
+        return Dibit.fromValue(value & 3);
+    }
+}

src/main/java/io/github/dsheirer/dsp/symbol/Dibit.java

@@ -1,3 +1,25 @@
+/*
+ *
+ *  * ******************************************************************************
+ *  * Copyright (C) 2014-2020 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.dsp.symbol;
 
 public enum Dibit
@@ -133,6 +155,89 @@ public enum Dibit
         return Dibit.D00_PLUS_1;
     }
 
+    public static enum Rotation {PLUS90, MINUS90, INVERT}
+
+    /**
+     * Returns the value of this dibit if the symbol were rotated in the direction indicated.
+     *
+     * This can be used for calculating phase rotation and phase inversion pattern derivatives from a normal sync pattern
+     * @param rotation to apply to this dibit
+     * @return rotated version of this dibit
+     */
+    public Dibit rotate(Rotation rotation)
+    {
+        switch(this)
+        {
+            case D00_PLUS_1:
+                switch(rotation)
+                {
+                    case PLUS90:
+                        return Dibit.D01_PLUS_3;
+                    case MINUS90:
+                        return Dibit.D10_MINUS_1;
+                    case INVERT:
+                        return Dibit.D11_MINUS_3;
+                }
+                break;
+            case D01_PLUS_3:
+                switch(rotation)
+                {
+                    case PLUS90:
+                        return Dibit.D11_MINUS_3;
+                    case MINUS90:
+                        return Dibit.D00_PLUS_1;
+                    case INVERT:
+                        return Dibit.D10_MINUS_1;
+                }
+                break;
+            case D10_MINUS_1:
+                switch(rotation)
+                {
+                    case PLUS90:
+                        return Dibit.D00_PLUS_1;
+                    case MINUS90:
+                        return Dibit.D11_MINUS_3;
+                    case INVERT:
+                        return Dibit.D01_PLUS_3;
+                }
+                break;
+            case D11_MINUS_3:
+                switch(rotation)
+                {
+                    case PLUS90:
+                        return Dibit.D10_MINUS_1;
+                    case MINUS90:
+                        return Dibit.D01_PLUS_3;
+                    case INVERT:
+                        return Dibit.D00_PLUS_1;
+                }
+        }
+
+        //We should never reach this point
+        return Dibit.D00_PLUS_1;
+    }
+
+    /**
+     * Returns the dibit that corresponds to the value
+     * @param value 0-3
+     * @return representative dibit or Dibit.00 if the value is outside of the range 0-3
+     */
+    public static Dibit fromValue(int value)
+    {
+        switch(value)
+        {
+            case 0:
+            default:
+                return Dibit.D00_PLUS_1;
+            case 1:
+                return Dibit.D01_PLUS_3;
+            case 2:
+                return Dibit.D10_MINUS_1;
+            case 3:
+                return Dibit.D11_MINUS_3;
+        }
+    }
+
     public static void main(String[] args)
     {
         byte a = (byte)0x1B;

src/main/java/io/github/dsheirer/dsp/symbol/FrameSync.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -29,7 +29,10 @@ public enum FrameSync
 	P25_PHASE1_ERROR_90_CW(  0x001050551155l ),
 	P25_PHASE1_ERROR_180(    0xAA8A0A008800l ),
 
-	P25_PHASE2_NORMAL(0x575D57F7FFl);
+	P25_PHASE2_NORMAL(      0x575D57F7FFl),
+	P25_PHASE2_ERROR_90_CCW(0xFEFBFEAEAAl),
+	P25_PHASE2_ERROR_90_CW( 0x0104015155l),
+	P25_PHASE2_ERROR_180(   0xA8A2A80800l);
 	
 	private long mSync;
 	

src/main/java/io/github/dsheirer/dsp/symbol/ISyncDetectListener.java

@@ -1,18 +1,24 @@
-/*******************************************************************************
- * sdr-trunk
- * Copyright (C) 2014-2018 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.
+ *  * ******************************************************************************
+ *  * Copyright (C) 2014-2020 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/>
+ *  * *****************************************************************************
  *
- * 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.dsp.symbol;
 
 /**
@@ -31,6 +37,8 @@ public interface ISyncDetectListener
 
     /**
      * Indicates that sync has been lost
+     *
+     * @param bitsProcessed number of bits that were processed without a sync detection
      */
-    void syncLost();
+    void syncLost(int bitsProcessed);
 }

src/main/java/io/github/dsheirer/gui/SDRTrunk.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -178,7 +178,7 @@ public class SDRTrunk implements Listener<TunerEvent>
 
         ChannelMapModel channelMapModel = new ChannelMapModel();
 
-        EventLogManager eventLogManager = new EventLogManager(mUserPreferences);
+        EventLogManager eventLogManager = new EventLogManager(aliasModel, mUserPreferences);
 
         RecorderManager recorderManager = new RecorderManager(aliasModel, mUserPreferences);
 
@@ -474,7 +474,6 @@ public class SDRTrunk implements Listener<TunerEvent>
         mAudioPacketManager.stop();
         mLog.info("Stopping spectral display ...");
         mSpectralPanel.clearTuner();
-        mLog.info("Releasing tuners ...");
         mSourceManager.shutdown();
         mLog.info("Shutdown complete.");
         mApplicationLog.stop();

src/main/java/io/github/dsheirer/gui/instrument/decoder/LJ1200Pane.java

@@ -1,18 +1,24 @@
-/*******************************************************************************
- * sdr-trunk
- * Copyright (C) 2014-2018 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.
+ *  * ******************************************************************************
+ *  * Copyright (C) 2014-2020 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/>
+ *  * *****************************************************************************
  *
- * 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.gui.instrument.decoder;
 
 import io.github.dsheirer.dsp.symbol.ISyncDetectListener;
@@ -46,7 +52,7 @@ public class LJ1200Pane extends AbstractAFSK1200Pane
                 }
 
                 @Override
-                public void syncLost()
+                public void syncLost(int bitsProcessed)
                 {
                     //no-op
                 }
@@ -60,7 +66,7 @@ public class LJ1200Pane extends AbstractAFSK1200Pane
                 }
 
                 @Override
-                public void syncLost()
+                public void syncLost(int bitsProcessed)
                 {
                     //no-op
                 }

src/main/java/io/github/dsheirer/gui/instrument/decoder/MDC1200Pane.java

@@ -1,18 +1,24 @@
-/*******************************************************************************
- * sdr-trunk
- * Copyright (C) 2014-2018 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.
+ *  * ******************************************************************************
+ *  * Copyright (C) 2014-2020 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/>
+ *  * *****************************************************************************
  *
- * 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.gui.instrument.decoder;
 
 import io.github.dsheirer.dsp.symbol.ISyncDetectListener;
@@ -46,7 +52,7 @@ public class MDC1200Pane extends AbstractAFSK1200Pane
                 }
 
                 @Override
-                public void syncLost()
+                public void syncLost(int bitsProcessed)
                 {
                     mLog.debug("Sync Lost!");
                 }

src/main/java/io/github/dsheirer/gui/instrument/decoder/MPT1327Pane.java

@@ -1,18 +1,24 @@
-/*******************************************************************************
- * sdr-trunk
- * Copyright (C) 2014-2018 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.
+ *  * ******************************************************************************
+ *  * Copyright (C) 2014-2020 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/>
+ *  * *****************************************************************************
  *
- * 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.gui.instrument.decoder;
 
 import io.github.dsheirer.dsp.symbol.ISyncDetectListener;
@@ -46,7 +52,7 @@ public class MPT1327Pane extends AbstractAFSK1200Pane
                 }
 
                 @Override
-                public void syncLost()
+                public void syncLost(int bitsProcessed)
                 {
                     //no-op
                 }
@@ -60,7 +66,7 @@ public class MPT1327Pane extends AbstractAFSK1200Pane
                 }
 
                 @Override
-                public void syncLost()
+                public void syncLost(int bitsProcessed)
                 {
                     //no-op
                 }

src/main/java/io/github/dsheirer/gui/instrument/decoder/Tait1200Pane.java

@@ -1,18 +1,24 @@
-/*******************************************************************************
- * sdr-trunk
- * Copyright (C) 2014-2018 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.
+ *  * ******************************************************************************
+ *  * Copyright (C) 2014-2020 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/>
+ *  * *****************************************************************************
  *
- * 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.gui.instrument.decoder;
 
 import io.github.dsheirer.dsp.symbol.ISyncDetectListener;
@@ -46,7 +52,7 @@ public class Tait1200Pane extends AbstractAFSK1200Pane
                 }
 
                 @Override
-                public void syncLost()
+                public void syncLost(int bitsProcessed)
                 {
 
                 }
@@ -60,7 +66,7 @@ public class Tait1200Pane extends AbstractAFSK1200Pane
                 }
 
                 @Override
-                public void syncLost()
+                public void syncLost(int bitsProcessed)
                 {
 
                 }

src/main/java/io/github/dsheirer/icon/Icon.java

@@ -81,7 +81,7 @@ public class Icon implements Comparable<Icon>
         {
             try
             {
-                if(mPath.startsWith("/"))
+                if(!mPath.startsWith("images"))
                 {
                     mImageIcon = new ImageIcon(mPath);
                 }

src/main/java/io/github/dsheirer/module/ProcessingChain.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -115,14 +115,12 @@ public class ProcessingChain implements Listener<ChannelEvent>
     private Broadcaster<SourceEvent> mSourceEventBroadcaster = new Broadcaster<>();
     private Broadcaster<IMessage> mMessageBroadcaster = new Broadcaster<>();
     private Broadcaster<SquelchStateEvent> mSquelchStateEventBroadcaster = new Broadcaster<>();
-
     private AtomicBoolean mRunning = new AtomicBoolean();
-
-    protected Source mSource;
     private List<Module> mModules = new ArrayList<>();
     private DecodeEventModel mDecodeEventModel;
     private AbstractChannelState mChannelState;
     private MessageActivityModel mMessageActivityModel;
+    protected Source mSource;
 
     /**
      * Creates a processing chain for managing a set of modules
@@ -208,6 +206,14 @@ public class ProcessingChain implements Listener<ChannelEvent>
         return mSource != null;
     }
 
+    /**
+     * Indicates if this chain's source is the same as the source argument
+     */
+    public boolean hasSource(Source source)
+    {
+        return mSource != null && mSource.equals(source);
+    }
+
     /**
      * Applies a sample source to this processing chain.  Processing won't
      * start until the start() method is invoked.
@@ -800,6 +806,14 @@ public class ProcessingChain implements Listener<ChannelEvent>
         }
     }
 
+    /**
+     * Adds a listener to receive source events from this processing chain
+     */
+    public void addSourceEventListener(Listener<SourceEvent> listener)
+    {
+        mSourceEventBroadcaster.addListener(listener);
+    }
+
     /**
      * Removes the listener from receiving decoded messages from all decoders.
      */

src/main/java/io/github/dsheirer/module/decode/FeedbackDecoder.java

@@ -0,0 +1,65 @@
+/*
+ *
+ *  * ******************************************************************************
+ *  * Copyright (C) 2014-2020 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.module.decode;
+
+import io.github.dsheirer.sample.Listener;
+import io.github.dsheirer.source.ISourceEventProvider;
+import io.github.dsheirer.source.SourceEvent;
+
+/**
+ * Decoder that provides feedback to signal source(s) via SourceEvent broadcasts and supports registering source
+ * event listeners.
+ */
+public abstract class FeedbackDecoder extends Decoder implements ISourceEventProvider
+{
+    private Listener<SourceEvent> mSourceEventListener;
+
+    /**
+     * Registers the listener to receive source events from this decoder
+     */
+    @Override
+    public void setSourceEventListener(Listener<SourceEvent> listener)
+    {
+        mSourceEventListener = listener;
+    }
+
+    /**
+     * Deregisters the listener from receiving source events from this decoder.
+     */
+    @Override
+    public void removeSourceEventListener()
+    {
+        mSourceEventListener = null;
+    }
+
+    /**
+     * Broadcasts the specified source event to the optional registered source event listener
+     */
+    public void broadcast(SourceEvent sourceEvent)
+    {
+        if(mSourceEventListener != null)
+        {
+            mSourceEventListener.receive(sourceEvent);
+        }
+    }
+}

src/main/java/io/github/dsheirer/module/decode/p25/identifier/channel/P25ExplicitChannel.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -55,7 +55,8 @@ public class P25ExplicitChannel extends P25Channel implements Comparable<P25Chan
     {
         if(mUplinkFrequencyBand != null)
         {
-            return mUplinkFrequencyBand.getUplinkFrequency(getUplinkChannelNumber());
+            //Note: we explicitly use the downlink frequency from the uplink channel frequency band here
+            return mUplinkFrequencyBand.getDownlinkFrequency(getUplinkChannelNumber());
         }
 
         return 0;

src/main/java/io/github/dsheirer/module/decode/p25/identifier/radio/APCO25RadioIdentifier.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -29,9 +29,9 @@ import io.github.dsheirer.protocol.Protocol;
 /**
  * APCO-25 Radio Identifier
  */
-public class APCO25Radio extends RadioIdentifier
+public class APCO25RadioIdentifier extends RadioIdentifier
 {
-    public APCO25Radio(Integer value, Role role)
+    public APCO25RadioIdentifier(Integer value, Role role)
     {
         super(value, role);
     }
@@ -47,7 +47,7 @@ public class APCO25Radio extends RadioIdentifier
      */
     public static RadioIdentifier createTo(int radioId)
     {
-        return new APCO25Radio(radioId, Role.TO);
+        return new APCO25RadioIdentifier(radioId, Role.TO);
     }
 
     /**
@@ -55,7 +55,7 @@ public class APCO25Radio extends RadioIdentifier
      */
     public static RadioIdentifier createFrom(int radioId)
     {
-        return new APCO25Radio(radioId, Role.FROM);
+        return new APCO25RadioIdentifier(radioId, Role.FROM);
     }
 
     /**
@@ -63,6 +63,6 @@ public class APCO25Radio extends RadioIdentifier
      */
     public static RadioIdentifier createAny(int radioId)
     {
-        return new APCO25Radio(radioId, Role.ANY);
+        return new APCO25RadioIdentifier(radioId, Role.ANY);
     }
 }

src/main/java/io/github/dsheirer/module/decode/p25/phase1/P25P1DataUnitDetector.java

@@ -1,21 +1,23 @@
 /*
- * ******************************************************************************
- * sdrtrunk
- * Copyright (C) 2014-2019 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.
+ *  * ******************************************************************************
+ *  * Copyright (C) 2014-2020 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/>
+ *  * *****************************************************************************
  *
- * 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.module.decode.p25.phase1;
 
@@ -72,9 +74,9 @@ public class P25P1DataUnitDetector implements Listener<Dibit>, ISyncDetectListen
     }
 
     @Override
-    public void syncLost()
+    public void syncLost(int bitsProcessed)
     {
-        dispatchSyncLoss(0);
+        dispatchSyncLoss(bitsProcessed);
     }
 
     private void dispatchSyncLoss(int bitsProcessed)

src/main/java/io/github/dsheirer/module/decode/p25/phase1/P25P1Decoder.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -23,8 +23,8 @@ package io.github.dsheirer.module.decode.p25.phase1;
 
 import io.github.dsheirer.dsp.symbol.Dibit;
 import io.github.dsheirer.dsp.symbol.DibitToByteBufferAssembler;
-import io.github.dsheirer.module.decode.Decoder;
 import io.github.dsheirer.module.decode.DecoderType;
+import io.github.dsheirer.module.decode.FeedbackDecoder;
 import io.github.dsheirer.sample.Broadcaster;
 import io.github.dsheirer.sample.Listener;
 import io.github.dsheirer.sample.buffer.IReusableByteBufferProvider;
@@ -32,10 +32,9 @@ import io.github.dsheirer.sample.buffer.IReusableComplexBufferListener;
 import io.github.dsheirer.sample.buffer.ReusableByteBuffer;
 import io.github.dsheirer.sample.buffer.ReusableComplexBuffer;
 import io.github.dsheirer.source.ISourceEventListener;
-import io.github.dsheirer.source.ISourceEventProvider;
 import io.github.dsheirer.source.SourceEvent;
 
-public abstract class P25P1Decoder extends Decoder implements ISourceEventListener, ISourceEventProvider,
+public abstract class P25P1Decoder extends FeedbackDecoder implements ISourceEventListener,
     IReusableComplexBufferListener, Listener<ReusableComplexBuffer>, IReusableByteBufferProvider
 {
     private double mSampleRate;
@@ -131,24 +130,6 @@ public abstract class P25P1Decoder extends Decoder implements ISourceEventListen
         mMessageProcessor = null;
     }
 
-    /**
-     * Sets the source event listener to receive source events from this decoder.
-     */
-    @Override
-    public void setSourceEventListener(Listener<SourceEvent> listener)
-    {
-        mSourceEventListener = listener;
-    }
-
-    /**
-     * Removes a registered source event listener from receiving source events from this decoder
-     */
-    @Override
-    public void removeSourceEventListener()
-    {
-        mSourceEventListener = null;
-    }
-
     @Override
     public Listener<SourceEvent> getSourceEventListener()
     {
@@ -168,19 +149,6 @@ public abstract class P25P1Decoder extends Decoder implements ISourceEventListen
      */
     protected abstract void process(SourceEvent sourceEvent);
 
-    /**
-     * Broadcasts the source event to an optional registered listener.  This method should primarily be used to
-     * issue frequency correction requests to the channel source.
-     * @param sourceEvent to broadcast
-     */
-    public void broadcast(SourceEvent sourceEvent)
-    {
-        if(mSourceEventListener != null)
-        {
-            mSourceEventListener.receive(sourceEvent);
-        }
-    }
-
     /**
      * Listener interface to receive reusable complex buffers
      */

src/main/java/io/github/dsheirer/module/decode/p25/phase1/P25P1DecoderC4FM.java

@@ -1,21 +1,23 @@
 /*
- * ******************************************************************************
- * sdrtrunk
- * Copyright (C) 2014-2019 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.
+ *  * ******************************************************************************
+ *  * Copyright (C) 2014-2020 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/>
+ *  * *****************************************************************************
  *
- * 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.module.decode.p25.phase1;
 
@@ -26,8 +28,9 @@ import io.github.dsheirer.dsp.filter.fir.complex.ComplexFIRFilter2;
 import io.github.dsheirer.dsp.gain.ComplexFeedForwardGainControl;
 import io.github.dsheirer.dsp.psk.DQPSKDecisionDirectedDemodulator;
 import io.github.dsheirer.dsp.psk.InterpolatingSampleBuffer;
-import io.github.dsheirer.dsp.psk.pll.AdaptivePLLGainMonitor;
 import io.github.dsheirer.dsp.psk.pll.CostasLoop;
+import io.github.dsheirer.dsp.psk.pll.FrequencyCorrectionSyncMonitor;
+import io.github.dsheirer.dsp.psk.pll.PLLBandwidth;
 import io.github.dsheirer.module.decode.DecoderType;
 import io.github.dsheirer.sample.buffer.ReusableComplexBuffer;
 import io.github.dsheirer.source.SourceEvent;
@@ -45,7 +48,7 @@ public class P25P1DecoderC4FM extends P25P1Decoder
     protected InterpolatingSampleBuffer mInterpolatingSampleBuffer;
     protected DQPSKDecisionDirectedDemodulator mQPSKDemodulator;
     protected CostasLoop mCostasLoop;
-    protected AdaptivePLLGainMonitor mPLLGainMonitor;
+    protected FrequencyCorrectionSyncMonitor mFrequencyCorrectionSyncMonitor;
     protected P25P1MessageFramer mMessageFramer;
     private ComplexFeedForwardGainControl mAGC = new ComplexFeedForwardGainControl(32);
     private Map<Double,float[]> mBasebandFilters = new HashMap<>();
@@ -68,7 +71,8 @@ public class P25P1DecoderC4FM extends P25P1Decoder
         mBasebandFilter = new ComplexFIRFilter2(getBasebandFilter());
 
         mCostasLoop = new CostasLoop(getSampleRate(), getSymbolRate());
-        mPLLGainMonitor = new AdaptivePLLGainMonitor(mCostasLoop, this);
+        mCostasLoop.setPLLBandwidth(PLLBandwidth.BW_300);
+        mFrequencyCorrectionSyncMonitor = new FrequencyCorrectionSyncMonitor(mCostasLoop, this);
         mInterpolatingSampleBuffer = new InterpolatingSampleBuffer(getSamplesPerSymbol(), SAMPLE_COUNTER_GAIN);
 
         mQPSKDemodulator = new DQPSKDecisionDirectedDemodulator(mCostasLoop, mInterpolatingSampleBuffer);
@@ -81,7 +85,7 @@ public class P25P1DecoderC4FM extends P25P1Decoder
         //The Costas Loop receives symbol-inversion correction requests when detected.
         //The PLL gain monitor receives sync detect/loss signals from the message framer
         mMessageFramer = new P25P1MessageFramer(mCostasLoop, DecoderType.P25_PHASE1.getProtocol().getBitRate());
-        mMessageFramer.setSyncDetectListener(mPLLGainMonitor);
+        mMessageFramer.setSyncDetectListener(mFrequencyCorrectionSyncMonitor);
         mMessageFramer.setListener(getMessageProcessor());
         mMessageFramer.setSampleRate(sampleRate);
 
@@ -202,6 +206,6 @@ public class P25P1DecoderC4FM extends P25P1Decoder
     public void reset()
     {
         mCostasLoop.reset();
-        mPLLGainMonitor.reset();
+        mFrequencyCorrectionSyncMonitor.reset();
     }
 }

src/main/java/io/github/dsheirer/module/decode/p25/phase1/P25P1DecoderLSM.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -27,8 +27,9 @@ import io.github.dsheirer.dsp.filter.fir.complex.ComplexFIRFilter2;
 import io.github.dsheirer.dsp.gain.ComplexFeedForwardGainControl;
 import io.github.dsheirer.dsp.psk.DQPSKGardnerDemodulator;
 import io.github.dsheirer.dsp.psk.InterpolatingSampleBuffer;
-import io.github.dsheirer.dsp.psk.pll.AdaptivePLLGainMonitor;
 import io.github.dsheirer.dsp.psk.pll.CostasLoop;
+import io.github.dsheirer.dsp.psk.pll.FrequencyCorrectionSyncMonitor;
+import io.github.dsheirer.dsp.psk.pll.PLLBandwidth;
 import io.github.dsheirer.module.decode.DecoderType;
 import io.github.dsheirer.protocol.Protocol;
 import io.github.dsheirer.record.binary.BinaryRecorder;
@@ -56,8 +57,8 @@ public class P25P1DecoderLSM extends P25P1Decoder
     protected DQPSKGardnerDemodulator mQPSKDemodulator;
     protected P25P1MessageFramer mMessageFramer;
     protected CostasLoop mCostasLoop;
-    protected AdaptivePLLGainMonitor mPLLGainMonitor;
     protected InterpolatingSampleBuffer mInterpolatingSampleBuffer;
+    protected FrequencyCorrectionSyncMonitor mFrequencyCorrectionSyncMonitor;
 
     /**
      * P25 Phase 1 - linear simulcast modulation (LSM) decoder.  Uses Differential QPSK decoding with a Costas PLL and
@@ -81,7 +82,8 @@ public class P25P1DecoderLSM extends P25P1Decoder
         mBasebandFilter = new ComplexFIRFilter2(getBasebandFilter());
 
         mCostasLoop = new CostasLoop(getSampleRate(), getSymbolRate());
-        mPLLGainMonitor = new AdaptivePLLGainMonitor(mCostasLoop, this);
+        mCostasLoop.setPLLBandwidth(PLLBandwidth.BW_200);
+        mFrequencyCorrectionSyncMonitor = new FrequencyCorrectionSyncMonitor(mCostasLoop, this);
 
         mInterpolatingSampleBuffer = new InterpolatingSampleBuffer(getSamplesPerSymbol(), SAMPLE_COUNTER_GAIN);
 
@@ -95,7 +97,7 @@ public class P25P1DecoderLSM extends P25P1Decoder
         }
 
         mMessageFramer = new P25P1MessageFramer(mCostasLoop, DecoderType.P25_PHASE1.getProtocol().getBitRate());
-        mMessageFramer.setSyncDetectListener(mPLLGainMonitor);
+        mMessageFramer.setSyncDetectListener(mFrequencyCorrectionSyncMonitor);
         mMessageFramer.setListener(getMessageProcessor());
         mMessageFramer.setSampleRate(sampleRate);
         mQPSKDemodulator.setSymbolListener(getDibitBroadcaster());
@@ -163,7 +165,7 @@ public class P25P1DecoderLSM extends P25P1Decoder
     public void reset()
     {
         mCostasLoop.reset();
-        mPLLGainMonitor.reset();
+        mFrequencyCorrectionSyncMonitor.reset();
     }
 
     public void dispose()

src/main/java/io/github/dsheirer/module/decode/p25/phase1/P25P1DecoderState.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -1357,7 +1357,7 @@ public class P25P1DecoderState extends DecoderState implements IChannelEventList
                 //Network Configuration Messages
                 case MOTOROLA_OSP_TRAFFIC_CHANNEL_ID:
                 case MOTOROLA_OSP_SYSTEM_LOADING:
-                case MOTOROLA_OSP_CONTROL_CHANNEL_ID:
+                case MOTOROLA_OSP_BASE_STATION_ID:
                 case MOTOROLA_OSP_CONTROL_CHANNEL_PLANNED_SHUTDOWN:
                 case OSP_IDENTIFIER_UPDATE_TDMA:
                 case OSP_IDENTIFIER_UPDATE_VHF_UHF_BANDS:

src/main/java/io/github/dsheirer/module/decode/p25/phase1/P25P1MessageFramer.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -416,7 +416,7 @@ public class P25P1MessageFramer implements Listener<Dibit>, IP25P1DataUnitDetect
 
         if(mSyncDetectListener != null)
         {
-            mSyncDetectListener.syncLost();
+            mSyncDetectListener.syncLost(bitsProcessed);
         }
     }
 

src/main/java/io/github/dsheirer/module/decode/p25/phase1/P25P1NetworkConfigurationMonitor.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -23,6 +23,7 @@
 package io.github.dsheirer.module.decode.p25.phase1;
 
 import io.github.dsheirer.channel.IChannelDescriptor;
+import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.module.decode.p25.phase1.message.IFrequencyBand;
 import io.github.dsheirer.module.decode.p25.phase1.message.lc.LinkControlWord;
 import io.github.dsheirer.module.decode.p25.phase1.message.lc.standard.LCAdjacentSiteStatusBroadcast;
@@ -39,6 +40,7 @@ import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.osp.AMBTCAd
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.osp.AMBTCNetworkStatusBroadcast;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.osp.AMBTCRFSSStatusBroadcast;
 import io.github.dsheirer.module.decode.p25.phase1.message.tsbk.TSBKMessage;
+import io.github.dsheirer.module.decode.p25.phase1.message.tsbk.motorola.osp.MotorolaBaseStationId;
 import io.github.dsheirer.module.decode.p25.phase1.message.tsbk.standard.osp.AdjacentStatusBroadcast;
 import io.github.dsheirer.module.decode.p25.phase1.message.tsbk.standard.osp.NetworkStatusBroadcast;
 import io.github.dsheirer.module.decode.p25.phase1.message.tsbk.standard.osp.RFSSStatusBroadcast;
@@ -95,6 +97,8 @@ public class P25P1NetworkConfigurationMonitor
     private Map<Integer,LCAdjacentSiteStatusBroadcastExplicit> mLCNeighborSitesExplicit = new HashMap<>();
     private Map<Integer,AdjacentStatusBroadcast> mTSBKNeighborSites = new HashMap<>();
 
+    private MotorolaBaseStationId mMotorolaBaseStationId;
+
     private P25P1Decoder.Modulation mModulation;
 
     /**
@@ -173,6 +177,12 @@ public class P25P1NetworkConfigurationMonitor
                     mSNDCPDataChannel = (SNDCPDataChannelAnnouncementExplicit)tsbk;
                 }
                 break;
+            case MOTOROLA_OSP_BASE_STATION_ID:
+                if(tsbk instanceof MotorolaBaseStationId)
+                {
+                    mMotorolaBaseStationId = (MotorolaBaseStationId)tsbk;
+                }
+                break;
         }
     }
 
@@ -314,6 +324,31 @@ public class P25P1NetworkConfigurationMonitor
         mTSBKNeighborSites.clear();
     }
 
+    /**
+     * Formats the identifier with an appended hexadecimal value when the identifier is an integer
+     * @param identifier to format
+     * @param width of the hex value with zero pre-padding
+     * @return formatted identifier
+     */
+    private String format(Identifier identifier, int width)
+    {
+        if(identifier.getValue() instanceof Integer)
+        {
+            String hex = Integer.toHexString((Integer)identifier.getValue());
+
+            while(hex.length() < width)
+            {
+                hex = "0" + hex;
+            }
+
+            return hex.toUpperCase() + "[" + identifier.getValue() + "]";
+        }
+        else
+        {
+            return identifier.toString();
+        }
+    }
+
     public String getActivitySummary()
     {
         StringBuilder sb = new StringBuilder();
@@ -323,26 +358,26 @@ public class P25P1NetworkConfigurationMonitor
         sb.append("\n\nNetwork\n");
         if(mTSBKNetworkStatusBroadcast != null)
         {
-            sb.append("  NAC:").append(mTSBKNetworkStatusBroadcast.getNAC());
-            sb.append(" WACN:").append(mTSBKNetworkStatusBroadcast.getWacn());
-            sb.append(" SYSTEM:").append(mTSBKNetworkStatusBroadcast.getSystem());
-            sb.append(" LRA:").append(mTSBKNetworkStatusBroadcast.getLocationRegistrationArea());
+            sb.append("  WACN:").append(format(mTSBKNetworkStatusBroadcast.getWacn(), 5));
+            sb.append(" SYSTEM:").append(format(mTSBKNetworkStatusBroadcast.getSystem(), 3));
+            sb.append(" NAC:").append(format(mTSBKNetworkStatusBroadcast.getNAC(), 3));
+            sb.append(" LRA:").append(format(mTSBKNetworkStatusBroadcast.getLocationRegistrationArea(), 2));
         }
         else if(mAMBTCNetworkStatusBroadcast != null)
         {
-            sb.append("  NAC:").append(mAMBTCNetworkStatusBroadcast.getNAC());
-            sb.append(" WACN:").append(mAMBTCNetworkStatusBroadcast.getWacn());
-            sb.append(" SYSTEM:").append(mAMBTCNetworkStatusBroadcast.getSystem());
+            sb.append("  WACN:").append(format(mAMBTCNetworkStatusBroadcast.getWacn(), 5));
+            sb.append(" SYSTEM:").append(format(mAMBTCNetworkStatusBroadcast.getSystem(), 3));
+            sb.append(" NAC:").append(format(mAMBTCNetworkStatusBroadcast.getNAC(), 3));
         }
         else if(mLCNetworkStatusBroadcast != null)
         {
-            sb.append("  WACN:").append(mLCNetworkStatusBroadcast.getWACN());
-            sb.append(" SYSTEM:").append(mLCNetworkStatusBroadcast.getSystem());
+            sb.append("  WACN:").append(format(mLCNetworkStatusBroadcast.getWACN(), 5));
+            sb.append(" SYSTEM:").append(format(mLCNetworkStatusBroadcast.getSystem(), 3));
         }
         else if(mLCNetworkStatusBroadcastExplicit != null)
         {
-            sb.append("  WACN:").append(mLCNetworkStatusBroadcastExplicit.getWACN());
-            sb.append(" SYSTEM:").append(mLCNetworkStatusBroadcastExplicit.getSystem());
+            sb.append("  WACN:").append(format(mLCNetworkStatusBroadcastExplicit.getWACN(), 5));
+            sb.append(" SYSTEM:").append(format(mLCNetworkStatusBroadcastExplicit.getSystem(), 3));
         }
         else
         {
@@ -350,12 +385,14 @@ public class P25P1NetworkConfigurationMonitor
         }
 
         sb.append("\n\nCurrent Site\n");
+
         if(mTSBKRFSSStatusBroadcast != null)
         {
-            sb.append("  SYSTEM:").append(mTSBKRFSSStatusBroadcast.getSystem());
-            sb.append(" SITE:").append(mTSBKRFSSStatusBroadcast.getSite());
-            sb.append(" RF SUBSYSTEM:").append(mTSBKRFSSStatusBroadcast.getRfss());
-            sb.append(" LOCATION REGISTRATION AREA:").append(mTSBKRFSSStatusBroadcast.getLocationRegistrationArea());
+            sb.append("  SYSTEM:").append(format(mTSBKRFSSStatusBroadcast.getSystem(), 3));
+            sb.append(" NAC:").append(format(mTSBKRFSSStatusBroadcast.getNAC(), 3));
+            sb.append(" RFSS:").append(format(mTSBKRFSSStatusBroadcast.getRfss(), 2));
+            sb.append(" SITE:").append(format(mTSBKRFSSStatusBroadcast.getSite(), 2));
+            sb.append(" LRA:").append(format(mTSBKRFSSStatusBroadcast.getLocationRegistrationArea(), 2));
             sb.append("  STATUS:").append(mTSBKRFSSStatusBroadcast.isActiveNetworkConnectionToRfssControllerSite() ?
                 "ACTIVE RFSS NETWORK CONNECTION\n" : "\n");
             sb.append("  PRI CONTROL CHANNEL:").append(mTSBKRFSSStatusBroadcast.getChannel());
@@ -364,29 +401,30 @@ public class P25P1NetworkConfigurationMonitor
         }
         else if(mLCRFSSStatusBroadcast != null)
         {
-            sb.append("  SYSTEM:").append(mLCRFSSStatusBroadcast.getSystem());
-            sb.append(" SITE:").append(mLCRFSSStatusBroadcast.getSite());
-            sb.append(" RF SUBSYSTEM:").append(mLCRFSSStatusBroadcast.getRfss());
-            sb.append(" LOCATION REGISTRATION AREA:").append(mLCRFSSStatusBroadcast.getLocationRegistrationArea()).append("\n");
+            sb.append("  SYSTEM:").append(format(mLCRFSSStatusBroadcast.getSystem(), 3));
+            sb.append(" RFSS:").append(format(mLCRFSSStatusBroadcast.getRfss(), 2));
+            sb.append(" SITE:").append(format(mLCRFSSStatusBroadcast.getSite(), 2));
+            sb.append(" LRA:").append(format(mLCRFSSStatusBroadcast.getLocationRegistrationArea(), 2)).append("\n");
             sb.append("  PRI CONTROL CHANNEL:").append(mLCRFSSStatusBroadcast.getChannel());
             sb.append(" DOWNLINK:").append(mLCRFSSStatusBroadcast.getChannel().getDownlinkFrequency());
             sb.append(" UPLINK:").append(mLCRFSSStatusBroadcast.getChannel().getUplinkFrequency()).append("\n");
         }
         else if(mLCRFSSStatusBroadcastExplicit != null)
         {
-            sb.append("  SITE:").append(mLCRFSSStatusBroadcastExplicit.getSite());
-            sb.append(" RF SUBSYSTEM:").append(mLCRFSSStatusBroadcastExplicit.getRfss());
-            sb.append(" LOCATION REGISTRATION AREA:").append(mLCRFSSStatusBroadcastExplicit.getLocationRegistrationArea()).append("\n");
+            sb.append("  RFSS:").append(mLCRFSSStatusBroadcastExplicit.getRfss());
+            sb.append(" SITE:").append(format(mLCRFSSStatusBroadcastExplicit.getSite(), 2));
+            sb.append(" LRA:").append(format(mLCRFSSStatusBroadcastExplicit.getLocationRegistrationArea(), 2)).append("\n");
             sb.append("  PRI CONTROL CHANNEL:").append(mLCRFSSStatusBroadcastExplicit.getChannel());
             sb.append(" DOWNLINK:").append(mLCRFSSStatusBroadcastExplicit.getChannel().getDownlinkFrequency());
             sb.append(" UPLINK:").append(mLCRFSSStatusBroadcastExplicit.getChannel().getUplinkFrequency()).append("\n");
         }
         else if(mAMBTCRFSSStatusBroadcast != null)
         {
-            sb.append("  SYSTEM:").append(mAMBTCRFSSStatusBroadcast.getSystem());
-            sb.append(" SITE:").append(mAMBTCRFSSStatusBroadcast.getSite());
-            sb.append(" RF SUBSYSTEM:").append(mAMBTCRFSSStatusBroadcast.getRFSS());
-            sb.append(" LOCATION REGISTRATION AREA:").append(mAMBTCRFSSStatusBroadcast.getLRA());
+            sb.append("  SYSTEM:").append(format(mAMBTCRFSSStatusBroadcast.getSystem(), 3));
+            sb.append(" NAC:").append(format(mAMBTCRFSSStatusBroadcast.getNAC(), 3));
+            sb.append(" RFSS:").append(format(mAMBTCRFSSStatusBroadcast.getRFSS(), 2));
+            sb.append(" SITE:").append(format(mAMBTCRFSSStatusBroadcast.getSite(), 2));
+            sb.append(" LRA:").append(format(mAMBTCRFSSStatusBroadcast.getLRA(), 2));
             sb.append("  STATUS:").append(mAMBTCRFSSStatusBroadcast.isActiveNetworkConnectionToRfssControllerSite() ?
                 "ACTIVE RFSS NETWORK CONNECTION\n" : "\n");
             sb.append("  PRI CONTROL CHANNEL:").append(mAMBTCRFSSStatusBroadcast.getChannel());
@@ -423,6 +461,11 @@ public class P25P1NetworkConfigurationMonitor
             sb.append(" UPLINK:").append(mSNDCPDataChannel.getChannel().getUplinkFrequency()).append("\n");
         }
 
+        if(mMotorolaBaseStationId != null)
+        {
+            sb.append("  STATION ID/LICENSE: " + mMotorolaBaseStationId.getCWID()).append("\n");
+        }
+
         if(mTSBKSystemServiceBroadcast != null)
         {
             sb.append("  AVAILABLE SERVICES:").append(mTSBKSystemServiceBroadcast.getAvailableServices());
@@ -434,7 +477,6 @@ public class P25P1NetworkConfigurationMonitor
             sb.append("  SUPPORTED SERVICES:").append(mLCSystemServiceBroadcast.getSupportedServices());
         }
 
-
         sb.append("\nNeighbor Sites\n");
         Set<Integer> sites = new TreeSet<>();
         sites.addAll(mAMBTCNeighborSites.keySet());
@@ -456,10 +498,11 @@ public class P25P1NetworkConfigurationMonitor
                 if(mAMBTCNeighborSites.containsKey(site))
                 {
                     AMBTCAdjacentStatusBroadcast ambtc = mAMBTCNeighborSites.get(site);
-                    sb.append("  SYSTEM:").append(ambtc.getSystem());
-                    sb.append(" SITE:").append(ambtc.getSite());
-                    sb.append(" LRA:").append(ambtc.getLocationRegistrationArea());
-                    sb.append(" RFSS:").append(ambtc.getRfss());
+                    sb.append("  SYSTEM:").append(format(ambtc.getSystem(), 3));
+                    sb.append(" NAC:").append(format(ambtc.getNAC(), 3));
+                    sb.append(" RFSS:").append(format(ambtc.getRfss(), 2));
+                    sb.append(" SITE:").append(format(ambtc.getSite(), 2));
+                    sb.append(" LRA:").append(format(ambtc.getLocationRegistrationArea(), 2));
                     sb.append(" CHANNEL:").append(ambtc.getChannel());
                     sb.append(" DOWNLINK:").append(ambtc.getChannel().getDownlinkFrequency());
                     sb.append(" UPLINK:").append(ambtc.getChannel().getUplinkFrequency()).append("\n");
@@ -467,10 +510,10 @@ public class P25P1NetworkConfigurationMonitor
                 if(mLCNeighborSites.containsKey(site))
                 {
                     LCAdjacentSiteStatusBroadcast lc = mLCNeighborSites.get(site);
-                    sb.append("  SYSTEM:").append(lc.getSystem());
-                    sb.append(" SITE:").append(lc.getSite());
-                    sb.append(" LRA:").append(lc.getLocationRegistrationArea());
-                    sb.append(" RFSS:").append(lc.getRfss());
+                    sb.append("  SYSTEM:").append(format(lc.getSystem(), 3));
+                    sb.append(" RFSS:").append(format(lc.getRfss(), 2));
+                    sb.append(" SITE:").append(format(lc.getSite(), 2));
+                    sb.append(" LRA:").append(format(lc.getLocationRegistrationArea(), 2));
                     sb.append(" CHANNEL:").append(lc.getChannel());
                     sb.append(" DOWNLINK:").append(lc.getChannel().getDownlinkFrequency());
                     sb.append(" UPLINK:").append(lc.getChannel().getUplinkFrequency()).append("\n");
@@ -480,9 +523,9 @@ public class P25P1NetworkConfigurationMonitor
                 {
                     LCAdjacentSiteStatusBroadcastExplicit lce = mLCNeighborSitesExplicit.get(site);
                     sb.append("  SYSTEM:---");
-                    sb.append(" SITE:").append(lce.getSite());
-                    sb.append(" LRA:").append(lce.getLocationRegistrationArea());
-                    sb.append(" RFSS:").append(lce.getRfss());
+                    sb.append(" RFSS:").append(format(lce.getRfss(), 2));
+                    sb.append(" SITE:").append(format(lce.getSite(), 2));
+                    sb.append(" LRA:").append(format(lce.getLocationRegistrationArea(), 2));
                     sb.append(" CHANNEL:").append(lce.getChannel());
                     sb.append(" DOWNLINK:").append(lce.getChannel().getDownlinkFrequency());
                     sb.append(" UPLINK:").append(lce.getChannel().getUplinkFrequency()).append("\n");
@@ -490,10 +533,11 @@ public class P25P1NetworkConfigurationMonitor
                 if(mTSBKNeighborSites.containsKey(site))
                 {
                     AdjacentStatusBroadcast asb = mTSBKNeighborSites.get(site);
-                    sb.append("  SYSTEM:").append(asb.getSystem());
-                    sb.append(" SITE:").append(asb.getSite());
-                    sb.append(" LRA:").append(asb.getLocationRegistrationArea());
-                    sb.append(" RFSS:").append(asb.getRfss());
+                    sb.append("  SYSTEM:").append(format(asb.getSystem(), 3));
+                    sb.append(" NAC:").append(format(asb.getNAC(), 3));
+                    sb.append(" RFSS:").append(format(asb.getRfss(), 2));
+                    sb.append(" SITE:").append(format(asb.getSite(), 2));
+                    sb.append(" LRA:").append(format(asb.getLocationRegistrationArea(), 2));
                     sb.append(" CHANNEL:").append(asb.getChannel());
                     sb.append(" DOWNLINK:").append(asb.getChannel().getDownlinkFrequency());
                     sb.append(" UPLINK:").append(asb.getChannel().getUplinkFrequency());

src/main/java/io/github/dsheirer/module/decode/p25/phase1/P25P1SyncDetector.java

@@ -1,21 +1,23 @@
 /*
- * ******************************************************************************
- * sdrtrunk
- * Copyright (C) 2014-2019 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.
+ *  * ******************************************************************************
+ *  * Copyright (C) 2014-2020 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/>
+ *  * *****************************************************************************
  *
- * 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.module.decode.p25.phase1;
 
@@ -37,9 +39,10 @@ public class P25P1SyncDetector implements Listener<Dibit>
      * 90 degrees requires a correction of 1/4 of the symbol rate (1200Hz).  An
      * error of 180 degrees requires a correction of 1/2 of the symbol rate */
     public static final double DEFAULT_SAMPLE_RATE = 50000.0;
+    public static final double DEFAULT_SYMBOL_RATE = 4800;
 
-    public static final double FREQUENCY_PHASE_CORRECTION_90_DEGREES = 1200.0;
-    public static final double FREQUENCY_PHASE_CORRECTION_180_DEGREES = 2400.0;
+    public static final double FREQUENCY_PHASE_CORRECTION_90_DEGREES = DEFAULT_SYMBOL_RATE / 4.0;
+    public static final double FREQUENCY_PHASE_CORRECTION_180_DEGREES = DEFAULT_SYMBOL_RATE / 2.0;
 
     private MultiSyncPatternMatcher mMatcher;
     private SoftSyncDetector mPrimarySyncDetector;
@@ -146,7 +149,7 @@ public class P25P1SyncDetector implements Listener<Dibit>
                 }
 
                 @Override
-                public void syncLost()
+                public void syncLost(int bitsProcessed)
                 {
                     //no-op
                 }

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/lc/motorola/LCMotorolaPatchGroupVoiceChannelUser.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -26,7 +26,7 @@ import io.github.dsheirer.bits.BinaryMessage;
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.identifier.patch.PatchGroup;
 import io.github.dsheirer.module.decode.p25.identifier.patch.APCO25PatchGroup;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.identifier.talkgroup.APCO25Talkgroup;
 import io.github.dsheirer.module.decode.p25.reference.VoiceServiceOptions;
 
@@ -96,7 +96,7 @@ public class LCMotorolaPatchGroupVoiceChannelUser extends MotorolaLinkControlWor
     {
         if(mSourceAddress == null)
         {
-            mSourceAddress = APCO25Radio.createFrom(getMessage().getInt(SOURCE_ADDRESS));
+            mSourceAddress = APCO25RadioIdentifier.createFrom(getMessage().getInt(SOURCE_ADDRESS));
         }
 
         return mSourceAddress;

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/lc/standard/LCCallAlert.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -24,7 +24,7 @@ package io.github.dsheirer.module.decode.p25.phase1.message.lc.standard;
 
 import io.github.dsheirer.bits.BinaryMessage;
 import io.github.dsheirer.identifier.Identifier;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.phase1.message.lc.LinkControlWord;
 
 import java.util.ArrayList;
@@ -71,7 +71,7 @@ public class LCCallAlert extends LinkControlWord
     {
         if(mTargetAddress == null)
         {
-            mTargetAddress = APCO25Radio.createTo(getMessage().getInt(TARGET_ADDRESS));
+            mTargetAddress = APCO25RadioIdentifier.createTo(getMessage().getInt(TARGET_ADDRESS));
         }
 
         return mTargetAddress;
@@ -84,7 +84,7 @@ public class LCCallAlert extends LinkControlWord
     {
         if(mSourceAddress == null)
         {
-            mSourceAddress = APCO25Radio.createFrom(getMessage().getInt(SOURCE_ADDRESS));
+            mSourceAddress = APCO25RadioIdentifier.createFrom(getMessage().getInt(SOURCE_ADDRESS));
         }
 
         return mSourceAddress;

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/lc/standard/LCExtendedFunctionCommand.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -24,7 +24,7 @@ package io.github.dsheirer.module.decode.p25.phase1.message.lc.standard;
 
 import io.github.dsheirer.bits.BinaryMessage;
 import io.github.dsheirer.identifier.Identifier;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.phase1.message.lc.LinkControlWord;
 import io.github.dsheirer.module.decode.p25.reference.ExtendedFunction;
 
@@ -88,7 +88,7 @@ public class LCExtendedFunctionCommand extends LinkControlWord
     {
         if(mTargetAddress == null)
         {
-            mTargetAddress = APCO25Radio.createTo(getMessage().getInt(TARGET_ADDRESS));
+            mTargetAddress = APCO25RadioIdentifier.createTo(getMessage().getInt(TARGET_ADDRESS));
         }
 
         return mTargetAddress;

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/lc/standard/LCGroupAffiliationQuery.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -24,7 +24,7 @@ package io.github.dsheirer.module.decode.p25.phase1.message.lc.standard;
 
 import io.github.dsheirer.bits.BinaryMessage;
 import io.github.dsheirer.identifier.Identifier;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.phase1.message.lc.LinkControlWord;
 
 import java.util.ArrayList;
@@ -70,7 +70,7 @@ public class LCGroupAffiliationQuery extends LinkControlWord
     {
         if(mTargetAddress == null)
         {
-            mTargetAddress = APCO25Radio.createTo(getMessage().getInt(TARGET_ADDRESS));
+            mTargetAddress = APCO25RadioIdentifier.createTo(getMessage().getInt(TARGET_ADDRESS));
         }
 
         return mTargetAddress;
@@ -83,7 +83,7 @@ public class LCGroupAffiliationQuery extends LinkControlWord
     {
         if(mSourceAddress == null)
         {
-            mSourceAddress = APCO25Radio.createFrom(getMessage().getInt(SOURCE_ADDRESS));
+            mSourceAddress = APCO25RadioIdentifier.createFrom(getMessage().getInt(SOURCE_ADDRESS));
         }
 
         return mSourceAddress;

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/lc/standard/LCGroupVoiceChannelUser.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -24,7 +24,7 @@ package io.github.dsheirer.module.decode.p25.phase1.message.lc.standard;
 
 import io.github.dsheirer.bits.BinaryMessage;
 import io.github.dsheirer.identifier.Identifier;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.identifier.talkgroup.APCO25Talkgroup;
 import io.github.dsheirer.module.decode.p25.phase1.message.lc.LinkControlWord;
 import io.github.dsheirer.module.decode.p25.reference.VoiceServiceOptions;
@@ -100,7 +100,7 @@ public class LCGroupVoiceChannelUser extends LinkControlWord
     {
         if(mSourceAddress == null)
         {
-            mSourceAddress = APCO25Radio.createFrom(getMessage().getInt(SOURCE_ADDRESS));
+            mSourceAddress = APCO25RadioIdentifier.createFrom(getMessage().getInt(SOURCE_ADDRESS));
         }
 
         return mSourceAddress;

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/lc/standard/LCMessageUpdate.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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,7 +25,7 @@ package io.github.dsheirer.module.decode.p25.phase1.message.lc.standard;
 import io.github.dsheirer.bits.BinaryMessage;
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.module.decode.p25.identifier.message.APCO25ShortDataMessage;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.phase1.message.lc.LinkControlWord;
 
 import java.util.ArrayList;
@@ -84,7 +84,7 @@ public class LCMessageUpdate extends LinkControlWord
     {
         if(mTargetAddress == null)
         {
-            mTargetAddress = APCO25Radio.createTo(getMessage().getInt(TARGET_ADDRESS));
+            mTargetAddress = APCO25RadioIdentifier.createTo(getMessage().getInt(TARGET_ADDRESS));
         }
 
         return mTargetAddress;
@@ -97,7 +97,7 @@ public class LCMessageUpdate extends LinkControlWord
     {
         if(mSourceAddress == null)
         {
-            mSourceAddress = APCO25Radio.createFrom(getMessage().getInt(SOURCE_ADDRESS));
+            mSourceAddress = APCO25RadioIdentifier.createFrom(getMessage().getInt(SOURCE_ADDRESS));
         }
 
         return mSourceAddress;

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/lc/standard/LCProtectionParameterBroadcast.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -26,7 +26,7 @@ import io.github.dsheirer.bits.BinaryMessage;
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.identifier.encryption.EncryptionKeyIdentifier;
 import io.github.dsheirer.module.decode.p25.identifier.encryption.APCO25EncryptionKey;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.phase1.message.lc.LinkControlWord;
 
 import java.util.ArrayList;
@@ -84,7 +84,7 @@ public class LCProtectionParameterBroadcast extends LinkControlWord
     {
         if(mTargetAddress == null)
         {
-            mTargetAddress = APCO25Radio.createTo(getMessage().getInt(TARGET_ADDRESS));
+            mTargetAddress = APCO25RadioIdentifier.createTo(getMessage().getInt(TARGET_ADDRESS));
         }
 
         return mTargetAddress;

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/lc/standard/LCRFSSStatusBroadcastExplicit.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -42,12 +42,12 @@ import java.util.List;
 public class LCRFSSStatusBroadcastExplicit extends LinkControlWord implements IFrequencyBandReceiver
 {
     private static final int[] LRA = {8, 9, 10, 11, 12, 13, 14, 15};
-    private static final int[] DOWNLINK_FREQUENCY_BAND = {16, 17, 18, 19};
-    private static final int[] DOWNLINK_CHANNEL_NUMBER = {20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31};
+    private static final int[] UPLINK_FREQUENCY_BAND = {16, 17, 18, 19};
+    private static final int[] UPLINK_CHANNEL_NUMBER = {20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31};
     private static final int[] RFSS = {32, 33, 34, 35, 36, 37, 38, 39};
     private static final int[] SITE = {40, 41, 42, 43, 44, 45, 46, 47};
-    private static final int[] UPLINK_FREQUENCY_BAND = {48, 49, 50, 51};
-    private static final int[] UPLINK_CHANNEL_NUMBER = {52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63};
+    private static final int[] DOWNLINK_FREQUENCY_BAND = {48, 49, 50, 51};
+    private static final int[] DOWNLINK_CHANNEL_NUMBER = {52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63};
     private static final int[] SERVICE_CLASS = {64, 65, 66, 67, 68, 69, 70, 71};
 
     private List<Identifier> mIdentifiers;

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/lc/standard/LCStatusQuery.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -24,7 +24,7 @@ package io.github.dsheirer.module.decode.p25.phase1.message.lc.standard;
 
 import io.github.dsheirer.bits.BinaryMessage;
 import io.github.dsheirer.identifier.Identifier;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.phase1.message.lc.LinkControlWord;
 
 import java.util.ArrayList;
@@ -70,7 +70,7 @@ public class LCStatusQuery extends LinkControlWord
     {
         if(mTargetAddress == null)
         {
-            mTargetAddress = APCO25Radio.createTo(getMessage().getInt(TARGET_ADDRESS));
+            mTargetAddress = APCO25RadioIdentifier.createTo(getMessage().getInt(TARGET_ADDRESS));
         }
 
         return mTargetAddress;
@@ -83,7 +83,7 @@ public class LCStatusQuery extends LinkControlWord
     {
         if(mSourceAddress == null)
         {
-            mSourceAddress = APCO25Radio.createFrom(getMessage().getInt(SOURCE_ADDRESS));
+            mSourceAddress = APCO25RadioIdentifier.createFrom(getMessage().getInt(SOURCE_ADDRESS));
         }
 
         return mSourceAddress;

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/lc/standard/LCStatusUpdate.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -24,7 +24,7 @@ package io.github.dsheirer.module.decode.p25.phase1.message.lc.standard;
 
 import io.github.dsheirer.bits.BinaryMessage;
 import io.github.dsheirer.identifier.Identifier;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.identifier.status.APCO25UnitStatus;
 import io.github.dsheirer.module.decode.p25.identifier.status.APCO25UserStatus;
 import io.github.dsheirer.module.decode.p25.phase1.message.lc.LinkControlWord;
@@ -98,7 +98,7 @@ public class LCStatusUpdate extends LinkControlWord
     {
         if(mTargetAddress == null)
         {
-            mTargetAddress = APCO25Radio.createTo(getMessage().getInt(TARGET_ADDRESS));
+            mTargetAddress = APCO25RadioIdentifier.createTo(getMessage().getInt(TARGET_ADDRESS));
         }
 
         return mTargetAddress;
@@ -111,7 +111,7 @@ public class LCStatusUpdate extends LinkControlWord
     {
         if(mSourceAddress == null)
         {
-            mSourceAddress = APCO25Radio.createFrom(getMessage().getInt(SOURCE_ADDRESS));
+            mSourceAddress = APCO25RadioIdentifier.createFrom(getMessage().getInt(SOURCE_ADDRESS));
         }
 
         return mSourceAddress;

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/lc/standard/LCTelephoneInterconnectAnswerRequest.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -24,7 +24,7 @@ package io.github.dsheirer.module.decode.p25.phase1.message.lc.standard;
 
 import io.github.dsheirer.bits.BinaryMessage;
 import io.github.dsheirer.identifier.Identifier;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.identifier.telephone.APCO25TelephoneNumber;
 import io.github.dsheirer.module.decode.p25.phase1.message.lc.LinkControlWord;
 import io.github.dsheirer.module.decode.p25.reference.Digit;
@@ -103,7 +103,7 @@ public class LCTelephoneInterconnectAnswerRequest extends LinkControlWord
     {
         if(mTargetAddress == null)
         {
-            mTargetAddress = APCO25Radio.createTo(getMessage().getInt(TARGET_ADDRESS));
+            mTargetAddress = APCO25RadioIdentifier.createTo(getMessage().getInt(TARGET_ADDRESS));
         }
 
         return mTargetAddress;

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/lc/standard/LCUnitAuthenticationCommand.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -26,7 +26,7 @@ import io.github.dsheirer.bits.BinaryMessage;
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25System;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25Wacn;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.phase1.message.lc.LinkControlWord;
 
 import java.util.ArrayList;
@@ -101,7 +101,7 @@ public class LCUnitAuthenticationCommand extends LinkControlWord
     {
         if(mTargetAddress == null)
         {
-            mTargetAddress = APCO25Radio.createTo(getMessage().getInt(TARGET_ADDRESS));
+            mTargetAddress = APCO25RadioIdentifier.createTo(getMessage().getInt(TARGET_ADDRESS));
         }
 
         return mTargetAddress;

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/lc/standard/LCUnitRegistrationCommand.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -26,7 +26,7 @@ import io.github.dsheirer.bits.BinaryMessage;
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25System;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25Wacn;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.phase1.message.lc.LinkControlWord;
 
 import java.util.ArrayList;
@@ -101,7 +101,7 @@ public class LCUnitRegistrationCommand extends LinkControlWord
     {
         if(mTargetAddress == null)
         {
-            mTargetAddress = APCO25Radio.createTo(getMessage().getInt(TARGET_ADDRESS));
+            mTargetAddress = APCO25RadioIdentifier.createTo(getMessage().getInt(TARGET_ADDRESS));
         }
 
         return mTargetAddress;

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/lc/standard/LCUnitToUnitAnswerRequest.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -24,7 +24,7 @@ package io.github.dsheirer.module.decode.p25.phase1.message.lc.standard;
 
 import io.github.dsheirer.bits.BinaryMessage;
 import io.github.dsheirer.identifier.Identifier;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.phase1.message.lc.LinkControlWord;
 import io.github.dsheirer.module.decode.p25.reference.VoiceServiceOptions;
 
@@ -88,7 +88,7 @@ public class LCUnitToUnitAnswerRequest extends LinkControlWord
     {
         if(mTargetAddress == null)
         {
-            mTargetAddress = APCO25Radio.createTo(getMessage().getInt(TARGET_ADDRESS));
+            mTargetAddress = APCO25RadioIdentifier.createTo(getMessage().getInt(TARGET_ADDRESS));
         }
 
         return mTargetAddress;
@@ -101,7 +101,7 @@ public class LCUnitToUnitAnswerRequest extends LinkControlWord
     {
         if(mSourceAddress == null)
         {
-            mSourceAddress = APCO25Radio.createFrom(getMessage().getInt(SOURCE_ADDRESS));
+            mSourceAddress = APCO25RadioIdentifier.createFrom(getMessage().getInt(SOURCE_ADDRESS));
         }
 
         return mSourceAddress;

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/lc/standard/LCUnitToUnitVoiceChannelUser.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -24,7 +24,7 @@ package io.github.dsheirer.module.decode.p25.phase1.message.lc.standard;
 
 import io.github.dsheirer.bits.BinaryMessage;
 import io.github.dsheirer.identifier.Identifier;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.phase1.message.lc.LinkControlWord;
 import io.github.dsheirer.module.decode.p25.reference.VoiceServiceOptions;
 
@@ -87,7 +87,7 @@ public class LCUnitToUnitVoiceChannelUser extends LinkControlWord
     {
         if(mTargetAddress == null)
         {
-            mTargetAddress = APCO25Radio.createTo(getMessage().getInt(TARGET_ADDRESS));
+            mTargetAddress = APCO25RadioIdentifier.createTo(getMessage().getInt(TARGET_ADDRESS));
         }
 
         return mTargetAddress;
@@ -100,7 +100,7 @@ public class LCUnitToUnitVoiceChannelUser extends LinkControlWord
     {
         if(mSourceAddress == null)
         {
-            mSourceAddress = APCO25Radio.createFrom(getMessage().getInt(SOURCE_ADDRESS));
+            mSourceAddress = APCO25RadioIdentifier.createFrom(getMessage().getInt(SOURCE_ADDRESS));
         }
 
         return mSourceAddress;

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/pdu/PDUHeader.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -26,7 +26,7 @@ import io.github.dsheirer.bits.BinaryMessage;
 import io.github.dsheirer.bits.CorrectedBinaryMessage;
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.message.IBitErrorProvider;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.reference.Direction;
 import io.github.dsheirer.module.decode.p25.reference.PDUFormat;
 import io.github.dsheirer.module.decode.p25.reference.Vendor;
@@ -154,11 +154,11 @@ public class PDUHeader implements IBitErrorProvider
         {
             if(isOutbound())
             {
-                mLLID = APCO25Radio.createTo(getMessage().getInt(LOGICAL_LINK_ID));
+                mLLID = APCO25RadioIdentifier.createTo(getMessage().getInt(LOGICAL_LINK_ID));
             }
             else
             {
-                mLLID = APCO25Radio.createFrom(getMessage().getInt(LOGICAL_LINK_ID));
+                mLLID = APCO25RadioIdentifier.createFrom(getMessage().getInt(LOGICAL_LINK_ID));
             }
         }
 

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/pdu/PDUMessage.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -23,7 +23,7 @@ package io.github.dsheirer.module.decode.p25.phase1.message.pdu;
 
 import io.github.dsheirer.bits.CorrectedBinaryMessage;
 import io.github.dsheirer.identifier.Identifier;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.phase1.P25P1DataUnitID;
 import io.github.dsheirer.module.decode.p25.phase1.message.P25Message;
 import io.github.dsheirer.module.decode.p25.phase1.message.tsbk.Opcode;
@@ -177,11 +177,11 @@ public class PDUMessage extends P25Message
         {
             if(isOutbound())
             {
-                mLLID = APCO25Radio.createTo(getMessage().getInt(LOGICAL_LINK_ID));
+                mLLID = APCO25RadioIdentifier.createTo(getMessage().getInt(LOGICAL_LINK_ID));
             }
             else
             {
-                mLLID = APCO25Radio.createFrom(getMessage().getInt(LOGICAL_LINK_ID));
+                mLLID = APCO25RadioIdentifier.createFrom(getMessage().getInt(LOGICAL_LINK_ID));
             }
         }
 

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/pdu/ambtc/isp/AMBTCAuthenticationQuery.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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,7 +25,7 @@ package io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.isp;
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25System;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25Wacn;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.PDUSequence;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.AMBTCMessage;
 
@@ -76,7 +76,7 @@ public class AMBTCAuthenticationQuery extends AMBTCMessage
     {
         if(mSourceAddress == null)
         {
-            mSourceAddress = APCO25Radio.createFrom(getHeader().getMessage().getInt(HEADER_ADDRESS));
+            mSourceAddress = APCO25RadioIdentifier.createFrom(getHeader().getMessage().getInt(HEADER_ADDRESS));
         }
 
         return mSourceAddress;
@@ -109,7 +109,7 @@ public class AMBTCAuthenticationQuery extends AMBTCMessage
     {
         if(mTargetId == null && hasDataBlock(0))
         {
-            mTargetId = APCO25Radio.createTo(getDataBlock(0).getMessage().getInt(BLOCK_0_TARGET_ID));
+            mTargetId = APCO25RadioIdentifier.createTo(getDataBlock(0).getMessage().getInt(BLOCK_0_TARGET_ID));
         }
 
         return mTargetId;

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/pdu/ambtc/isp/AMBTCAuthenticationResponse.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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,7 +25,7 @@ package io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.isp;
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25System;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25Wacn;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.PDUSequence;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.AMBTCMessage;
 
@@ -82,7 +82,7 @@ public class AMBTCAuthenticationResponse extends AMBTCMessage
     {
         if(mTargetAddress == null)
         {
-            mTargetAddress = APCO25Radio.createTo(getHeader().getMessage().getInt(HEADER_ADDRESS));
+            mTargetAddress = APCO25RadioIdentifier.createTo(getHeader().getMessage().getInt(HEADER_ADDRESS));
         }
 
         return mTargetAddress;
@@ -115,7 +115,7 @@ public class AMBTCAuthenticationResponse extends AMBTCMessage
     {
         if(mSourceId == null && hasDataBlock(0))
         {
-            mSourceId = APCO25Radio.createFrom(getDataBlock(0).getMessage().getInt(BLOCK_0_SOURCE_ID));
+            mSourceId = APCO25RadioIdentifier.createFrom(getDataBlock(0).getMessage().getInt(BLOCK_0_SOURCE_ID));
         }
 
         return mSourceId;

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/pdu/ambtc/isp/AMBTCCallAlertRequest.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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,7 +25,7 @@ package io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.isp;
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25System;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25Wacn;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.PDUSequence;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.AMBTCMessage;
 
@@ -75,7 +75,7 @@ public class AMBTCCallAlertRequest extends AMBTCMessage
     {
         if(mTargetId == null)
         {
-            mTargetId = APCO25Radio.createTo(getHeader().getMessage().getInt(BLOCK_0_TARGET_ID));
+            mTargetId = APCO25RadioIdentifier.createTo(getHeader().getMessage().getInt(BLOCK_0_TARGET_ID));
         }
 
         return mTargetId;
@@ -108,7 +108,7 @@ public class AMBTCCallAlertRequest extends AMBTCMessage
     {
         if(mSourceAddress == null && hasDataBlock(0))
         {
-            mSourceAddress = APCO25Radio.createFrom(getDataBlock(0).getMessage().getInt(HEADER_ADDRESS));
+            mSourceAddress = APCO25RadioIdentifier.createFrom(getDataBlock(0).getMessage().getInt(HEADER_ADDRESS));
         }
 
         return mSourceAddress;

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/pdu/ambtc/isp/AMBTCGroupAffiliationRequest.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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,7 +25,7 @@ package io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.isp;
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25System;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25Wacn;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.identifier.talkgroup.APCO25Talkgroup;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.PDUSequence;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.AMBTCMessage;
@@ -110,7 +110,7 @@ public class AMBTCGroupAffiliationRequest extends AMBTCMessage
     {
         if(mSourceAddress == null && hasDataBlock(0))
         {
-            mSourceAddress = APCO25Radio.createFrom(getDataBlock(0).getMessage().getInt(HEADER_ADDRESS));
+            mSourceAddress = APCO25RadioIdentifier.createFrom(getDataBlock(0).getMessage().getInt(HEADER_ADDRESS));
         }
 
         return mSourceAddress;

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/pdu/ambtc/isp/AMBTCIndividualDataServiceRequest.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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,7 +25,7 @@ package io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.isp;
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25System;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25Wacn;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.PDUSequence;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.AMBTCMessage;
 import io.github.dsheirer.module.decode.p25.reference.DataServiceOptions;
@@ -79,7 +79,7 @@ public class AMBTCIndividualDataServiceRequest extends AMBTCMessage
     {
         if(mSourceAddress == null)
         {
-            mSourceAddress = APCO25Radio.createFrom(getHeader().getMessage().getInt(HEADER_ADDRESS));
+            mSourceAddress = APCO25RadioIdentifier.createFrom(getHeader().getMessage().getInt(HEADER_ADDRESS));
         }
 
         return mSourceAddress;
@@ -119,7 +119,7 @@ public class AMBTCIndividualDataServiceRequest extends AMBTCMessage
     {
         if(mTargetId == null && hasDataBlock(0))
         {
-            mTargetId = APCO25Radio.createTo(getDataBlock(0).getMessage().getInt(BLOCK_0_TARGET_ID));
+            mTargetId = APCO25RadioIdentifier.createTo(getDataBlock(0).getMessage().getInt(BLOCK_0_TARGET_ID));
         }
 
         return mTargetId;

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/pdu/ambtc/isp/AMBTCLocationRegistrationRequest.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -26,7 +26,7 @@ import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25Lra;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25System;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25Wacn;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.identifier.talkgroup.APCO25Talkgroup;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.PDUSequence;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.AMBTCMessage;
@@ -110,7 +110,7 @@ public class AMBTCLocationRegistrationRequest extends AMBTCMessage
     {
         if(mSourceId == null)
         {
-            mSourceId = APCO25Radio.createFrom(getHeader().getMessage().getInt(BLOCK_0_SOURCE_ID));
+            mSourceId = APCO25RadioIdentifier.createFrom(getHeader().getMessage().getInt(BLOCK_0_SOURCE_ID));
         }
 
         return mSourceId;
@@ -143,7 +143,7 @@ public class AMBTCLocationRegistrationRequest extends AMBTCMessage
     {
         if(mSourceAddress == null && hasDataBlock(0))
         {
-            mSourceAddress = APCO25Radio.createFrom(getDataBlock(0).getMessage().getInt(HEADER_ADDRESS));
+            mSourceAddress = APCO25RadioIdentifier.createFrom(getDataBlock(0).getMessage().getInt(HEADER_ADDRESS));
         }
 
         return mSourceAddress;

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/pdu/ambtc/isp/AMBTCMessageUpdateRequest.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -26,7 +26,7 @@ import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25System;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25Wacn;
 import io.github.dsheirer.module.decode.p25.identifier.message.APCO25ShortDataMessage;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.PDUSequence;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.AMBTCMessage;
 
@@ -78,7 +78,7 @@ public class AMBTCMessageUpdateRequest extends AMBTCMessage
     {
         if(mSourceAddress == null)
         {
-            mSourceAddress = APCO25Radio.createFrom(getHeader().getMessage().getInt(HEADER_ADDRESS));
+            mSourceAddress = APCO25RadioIdentifier.createFrom(getHeader().getMessage().getInt(HEADER_ADDRESS));
         }
 
         return mSourceAddress;
@@ -118,7 +118,7 @@ public class AMBTCMessageUpdateRequest extends AMBTCMessage
     {
         if(mTargetId == null && hasDataBlock(0))
         {
-            mTargetId = APCO25Radio.createTo(getDataBlock(0).getMessage().getInt(BLOCK_0_TARGET_ID));
+            mTargetId = APCO25RadioIdentifier.createTo(getDataBlock(0).getMessage().getInt(BLOCK_0_TARGET_ID));
         }
 
         return mTargetId;

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/pdu/ambtc/isp/AMBTCRoamingAddressRequest.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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,7 +25,7 @@ package io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.isp;
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25System;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25Wacn;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.PDUSequence;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.AMBTCMessage;
 
@@ -75,7 +75,7 @@ public class AMBTCRoamingAddressRequest extends AMBTCMessage
     {
         if(mTargetId == null)
         {
-            mTargetId = APCO25Radio.createTo(getHeader().getMessage().getInt(BLOCK_0_TARGET_ID));
+            mTargetId = APCO25RadioIdentifier.createTo(getHeader().getMessage().getInt(BLOCK_0_TARGET_ID));
         }
 
         return mTargetId;
@@ -108,7 +108,7 @@ public class AMBTCRoamingAddressRequest extends AMBTCMessage
     {
         if(mSourceAddress == null && hasDataBlock(0))
         {
-            mSourceAddress = APCO25Radio.createFrom(getDataBlock(0).getMessage().getInt(HEADER_ADDRESS));
+            mSourceAddress = APCO25RadioIdentifier.createFrom(getDataBlock(0).getMessage().getInt(HEADER_ADDRESS));
         }
 
         return mSourceAddress;

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/pdu/ambtc/isp/AMBTCStatusQueryRequest.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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,7 +25,7 @@ package io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.isp;
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25System;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25Wacn;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.PDUSequence;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.AMBTCMessage;
 
@@ -77,7 +77,7 @@ public class AMBTCStatusQueryRequest extends AMBTCMessage
     {
         if(mTargetId == null)
         {
-            mTargetId = APCO25Radio.createTo(getHeader().getMessage().getInt(BLOCK_0_TARGET_ID));
+            mTargetId = APCO25RadioIdentifier.createTo(getHeader().getMessage().getInt(BLOCK_0_TARGET_ID));
         }
 
         return mTargetId;
@@ -110,7 +110,7 @@ public class AMBTCStatusQueryRequest extends AMBTCMessage
     {
         if(mSourceAddress == null && hasDataBlock(0))
         {
-            mSourceAddress = APCO25Radio.createFrom(getDataBlock(0).getMessage().getInt(HEADER_ADDRESS));
+            mSourceAddress = APCO25RadioIdentifier.createFrom(getDataBlock(0).getMessage().getInt(HEADER_ADDRESS));
         }
 
         return mSourceAddress;

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/pdu/ambtc/isp/AMBTCStatusQueryResponse.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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,7 +25,7 @@ package io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.isp;
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25System;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25Wacn;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.identifier.status.APCO25UnitStatus;
 import io.github.dsheirer.module.decode.p25.identifier.status.APCO25UserStatus;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.PDUSequence;
@@ -82,7 +82,7 @@ public class AMBTCStatusQueryResponse extends AMBTCMessage
     {
         if(mSourceAddress == null)
         {
-            mSourceAddress = APCO25Radio.createFrom(getHeader().getMessage().getInt(HEADER_ADDRESS));
+            mSourceAddress = APCO25RadioIdentifier.createFrom(getHeader().getMessage().getInt(HEADER_ADDRESS));
         }
 
         return mSourceAddress;
@@ -132,7 +132,7 @@ public class AMBTCStatusQueryResponse extends AMBTCMessage
     {
         if(mTargetId == null && hasDataBlock(0))
         {
-            mTargetId = APCO25Radio.createTo(getDataBlock(0).getMessage().getInt(BLOCK_0_TARGET_ID));
+            mTargetId = APCO25RadioIdentifier.createTo(getDataBlock(0).getMessage().getInt(BLOCK_0_TARGET_ID));
         }
 
         return mTargetId;

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/pdu/ambtc/isp/AMBTCStatusUpdateRequest.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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,7 +25,7 @@ package io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.isp;
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25System;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25Wacn;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.identifier.status.APCO25UnitStatus;
 import io.github.dsheirer.module.decode.p25.identifier.status.APCO25UserStatus;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.PDUSequence;
@@ -82,7 +82,7 @@ public class AMBTCStatusUpdateRequest extends AMBTCMessage
     {
         if(mSourceAddress == null)
         {
-            mSourceAddress = APCO25Radio.createFrom(getHeader().getMessage().getInt(HEADER_ADDRESS));
+            mSourceAddress = APCO25RadioIdentifier.createFrom(getHeader().getMessage().getInt(HEADER_ADDRESS));
         }
 
         return mSourceAddress;
@@ -132,7 +132,7 @@ public class AMBTCStatusUpdateRequest extends AMBTCMessage
     {
         if(mTargetId == null && hasDataBlock(0))
         {
-            mTargetId = APCO25Radio.createTo(getDataBlock(0).getMessage().getInt(BLOCK_0_TARGET_ID));
+            mTargetId = APCO25RadioIdentifier.createTo(getDataBlock(0).getMessage().getInt(BLOCK_0_TARGET_ID));
         }
 
         return mTargetId;

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/pdu/ambtc/isp/AMBTCUnitAcknowledgeResponse.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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,7 +25,7 @@ package io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.isp;
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25System;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25Wacn;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.PDUSequence;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.AMBTCMessage;
 import io.github.dsheirer.module.decode.p25.phase1.message.tsbk.Opcode;
@@ -81,7 +81,7 @@ public class AMBTCUnitAcknowledgeResponse extends AMBTCMessage
     {
         if(mSourceAddress == null)
         {
-            mSourceAddress = APCO25Radio.createFrom(getHeader().getMessage().getInt(HEADER_ADDRESS));
+            mSourceAddress = APCO25RadioIdentifier.createFrom(getHeader().getMessage().getInt(HEADER_ADDRESS));
         }
 
         return mSourceAddress;
@@ -125,7 +125,7 @@ public class AMBTCUnitAcknowledgeResponse extends AMBTCMessage
     {
         if(mTargetId == null && hasDataBlock(0))
         {
-            mTargetId = APCO25Radio.createTo(getDataBlock(0).getMessage().getInt(BLOCK_0_TARGET_ID));
+            mTargetId = APCO25RadioIdentifier.createTo(getDataBlock(0).getMessage().getInt(BLOCK_0_TARGET_ID));
         }
 
         return mTargetId;

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/pdu/ambtc/isp/AMBTCUnitToUnitVoiceServiceAnswerResponse.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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,7 +25,7 @@ package io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.isp;
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25System;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25Wacn;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.PDUSequence;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.AMBTCMessage;
 import io.github.dsheirer.module.decode.p25.reference.AnswerResponse;
@@ -84,7 +84,7 @@ public class AMBTCUnitToUnitVoiceServiceAnswerResponse extends AMBTCMessage
     {
         if(mSourceAddress == null)
         {
-            mSourceAddress = APCO25Radio.createFrom(getHeader().getMessage().getInt(HEADER_ADDRESS));
+            mSourceAddress = APCO25RadioIdentifier.createFrom(getHeader().getMessage().getInt(HEADER_ADDRESS));
         }
 
         return mSourceAddress;
@@ -134,7 +134,7 @@ public class AMBTCUnitToUnitVoiceServiceAnswerResponse extends AMBTCMessage
     {
         if(mTargetId == null && hasDataBlock(0))
         {
-            mTargetId = APCO25Radio.createTo(getDataBlock(0).getMessage().getInt(BLOCK_0_TARGET_ID));
+            mTargetId = APCO25RadioIdentifier.createTo(getDataBlock(0).getMessage().getInt(BLOCK_0_TARGET_ID));
         }
 
         return mTargetId;

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/pdu/ambtc/isp/AMBTCUnitToUnitVoiceServiceRequest.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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,7 +25,7 @@ package io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.isp;
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25System;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25Wacn;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.PDUSequence;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.AMBTCMessage;
 import io.github.dsheirer.module.decode.p25.reference.VoiceServiceOptions;
@@ -81,7 +81,7 @@ public class AMBTCUnitToUnitVoiceServiceRequest extends AMBTCMessage
     {
         if(mSourceAddress == null)
         {
-            mSourceAddress = APCO25Radio.createFrom(getHeader().getMessage().getInt(HEADER_ADDRESS));
+            mSourceAddress = APCO25RadioIdentifier.createFrom(getHeader().getMessage().getInt(HEADER_ADDRESS));
         }
 
         return mSourceAddress;
@@ -121,7 +121,7 @@ public class AMBTCUnitToUnitVoiceServiceRequest extends AMBTCMessage
     {
         if(mTargetId == null && hasDataBlock(0))
         {
-            mTargetId = APCO25Radio.createTo(getDataBlock(0).getMessage().getInt(BLOCK_0_TARGET_ID));
+            mTargetId = APCO25RadioIdentifier.createTo(getDataBlock(0).getMessage().getInt(BLOCK_0_TARGET_ID));
         }
 
         return mTargetId;

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/pdu/ambtc/osp/AMBTCCallAlert.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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,7 +25,7 @@ package io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.osp;
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25System;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25Wacn;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.PDUSequence;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.AMBTCMessage;
 
@@ -105,7 +105,7 @@ public class AMBTCCallAlert extends AMBTCMessage
     {
         if(mTargetAddress == null && hasDataBlock(0))
         {
-            mTargetAddress = APCO25Radio.createTo(getDataBlock(0).getMessage().getInt(HEADER_ADDRESS));
+            mTargetAddress = APCO25RadioIdentifier.createTo(getDataBlock(0).getMessage().getInt(HEADER_ADDRESS));
         }
 
         return mTargetAddress;
@@ -115,7 +115,7 @@ public class AMBTCCallAlert extends AMBTCMessage
     {
         if(mSourceId == null && hasDataBlock(0))
         {
-            mSourceId = APCO25Radio.createFrom(getDataBlock(0).getMessage().getInt(BLOCK_0_SOURCE_ID));
+            mSourceId = APCO25RadioIdentifier.createFrom(getDataBlock(0).getMessage().getInt(BLOCK_0_SOURCE_ID));
         }
 
         return mSourceId;

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/pdu/ambtc/osp/AMBTCGroupAffiliationQuery.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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,7 +25,7 @@ package io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.osp;
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25System;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25Wacn;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.PDUSequence;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.AMBTCMessage;
 
@@ -105,7 +105,7 @@ public class AMBTCGroupAffiliationQuery extends AMBTCMessage
     {
         if(mTargetAddress == null && hasDataBlock(0))
         {
-            mTargetAddress = APCO25Radio.createTo(getDataBlock(0).getMessage().getInt(HEADER_ADDRESS));
+            mTargetAddress = APCO25RadioIdentifier.createTo(getDataBlock(0).getMessage().getInt(HEADER_ADDRESS));
         }
 
         return mTargetAddress;
@@ -115,7 +115,7 @@ public class AMBTCGroupAffiliationQuery extends AMBTCMessage
     {
         if(mSourceId == null && hasDataBlock(0))
         {
-            mSourceId = APCO25Radio.createFrom(getDataBlock(0).getMessage().getInt(BLOCK_0_SOURCE_ID));
+            mSourceId = APCO25RadioIdentifier.createFrom(getDataBlock(0).getMessage().getInt(BLOCK_0_SOURCE_ID));
         }
 
         return mSourceId;

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/pdu/ambtc/osp/AMBTCGroupAffiliationResponse.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -24,7 +24,7 @@ package io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.osp;
 
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25FullyQualifiedRadioIdentifier;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.identifier.talkgroup.APCO25AnnouncementTalkgroup;
 import io.github.dsheirer.module.decode.p25.identifier.talkgroup.APCO25FullyQualifiedTalkgroupIdentifier;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.PDUSequence;
@@ -89,7 +89,7 @@ public class AMBTCGroupAffiliationResponse extends AMBTCMessage
     {
         if(mTargetAddress == null && hasDataBlock(0))
         {
-            mTargetAddress = APCO25Radio.createTo(getDataBlock(0).getMessage().getInt(HEADER_ADDRESS));
+            mTargetAddress = APCO25RadioIdentifier.createTo(getDataBlock(0).getMessage().getInt(HEADER_ADDRESS));
         }
 
         return mTargetAddress;

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/pdu/ambtc/osp/AMBTCGroupDataChannelGrant.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -26,7 +26,7 @@ import io.github.dsheirer.channel.IChannelDescriptor;
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.module.decode.p25.identifier.channel.APCO25Channel;
 import io.github.dsheirer.module.decode.p25.identifier.channel.APCO25ExplicitChannel;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.identifier.talkgroup.APCO25Talkgroup;
 import io.github.dsheirer.module.decode.p25.phase1.message.IFrequencyBandReceiver;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.PDUSequence;
@@ -85,7 +85,7 @@ public class AMBTCGroupDataChannelGrant extends AMBTCMessage implements IFrequen
     {
         if(mSourceAddress == null)
         {
-            mSourceAddress = APCO25Radio.createFrom(getHeader().getMessage().getInt(HEADER_ADDRESS));
+            mSourceAddress = APCO25RadioIdentifier.createFrom(getHeader().getMessage().getInt(HEADER_ADDRESS));
         }
 
         return mSourceAddress;

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/pdu/ambtc/osp/AMBTCGroupVoiceChannelGrant.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -26,7 +26,7 @@ import io.github.dsheirer.channel.IChannelDescriptor;
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.module.decode.p25.identifier.channel.APCO25Channel;
 import io.github.dsheirer.module.decode.p25.identifier.channel.APCO25ExplicitChannel;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.identifier.talkgroup.APCO25Talkgroup;
 import io.github.dsheirer.module.decode.p25.phase1.message.IFrequencyBandReceiver;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.PDUSequence;
@@ -85,7 +85,7 @@ public class AMBTCGroupVoiceChannelGrant extends AMBTCMessage implements IFreque
     {
         if(mSourceAddress == null)
         {
-            mSourceAddress = APCO25Radio.createFrom(getHeader().getMessage().getInt(HEADER_ADDRESS));
+            mSourceAddress = APCO25RadioIdentifier.createFrom(getHeader().getMessage().getInt(HEADER_ADDRESS));
         }
 
         return mSourceAddress;

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/pdu/ambtc/osp/AMBTCIndividualDataChannelGrant.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -28,7 +28,7 @@ import io.github.dsheirer.module.decode.p25.identifier.APCO25System;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25Wacn;
 import io.github.dsheirer.module.decode.p25.identifier.channel.APCO25Channel;
 import io.github.dsheirer.module.decode.p25.identifier.channel.APCO25ExplicitChannel;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.identifier.talkgroup.APCO25Talkgroup;
 import io.github.dsheirer.module.decode.p25.phase1.message.IFrequencyBandReceiver;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.PDUSequence;
@@ -124,7 +124,7 @@ public class AMBTCIndividualDataChannelGrant extends AMBTCMessage implements IFr
     {
         if(mSourceAddress == null)
         {
-            mSourceAddress = APCO25Radio.createFrom(getHeader().getMessage().getInt(HEADER_ADDRESS));
+            mSourceAddress = APCO25RadioIdentifier.createFrom(getHeader().getMessage().getInt(HEADER_ADDRESS));
         }
 
         return mSourceAddress;
@@ -134,7 +134,7 @@ public class AMBTCIndividualDataChannelGrant extends AMBTCMessage implements IFr
     {
         if(mSourceId == null && hasDataBlock(0))
         {
-            mSourceId = APCO25Radio.createFrom(getHeader().getMessage().getInt(BLOCK_0_SOURCE_ID));
+            mSourceId = APCO25RadioIdentifier.createFrom(getHeader().getMessage().getInt(BLOCK_0_SOURCE_ID));
         }
 
         return mSourceId;

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/pdu/ambtc/osp/AMBTCMessageUpdate.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -26,7 +26,7 @@ import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25System;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25Wacn;
 import io.github.dsheirer.module.decode.p25.identifier.message.APCO25ShortDataMessage;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.PDUSequence;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.AMBTCMessage;
 
@@ -112,7 +112,7 @@ public class AMBTCMessageUpdate extends AMBTCMessage
     {
         if(mTargetAddress == null && hasDataBlock(0))
         {
-            mTargetAddress = APCO25Radio.createTo(getDataBlock(0).getMessage().getInt(HEADER_ADDRESS));
+            mTargetAddress = APCO25RadioIdentifier.createTo(getDataBlock(0).getMessage().getInt(HEADER_ADDRESS));
         }
 
         return mTargetAddress;
@@ -122,7 +122,7 @@ public class AMBTCMessageUpdate extends AMBTCMessage
     {
         if(mSourceId == null && hasDataBlock(0))
         {
-            mSourceId = APCO25Radio.createFrom(getDataBlock(0).getMessage().getInt(BLOCK_0_SOURCE_ID));
+            mSourceId = APCO25RadioIdentifier.createFrom(getDataBlock(0).getMessage().getInt(BLOCK_0_SOURCE_ID));
         }
 
         return mSourceId;

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/pdu/ambtc/osp/AMBTCProtectionParameterBroadcast.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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,7 +25,7 @@ package io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.osp;
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.identifier.encryption.EncryptionKeyIdentifier;
 import io.github.dsheirer.module.decode.p25.identifier.encryption.APCO25EncryptionKey;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.PDUSequence;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.AMBTCMessage;
 
@@ -88,7 +88,7 @@ public class AMBTCProtectionParameterBroadcast extends AMBTCMessage
     {
         if(mTargetAddress == null && hasDataBlock(0))
         {
-            mTargetAddress = APCO25Radio.createTo(getDataBlock(0).getMessage().getInt(HEADER_ADDRESS));
+            mTargetAddress = APCO25RadioIdentifier.createTo(getDataBlock(0).getMessage().getInt(HEADER_ADDRESS));
         }
 
         return mTargetAddress;

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/pdu/ambtc/osp/AMBTCRoamingAddressResponse.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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,7 +25,7 @@ package io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.osp;
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25System;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25Wacn;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.PDUSequence;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.AMBTCMessage;
 
@@ -140,7 +140,7 @@ public class AMBTCRoamingAddressResponse extends AMBTCMessage
     {
         if(mTargetAddress == null && hasDataBlock(0))
         {
-            mTargetAddress = APCO25Radio.createTo(getDataBlock(0).getMessage().getInt(HEADER_ADDRESS));
+            mTargetAddress = APCO25RadioIdentifier.createTo(getDataBlock(0).getMessage().getInt(HEADER_ADDRESS));
         }
 
         return mTargetAddress;

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/pdu/ambtc/osp/AMBTCRoamingAddressUpdate.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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,7 +25,7 @@ package io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.osp;
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25System;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25Wacn;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.PDUSequence;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.AMBTCMessage;
 
@@ -140,7 +140,7 @@ public class AMBTCRoamingAddressUpdate extends AMBTCMessage
     {
         if(mTargetAddress == null && hasDataBlock(0))
         {
-            mTargetAddress = APCO25Radio.createTo(getDataBlock(0).getMessage().getInt(HEADER_ADDRESS));
+            mTargetAddress = APCO25RadioIdentifier.createTo(getDataBlock(0).getMessage().getInt(HEADER_ADDRESS));
         }
 
         return mTargetAddress;

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/pdu/ambtc/osp/AMBTCStatusQuery.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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,7 +25,7 @@ package io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.osp;
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25System;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25Wacn;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.PDUSequence;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.AMBTCMessage;
 
@@ -105,7 +105,7 @@ public class AMBTCStatusQuery extends AMBTCMessage
     {
         if(mTargetAddress == null && hasDataBlock(0))
         {
-            mTargetAddress = APCO25Radio.createTo(getDataBlock(0).getMessage().getInt(HEADER_ADDRESS));
+            mTargetAddress = APCO25RadioIdentifier.createTo(getDataBlock(0).getMessage().getInt(HEADER_ADDRESS));
         }
 
         return mTargetAddress;
@@ -115,7 +115,7 @@ public class AMBTCStatusQuery extends AMBTCMessage
     {
         if(mSourceId == null && hasDataBlock(0))
         {
-            mSourceId = APCO25Radio.createFrom(getDataBlock(0).getMessage().getInt(BLOCK_0_SOURCE_ID));
+            mSourceId = APCO25RadioIdentifier.createFrom(getDataBlock(0).getMessage().getInt(BLOCK_0_SOURCE_ID));
         }
 
         return mSourceId;

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/pdu/ambtc/osp/AMBTCStatusUpdate.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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,7 +25,7 @@ package io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.osp;
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25System;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25Wacn;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.identifier.status.APCO25UnitStatus;
 import io.github.dsheirer.module.decode.p25.identifier.status.APCO25UserStatus;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.PDUSequence;
@@ -119,7 +119,7 @@ public class AMBTCStatusUpdate extends AMBTCMessage
     {
         if(mTargetAddress == null && hasDataBlock(0))
         {
-            mTargetAddress = APCO25Radio.createTo(getDataBlock(0).getMessage().getInt(HEADER_ADDRESS));
+            mTargetAddress = APCO25RadioIdentifier.createTo(getDataBlock(0).getMessage().getInt(HEADER_ADDRESS));
         }
 
         return mTargetAddress;
@@ -129,7 +129,7 @@ public class AMBTCStatusUpdate extends AMBTCMessage
     {
         if(mSourceId == null && hasDataBlock(0))
         {
-            mSourceId = APCO25Radio.createFrom(getDataBlock(0).getMessage().getInt(BLOCK_0_SOURCE_ID));
+            mSourceId = APCO25RadioIdentifier.createFrom(getDataBlock(0).getMessage().getInt(BLOCK_0_SOURCE_ID));
         }
 
         return mSourceId;

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/pdu/ambtc/osp/AMBTCTelephoneInterconnectChannelGrant.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -26,7 +26,7 @@ import io.github.dsheirer.channel.IChannelDescriptor;
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.module.decode.p25.identifier.channel.APCO25Channel;
 import io.github.dsheirer.module.decode.p25.identifier.channel.APCO25ExplicitChannel;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.phase1.message.IFrequencyBandReceiver;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.PDUSequence;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.AMBTCMessage;
@@ -96,7 +96,7 @@ public class AMBTCTelephoneInterconnectChannelGrant extends AMBTCMessage impleme
     {
         if(mAnyAddress == null)
         {
-            mAnyAddress = APCO25Radio.createFrom(getHeader().getMessage().getInt(HEADER_ADDRESS));
+            mAnyAddress = APCO25RadioIdentifier.createFrom(getHeader().getMessage().getInt(HEADER_ADDRESS));
         }
 
         return mAnyAddress;

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/pdu/ambtc/osp/AMBTCTelephoneInterconnectChannelGrantUpdate.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -26,7 +26,7 @@ import io.github.dsheirer.channel.IChannelDescriptor;
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.module.decode.p25.identifier.channel.APCO25Channel;
 import io.github.dsheirer.module.decode.p25.identifier.channel.APCO25ExplicitChannel;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.phase1.message.IFrequencyBandReceiver;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.PDUSequence;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.AMBTCMessage;
@@ -96,7 +96,7 @@ public class AMBTCTelephoneInterconnectChannelGrantUpdate extends AMBTCMessage i
     {
         if(mAnyAddress == null)
         {
-            mAnyAddress = APCO25Radio.createFrom(getHeader().getMessage().getInt(HEADER_ADDRESS));
+            mAnyAddress = APCO25RadioIdentifier.createFrom(getHeader().getMessage().getInt(HEADER_ADDRESS));
         }
 
         return mAnyAddress;

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/pdu/ambtc/osp/AMBTCUnitRegistrationResponse.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -24,7 +24,7 @@ package io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.osp;
 
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25FullyQualifiedRadioIdentifier;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.PDUSequence;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.AMBTCMessage;
 import io.github.dsheirer.module.decode.p25.reference.Response;
@@ -92,7 +92,7 @@ public class AMBTCUnitRegistrationResponse extends AMBTCMessage
     {
         if(mTargetAddress == null && hasDataBlock(0))
         {
-            mTargetAddress = APCO25Radio.createTo(getDataBlock(0).getMessage().getInt(HEADER_ADDRESS));
+            mTargetAddress = APCO25RadioIdentifier.createTo(getDataBlock(0).getMessage().getInt(HEADER_ADDRESS));
         }
 
         return mTargetAddress;
@@ -118,7 +118,7 @@ public class AMBTCUnitRegistrationResponse extends AMBTCMessage
     {
         if(mSourceAddress == null && hasDataBlock(0))
         {
-            mSourceAddress = APCO25Radio.createFrom(getDataBlock(0).getMessage().getInt(BLOCK_0_SOURCE_ADDRESS));
+            mSourceAddress = APCO25RadioIdentifier.createFrom(getDataBlock(0).getMessage().getInt(BLOCK_0_SOURCE_ADDRESS));
         }
 
         return mSourceAddress;

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/pdu/ambtc/osp/AMBTCUnitToUnitAnswerRequest.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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,7 +25,7 @@ package io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.osp;
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25System;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25Wacn;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.identifier.talkgroup.APCO25Talkgroup;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.PDUSequence;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.AMBTCMessage;
@@ -111,7 +111,7 @@ public class AMBTCUnitToUnitAnswerRequest extends AMBTCMessage
     {
         if(mSourceId == null)
         {
-            mSourceId = APCO25Radio.createFrom(getHeader().getMessage().getInt(BLOCK_0_SOURCE_ID));
+            mSourceId = APCO25RadioIdentifier.createFrom(getHeader().getMessage().getInt(BLOCK_0_SOURCE_ID));
         }
 
         return mSourceId;

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/pdu/ambtc/osp/AMBTCUnitToUnitVoiceServiceChannelGrant.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -28,7 +28,7 @@ import io.github.dsheirer.module.decode.p25.identifier.APCO25System;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25Wacn;
 import io.github.dsheirer.module.decode.p25.identifier.channel.APCO25Channel;
 import io.github.dsheirer.module.decode.p25.identifier.channel.APCO25ExplicitChannel;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.identifier.talkgroup.APCO25Talkgroup;
 import io.github.dsheirer.module.decode.p25.phase1.message.IFrequencyBandReceiver;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.PDUSequence;
@@ -124,7 +124,7 @@ public class AMBTCUnitToUnitVoiceServiceChannelGrant extends AMBTCMessage implem
     {
         if(mSourceAddress == null)
         {
-            mSourceAddress = APCO25Radio.createFrom(getHeader().getMessage().getInt(HEADER_ADDRESS));
+            mSourceAddress = APCO25RadioIdentifier.createFrom(getHeader().getMessage().getInt(HEADER_ADDRESS));
         }
 
         return mSourceAddress;
@@ -134,7 +134,7 @@ public class AMBTCUnitToUnitVoiceServiceChannelGrant extends AMBTCMessage implem
     {
         if(mSourceId == null && hasDataBlock(0))
         {
-            mSourceId = APCO25Radio.createFrom(getHeader().getMessage().getInt(BLOCK_0_SOURCE_ID));
+            mSourceId = APCO25RadioIdentifier.createFrom(getHeader().getMessage().getInt(BLOCK_0_SOURCE_ID));
         }
 
         return mSourceId;

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/pdu/ambtc/osp/AMBTCUnitToUnitVoiceServiceChannelGrantUpdate.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -28,7 +28,7 @@ import io.github.dsheirer.module.decode.p25.identifier.APCO25System;
 import io.github.dsheirer.module.decode.p25.identifier.APCO25Wacn;
 import io.github.dsheirer.module.decode.p25.identifier.channel.APCO25Channel;
 import io.github.dsheirer.module.decode.p25.identifier.channel.APCO25ExplicitChannel;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.identifier.talkgroup.APCO25Talkgroup;
 import io.github.dsheirer.module.decode.p25.phase1.message.IFrequencyBandReceiver;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.PDUSequence;
@@ -124,7 +124,7 @@ public class AMBTCUnitToUnitVoiceServiceChannelGrantUpdate extends AMBTCMessage
     {
         if(mSourceAddress == null)
         {
-            mSourceAddress = APCO25Radio.createFrom(getHeader().getMessage().getInt(HEADER_ADDRESS));
+            mSourceAddress = APCO25RadioIdentifier.createFrom(getHeader().getMessage().getInt(HEADER_ADDRESS));
         }
 
         return mSourceAddress;
@@ -134,7 +134,7 @@ public class AMBTCUnitToUnitVoiceServiceChannelGrantUpdate extends AMBTCMessage
     {
         if(mSourceId == null && hasDataBlock(0))
         {
-            mSourceId = APCO25Radio.createFrom(getHeader().getMessage().getInt(BLOCK_0_SOURCE_ID));
+            mSourceId = APCO25RadioIdentifier.createFrom(getHeader().getMessage().getInt(BLOCK_0_SOURCE_ID));
         }
 
         return mSourceId;

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/pdu/umbtc/isp/UMBTCTelephoneInterconnectRequestExplicitDialing.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -24,7 +24,7 @@ package io.github.dsheirer.module.decode.p25.phase1.message.pdu.umbtc.isp;
 
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.message.IBitErrorProvider;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.identifier.telephone.APCO25TelephoneNumber;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.PDUSequence;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.umbtc.UMBTCMessage;
@@ -83,7 +83,7 @@ public class UMBTCTelephoneInterconnectRequestExplicitDialing extends UMBTCMessa
     {
         if(mSourceAddress == null)
         {
-            mSourceAddress = APCO25Radio.createFrom(getHeader().getMessage().getInt(HEADER_ADDRESS));
+            mSourceAddress = APCO25RadioIdentifier.createFrom(getHeader().getMessage().getInt(HEADER_ADDRESS));
         }
 
         return mSourceAddress;

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/tsbk/Opcode.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -171,10 +171,10 @@ public enum Opcode
     MOTOROLA_OSP_PATCH_GROUP_DELETE(1, "PATCH GROUP DELE", "MOTOROLA PATCH GROUP DELETE"),
     MOTOROLA_OSP_PATCH_GROUP_CHANNEL_GRANT(2, "PTCH GRP VCHN GR", "MOTOROLA PATCH GROUP CHANNEL GRANT"),
     MOTOROLA_OSP_PATCH_GROUP_CHANNEL_GRANT_UPDATE(3, "PTCH GRP VCH UPD", "MOTOROLA PATCH GROUP CHANNEL GRANT UPDATE"),
-    MOTOROLA_OSP_TRAFFIC_CHANNEL_ID(5, "CHANNEL CWID", "CHANNEL CWID"),
+    MOTOROLA_OSP_TRAFFIC_CHANNEL_ID(5, "TRAFFIC CHANNEL", "TRAFFIC CHANNEL"),
     MOTOROLA_OSP_DENY_RESPONSE(7, "DENY RESPONSE", "MOTOROLA DENY RESPONSE"),
     MOTOROLA_OSP_SYSTEM_LOADING(9, "SYSTEM LOADING", "SYSTEM LOADING"),
-    MOTOROLA_OSP_CONTROL_CHANNEL_ID(11, "CCH BASE STAT ID", "CONTROL CHANNEL BASE STATION ID"),
+    MOTOROLA_OSP_BASE_STATION_ID(11, "CCH BASE STAT ID", "CONTROL CHANNEL BASE STATION ID"),
     MOTOROLA_OSP_CONTROL_CHANNEL_PLANNED_SHUTDOWN(14, "CCH PLND SHUTDWN", "CONTROL CHANNEL PLANNED SHUTDOWN"),
     MOTOROLA_OSP_UNKNOWN(-1, "MOTOROLA OSP UNKNOWN OPCODE", "MOTOROLA OSP UNKNOWN OPCODE"),
 
@@ -332,7 +332,7 @@ public enum Opcode
                         case 0x09:
                             return MOTOROLA_OSP_SYSTEM_LOADING;
                         case 0x0B:
-                            return MOTOROLA_OSP_CONTROL_CHANNEL_ID;
+                            return MOTOROLA_OSP_BASE_STATION_ID;
                         case 0x0E:
                             return MOTOROLA_OSP_CONTROL_CHANNEL_PLANNED_SHUTDOWN;
                         default:

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/tsbk/TSBKMessageFactory.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -33,6 +33,7 @@ import io.github.dsheirer.module.decode.p25.phase1.message.tsbk.motorola.isp.Unk
 import io.github.dsheirer.module.decode.p25.phase1.message.tsbk.motorola.osp.ChannelLoading;
 import io.github.dsheirer.module.decode.p25.phase1.message.tsbk.motorola.osp.MotorolaBaseStationId;
 import io.github.dsheirer.module.decode.p25.phase1.message.tsbk.motorola.osp.MotorolaDenyResponse;
+import io.github.dsheirer.module.decode.p25.phase1.message.tsbk.motorola.osp.MotorolaTrafficChannel;
 import io.github.dsheirer.module.decode.p25.phase1.message.tsbk.motorola.osp.PatchGroupAdd;
 import io.github.dsheirer.module.decode.p25.phase1.message.tsbk.motorola.osp.PatchGroupDelete;
 import io.github.dsheirer.module.decode.p25.phase1.message.tsbk.motorola.osp.PatchGroupVoiceChannelGrant;
@@ -118,12 +119,15 @@ import io.github.dsheirer.module.decode.p25.phase1.message.tsbk.unknown.isp.Unkn
 import io.github.dsheirer.module.decode.p25.phase1.message.tsbk.unknown.osp.UnknownVendorOSPMessage;
 import io.github.dsheirer.module.decode.p25.reference.Direction;
 import io.github.dsheirer.module.decode.p25.reference.Vendor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Factory for creating Trunking Signalling Block (TSBK) message parser classes
  */
 public class TSBKMessageFactory
 {
+    private final static Logger mLog = LoggerFactory.getLogger(TSBKMessageFactory.class);
     private static final ViterbiDecoder_1_2_P25 VITERBI_HALF_RATE_DECODER = new ViterbiDecoder_1_2_P25();
 
     public static TSBKMessage create(Direction direction, P25P1DataUnitID dataUnitID,
@@ -301,14 +305,14 @@ public class TSBKMessageFactory
 
             case MOTOROLA_ISP_UNKNOWN:
                 return new UnknownMotorolaISPMessage(dataUnitID, message, nac, timestamp);
-            case MOTOROLA_OSP_CONTROL_CHANNEL_ID:
+            case MOTOROLA_OSP_BASE_STATION_ID:
                 return new MotorolaBaseStationId(dataUnitID, message, nac, timestamp);
             case MOTOROLA_OSP_CONTROL_CHANNEL_PLANNED_SHUTDOWN:
                 return new PlannedChannelShutdown(dataUnitID, message, nac, timestamp);
             case MOTOROLA_OSP_DENY_RESPONSE:
                 return new MotorolaDenyResponse(dataUnitID, message, nac, timestamp);
             case MOTOROLA_OSP_TRAFFIC_CHANNEL_ID:
-                return new MotorolaBaseStationId(dataUnitID, message, nac, timestamp);
+                return new MotorolaTrafficChannel(dataUnitID, message, nac, timestamp);
             case MOTOROLA_OSP_PATCH_GROUP_ADD:
                 return new PatchGroupAdd(dataUnitID, message, nac, timestamp);
             case MOTOROLA_OSP_PATCH_GROUP_DELETE:

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/tsbk/motorola/osp/MotorolaDenyResponse.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -24,7 +24,7 @@ package io.github.dsheirer.module.decode.p25.phase1.message.tsbk.motorola.osp;
 
 import io.github.dsheirer.bits.CorrectedBinaryMessage;
 import io.github.dsheirer.identifier.Identifier;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.phase1.P25P1DataUnitID;
 import io.github.dsheirer.module.decode.p25.phase1.message.tsbk.OSPMessage;
 import io.github.dsheirer.module.decode.p25.phase1.message.tsbk.Opcode;
@@ -114,7 +114,7 @@ public class MotorolaDenyResponse extends OSPMessage
     {
         if(mTargetAddress == null)
         {
-            mTargetAddress = APCO25Radio.createTo(getMessage().getInt(TARGET_ADDRESS));
+            mTargetAddress = APCO25RadioIdentifier.createTo(getMessage().getInt(TARGET_ADDRESS));
         }
 
         return mTargetAddress;

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/tsbk/motorola/osp/MotorolaTrafficChannel.java

@@ -0,0 +1,53 @@
+/*
+ *
+ *  * ******************************************************************************
+ *  * Copyright (C) 2014-2020 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.module.decode.p25.phase1.message.tsbk.motorola.osp;
+
+import io.github.dsheirer.bits.CorrectedBinaryMessage;
+import io.github.dsheirer.identifier.Identifier;
+import io.github.dsheirer.module.decode.p25.phase1.P25P1DataUnitID;
+import io.github.dsheirer.module.decode.p25.phase1.message.tsbk.OSPMessage;
+
+import java.util.Collections;
+import java.util.List;
+
+public class MotorolaTrafficChannel extends OSPMessage
+{
+    public MotorolaTrafficChannel(P25P1DataUnitID dataUnitID, CorrectedBinaryMessage message, int nac, long timestamp)
+    {
+        super(dataUnitID, message, nac, timestamp);
+    }
+
+    public String toString()
+    {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getMessageStub());
+        sb.append(" TRAFFIC CHANNEL ");
+        sb.append(getMessage().toHexString());
+        return sb.toString();
+    }
+
+    @Override
+    public List<Identifier> getIdentifiers()
+    {
+        return Collections.EMPTY_LIST;
+    }
+}

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/tsbk/motorola/osp/PatchGroupVoiceChannelGrant.java

@@ -1,7 +1,7 @@
 /*
  *
  *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  * Copyright (C) 2014-2020 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
@@ -28,7 +28,7 @@ import io.github.dsheirer.identifier.patch.PatchGroup;
 import io.github.dsheirer.identifier.patch.PatchGroupIdentifier;
 import io.github.dsheirer.module.decode.p25.identifier.channel.APCO25Channel;
 import io.github.dsheirer.module.decode.p25.identifier.patch.APCO25PatchGroup;
-import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25Radio;
+import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.identifier.talkgroup.APCO25Talkgroup;
 import io.github.dsheirer.module.decode.p25.phase1.P25P1DataUnitID;
 import io.github.dsheirer.module.decode.p25.phase1.message.IFrequencyBandReceiver;
@@ -95,7 +95,7 @@ public class PatchGroupVoiceChannelGrant extends OSPMessage implements IFrequenc
     {
         if(mSourceAddress == null)
         {
-            mSourceAddress = APCO25Radio.createFrom(getMessage().getInt(SOURCE_ADDRESS));
+            mSourceAddress = APCO25RadioIdentifier.createFrom(getMessage().getInt(SOURCE_ADDRESS));
         }
 
         return mSourceAddress;