Incrementing build to 0.3.0 beta7

Resolves issue audio recorders left open

.idea/dictionaries/denny.xml

@@ -18,6 +18,7 @@
       <w>talkgroup</w>
       <w>tgid</w>
       <w>ultravox</w>
+      <w>wacn</w>
       <w>xtea</w>
     </words>
   </dictionary>

CHANGELOG

@@ -18,6 +18,7 @@
    buffers.  Bounded queues have ability to enter/exit overflow state when queue
    size reaches overflow threshold and reset when queue size falls below the reset
    threshold.  Channel state will show OVERFLOW in red/yellow.
+ - Improves handling of P25 TDMA channels (NO Phase 2 decoder support yet)
  - Updated airspy controller for airspy-mini specific sample rate handling.
  - New developer remez filter designer tool and internal usage
 

README.md

@@ -2,18 +2,10 @@
 A cross-platform java application for decoding, monitoring, recording and streaming trunked mobile and related radio protocols using Software Defined Radios (SDR).
 
 * [Getting Started](https://github.com/DSheirer/sdrtrunk/wiki/GettingStarted)
-* [User's Manual](https://github.com/DSheirer/sdrtrunk/wiki/UserManual)
+* [User's Manual Version 0.2.0](https://github.com/DSheirer/sdrtrunk/wiki/UserManual)
+* [User's Manual Version 0.3.0](https://github.com/DSheirer/sdrtrunk/wiki/UserManual_Version0.3.0)
 * [Download](https://github.com/DSheirer/sdrtrunk/releases)
 * [Support](https://groups.google.com/forum/#!forum/sdrtrunk)
 
-![](https://github.com/DSheirer/sdrtrunk/wiki/images/SDRTrunk_application.png)
+![sdrtrunk Application Overview - Version 0.3.0](https://github.com/DSheirer/sdrtrunk/wiki/images/ApplicationOverview_V0.3.0.png)
-<script>
+**Figure 1:** sdrtrunk **Version 0.3.0** Application Screenshot
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-  ga('create', 'UA-67489234-1', 'auto');
-  ga('send', 'pageview');
-
-</script>

build/build.xml

@@ -7,7 +7,7 @@
   <property name="major" value="0"/>
   <property name="minor" value="3"/>
   <property name="patch" value="0"/>
-  <property name="release" value="-beta3"/>
+  <property name="release" value="-beta7"/>
   <property name="filename" value="sdrtrunk_${major}.${minor}.${patch}${release}"/>
     
   <!-- Build properties -->

src/alias/Alias.java

@@ -185,27 +185,6 @@ public class Alias
 	 */
 	public void validate()
 	{
-		//Check for duplicate broadcast channels
-		List<BroadcastChannel> broadcastChannels = getBroadcastChannels();
-
-		if(broadcastChannels.size() > 0)
-		{
-			Set<String> channelNames = new TreeSet<>();
-
-			for(BroadcastChannel broadcastChannel: broadcastChannels)
-			{
-				String channelName = broadcastChannel.getChannelName();
-
-				if(channelName == null || channelName.isEmpty() || channelNames.contains(channelName))
-				{
-					removeAliasID(broadcastChannel);
-				}
-				else
-				{
-					channelNames.add(channelName);
-				}
-			}
-		}
 	}
 	/**
 	 * Returns the priority level of this alias, if defined, or the default priority
@@ -336,9 +315,9 @@ public class Alias
 	 * List of broadcast channels specified for this alias.
 	 */
     @XmlTransient
-	public List<BroadcastChannel> getBroadcastChannels()
+	public Set<BroadcastChannel> getBroadcastChannels()
 	{
-		List<BroadcastChannel> broadcastChannels = new ArrayList<>();
+		Set<BroadcastChannel> broadcastChannels = new TreeSet<>();
 
 		for(AliasID id: getId())
 		{

src/alias/AliasList.java

@@ -631,36 +631,47 @@ public class AliasList implements Listener<AliasEvent>
         return mName;
     }
 
+    /**
+     * Indicates if this alias list has a non-null, non-empty name
+     */
+    private boolean hasName()
+    {
+        return mName != null && !mName.isEmpty();
+    }
+
     /**
      * Receive alias change event notifications and modify this list accordingly
      */
     @Override
     public void receive(AliasEvent event)
     {
-        Alias alias = event.getAlias();
+        if(hasName())
-
-        switch(event.getEvent())
         {
-            case ADD:
+            Alias alias = event.getAlias();
-                if(alias.getList() != null && getName().equalsIgnoreCase(alias.getList()))
+
-                {
+            switch(event.getEvent())
-                    addAlias(alias);
+            {
-                }
+                case ADD:
-                break;
+                    if(alias.getList() != null && getName().equalsIgnoreCase(alias.getList()))
-            case CHANGE:
+                    {
-                if(alias.getList() != null && getName().equalsIgnoreCase(alias.getList()))
+                        addAlias(alias);
-                {
+                    }
-                    addAlias(alias);
+                    break;
-                }
+                case CHANGE:
-                break;
+                    if(alias.getList() != null && getName().equalsIgnoreCase(alias.getList()))
-            case DELETE:
+                    {
-                if(alias.getList() != null && getName().equalsIgnoreCase(alias.getList()))
+                        addAlias(alias);
-                {
+                    }
-                    removeAlias(alias);
+                    break;
-                }
+                case DELETE:
-                break;
+                    if(alias.getList() != null && getName().equalsIgnoreCase(alias.getList()))
-            default:
+                    {
-                break;
+                        removeAlias(alias);
+                    }
+                    break;
+                default:
+                    break;
+            }
         }
     }
 }

src/alias/AliasModel.java

@@ -17,6 +17,12 @@
  ******************************************************************************/
 package alias;
 
+import alias.AliasEvent.Event;
+import alias.id.broadcast.BroadcastChannel;
+import sample.Broadcaster;
+import sample.Listener;
+
+import javax.swing.table.AbstractTableModel;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -24,195 +30,192 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import javax.swing.table.AbstractTableModel;
-
-import alias.id.broadcast.BroadcastChannel;
-import sample.Broadcaster;
-import sample.Listener;
-import alias.AliasEvent.Event;
-
 /**
  * Alias Model
  */
 public class AliasModel extends AbstractTableModel
 {
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	public static final int COLUMN_LIST = 0;
+    public static final int COLUMN_LIST = 0;
-	public static final int COLUMN_GROUP = 1;
+    public static final int COLUMN_GROUP = 1;
-	public static final int COLUMN_NAME = 2;
+    public static final int COLUMN_NAME = 2;
-	public static final int COLUMN_ICON = 3;
+    public static final int COLUMN_ICON = 3;
-	public static final int COLUMN_COLOR = 4;
+    public static final int COLUMN_COLOR = 4;
 
-	private List<Alias> mAliases = new CopyOnWriteArrayList<>();
+    private List<Alias> mAliases = new CopyOnWriteArrayList<>();
-	private Broadcaster<AliasEvent> mAliasEventBroadcaster = new Broadcaster<>();
+    private Broadcaster<AliasEvent> mAliasEventBroadcaster = new Broadcaster<>();
-	private Map<String,AliasList> mAliasListMap = new HashMap<>();
+    private Map<String,AliasList> mAliasListMap = new HashMap<>();
 
-	public AliasModel()
+    public AliasModel()
-	{
+    {
-	}
+    }
 
-	/**
+    /**
-	 * Unmodifiable list of all aliases currently in the model
+     * Unmodifiable list of all aliases currently in the model
-	 */
+     */
-	public List<Alias> getAliases()
+    public List<Alias> getAliases()
-	{
+    {
-		return Collections.unmodifiableList( mAliases );
+        return Collections.unmodifiableList(mAliases);
-	}
+    }
 
-	public Alias getAliasAtIndex( int row )
+    public Alias getAliasAtIndex(int row)
-	{
+    {
-		if( mAliases.size() >= row )
+        if(mAliases.size() >= row)
-		{
+        {
-			return mAliases.get( row );
+            return mAliases.get(row);
-		}
+        }
 
-		return null;
+        return null;
-	}
+    }
 
-	public AliasList getAliasList( String name )
+    public AliasList getAliasList(String name)
-	{
+    {
-		if( mAliasListMap.containsKey( name ) )
+        if(name != null && mAliasListMap.containsKey(name))
-		{
+        {
-			return mAliasListMap.get( name );
+            return mAliasListMap.get(name);
-		}
+        }
 
-		AliasList aliasList = new AliasList( name );
+        AliasList aliasList = new AliasList(name);
 
-		for( Alias alias: mAliases )
+        if(name != null)
-		{
+        {
-			if( alias.getList().equalsIgnoreCase( name ) )
+            for(Alias alias : mAliases)
-			{
+            {
-				aliasList.addAlias( alias );
+                if(alias.hasList() && alias.getList().equalsIgnoreCase(name))
-			}
+                {
-		}
+                    aliasList.addAlias(alias);
+                }
+            }
 
-		mAliasListMap.put( name, aliasList );
+            mAliasListMap.put(name, aliasList);
 
-		//Register the new alias list to receive updates from this model
+            //Register the new alias list to receive updates from this model
-		addListener( aliasList );
+            addListener(aliasList);
+        }
 
-		return aliasList;
+        return aliasList;
-	}
+    }
 
-	/**
+    /**
-	 * Returns a list of unique alias list names from across the alias set
+     * Returns a list of unique alias list names from across the alias set
-	 */
+     */
-	public List<String> getListNames()
+    public List<String> getListNames()
-	{
+    {
-		List<String> listNames = new ArrayList<>();
+        List<String> listNames = new ArrayList<>();
 
-		for( Alias alias: mAliases )
+        for(Alias alias : mAliases)
-		{
+        {
-			if( alias.hasList() && !listNames.contains( alias.getList() ) )
+            if(alias.hasList() && !listNames.contains(alias.getList()))
-			{
+            {
-				listNames.add( alias.getList() );
+                listNames.add(alias.getList());
-			}
+            }
-		}
+        }
 
-		Collections.sort( listNames );
+        Collections.sort(listNames);
 
-		return listNames;
+        return listNames;
-	}
+    }
 
-	/**
+    /**
-	 * Returns a list of alias group names for all aliases
+     * Returns a list of alias group names for all aliases
-	 */
+     */
-	public List<String> getGroupNames()
+    public List<String> getGroupNames()
-	{
+    {
-		List<String> groupNames = new ArrayList<>();
+        List<String> groupNames = new ArrayList<>();
 
-		for( Alias alias: mAliases )
+        for(Alias alias : mAliases)
-		{
+        {
-			if( alias.hasGroup() &&	!groupNames.contains( alias.getGroup() ) )
+            if(alias.hasGroup() && !groupNames.contains(alias.getGroup()))
-			{
+            {
-				groupNames.add( alias.getGroup() );
+                groupNames.add(alias.getGroup());
-			}
+            }
-		}
+        }
 
-		Collections.sort( groupNames );
+        Collections.sort(groupNames);
 
-		return groupNames;
+        return groupNames;
-	}
+    }
 
-	/**
+    /**
-	 * Returns a list of alias group names for all aliases that have a matching
+     * Returns a list of alias group names for all aliases that have a matching
-	 * list name value
+     * list name value
-	 */
+     */
-	public List<String> getGroupNames( String listName )
+    public List<String> getGroupNames(String listName)
-	{
+    {
-		List<String> groupNames = new ArrayList<>();
+        List<String> groupNames = new ArrayList<>();
 
-		if( listName != null )
+        if(listName != null)
-		{
+        {
-			for( Alias alias: mAliases )
+            for(Alias alias : mAliases)
-			{
+            {
-				if( alias.hasList() && 
+                if(alias.hasList() &&
-					alias.hasGroup() &&
+                    alias.hasGroup() &&
-					listName.equals( alias.getList() ) &&
+                    listName.equals(alias.getList()) &&
-					!groupNames.contains( alias.getGroup() ) )
+                    !groupNames.contains(alias.getGroup()))
-				{
+                {
-					groupNames.add( alias.getGroup() );
+                    groupNames.add(alias.getGroup());
-				}
+                }
-			}
+            }
-		}
+        }
 
-		Collections.sort( groupNames );
+        Collections.sort(groupNames);
 
-		return groupNames;
+        return groupNames;
-	}
+    }
 
-	/**
+    /**
-	 * Bulk loading of aliases
+     * Bulk loading of aliases
-	 */
+     */
-	public void addAliases( List<Alias> aliases )
+    public void addAliases(List<Alias> aliases)
-	{
+    {
-		for( Alias alias: aliases )
+        for(Alias alias : aliases)
-		{
+        {
-			addAlias( alias );
+            addAlias(alias);
-		}
+        }
-	}
+    }
 
-	/**
+    /**
-	 * Adds the alias to the model
+     * Adds the alias to the model
-	 */
+     */
-	public int addAlias( Alias alias )
+    public int addAlias(Alias alias)
-	{
+    {
-		if( alias != null )
+        if(alias != null)
-		{
+        {
-			mAliases.add( alias );
+            mAliases.add(alias);
 
-			int index = mAliases.size() - 1;
+            int index = mAliases.size() - 1;
 
-			fireTableRowsInserted( index, index );
+            fireTableRowsInserted(index, index);
 
-			broadcast( new AliasEvent( alias, Event.ADD ) );
+            broadcast(new AliasEvent(alias, Event.ADD));
 
-			return index;
+            return index;
-		}
+        }
 
-		return -1;
+        return -1;
-	}
+    }
 
-	/**
+    /**
-	 * Removes the channel from the model and broadcasts a channel remove event
+     * Removes the channel from the model and broadcasts a channel remove event
-	 */
+     */
-	public void removeAlias( Alias alias )
+    public void removeAlias(Alias alias)
-	{
+    {
-		if( alias != null )
+        if(alias != null)
-		{
+        {
-			int index = mAliases.indexOf( alias );
+            int index = mAliases.indexOf(alias);
 
-			mAliases.remove( alias );
+            mAliases.remove(alias);
 
-			fireTableRowsDeleted( index, index );
+            fireTableRowsDeleted(index, index);
 
-			broadcast( new AliasEvent( alias, Event.DELETE ) );
+            broadcast(new AliasEvent(alias, Event.DELETE));
-		}
+        }
-	}
+    }
 
     /**
      * Renames any broadcast channels that have the previous name.
+     *
      * @param previousName to rename
      * @param newName to assign to the broadcast channel
      */
@@ -223,11 +226,11 @@ public class AliasModel extends AbstractTableModel
             return;
         }
 
-        for(Alias alias: mAliases)
+        for(Alias alias : mAliases)
         {
             if(alias.hasBroadcastChannel(previousName))
             {
-                for(BroadcastChannel broadcastChannel: alias.getBroadcastChannels())
+                for(BroadcastChannel broadcastChannel : alias.getBroadcastChannels())
                 {
                     if(broadcastChannel.getChannelName().contentEquals(previousName))
                     {
@@ -238,85 +241,85 @@ public class AliasModel extends AbstractTableModel
         }
     }
 
-	@Override
+    @Override
-	public int getRowCount()
+    public int getRowCount()
-	{
+    {
-		return mAliases.size();
+        return mAliases.size();
-	}
+    }
 
-	@Override
+    @Override
-	public int getColumnCount()
+    public int getColumnCount()
-	{
+    {
-		return 5;
+        return 5;
-	}
+    }
 
-	@Override
+    @Override
-	public String getColumnName( int columnIndex )
+    public String getColumnName(int columnIndex)
-	{
+    {
-		switch( columnIndex )
+        switch(columnIndex)
-		{
+        {
-			case COLUMN_LIST:
+            case COLUMN_LIST:
-				return "List";
+                return "List";
-			case COLUMN_GROUP:
+            case COLUMN_GROUP:
-				return "Group";
+                return "Group";
-			case COLUMN_NAME:
+            case COLUMN_NAME:
-				return "Name";
+                return "Name";
-			case COLUMN_ICON:
+            case COLUMN_ICON:
-				return "Icon";
+                return "Icon";
-			case COLUMN_COLOR:
+            case COLUMN_COLOR:
-				return "Color";
+                return "Color";
-		}
+        }
 
-		return null;
+        return null;
-	}
+    }
 
-	@Override
+    @Override
-	public Class<?> getColumnClass( int columnIndex )
+    public Class<?> getColumnClass(int columnIndex)
-	{
+    {
-		if( columnIndex == COLUMN_COLOR )
+        if(columnIndex == COLUMN_COLOR)
-		{
+        {
-			return Integer.class;
+            return Integer.class;
-		}
+        }
 
-		return String.class;
+        return String.class;
-	}
+    }
 
-	@Override
+    @Override
-	public boolean isCellEditable( int rowIndex, int columnIndex )
+    public boolean isCellEditable(int rowIndex, int columnIndex)
-	{
+    {
-		return false;
+        return false;
-	}
+    }
 
-	@Override
+    @Override
-	public Object getValueAt( int rowIndex, int columnIndex )
+    public Object getValueAt(int rowIndex, int columnIndex)
-	{
+    {
-		Alias alias = mAliases.get( rowIndex );
+        Alias alias = mAliases.get(rowIndex);
 
-		switch( columnIndex )
+        switch(columnIndex)
-		{
+        {
-			case COLUMN_LIST:
+            case COLUMN_LIST:
-				return alias.getList();
+                return alias.getList();
-			case COLUMN_GROUP:
+            case COLUMN_GROUP:
-				return alias.getGroup();
+                return alias.getGroup();
-			case COLUMN_NAME:
+            case COLUMN_NAME:
-				return alias.getName();
+                return alias.getName();
-			case COLUMN_ICON:
+            case COLUMN_ICON:
-				return alias.getIconName();
+                return alias.getIconName();
-			case COLUMN_COLOR:
+            case COLUMN_COLOR:
-				return alias.getColor();
+                return alias.getColor();
-		}
+        }
 
-		return null;
+        return null;
-	}
+    }
 
-	@Override
+    @Override
-	public void setValueAt( Object aValue, int rowIndex, int columnIndex )
+    public void setValueAt(Object aValue, int rowIndex, int columnIndex)
-	{
+    {
-		throw new IllegalArgumentException( "Not yet implemented" );
+        throw new IllegalArgumentException("Not yet implemented");
-	}
+    }
 
-	public void broadcast( AliasEvent event )
+    public void broadcast(AliasEvent event)
-	{
+    {
         Alias alias = event.getAlias();
 
         //Validate the alias following a user action that changed the alias or any alias IDs
@@ -325,23 +328,23 @@ public class AliasModel extends AbstractTableModel
             alias.validate();
         }
 
-		if( event.getEvent() == Event.CHANGE )
+        if(event.getEvent() == Event.CHANGE)
-		{
+        {
-			int index = mAliases.indexOf( event.getAlias() );
+            int index = mAliases.indexOf(event.getAlias());
 
-			fireTableRowsUpdated( index, index );
+            fireTableRowsUpdated(index, index);
-		}
+        }
 
-		mAliasEventBroadcaster.broadcast( event );
+        mAliasEventBroadcaster.broadcast(event);
-	}
+    }
 
-	public void addListener( Listener<AliasEvent> listener )
+    public void addListener(Listener<AliasEvent> listener)
-	{
+    {
-		mAliasEventBroadcaster.addListener( listener );
+        mAliasEventBroadcaster.addListener(listener);
-	}
+    }
 
-	public void removeListener( Listener<AliasEvent> listener )
+    public void removeListener(Listener<AliasEvent> listener)
-	{
+    {
-		mAliasEventBroadcaster.removeListener( listener );
+        mAliasEventBroadcaster.removeListener(listener);
-	}
+    }
 }

src/alias/AliasNameEditor.java

@@ -40,10 +40,11 @@ public class AliasNameEditor extends Editor<Alias>
 {
     private static final long serialVersionUID = 1L;
 
-    private static ComboBoxModel<String> EMPTY_MODEL = new DefaultComboBoxModel<>();
+    private static ComboBoxModel<String> EMPTY_LIST_MODEL = new DefaultComboBoxModel<>();
+    private static ComboBoxModel<String> EMPTY_GROUP_MODEL = new DefaultComboBoxModel<>();
 
-    private JComboBox<String> mListCombo = new JComboBox<>(EMPTY_MODEL);
+    private JComboBox<String> mListCombo = new JComboBox<>(EMPTY_LIST_MODEL);
-    private JComboBox<String> mGroupCombo = new JComboBox<>(EMPTY_MODEL);
+    private JComboBox<String> mGroupCombo = new JComboBox<>(EMPTY_GROUP_MODEL);
     private JComboBox<Icon> mIconCombo;
     private JTextField mName;
     private JButton mButtonColor;
@@ -110,7 +111,7 @@ public class AliasNameEditor extends Editor<Alias>
 
                     if(groups.isEmpty())
                     {
-                        mGroupCombo.setModel(EMPTY_MODEL);
+                        mGroupCombo.setModel(EMPTY_GROUP_MODEL);
                     }
                     else
                     {
@@ -238,7 +239,7 @@ public class AliasNameEditor extends Editor<Alias>
 
             if(listNames.isEmpty())
             {
-                mListCombo.setModel(EMPTY_MODEL);
+                mListCombo.setModel(EMPTY_LIST_MODEL);
             }
             else
             {
@@ -253,7 +254,7 @@ public class AliasNameEditor extends Editor<Alias>
 
             if(groupNames.isEmpty())
             {
-                mGroupCombo.setModel(EMPTY_MODEL);
+                mGroupCombo.setModel(EMPTY_GROUP_MODEL);
             }
             else
             {
@@ -285,8 +286,8 @@ public class AliasNameEditor extends Editor<Alias>
         }
         else
         {
-            mListCombo.setModel(EMPTY_MODEL);
+            mListCombo.setModel(EMPTY_LIST_MODEL);
-            mGroupCombo.setModel(EMPTY_MODEL);
+            mGroupCombo.setModel(EMPTY_GROUP_MODEL);
             mName.setText(null);
 
             mButtonColor.setBackground(getBackground());

src/alias/PatchGroupAlias.java

@@ -24,12 +24,20 @@ import alias.id.AliasIDType;
 import alias.id.broadcast.BroadcastChannel;
 import alias.id.priority.Priority;
 import alias.id.talkgroup.TalkgroupID;
+import gui.SDRTrunk;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import playlist.version1.System;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
 
 public class PatchGroupAlias extends Alias
 {
+    private final static Logger mLog = LoggerFactory.getLogger(PatchGroupAlias.class);
+
     private Alias mPatchGroupAlias;
     private List<Alias> mPatchedAliases = new ArrayList<>();
     private List<String> mPatchedTalkgroupIDs = new ArrayList<>();
@@ -197,22 +205,44 @@ public class PatchGroupAlias extends Alias
         return hasPatchGroupAlias() && getPatchGroupAlias().hasActions();
     }
 
+    /**
+     * Returns the highest listenable audio priority defined among the aliases in the group, or returns 'Do Not Monitor'
+     * if that is the only priority defined.  Otherwise, returns default (100) priority.
+     */
     @Override
     public int getCallPriority()
     {
-        int highestPriority = (hasPatchGroupAlias() ? getPatchGroupAlias().getCallPriority() : Priority.DEFAULT_PRIORITY);
+        boolean hasDoNotMonitor = false;
+
+        int highestPriority = (hasPatchGroupAlias() ? getPatchGroupAlias().getCallPriority() : Priority.DEFAULT_PRIORITY + 1);
 
         for(Alias alias: mPatchedAliases)
         {
-            if(!(alias instanceof PatchGroupAlias) &&
+            if(!(alias instanceof PatchGroupAlias) && alias.hasCallPriority() && alias.getCallPriority() < highestPriority)
-                alias.hasCallPriority() &&
-                alias.getCallPriority() < highestPriority)
             {
-                highestPriority = alias.getCallPriority();
+                if(alias.getCallPriority() == Priority.DO_NOT_MONITOR)
+                {
+                    hasDoNotMonitor = true;
+                }
+                else
+                {
+                    highestPriority = alias.getCallPriority();
+                }
             }
         }
 
-        return highestPriority;
+        if(highestPriority <= Priority.DEFAULT_PRIORITY)
+        {
+            return highestPriority;
+        }
+        else if(hasDoNotMonitor)
+        {
+            return Priority.DO_NOT_MONITOR;
+        }
+        else
+        {
+            return Priority.DEFAULT_PRIORITY;
+        }
     }
 
     @Override
@@ -273,9 +303,9 @@ public class PatchGroupAlias extends Alias
     }
 
     @Override
-    public List<BroadcastChannel> getBroadcastChannels()
+    public Set<BroadcastChannel> getBroadcastChannels()
     {
-        List<BroadcastChannel> broadcastChannels = new ArrayList<>();
+        Set<BroadcastChannel> broadcastChannels = new TreeSet<>();
 
         if(hasPatchGroupAlias())
         {
@@ -286,13 +316,7 @@ public class PatchGroupAlias extends Alias
         {
             if(!(alias instanceof PatchGroupAlias))
             {
-                for(BroadcastChannel broadcastChannel: alias.getBroadcastChannels())
+                broadcastChannels.addAll(alias.getBroadcastChannels());
-                {
-                    if(!broadcastChannels.contains(broadcastChannel))
-                    {
-                        broadcastChannels.add(broadcastChannel);
-                    }
-                }
             }
         }
 
@@ -317,4 +341,41 @@ public class PatchGroupAlias extends Alias
 
         return false;
     }
+
+    public static void main(String[] args)
+    {
+        Alias a1 = new Alias("Alias 1");
+        a1.addAliasID(new BroadcastChannel("Channel 1"));
+        a1.addAliasID(new BroadcastChannel("Channel 2"));
+        a1.addAliasID(new BroadcastChannel("Channel 3"));
+        a1.addAliasID(new BroadcastChannel("Channel 4"));
+
+        Alias a2 = new Alias("Alias 1");
+        a1.addAliasID(new BroadcastChannel("Channel 1"));
+        a1.addAliasID(new BroadcastChannel("Channel 2"));
+        a1.addAliasID(new BroadcastChannel("Channel 3"));
+        a1.addAliasID(new BroadcastChannel("Channel 4"));
+
+        Alias a3 = new Alias("Alias 1");
+        a1.addAliasID(new BroadcastChannel("Channel 1"));
+        a1.addAliasID(new BroadcastChannel("Channel 2"));
+        a1.addAliasID(new BroadcastChannel("Channel 3"));
+        a1.addAliasID(new BroadcastChannel("Channel 4"));
+
+        Alias a4 = new Alias("Alias 1");
+        a1.addAliasID(new BroadcastChannel("Channel 1"));
+        a1.addAliasID(new BroadcastChannel("Channel 2"));
+        a1.addAliasID(new BroadcastChannel("Channel 3"));
+        a1.addAliasID(new BroadcastChannel("Channel 4"));
+
+        PatchGroupAlias pga = new PatchGroupAlias();
+        pga.setPatchGroupAlias(a1);
+        pga.addPatchedAlias(a2);
+        pga.addPatchedAlias(a3);
+        pga.addPatchedAlias(a4);
+
+        Set<BroadcastChannel> bc = pga.getBroadcastChannels();
+
+        mLog.debug("Channels:" + bc);
+    }
 }

src/alias/id/WildcardID.java

@@ -18,6 +18,8 @@
  ******************************************************************************/
 package alias.id;
 
+import org.apache.commons.lang3.Validate;
+
 import java.util.regex.Pattern;
 
 public class WildcardID implements Comparable<WildcardID>
@@ -45,7 +47,7 @@ public class WildcardID implements Comparable<WildcardID>
      */
     public WildcardID(String value)
     {
-        assert(value != null && value.contains(WILDCARD) && value.length() < 10);
+        Validate.isTrue(value != null && value.contains(WILDCARD) && value.length() < 10);
 
         mValue = value;
 

src/audio/broadcast/BroadcastModel.java

@@ -707,9 +707,7 @@ public class BroadcastModel extends AbstractTableModel implements Listener<Audio
 
             if(metadata != null && metadata.isStreamable())
             {
-                List<BroadcastChannel> broadcastChannels = metadata.getBroadcastChannels();
+                for(BroadcastChannel broadcastChannel : metadata.getBroadcastChannels())
-
-                for(BroadcastChannel broadcastChannel : broadcastChannels)
                 {
                     String channelName = broadcastChannel.getChannelName();
 

src/audio/broadcast/icecast/IcecastHTTPAudioBroadcaster.java

@@ -156,6 +156,8 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
 
                         disconnect();
                     }
+
+                    mConnecting.set(false);
                 }
             };
 
@@ -176,8 +178,6 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
         {
             mStreamingSession.closeNow();
         }
-
-        mConnecting.set(false);
     }
 
     /**
@@ -256,6 +256,7 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
             mSocketConnector = null;
 
             mConnecting.set(false);
+
             super.sessionClosed(session);
         }
 

src/audio/broadcast/icecast/IcecastTCPAudioBroadcaster.java

@@ -25,6 +25,7 @@ import org.apache.mina.core.RuntimeIoException;
 import org.apache.mina.core.future.ConnectFuture;
 import org.apache.mina.core.service.IoHandlerAdapter;
 import org.apache.mina.core.session.IoSession;
+import org.apache.mina.core.write.WriteTimeoutException;
 import org.apache.mina.filter.codec.ProtocolCodecFilter;
 import org.apache.mina.transport.socket.nio.NioSocketConnector;
 import org.slf4j.Logger;
@@ -146,6 +147,8 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
 
                         disconnect();
                     }
+
+                    mConnecting.set(false);
                 }
             };
 
@@ -254,7 +257,7 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
                         disconnect();
                         connect();
                     }
-                    if(reason.startsWith("Connection reset"))
+                    else if(reason.startsWith("Connection reset"))
                     {
                         mLog.info("Streaming connection reset by remote server - reestablishing connection");
                         disconnect();
@@ -273,6 +276,12 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
                         mLog.error("Unrecognized IO error: " + reason + ". Streaming halted.", cause);
                     }
                 }
+                else if(ioe instanceof WriteTimeoutException)
+                {
+                    mLog.info("Network write timeout error - resetting connection");
+                    disconnect();
+                    connect();
+                }
                 else
                 {
                     setBroadcastState(BroadcastState.ERROR);
@@ -286,8 +295,6 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
                 setBroadcastState(BroadcastState.ERROR);
                 disconnect();
             }
-
-            mConnecting.set(false);
         }
 
         @Override

src/audio/broadcast/shoutcast/v1/ShoutcastV1AudioBroadcaster.java

@@ -168,6 +168,8 @@ public class ShoutcastV1AudioBroadcaster extends AudioBroadcaster
 
                         disconnect();
                     }
+
+                    mConnecting.set(false);
                 }
             };
 

src/audio/broadcast/shoutcast/v2/ShoutcastV2AudioBroadcaster.java

@@ -50,6 +50,7 @@ import properties.SystemProperties;
 import util.ThreadPool;
 
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.net.ConnectException;
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
@@ -203,6 +204,8 @@ public class ShoutcastV2AudioBroadcaster extends AudioBroadcaster implements IBr
 
                         disconnect();
                     }
+
+                    mConnecting.set(false);
                 }
             };
 
@@ -244,43 +247,50 @@ public class ShoutcastV2AudioBroadcaster extends AudioBroadcaster implements IBr
 
         sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\" ?><metadata>");
 
-        sb.append(UltravoxMetadata.ALBUM_TITLE.asXML(getConfiguration().getName()));
+        try
-
-        sb.append(UltravoxMetadata.BROADCAST_CLIENT_APPLICATION.asXML(SystemProperties.getInstance().getApplicationName()));
-
-        if(getConfiguration().hasGenre())
         {
-            sb.append(UltravoxMetadata.GENRE.asXML(getConfiguration().getGenre()));
+            sb.append(UltravoxMetadata.ALBUM_TITLE.asXML(getConfiguration().getName()));
-        }
 
-        if(getConfiguration().hasURL())
+            sb.append(UltravoxMetadata.BROADCAST_CLIENT_APPLICATION.asXML(SystemProperties.getInstance().getApplicationName()));
-        {
-            sb.append(UltravoxMetadata.URL.asXML(getConfiguration().getURL()));
-        }
 
-        if(metadata != null)
+            if(getConfiguration().hasGenre())
-        {
-            if(metadata.getPrimaryAddressTo().hasAlias())
             {
-                sb.append(UltravoxMetadata.TITLE_2.asXML(metadata.getPrimaryAddressTo().getAlias().getName()));
+                sb.append(UltravoxMetadata.GENRE.asXML(getConfiguration().getGenre()));
-            }
-            else if(metadata.getPrimaryAddressTo().hasIdentifier())
-            {
-                sb.append(UltravoxMetadata.TITLE_2.asXML(metadata.getPrimaryAddressTo().getIdentifier()));
             }
 
-            if(metadata.getPrimaryAddressFrom().hasAlias())
+            if(getConfiguration().hasURL())
             {
-                sb.append(UltravoxMetadata.TITLE_3.asXML("From:" + metadata.getPrimaryAddressFrom().getAlias().getName()));
+                sb.append(UltravoxMetadata.URL.asXML(getConfiguration().getURL()));
             }
-            else if(metadata.getPrimaryAddressFrom().hasIdentifier())
+
+            if(metadata != null)
             {
-                sb.append(UltravoxMetadata.TITLE_3.asXML("From:" + metadata.getPrimaryAddressFrom().getIdentifier()));
+                if(metadata.getPrimaryAddressTo().hasAlias())
+                {
+                    sb.append(UltravoxMetadata.TITLE_2.asXML(metadata.getPrimaryAddressTo().getAlias().getName()));
+                }
+                else if(metadata.getPrimaryAddressTo().hasIdentifier())
+                {
+                    sb.append(UltravoxMetadata.TITLE_2.asXML(metadata.getPrimaryAddressTo().getIdentifier()));
+                }
+
+                if(metadata.getPrimaryAddressFrom().hasAlias())
+                {
+                    sb.append(UltravoxMetadata.TITLE_3.asXML("From:" + metadata.getPrimaryAddressFrom().getAlias().getName()));
+                }
+                else if(metadata.getPrimaryAddressFrom().hasIdentifier())
+                {
+                    sb.append(UltravoxMetadata.TITLE_3.asXML("From:" + metadata.getPrimaryAddressFrom().getIdentifier()));
+                }
+            }
+            else
+            {
+                sb.append(UltravoxMetadata.TITLE_2.asXML("Scanning ..."));
             }
         }
-        else
+        catch(UnsupportedEncodingException uee)
         {
-            sb.append(UltravoxMetadata.TITLE_2.asXML("Scanning ..."));
+            mLog.error("UTF-8 Encoding is not supported - shoutcast/ultravox metadata will not be updated");
         }
 
         sb.append("</metadata>");

src/audio/broadcast/shoutcast/v2/ShoutcastV2Configuration.java

@@ -21,6 +21,7 @@ package audio.broadcast.shoutcast.v2;
 import audio.broadcast.BroadcastConfiguration;
 import audio.broadcast.BroadcastFormat;
 import audio.broadcast.BroadcastServerType;
+import org.apache.commons.lang3.Validate;
 
 import javax.xml.bind.annotation.XmlAttribute;
 
@@ -90,7 +91,7 @@ public class ShoutcastV2Configuration extends BroadcastConfiguration
      */
     public void setStreamID(int streamID)
     {
-        assert(1 <= streamID && streamID <= Integer.MAX_VALUE);
+        Validate.isTrue(1 <= streamID && streamID <= Integer.MAX_VALUE);
         mStreamID = streamID;
     }
 

src/audio/broadcast/shoutcast/v2/ultravox/NegotiateMaxPayloadSize.java

@@ -18,6 +18,8 @@
  ******************************************************************************/
 package audio.broadcast.shoutcast.v2.ultravox;
 
+import org.apache.commons.lang3.Validate;
+
 public class NegotiateMaxPayloadSize extends UltravoxMessage
 {
     /**
@@ -47,8 +49,8 @@ public class NegotiateMaxPayloadSize extends UltravoxMessage
      */
     public void setMaximumPayloadSize(int desiredMaximum, int minimum)
     {
-        assert(desiredMaximum <= 16377);
+        Validate.isTrue(desiredMaximum <= 16377);
-        assert(minimum <= 16377);
+        Validate.isTrue(minimum <= 16377);
 
         StringBuilder sb = new StringBuilder();
         sb.append(desiredMaximum).append(":").append(minimum);

src/audio/broadcast/shoutcast/v2/ultravox/UltravoxMessage.java

@@ -19,6 +19,7 @@
 package audio.broadcast.shoutcast.v2.ultravox;
 
 import bits.BinaryMessage;
+import org.apache.commons.lang3.Validate;
 
 import java.util.Arrays;
 
@@ -154,7 +155,7 @@ public abstract class UltravoxMessage
      */
     public void setSendQueuePriority(int priority)
     {
-        assert(0 <= priority && priority <= 7);
+        Validate.isTrue(0 <= priority && priority <= 7);
 
         mMessage.setInt(priority, SEND_QUEUE_PRIORITY);
     }

src/audio/broadcast/shoutcast/v2/ultravox/UltravoxMetadata.java

@@ -18,6 +18,9 @@
  ******************************************************************************/
 package audio.broadcast.shoutcast.v2.ultravox;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+
 public enum UltravoxMetadata
 {
     ALBUM_TITLE("TALB"),
@@ -58,11 +61,11 @@ public enum UltravoxMetadata
      * @param value to enclose in XML tags
      * @return xml tag wrapped value
      */
-    public String asXML(String value)
+    public String asXML(String value) throws UnsupportedEncodingException
     {
         StringBuilder sb = new StringBuilder();
         sb.append("<").append(getXMLTag()).append(">");
-        sb.append(value);
+        sb.append(new String(value.getBytes(), "UTF-8"));
         sb.append("</").append(getXMLTag()).append(">");
 
         return sb.toString();

src/bits/BinaryMessage.java

@@ -22,6 +22,7 @@ import java.util.BitSet;
 import java.util.logging.LogManager;
 
 import edac.CRC;
+import org.apache.commons.lang3.Validate;
 
 public class BinaryMessage extends BitSet
 {
@@ -456,7 +457,7 @@ public class BinaryMessage extends BitSet
      */
     public byte getByte(int index)
     {
-        assert((index + 7) <= size());
+        Validate.isTrue((index + 7) <= size());
 
         int value = 0;
 
@@ -481,7 +482,7 @@ public class BinaryMessage extends BitSet
      */
     public void setByte(int index, byte value)
     {
-        assert((index + 8) <= size());
+        Validate.isTrue((index + 8) <= size());
 
         int mask = 0x80;
 

src/bits/MultiSyncPatternMatcher.java

@@ -17,6 +17,8 @@
  ******************************************************************************/
 package bits;
 
+import org.apache.commons.lang3.Validate;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -39,7 +41,7 @@ public class MultiSyncPatternMatcher
 	
 	public MultiSyncPatternMatcher( int syncSize )
 	{
-		assert( syncSize < 64 );
+		Validate.isTrue(syncSize < 64);
 		
 		//Setup a bit mask of all ones the length of the sync pattern
 		mMask = (long)( ( Math.pow( 2, syncSize ) ) - 1 );

src/channel/details/ChannelDetailPanel.java

@@ -38,7 +38,7 @@ public class ChannelDetailPanel extends JPanel implements Listener<ProcessingCha
     private JLabel mSystemLabel;
     private JLabel mSiteLabel;
     private JLabel mNameLabel;
-    private JTextArea mDetailTextArea;
+    private JTextArea mDetailTextPane;
 
     private ChannelProcessingManager mChannelProcessingManager;
     private ProcessingChain mProcessingChain;
@@ -82,10 +82,10 @@ public class ChannelDetailPanel extends JPanel implements Listener<ProcessingCha
 
         add(buttonPanel, "wrap");
 
-        mDetailTextArea = new JTextArea(EMPTY_DETAILS);
+        mDetailTextPane = new JTextArea(EMPTY_DETAILS);
-        DefaultCaret caret = (DefaultCaret)mDetailTextArea.getCaret();
+        DefaultCaret caret = (DefaultCaret)mDetailTextPane.getCaret();
         caret.setUpdatePolicy(DefaultCaret.NEVER_UPDATE);
-        add(new JScrollPane(mDetailTextArea));
+        add(new JScrollPane(mDetailTextPane));
     }
 
     @Override
@@ -126,7 +126,7 @@ public class ChannelDetailPanel extends JPanel implements Listener<ProcessingCha
                 mSystemLabel.setText(system);
                 mSiteLabel.setText(site);
                 mNameLabel.setText(name);
-                mDetailTextArea.setText(details);
+                mDetailTextPane.setText(details);
             }
         });
     }

src/channel/metadata/AttributeMonitor.java

@@ -19,8 +19,6 @@
 package channel.metadata;
 
 import alias.Alias;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import sample.Listener;
 
 import java.util.ArrayList;
@@ -30,8 +28,6 @@ import java.util.Map;
 
 public class AttributeMonitor<T>
 {
-    private final static Logger mLog = LoggerFactory.getLogger(AttributeMonitor.class);
-
     private Attribute mAttribute;
     private Listener<AttributeChangeRequest> mListener;
     private boolean mHeuristicsEnabled = true;
@@ -50,8 +46,8 @@ public class AttributeMonitor<T>
      * an internal mapping of values to occurrence counts is updated and a change is emitted once a value that is
      * different from the current value, has a higher occurrence count than the current value.  If heuristics are
      * disabled, then a change is emitted at each change in the value.
-     * @param t
      *
+     * @param t type
      * @return true if the value was changed after processing
      */
     public boolean process(T t)
@@ -83,7 +79,7 @@ public class AttributeMonitor<T>
                 {
                     int count = mOccurrenceCounts.get(mCurrentValue);
 
-                    for(Map.Entry<T,Integer> entry: mOccurrenceCounts.entrySet())
+                    for(Map.Entry<T,Integer> entry : mOccurrenceCounts.entrySet())
                     {
                         if(entry.getValue() > count)
                         {
@@ -155,35 +151,4 @@ public class AttributeMonitor<T>
     {
         return mCurrentValue != null;
     }
-
-    public static void main(String[] args)
-    {
-        AttributeMonitor<String> monitor = new AttributeMonitor<>(Attribute.PRIMARY_ADDRESS_TO, new Listener<AttributeChangeRequest>()
-        {
-            @Override
-            public void receive(AttributeChangeRequest attributeChangeRequest)
-            {
-                mLog.debug("Attribute Changed - value:" + attributeChangeRequest.getValue());
-            }
-        });
-        monitor.addIllegalValue("0000");
-        monitor.addIllegalValue("000000");
-
-        monitor.process("ABCD");
-        monitor.process("EFGH");
-        monitor.process("0000");
-        monitor.process("0000");
-        monitor.process("ABCD");
-        monitor.reset();
-
-        monitor.process("EFGH");
-        monitor.process("ABCD");
-        monitor.process("ABCD");
-        monitor.process("EFGH");
-        monitor.process("EFGH");
-        monitor.process("000000");
-        monitor.process("000000");
-        monitor.process("000000");
-        monitor.process("000000");
-    }
 }

src/channel/metadata/ChannelMetadataPanel.java

@@ -26,6 +26,7 @@ import controller.channel.ChannelUtils;
 import icon.IconManager;
 import module.ProcessingChain;
 import net.miginfocom.swing.MigLayout;
+import org.apache.commons.lang3.Validate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import properties.SystemProperties;
@@ -140,7 +141,7 @@ public class ChannelMetadataPanel extends JPanel implements ListSelectionListene
 
         public AliasedValueCellRenderer(Attribute attribute)
         {
-            assert(attribute != null);
+            Validate.isTrue(attribute != null);
             mAttribute = attribute;
             setHorizontalAlignment(JLabel.CENTER);
         }

src/channel/metadata/Metadata.java

@@ -28,6 +28,8 @@ import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
 
 public class Metadata
 {
@@ -61,7 +63,7 @@ public class Metadata
     private Integer mAudioPriority;
     protected Boolean mRecordable = false;
     protected Boolean mDoNotRecord;
-    private List<BroadcastChannel> mBroadcastChannels;
+    private Set<BroadcastChannel> mBroadcastChannels;
 
 
     /**
@@ -166,7 +168,7 @@ public class Metadata
     /**
      * List of de-duplicated broadcast channels aggregated from the primary and secondary TO/FROM aliases.
      */
-    public List<BroadcastChannel> getBroadcastChannels()
+    public Set<BroadcastChannel> getBroadcastChannels()
     {
         if(mBroadcastChannels == null)
         {
@@ -582,50 +584,26 @@ public class Metadata
      */
     private void determineBroadcastChannels()
     {
-        mBroadcastChannels = new ArrayList<>();
+        mBroadcastChannels = new TreeSet<>();
 
         if(mPrimaryAddressTo.hasAlias() && mPrimaryAddressTo.getAlias().isStreamable())
         {
-            for(BroadcastChannel broadcastChannel: mPrimaryAddressTo.getAlias().getBroadcastChannels())
+            mBroadcastChannels.addAll(mPrimaryAddressTo.getAlias().getBroadcastChannels());
-            {
-                if(!mBroadcastChannels.contains(broadcastChannel))
-                {
-                    mBroadcastChannels.add(broadcastChannel);
-                }
-            }
         }
 
         if(mPrimaryAddressFrom.hasAlias() && mPrimaryAddressFrom.getAlias().isStreamable())
         {
-            for(BroadcastChannel broadcastChannel: mPrimaryAddressFrom.getAlias().getBroadcastChannels())
+            mBroadcastChannels.addAll(mPrimaryAddressFrom.getAlias().getBroadcastChannels());
-            {
-                if(!mBroadcastChannels.contains(broadcastChannel))
-                {
-                    mBroadcastChannels.add(broadcastChannel);
-                }
-            }
         }
 
         if(mSecondaryAddressTo.hasAlias() && mSecondaryAddressTo.getAlias().isStreamable())
         {
-            for(BroadcastChannel broadcastChannel: mSecondaryAddressTo.getAlias().getBroadcastChannels())
+            mBroadcastChannels.addAll(mSecondaryAddressTo.getAlias().getBroadcastChannels());
-            {
-                if(!mBroadcastChannels.contains(broadcastChannel))
-                {
-                    mBroadcastChannels.add(broadcastChannel);
-                }
-            }
         }
 
         if(mSecondaryAddressFrom.hasAlias() && mSecondaryAddressFrom.getAlias().isStreamable())
         {
-            for(BroadcastChannel broadcastChannel: mSecondaryAddressFrom.getAlias().getBroadcastChannels())
+            mBroadcastChannels.addAll(mSecondaryAddressFrom.getAlias().getBroadcastChannels());
-            {
-                if(!mBroadcastChannels.contains(broadcastChannel))
-                {
-                    mBroadcastChannels.add(broadcastChannel);
-                }
-            }
         }
     }
 

src/channel/state/DecoderState.java

@@ -23,6 +23,9 @@ public abstract class DecoderState extends Module implements ActivitySummaryProv
     IAttributeChangeRequestProvider, ICallEventProvider, IDecoderStateEventListener,
     IDecoderStateEventProvider, IMessageListener
 {
+    protected String DIVIDER1 = "======================================================\n";
+    protected String DIVIDER2 = "------------------------------------------------------\n";
+
     /* This has to be a broadcaster in order for references to persist */
     private Broadcaster<CallEvent> mCallEventBroadcaster = new Broadcaster<>();
     private Broadcaster<AttributeChangeRequest> mAttributeChangeRequestBroadcaster = new Broadcaster<>();

src/controller/channel/NameConfigurationEditor.java

@@ -17,253 +17,251 @@
  ******************************************************************************/
 package controller.channel;
 
+import alias.AliasModel;
 import gui.editor.Editor;
+import net.miginfocom.swing.MigLayout;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import javax.swing.*;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.Collections;
 import java.util.List;
 
-import javax.swing.ComboBoxModel;
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.JComboBox;
-import javax.swing.JLabel;
-import javax.swing.JTextField;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import net.miginfocom.swing.MigLayout;
-import alias.AliasModel;
-
 public class NameConfigurationEditor extends Editor<Channel> implements DocumentListener
 {
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	private final static Logger mLog = LoggerFactory.getLogger( NameConfigurationEditor.class );
+    private final static Logger mLog = LoggerFactory.getLogger(NameConfigurationEditor.class);
 
-	private static ComboBoxModel<String> EMPTY_MODEL = new DefaultComboBoxModel<>();
+    private static ComboBoxModel<String> EMPTY_SYSTEM_MODEL = new DefaultComboBoxModel<>();
+    private static ComboBoxModel<String> EMPTY_SITE_MODEL = new DefaultComboBoxModel<>();
+    private static ComboBoxModel<String> EMPTY_ALIAS_LIST_MODEL = new DefaultComboBoxModel<>();
 
-	private AliasModel mAliasModel;
+    private AliasModel mAliasModel;
-	private ChannelModel mChannelModel;
+    private ChannelModel mChannelModel;
 
-	private JTextField mChannelName;
+    private JTextField mChannelName;
-	private JComboBox<String> mSystemNameCombo;
+    private JComboBox<String> mSystemNameCombo;
-	private JComboBox<String> mSiteNameCombo;
+    private JComboBox<String> mSiteNameCombo;
-	private JComboBox<String> mAliasListCombo;
+    private JComboBox<String> mAliasListCombo;
 
-	public NameConfigurationEditor( AliasModel aliasModel, ChannelModel model )
+    public NameConfigurationEditor(AliasModel aliasModel, ChannelModel model)
-	{
+    {
-		mAliasModel = aliasModel;
+        mAliasModel = aliasModel;
-		mChannelModel = model;
+        mChannelModel = model;
 
-		init();
+        init();
-	}
+    }
 
-	private void init()
+    private void init()
-	{
+    {
-		setLayout( new MigLayout( "fill,wrap 4", "[right][grow,fill][right][grow,fill]", "[][][grow]" ) );
+        setLayout(new MigLayout("fill,wrap 4", "[right][grow,fill][right][grow,fill]", "[][][grow]"));
 
-		mChannelName = new JTextField( "" );
+        mChannelName = new JTextField("");
-		mChannelName.getDocument().addDocumentListener( this );
+        mChannelName.getDocument().addDocumentListener(this);
-		mChannelName.setEnabled( false );
+        mChannelName.setEnabled(false);
 
-		add( new JLabel( "Name:" ) );
+        add(new JLabel("Name:"));
-		add( mChannelName );
+        add(mChannelName);
 
-		mSystemNameCombo = new JComboBox<>( EMPTY_MODEL );
+        mSystemNameCombo = new JComboBox<>(EMPTY_SYSTEM_MODEL);
-		mSystemNameCombo.setEnabled( false );
+        mSystemNameCombo.setEnabled(false);
-		mSystemNameCombo.setEditable( true );
+        mSystemNameCombo.setEditable(true);
-		mSystemNameCombo.addActionListener( new ActionListener()
+        mSystemNameCombo.addActionListener(new ActionListener()
-		{
+        {
-			@Override
+            @Override
-			public void actionPerformed( ActionEvent e )
+            public void actionPerformed(ActionEvent e)
-			{
+            {
-				Object selected = mSystemNameCombo.getSelectedItem();
+                Object selected = mSystemNameCombo.getSelectedItem();
 
-				if( selected != null )
+                if(selected != null)
-				{
+                {
-					String system = (String)selected;
+                    String system = (String)selected;
 
-					List<String> sites = mChannelModel.getSites( system );
+                    List<String> sites = mChannelModel.getSites(system);
 
-					if( !sites.contains( getItem().getSite() ) )
+                    if(!sites.contains(getItem().getSite()))
-					{
+                    {
-						sites.add( getItem().getSite() );
+                        sites.add(getItem().getSite());
-					}
+                    }
 
-					if( sites.isEmpty() )
+                    if(sites.isEmpty())
-					{
+                    {
-						mSiteNameCombo.setModel( EMPTY_MODEL );
+                        mSiteNameCombo.setModel(EMPTY_SITE_MODEL);
-					}
+                    }
-					else
+                    else
-					{
+                    {
-						mSiteNameCombo.setModel( new DefaultComboBoxModel<String>( 
+                        mSiteNameCombo.setModel(new DefaultComboBoxModel<String>(
-								sites.toArray( new String[ sites.size() ] ) ) );;
+                            sites.toArray(new String[sites.size()])));
-					}
+                        ;
+                    }
 
-					mSiteNameCombo.setSelectedItem( getItem().getSite() );
+                    mSiteNameCombo.setSelectedItem(getItem().getSite());
-				}
+                }
 
-				setModified( true );
+                setModified(true);
-			}
+            }
-		} );
+        });
 
-		add( new JLabel( "System:" ) );
+        add(new JLabel("System:"));
-		add( mSystemNameCombo );
+        add(mSystemNameCombo);
 
-		mAliasListCombo = new JComboBox<String>();
+        mAliasListCombo = new JComboBox<String>(EMPTY_ALIAS_LIST_MODEL);
-		mAliasListCombo.setEnabled( false );
+        mAliasListCombo.setEnabled(false);
-		mAliasListCombo.setEditable( true );
+        mAliasListCombo.setEditable(true);
-		mAliasListCombo.addActionListener( new ActionListener()
+        mAliasListCombo.addActionListener(new ActionListener()
-		{
+        {
-			@Override
+            @Override
-			public void actionPerformed( ActionEvent e )
+            public void actionPerformed(ActionEvent e)
-			{
+            {
-				setModified( true );
+                setModified(true);
-			}
+            }
-		} );
+        });
 
-		add( new JLabel( "Alias List:" ) );
+        add(new JLabel("Alias List:"));
-		add( mAliasListCombo );
+        add(mAliasListCombo);
 
-		mSiteNameCombo = new JComboBox<>( EMPTY_MODEL );
+        mSiteNameCombo = new JComboBox<>(EMPTY_SITE_MODEL);
-		mSiteNameCombo.setEnabled( false );
+        mSiteNameCombo.setEnabled(false);
-		mSiteNameCombo.setEditable( true );
+        mSiteNameCombo.setEditable(true);
-		mSiteNameCombo.addActionListener( new ActionListener()
+        mSiteNameCombo.addActionListener(new ActionListener()
-		{
+        {
-			@Override
+            @Override
-			public void actionPerformed( ActionEvent e )
+            public void actionPerformed(ActionEvent e)
-			{
+            {
-				setModified( true );
+                setModified(true);
-			}
+            }
-		} );
+        });
 
-		add( new JLabel( "Site:" ) );
+        add(new JLabel("Site:"));
-		add( mSiteNameCombo );
+        add(mSiteNameCombo);
-	}
+    }
 
-	@Override
+    @Override
-	public void save()
+    public void save()
-	{
+    {
-		if( hasItem() && isModified() )
+        if(hasItem() && isModified())
-		{
+        {
-			getItem().setName( mChannelName.getText() );
+            getItem().setName(mChannelName.getText());
 
-			Object system = mSystemNameCombo.getSelectedItem();
+            Object system = mSystemNameCombo.getSelectedItem();
-			getItem().setSystem( ( system == null ? null : (String)system ) );
+            getItem().setSystem((system == null ? null : (String)system));
 
-			Object site = mSiteNameCombo.getSelectedItem();
+            Object site = mSiteNameCombo.getSelectedItem();
-			getItem().setSite( ( site == null ? null : (String)site ) );
+            getItem().setSite((site == null ? null : (String)site));
 
-			Object aliasList = mAliasListCombo.getSelectedItem();
+            Object aliasList = mAliasListCombo.getSelectedItem();
-			getItem().setAliasListName( aliasList == null ? null : (String)aliasList );
+            getItem().setAliasListName(aliasList == null ? null : (String)aliasList);
-		}
+        }
 
-		setModified( false );
+        setModified(false);
-	}
+    }
 
-	private void setControlsEnabled( boolean enabled )
+    private void setControlsEnabled(boolean enabled)
-	{
+    {
-		if( mChannelName.isEnabled() != enabled )
+        if(mChannelName.isEnabled() != enabled)
-		{
+        {
-			mChannelName.setEnabled( enabled );
+            mChannelName.setEnabled(enabled);
-		}
+        }
 
-		if( mAliasListCombo.isEnabled() != enabled )
+        if(mAliasListCombo.isEnabled() != enabled)
-		{
+        {
-			mAliasListCombo.setEnabled( enabled );
+            mAliasListCombo.setEnabled(enabled);
-		}
+        }
 
-		if( mSystemNameCombo.isEnabled() != enabled )
+        if(mSystemNameCombo.isEnabled() != enabled)
-		{
+        {
-			mSystemNameCombo.setEnabled( enabled );
+            mSystemNameCombo.setEnabled(enabled);
-		}
+        }
 
-		if( mSiteNameCombo.isEnabled() != enabled )
+        if(mSiteNameCombo.isEnabled() != enabled)
-		{
+        {
-			mSiteNameCombo.setEnabled( enabled );
+            mSiteNameCombo.setEnabled(enabled);
-		}
+        }
-	}
+    }
 
-	@Override
+    @Override
-	public void setItem( Channel channel )
+    public void setItem(Channel channel)
-	{
+    {
-		super.setItem( channel );
+        super.setItem(channel);
 
-		if( hasItem() )
+        if(hasItem())
-		{
+        {
-			setControlsEnabled( true );
+            setControlsEnabled(true);
 
-			mChannelName.setText( channel.getName() );
+            mChannelName.setText(channel.getName());
 
-			List<String> systems = mChannelModel.getSystems();
+            List<String> systems = mChannelModel.getSystems();
 
-			if( systems.isEmpty() )
+            if(systems.isEmpty())
-			{
+            {
-				mSystemNameCombo.setModel( EMPTY_MODEL );
+                mSystemNameCombo.setModel(EMPTY_SYSTEM_MODEL);
-			}
+            }
-			else
+            else
-			{
+            {
-				mSystemNameCombo.setModel( new DefaultComboBoxModel<String>( 
+                mSystemNameCombo.setModel(new DefaultComboBoxModel<String>(
-						systems.toArray( new String[ systems.size() ] ) ) );;
+                    systems.toArray(new String[systems.size()])));
-			}
+                ;
+            }
 
-			mSystemNameCombo.setSelectedItem( channel.getSystem() );
+            mSystemNameCombo.setSelectedItem(channel.getSystem());
 
-			List<String> sites = mChannelModel.getSites( channel.getSystem() );
+            List<String> sites = mChannelModel.getSites(channel.getSystem());
 
-			if( sites.isEmpty() )
+            if(sites.isEmpty())
-			{
+            {
-				mSiteNameCombo.setModel( EMPTY_MODEL );
+                mSiteNameCombo.setModel(EMPTY_SITE_MODEL);
-			}
+            }
-			else
+            else
-			{
+            {
-				mSiteNameCombo.setModel( new DefaultComboBoxModel<String>( 
+                mSiteNameCombo.setModel(new DefaultComboBoxModel<String>(
-						sites.toArray( new String[ sites.size() ] ) ) );;
+                    sites.toArray(new String[sites.size()])));
-			}
+                ;
+            }
 
-			if( channel.getSite() != null )
+            if(channel.getSite() != null)
-			{
+            {
-				mSiteNameCombo.setSelectedItem( channel.getSite() );
+                mSiteNameCombo.setSelectedItem(channel.getSite());
-			}
+            }
 
-			List<String> lists = mAliasModel.getListNames();
+            List<String> lists = mAliasModel.getListNames();
-			Collections.sort( lists );
+            Collections.sort(lists);
-			mAliasListCombo.setModel( new DefaultComboBoxModel<String>( 
+            mAliasListCombo.setModel(new DefaultComboBoxModel<String>(
-					lists.toArray( new String[ lists.size() ] ) ) );
+                lists.toArray(new String[lists.size()])));
 
-			if( channel.getAliasListName() != null )
+            if(channel.getAliasListName() != null)
-			{
+            {
-		   		mAliasListCombo.setSelectedItem( channel.getAliasListName() );
+                mAliasListCombo.setSelectedItem(channel.getAliasListName());
-			}
+            }
-		}
+        }
-		else
+        else
-		{
+        {
-			setControlsEnabled( false );
+            setControlsEnabled(false);
-			mChannelName.setText( null );
+            mChannelName.setText(null);
-		}
+        }
 
-		setModified( false );
+        setModified(false);
-	}
+    }
 
-	@Override
+    @Override
-	public void insertUpdate( DocumentEvent e )
+    public void insertUpdate(DocumentEvent e)
-	{
+    {
-		setModified( true );
+        setModified(true);
-	}
+    }
 
-	@Override
+    @Override
-	public void changedUpdate( DocumentEvent e )
+    public void changedUpdate(DocumentEvent e)
-	{
+    {
-		setModified( true );
+        setModified(true);
-	}
+    }
 
-	@Override
+    @Override
-	public void removeUpdate( DocumentEvent e ) 
+    public void removeUpdate(DocumentEvent e)
-	{
+    {
-		setModified( true );
+        setModified(true);
-	}
+    }
 }

src/dsp/filter/FloatFIRFilter.java

@@ -19,6 +19,7 @@ package dsp.filter;
 
 import java.util.ArrayList;
 
+import org.apache.commons.lang3.Validate;
 import sample.real.RealSampleListener;
 
 public class FloatFIRFilter implements RealSampleListener
@@ -139,7 +140,7 @@ public class FloatFIRFilter implements RealSampleListener
 	private void generateIndexMap( int size )
 	{
 		//Ensure we have an odd size
-		assert( size % 2 == 1 );
+		Validate.isTrue(size % 2 == 1);
 		
 		mIndexMap = new int[ size ][ size ];
 		

src/dsp/filter/FloatHalfBandFilter.java

@@ -19,6 +19,7 @@ package dsp.filter;
 
 import java.util.ArrayList;
 
+import org.apache.commons.lang3.Validate;
 import sample.real.RealSampleListener;
 
 public class FloatHalfBandFilter implements RealSampleListener
@@ -149,7 +150,7 @@ public class FloatHalfBandFilter implements RealSampleListener
 	private void generateIndexMap( int size )
 	{
 		//Ensure we have an odd size
-		assert( size % 2 == 1 );
+		Validate.isTrue(size % 2 == 1);
 
 		int mapWidth = ( ( size + 1 ) / 2 ) + 1;
 		

src/dsp/filter/FloatHalfBandNoDecimateFilter.java

@@ -19,6 +19,7 @@ package dsp.filter;
 
 import java.util.ArrayList;
 
+import org.apache.commons.lang3.Validate;
 import sample.real.RealSampleListener;
 
 public class FloatHalfBandNoDecimateFilter implements RealSampleListener
@@ -139,7 +140,7 @@ public class FloatHalfBandNoDecimateFilter implements RealSampleListener
 	private void generateIndexMap( int size )
 	{
 		//Ensure we have an odd size
-		assert( size % 2 == 1 );
+		Validate.isTrue(size % 2 == 1);
 
 		int mapWidth = ( ( size + 1 ) / 2 ) + 1;
 		

src/dsp/filter/cic/ComplexPrimeCICDecimate.java

@@ -20,6 +20,7 @@ package dsp.filter.cic;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.commons.lang3.Validate;
 import sample.Listener;
 import sample.complex.ComplexBuffer;
 import sample.complex.ComplexSampleListener;
@@ -67,7 +68,7 @@ public class ComplexPrimeCICDecimate implements Listener<ComplexBuffer>
 	public ComplexPrimeCICDecimate( int decimation, int order, 
 			int passFrequency, int attenuation, WindowType windowType )
 	{
-		assert( decimation <= 700 );
+		Validate.isTrue(decimation <= 700);
 		
 
 		List<Integer> stageSizes = getPrimeFactors( decimation );

src/dsp/filter/cic/RealPrimeCICDecimate.java

@@ -20,6 +20,7 @@ package dsp.filter.cic;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.commons.lang3.Validate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -81,7 +82,7 @@ public class RealPrimeCICDecimate
 	public RealPrimeCICDecimate( int decimation, int order, int passFrequency, 
 			int attenuation, WindowType windowType, int outputBufferSize )
 	{
-		assert( decimation <= 700 );
+		Validate.isTrue(decimation <= 700);
 
 		mOutputBufferSize = outputBufferSize;
 

src/dsp/filter/design/FilterViewer.java

@@ -1,65 +1,64 @@
 package dsp.filter.design;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import dsp.filter.fir.FIRFilterSpecification;
 import dsp.filter.fir.remez.RemezFIRFilterDesigner;
 import javafx.application.Application;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class FilterViewer extends Application
 {
-	private final static Logger mLog = LoggerFactory.getLogger( FilterViewer.class );
+    private final static Logger mLog = LoggerFactory.getLogger(FilterViewer.class);
 
-	/**
+    /**
-	 * Developer tool to visualize filter designs
+     * Developer tool to visualize filter designs
-	 */
+     */
-	public FilterViewer()
+    public FilterViewer()
-	{
+    {
-	}
+    }
 
-	@Override
+    @Override
-	public void start( Stage primaryStage ) throws Exception
+    public void start(Stage primaryStage) throws Exception
-	{
+    {
-		Scene scene = new Scene( new FilterView( getFilter() ) );
+        Scene scene = new Scene(new FilterView(getFilter()));
 
-		primaryStage.setTitle( "Filter Viewer" );
+        primaryStage.setTitle("Filter Viewer");
-		primaryStage.setScene( scene );
+        primaryStage.setScene(scene);
-		primaryStage.show();
+        primaryStage.show();
-	}
+    }
 
-	public static void main( String[] args )
+    public static void main(String[] args)
-	{
+    {
-		launch( args );
+        launch(args);
-	}
+    }
 
-	/**
+    /**
-	 * Provides the filter to visualize.  Modify this method to visualize your filter design.
+     * Provides the filter to visualize.  Modify this method to visualize your filter design.
-	 */
+     */
-	private float[] getFilter()
+    private float[] getFilter()
-	{
+    {
-//		FIRFilterSpecification specification = FIRFilterSpecification.lowPassBuilder()
+        FIRFilterSpecification specification = FIRFilterSpecification.lowPassBuilder()
-//		        .sampleRate( 48000 )
+            .sampleRate(48000)
-//		        .gridDensity( 16 )
+            .gridDensity(16)
-//                .passBandCutoff( 3200 )
+            .passBandCutoff(2500)
-//		        .passBandAmplitude( 1.0 )
+            .passBandAmplitude(1.0)
-//		        .passBandRipple( 0.02 )
+            .passBandRipple(0.01)
-//		        .stopBandStart( 4000 )
+            .stopBandStart(4000)
-//		        .stopBandAmplitude( 0.0 )
+            .stopBandAmplitude(0.0)
-//		        .stopBandRipple( 0.03 )
+            .stopBandRipple(0.008)
-//		        .build();
+            .build();
 
-		FIRFilterSpecification specification = FIRFilterSpecification.highPassBuilder()
+//        FIRFilterSpecification specification = FIRFilterSpecification.highPassBuilder()
-		        .sampleRate( 24000 )
+//            .sampleRate(24000)
-		        .stopBandCutoff( 800 )
+//            .stopBandCutoff(800)
-		        .stopBandAmplitude( 0.0 )
+//            .stopBandAmplitude(0.0)
-		        .stopBandRipple( 0.03 )
+//            .stopBandRipple(0.03)
-		        .passBandStart( 1000 )
+//            .passBandStart(1000)
-		        .passBandAmplitude( 1.0 )
+//            .passBandAmplitude(1.0)
-		        .passBandRipple( 0.08 )
+//            .passBandRipple(0.08)
-		        .build();
+//            .build();
 
 //		FIRFilterSpecification specification = FIRFilterSpecification.bandPassBuilder()
 //	        .sampleRate( 48000 )
@@ -71,24 +70,25 @@ public class FilterViewer extends Application
 //	        .passRipple( 0.008)
 //	        .build();
 
-		float[] taps = null;
+        float[] taps = null;
 
-//		taps = FilterFactory.getLowPass( 16000, 2400, 73, WindowType.HANNING );
+//        taps = FilterFactory.getLowPass(48000, 6750, 7500, 60,
+//            Window.WindowType.HAMMING, true);
 
-		try
+        try
-		{
+        {
-			RemezFIRFilterDesigner designer = new RemezFIRFilterDesigner( specification );
+            RemezFIRFilterDesigner designer = new RemezFIRFilterDesigner(specification);
 
-			if( designer.isValid() )
+            if(designer.isValid())
-			{
+            {
-				taps = designer.getImpulseResponse();
+                taps = designer.getImpulseResponse();
-			}
+            }
-		}
+        }
-		catch( FilterDesignException fde )
+        catch(FilterDesignException fde)
-		{
+        {
-		    mLog.error( "Filter design error", fde );
+            mLog.error("Filter design error", fde);
-		}
+        }
 
-		return taps;
+        return taps;
-	}
+    }
 }

src/dsp/filter/halfband/real/HalfBandFilter.java

@@ -17,6 +17,8 @@
  ******************************************************************************/
 package dsp.filter.halfband.real;
 
+import org.apache.commons.lang3.Validate;
+
 public class HalfBandFilter
 {
 	private float[] mBuffer;
@@ -122,7 +124,7 @@ public class HalfBandFilter
 	private void generateIndexMap( int size )
 	{
 		//Ensure we have an odd size
-		assert( size % 2 == 1 );
+		Validate.isTrue(size % 2 == 1);
 
 		int mapWidth = ( ( size + 1 ) / 2 ) + 1;
 		

src/dsp/filter/interpolator/RealInterpolator.java

@@ -1,5 +1,6 @@
 package dsp.filter.interpolator;
 
+import org.apache.commons.lang3.Validate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -31,7 +32,7 @@ public class RealInterpolator extends Interpolator
 	public float filter( float[] samples, int offset, float mu )
 	{
 		/* Ensure we have enough samples in the array */
-		assert( samples.length >= offset + 7 );
+		Validate.isTrue(samples.length >= offset + 7);
 
 		/* Identify the filter bank that corresponds to mu */
 		int index = (int)( NSTEPS * mu );

src/dsp/filter/polyphase/PolyphaseFIRInterpolatingFilter.java

@@ -18,6 +18,7 @@
  ******************************************************************************/
 package dsp.filter.polyphase;
 
+import org.apache.commons.lang3.Validate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -53,7 +54,7 @@ public class PolyphaseFIRInterpolatingFilter
 	public PolyphaseFIRInterpolatingFilter( double[] coefficients, int interpolation )
 	{
 		/* Ensure coefficients are an integral multiple of the interpolation factor */
-		assert( coefficients.length % interpolation == 0 );
+		Validate.isTrue(coefficients.length % interpolation == 0);
 		
 		mTaps = coefficients;
 

src/dsp/gain/DirectGainControl.java

@@ -17,6 +17,7 @@
  ******************************************************************************/
 package dsp.gain;
 
+import org.apache.commons.lang3.Validate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -49,7 +50,7 @@ public class DirectGainControl implements GainController, RealSampleListener
 	 */
 	public DirectGainControl( float gain, float minimum, float maximum, float increment )
 	{
-		assert( minimum > 0 );
+		Validate.isTrue(minimum > 0);
 
 		mDefaultGain = gain;
 		mGain = gain;

src/module/decode/DecoderFactory.java

@@ -103,35 +103,35 @@ public class DecoderFactory
 
     //Low-pass filter with ~60 dB attenuation and 89 taps
     private static final FIRFilterSpecification MPT1327_FILTER_SPECIFICATION = FIRFilterSpecification.lowPassBuilder()
-        .sampleRate( 48000 )
+        .sampleRate( 48000 ).gridDensity( 16 ).passBandCutoff( 3200 ).passBandAmplitude( 1.0 ).passBandRipple( 0.02 )
-        .gridDensity( 16 )
+        .stopBandStart( 4000 ).stopBandAmplitude( 0.0 ).stopBandRipple( 0.03 ).build();
-        .passBandCutoff( 3200 )
+
-        .passBandAmplitude( 1.0 )
+    private static final FIRFilterSpecification P25_C4FM_IQ_SPECIFICATION = FIRFilterSpecification.lowPassBuilder()
-        .passBandRipple( 0.02 )
+        .sampleRate(48000).gridDensity(16).passBandCutoff(6750).passBandAmplitude(1.0).passBandRipple(0.01)
-        .stopBandStart( 4000 )
+        .stopBandStart(7000).stopBandAmplitude(0.0).stopBandRipple(0.008).build();
-        .stopBandAmplitude( 0.0 )
+
-        .stopBandRipple( 0.03 )
+    private static final FIRFilterSpecification P25_C4FM_DEMOD_SPECIFICATION = FIRFilterSpecification.lowPassBuilder()
-        .build();
+        .sampleRate(48000).gridDensity(16).passBandCutoff(2500).passBandAmplitude(1.0).passBandRipple(0.01)
+        .stopBandStart(4000).stopBandAmplitude(0.0).stopBandRipple(0.008).build();
 
     private static float[] MPT1327_LOWPASS_FILTER;
+    private static float[] P25_C4FM_IQ_FILTER;
+    private static float[] P25_C4FM_DEMOD_FILTER;
 
     static
     {
         try
         {
             MPT1327_LOWPASS_FILTER = FilterFactory.getTaps(MPT1327_FILTER_SPECIFICATION);
+            P25_C4FM_IQ_FILTER = FilterFactory.getTaps(P25_C4FM_IQ_SPECIFICATION);
+            P25_C4FM_DEMOD_FILTER = FilterFactory.getTaps(P25_C4FM_DEMOD_SPECIFICATION);
         }
         catch(Exception e)
         {
-            mLog.error("Couldn't design MPT1327 bandpass filter");
+            mLog.error("Couldn't design startup filter(s)");
         }
     }
 
-    public static final boolean NO_REMOVE_DC = false;
-    public static final boolean REMOVE_DC = true;
-
-    public static final int NO_FREQUENCY_CORRECTION = 0;
-
     /**
      * Returns a list of one primary decoder and any auxiliary decoders, as
      * specified in the configurations.
@@ -228,7 +228,7 @@ public class DecoderFactory
                 }
 
                 modules.add(new FMDemodulatorModule(iqPass, iqStop));
-                modules.add(new DemodulatedAudioFilterModule(MPT1327_LOWPASS_FILTER, 1.0f));
+                modules.add(new DemodulatedAudioFilterModule(P25_C4FM_DEMOD_FILTER, 1.0f));
                 modules.add(new AudioModule(metadata));
                 break;
             case PASSPORT:
@@ -247,7 +247,8 @@ public class DecoderFactory
                 switch(modulation)
                 {
                     case C4FM:
-                        modules.add(new FMDemodulatorModule(6750, 7500));
+                        modules.add(new FMDemodulatorModule(P25_C4FM_IQ_FILTER));
+                        modules.add(new DemodulatedAudioFilterModule(P25_C4FM_DEMOD_FILTER, 1.0f));
                         modules.add(new P25_C4FMDecoder(aliasList, decodeConfig.getAFCMaximumCorrection()));
                         modules.add(new P25DecoderState(aliasList, channelType, Modulation.C4FM,
                             p25Config.getIgnoreDataCalls()));

src/module/decode/mpt1327/MPT1327DecoderState.java

@@ -389,9 +389,9 @@ public class MPT1327DecoderState extends DecoderState
     {
         StringBuilder sb = new StringBuilder();
 
-        sb.append("Activity Summary\n");
+        sb.append("Activity Summary - Decoder: MPT-1327\n");
-        sb.append("Decoder:\tMPT-1327\n");
+        sb.append(DIVIDER1);
-        sb.append("Site:\t");
+        sb.append("Site: ");
 
         if(mSite != null)
         {
@@ -403,9 +403,7 @@ public class MPT1327DecoderState extends DecoderState
 
                 if(siteAlias != null)
                 {
-                    sb.append(" ");
+                    sb.append(" ").append(siteAlias.getName()).append("\n");
-                    sb.append(siteAlias.getName());
-                    sb.append("\n");
                 }
             }
         }
@@ -414,13 +412,11 @@ public class MPT1327DecoderState extends DecoderState
             sb.append("Unknown\n");
         }
 
-        sb.append("\n\n");
+        sb.append(DIVIDER2).append("Talkgroups: ");
-
-        sb.append("Talkgroups\n\n");
 
         if(mGroups.isEmpty())
         {
-            sb.append("  None\n");
+            sb.append("None\n");
         }
         else
         {
@@ -429,8 +425,7 @@ public class MPT1327DecoderState extends DecoderState
 
             for(String talkgroup : talkgroups)
             {
-                sb.append("  ");
+                sb.append("\n ").append(talkgroup);
-                sb.append(talkgroup);
 
                 if(hasAliasList())
                 {
@@ -450,7 +445,7 @@ public class MPT1327DecoderState extends DecoderState
 
                 for(String member : members)
                 {
-                    sb.append("   >");
+                    sb.append("  >");
                     sb.append(member);
 
                     if(hasAliasList())
@@ -466,27 +461,26 @@ public class MPT1327DecoderState extends DecoderState
 
                     sb.append("\n");
                 }
-
-                sb.append("\n");
             }
         }
 
-        sb.append("\n");
+        sb.append(DIVIDER2).append("All Idents: ");
 
-        sb.append("Individual Idents\n");
         if(mIdents.isEmpty())
         {
-            sb.append("  None\n");
+            sb.append("None\n");
         }
         else
         {
+            sb.append("\n");
+
             Iterator<String> it = mIdents.iterator();
 
             while(it.hasNext())
             {
                 String ident = it.next();
 
-                sb.append("  ");
+                sb.append("");
                 sb.append(ident);
                 sb.append(" ");
 

src/module/decode/p25/P25DecoderState.java

@@ -148,6 +148,7 @@ public class P25DecoderState extends DecoderState
     private static final DecimalFormat mFrequencyFormatter =
         new DecimalFormat("0.000000");
 
+
     private module.decode.p25.message.tsbk.osp.control.NetworkStatusBroadcast mNetworkStatus;
     private NetworkStatusBroadcastExtended mNetworkStatusExtended;
     private ProtectionParameterBroadcast mProtectionParameterBroadcast;
@@ -2741,7 +2742,7 @@ public class P25DecoderState extends DecoderState
 
                     P25CallEvent event = new P25CallEvent.Builder(CallEventType.PATCH_GROUP_CALL)
                         .aliasList(getAliasList())
-                        .channel(channel)
+                        .channel(channel + (pgvcg.isTDMAChannel() ? " TDMA" : ""))
                         .details(details.toString())
                         .frequency(pgvcg.getDownlinkFrequency())
                         .from(from)
@@ -2752,8 +2753,10 @@ public class P25DecoderState extends DecoderState
                     broadcast(event);
                 }
 
-                broadcast(new TrafficChannelAllocationEvent(this,
+                if(!pgvcg.isTDMAChannel())
-                    mChannelCallMap.get(channel)));
+                {
+                    broadcast(new TrafficChannelAllocationEvent(this, mChannelCallMap.get(channel)));
+                }
                 break;
             case PATCH_GROUP_CHANNEL_GRANT_UPDATE:
                 //Cleanup patch groups - auto-expire any patch groups before we allocate a channel
@@ -2772,10 +2775,8 @@ public class P25DecoderState extends DecoderState
                 {
                     P25CallEvent event = new P25CallEvent.Builder(CallEventType.PATCH_GROUP_CALL)
                         .aliasList(getAliasList())
-                        .channel(channel)
+                        .channel(channel + (gvcgu.isTDMAChannel1() ? " TDMA" : ""))
-                        .details((gvcgu.isEncrypted() ? "ENCRYPTED " : "") +
+                        .details((gvcgu.isEncrypted() ? "ENCRYPTED " : ""))
-                            "PATCH UPDATE - GROUP 2:" + gvcgu.getPatchGroupAddress2() +
-                            " DN:" + gvcgu.getDownlinkFrequency2())
                         .frequency(gvcgu.getDownlinkFrequency1())
                         .to(to)
                         .build();
@@ -2784,8 +2785,37 @@ public class P25DecoderState extends DecoderState
                     broadcast(event);
                 }
 
-                broadcast(new TrafficChannelAllocationEvent(this,
+                if(!gvcgu.isTDMAChannel1())
-                    mChannelCallMap.get(channel)));
+                {
+                    broadcast(new TrafficChannelAllocationEvent(this, mChannelCallMap.get(channel)));
+                }
+
+                String channel2 = gvcgu.getChannel2();
+                String to2 = gvcgu.getPatchGroupAddress2();
+
+                if(hasCallEvent(channel2, null, to2))
+                {
+                    updateCallEvent(channel2, null, to2);
+                }
+                else
+                {
+                    P25CallEvent event = new P25CallEvent.Builder(CallEventType.PATCH_GROUP_CALL)
+                        .aliasList(getAliasList())
+                        .channel(channel2 + (gvcgu.isTDMAChannel2() ? " TDMA" : ""))
+                        .details((gvcgu.isEncrypted() ? "ENCRYPTED " : ""))
+                        .frequency(gvcgu.getDownlinkFrequency2())
+                        .to(to2)
+                        .build();
+
+                    registerCallEvent(event);
+                    broadcast(event);
+                }
+
+                if(!gvcgu.isTDMAChannel2())
+                {
+                    broadcast(new TrafficChannelAllocationEvent(this, mChannelCallMap.get(channel2)));
+                }
+
                 break;
             case PATCH_GROUP_ADD:
                 PatchGroupAdd pga = (PatchGroupAdd)tsbk;
@@ -2843,7 +2873,7 @@ public class P25DecoderState extends DecoderState
 
                     P25CallEvent event = new P25CallEvent.Builder(CallEventType.DATA_CALL)
                         .aliasList(getAliasList())
-                        .channel(channel)
+                        .channel(channel + (gdcg.isTDMAChannel() ? " TDMA" : ""))
                         .details(details.toString())
                         .frequency(gdcg.getDownlinkFrequency())
                         .from(from)
@@ -2854,7 +2884,7 @@ public class P25DecoderState extends DecoderState
                     broadcast(event);
                 }
 
-                if(!mIgnoreDataCalls)
+                if(!mIgnoreDataCalls && !gdcg.isTDMAChannel())
                 {
                     broadcast(new TrafficChannelAllocationEvent(this,
                         mChannelCallMap.get(channel)));
@@ -2881,7 +2911,7 @@ public class P25DecoderState extends DecoderState
 
                     P25CallEvent event = new P25CallEvent.Builder(CallEventType.GROUP_CALL)
                         .aliasList(getAliasList())
-                        .channel(channel)
+                        .channel(channel + (gvcg.isTDMAChannel() ? " TDMA" : ""))
                         .details(details.toString())
                         .frequency(gvcg.getDownlinkFrequency())
                         .from(from)
@@ -2892,8 +2922,10 @@ public class P25DecoderState extends DecoderState
                     broadcast(event);
                 }
 
-                broadcast(new TrafficChannelAllocationEvent(this,
+                if(!gvcg.isTDMAChannel())
-                    mChannelCallMap.get(channel)));
+                {
+                    broadcast(new TrafficChannelAllocationEvent(this, mChannelCallMap.get(channel)));
+                }
                 break;
             case GROUP_VOICE_CHANNEL_GRANT_UPDATE:
                 GroupVoiceChannelGrantUpdate gvcgu =
@@ -2917,8 +2949,7 @@ public class P25DecoderState extends DecoderState
 
                     P25CallEvent event = new P25CallEvent.Builder(CallEventType.GROUP_CALL)
                         .aliasList(getAliasList())
-                        .channel(channel)
+                        .channel(gvcgu.getChannel1() + (gvcgu.isTDMAChannel1() ? " TDMA" : ""))
-                        .channel(gvcgu.getChannel1())
                         .details(details.toString())
                         .frequency(gvcgu.getDownlinkFrequency1())
                         .from(from)
@@ -2929,8 +2960,10 @@ public class P25DecoderState extends DecoderState
                     broadcast(event);
                 }
 
-                broadcast(new TrafficChannelAllocationEvent(this,
+                if(!gvcgu.isTDMAChannel1())
-                    mChannelCallMap.get(channel)));
+                {
+                    broadcast(new TrafficChannelAllocationEvent(this, mChannelCallMap.get(channel)));
+                }
 
                 if(gvcgu.hasChannelNumber2())
                 {
@@ -2951,7 +2984,7 @@ public class P25DecoderState extends DecoderState
 
                         P25CallEvent event2 = new P25CallEvent.Builder(CallEventType.GROUP_CALL)
                             .aliasList(getAliasList())
-                            .channel(gvcgu.getChannel2())
+                            .channel(gvcgu.getChannel2() + (gvcgu.isTDMAChannel2() ? " TDMA" : ""))
                             .details(details.toString())
                             .frequency(gvcgu.getDownlinkFrequency2())
                             .to(gvcgu.getGroupAddress2())
@@ -2961,8 +2994,10 @@ public class P25DecoderState extends DecoderState
                         broadcast(event2);
                     }
 
-                    broadcast(new TrafficChannelAllocationEvent(this,
+                    if(!gvcgu.isTDMAChannel2())
-                        mChannelCallMap.get(channel)));
+                    {
+                        broadcast(new TrafficChannelAllocationEvent(this, mChannelCallMap.get(channel)));
+                    }
                 }
                 break;
             case GROUP_VOICE_CHANNEL_GRANT_UPDATE_EXPLICIT:
@@ -2988,7 +3023,7 @@ public class P25DecoderState extends DecoderState
 
                     P25CallEvent event = new P25CallEvent.Builder(CallEventType.GROUP_CALL)
                         .aliasList(getAliasList())
-                        .channel(channel)
+                        .channel(channel + (gvcgue.isTDMAChannel() ? " TDMA" : ""))
                         .details(details.toString())
                         .frequency(gvcgue.getDownlinkFrequency())
                         .from(from)
@@ -2999,8 +3034,10 @@ public class P25DecoderState extends DecoderState
                     broadcast(event);
                 }
 
-                broadcast(new TrafficChannelAllocationEvent(this,
+                if(!gvcgue.isTDMAChannel())
-                    mChannelCallMap.get(channel)));
+                {
+                    broadcast(new TrafficChannelAllocationEvent(this, mChannelCallMap.get(channel)));
+                }
                 break;
             case INDIVIDUAL_DATA_CHANNEL_GRANT:
                 IndividualDataChannelGrant idcg = (IndividualDataChannelGrant)message;
@@ -3023,7 +3060,7 @@ public class P25DecoderState extends DecoderState
 
                     P25CallEvent event = new P25CallEvent.Builder(CallEventType.DATA_CALL)
                         .aliasList(getAliasList())
-                        .channel(channel)
+                        .channel(channel + (idcg.isTDMAChannel() ? " TDMA" : ""))
                         .details(details.toString())
                         .frequency(idcg.getDownlinkFrequency())
                         .from(from)
@@ -3034,10 +3071,9 @@ public class P25DecoderState extends DecoderState
                     broadcast(event);
                 }
 
-                if(!mIgnoreDataCalls)
+                if(!mIgnoreDataCalls && !idcg.isTDMAChannel())
                 {
-                    broadcast(new TrafficChannelAllocationEvent(this,
+                    broadcast(new TrafficChannelAllocationEvent(this, mChannelCallMap.get(channel)));
-                        mChannelCallMap.get(channel)));
                 }
                 break;
             case SNDCP_DATA_CHANNEL_GRANT:
@@ -3060,7 +3096,7 @@ public class P25DecoderState extends DecoderState
 
                     P25CallEvent event = new P25CallEvent.Builder(CallEventType.DATA_CALL)
                         .aliasList(getAliasList())
-                        .channel(channel)
+                        .channel(channel + (sdcg.isTDMAChannel() ? " TDMA" : ""))
                         .details(details.toString())
                         .frequency(sdcg.getDownlinkFrequency())
                         .from(from)
@@ -3071,15 +3107,13 @@ public class P25DecoderState extends DecoderState
                     broadcast(event);
                 }
 
-                if(!mIgnoreDataCalls)
+                if(!mIgnoreDataCalls && !sdcg.isTDMAChannel())
                 {
-                    broadcast(new TrafficChannelAllocationEvent(this,
+                    broadcast(new TrafficChannelAllocationEvent(this, mChannelCallMap.get(channel)));
-                        mChannelCallMap.get(channel)));
                 }
                 break;
             case TELEPHONE_INTERCONNECT_VOICE_CHANNEL_GRANT:
-                TelephoneInterconnectVoiceChannelGrant tivcg =
+                TelephoneInterconnectVoiceChannelGrant tivcg = (TelephoneInterconnectVoiceChannelGrant)message;
-                    (TelephoneInterconnectVoiceChannelGrant)message;
 
                 channel = tivcg.getChannel();
                 from = null;
@@ -3103,7 +3137,7 @@ public class P25DecoderState extends DecoderState
                     P25CallEvent event = new P25CallEvent.Builder(
                         CallEventType.TELEPHONE_INTERCONNECT)
                         .aliasList(getAliasList())
-                        .channel(channel)
+                        .channel(channel + (tivcg.isTDMAChannel() ? " TDMA" : ""))
                         .details(details.toString())
                         .frequency(tivcg.getDownlinkFrequency())
                         .from(from)
@@ -3114,15 +3148,15 @@ public class P25DecoderState extends DecoderState
                     broadcast(event);
                 }
 
-                broadcast(new TrafficChannelAllocationEvent(this,
+                if(!tivcg.isTDMAChannel())
-                    mChannelCallMap.get(channel)));
+                {
+                    broadcast(new TrafficChannelAllocationEvent(this, mChannelCallMap.get(channel)));
+                }
                 break;
             case TELEPHONE_INTERCONNECT_VOICE_CHANNEL_GRANT_UPDATE:
-                TelephoneInterconnectVoiceChannelGrantUpdate tivcgu =
+                TelephoneInterconnectVoiceChannelGrantUpdate tivcgu = (TelephoneInterconnectVoiceChannelGrantUpdate)message;
-                    (TelephoneInterconnectVoiceChannelGrantUpdate)message;
 
-                channel = tivcgu.getChannelIdentifier() + "-" +
+                channel = tivcgu.getChannelIdentifier() + "-" + tivcgu.getChannelNumber();
-                    tivcgu.getChannelNumber();
                 from = null;
 
 				/* Address is ambiguous and could mean either source or target,
@@ -3145,7 +3179,7 @@ public class P25DecoderState extends DecoderState
                     P25CallEvent event = new P25CallEvent.Builder(
                         CallEventType.TELEPHONE_INTERCONNECT)
                         .aliasList(getAliasList())
-                        .channel(channel)
+                        .channel(channel + (tivcgu.isTDMAChannel() ? " TDMA" : ""))
                         .details(details.toString())
                         .frequency(tivcgu.getDownlinkFrequency())
                         .from(from)
@@ -3156,15 +3190,15 @@ public class P25DecoderState extends DecoderState
                     broadcast(event);
                 }
 
-                broadcast(new TrafficChannelAllocationEvent(this,
+                if(!tivcgu.isTDMAChannel())
-                    mChannelCallMap.get(channel)));
+                {
+                    broadcast(new TrafficChannelAllocationEvent(this, mChannelCallMap.get(channel)));
+                }
                 break;
             case UNIT_TO_UNIT_VOICE_CHANNEL_GRANT:
-                UnitToUnitVoiceChannelGrant uuvcg =
+                UnitToUnitVoiceChannelGrant uuvcg = (UnitToUnitVoiceChannelGrant)message;
-                    (UnitToUnitVoiceChannelGrant)message;
 
-                channel = uuvcg.getChannelIdentifier() + "-" +
+                channel = uuvcg.getChannelIdentifier() + "-" + uuvcg.getChannelNumber();
-                    uuvcg.getChannelNumber();
                 from = uuvcg.getSourceAddress();
                 to = uuvcg.getTargetAddress();
 
@@ -3183,7 +3217,7 @@ public class P25DecoderState extends DecoderState
                     P25CallEvent event = new P25CallEvent.Builder(
                         CallEventType.UNIT_TO_UNIT_CALL)
                         .aliasList(getAliasList())
-                        .channel(channel)
+                        .channel(channel + (uuvcg.isTDMAChannel() ? " TDMA" : ""))
                         .details(details.toString())
                         .frequency(uuvcg.getDownlinkFrequency())
                         .from(from)
@@ -3194,15 +3228,15 @@ public class P25DecoderState extends DecoderState
                     broadcast(event);
                 }
 
-                broadcast(new TrafficChannelAllocationEvent(this,
+                if(!uuvcg.isTDMAChannel())
-                    mChannelCallMap.get(channel)));
+                {
+                    broadcast(new TrafficChannelAllocationEvent(this, mChannelCallMap.get(channel)));
+                }
                 break;
             case UNIT_TO_UNIT_VOICE_CHANNEL_GRANT_UPDATE:
-                UnitToUnitVoiceChannelGrantUpdate uuvcgu =
+                UnitToUnitVoiceChannelGrantUpdate uuvcgu = (UnitToUnitVoiceChannelGrantUpdate)message;
-                    (UnitToUnitVoiceChannelGrantUpdate)message;
 
-                channel = uuvcgu.getChannelIdentifier() + "-" +
+                channel = uuvcgu.getChannelIdentifier() + "-" + uuvcgu.getChannelNumber();
-                    uuvcgu.getChannelNumber();
                 from = uuvcgu.getSourceAddress();
                 to = uuvcgu.getTargetAddress();
 
@@ -3221,7 +3255,7 @@ public class P25DecoderState extends DecoderState
                     P25CallEvent event = new P25CallEvent.Builder(
                         CallEventType.UNIT_TO_UNIT_CALL)
                         .aliasList(getAliasList())
-                        .channel(channel)
+                        .channel(channel + (uuvcgu.isTDMAChannel() ? " TDMA" : ""))
                         .details(details.toString())
                         .frequency(uuvcgu.getDownlinkFrequency())
                         .from(from)
@@ -3232,8 +3266,10 @@ public class P25DecoderState extends DecoderState
                     broadcast(event);
                 }
 
-                broadcast(new TrafficChannelAllocationEvent(this,
+                if(!uuvcgu.isTDMAChannel())
-                    mChannelCallMap.get(channel)));
+                {
+                    broadcast(new TrafficChannelAllocationEvent(this, mChannelCallMap.get(channel)));
+                }
                 break;
             default:
                 break;
@@ -3343,29 +3379,25 @@ public class P25DecoderState extends DecoderState
     {
         StringBuilder sb = new StringBuilder();
 
-        sb.append("Activity Summary\n");
+        sb.append("Activity Summary - Decoder:P25 ").append(getModulation().getLabel()).append("\n");
-        sb.append("Decoder:\tP25\n");
+        sb.append(DIVIDER1);
-        sb.append("===================== THIS SITE ======================");
+        sb.append("SITE ");
 
         if(mNetworkStatus != null)
         {
-            sb.append("\nNAC:\t" + mNetworkStatus.getNAC());
+            sb.append("NAC:" + mNetworkStatus.getNAC());
-            sb.append("\nWACN-SYS:\t" + mNetworkStatus.getWACN());
+            sb.append("h WACN:" + mNetworkStatus.getWACN());
-            sb.append("-" + mNetworkStatus.getSystemID());
+            sb.append("h SYS:" + mNetworkStatus.getSystemID());
-            sb.append(" [");
+            sb.append("h [").append(mNetworkStatus.getNetworkCallsign()).append("]");
-            sb.append(mNetworkStatus.getNetworkCallsign());
+            sb.append(" LRA:" + mNetworkStatus.getLocationRegistrationArea());
-            sb.append("]");
-            sb.append("\nLRA:\t" + mNetworkStatus.getLocationRegistrationArea());
         }
         else if(mNetworkStatusExtended != null)
         {
-            sb.append("\nNAC:\t" + mNetworkStatusExtended.getNAC());
+            sb.append("NAC:" + mNetworkStatusExtended.getNAC());
-            sb.append("\nWACN-SYS:\t" + mNetworkStatusExtended.getWACN());
+            sb.append("h WACN:" + mNetworkStatusExtended.getWACN());
-            sb.append("-" + mNetworkStatusExtended.getSystemID());
+            sb.append("h SYS:" + mNetworkStatusExtended.getSystemID());
-            sb.append(" [");
+            sb.append("h [").append(mNetworkStatusExtended.getNetworkCallsign()).append("]");
-            sb.append(mNetworkStatusExtended.getNetworkCallsign());
+            sb.append(" LRA:" + mNetworkStatusExtended.getLocationRegistrationArea());
-            sb.append("]");
-            sb.append("\nLRA:\t" + mNetworkStatusExtended.getLocationRegistrationArea());
         }
 
         String site = null;
@@ -3376,11 +3408,10 @@ public class P25DecoderState extends DecoderState
         }
         else if(mRFSSStatusMessageExtended != null)
         {
-            site = mRFSSStatusMessageExtended.getRFSubsystemID() + "-" +
+            site = mRFSSStatusMessageExtended.getRFSubsystemID() + "-" + mRFSSStatusMessageExtended.getSiteID();
-                mRFSSStatusMessageExtended.getSiteID();
         }
 
-        sb.append("\nRFSS-SITE:\t" + site);
+        sb.append("h RFSS-SITE:").append(site).append("h");
 
         if(hasAliasList())
         {
@@ -3392,121 +3423,120 @@ public class P25DecoderState extends DecoderState
             }
         }
 
+        sb.append("\n").append(DIVIDER2);
+
         if(mNetworkStatus != null)
         {
-            sb.append("\nSERVICES:\t" + SystemService.toString(
+            sb.append("SERVICES: " + SystemService.toString(mNetworkStatus.getSystemServiceClass())).append("\n");
-                mNetworkStatus.getSystemServiceClass()));
+            sb.append(DIVIDER2);
-            sb.append("\nPCCH:\tDNLINK " + mFrequencyFormatter.format(
+            sb.append("PCCH DOWNLINK ")
-                (double)mNetworkStatus.getDownlinkFrequency() / 1E6d) +
+              .append(mFrequencyFormatter.format((double)mNetworkStatus.getDownlinkFrequency() / 1E6d))
-                " [" + mNetworkStatus.getIdentifier() + "-" +
+              .append(" [").append(mNetworkStatus.getIdentifier()).append("-").append(mNetworkStatus.getChannel())
-                mNetworkStatus.getChannel() + "]\n");
+              .append("] UPLINK ")
-            sb.append("\tUPLINK " + mFrequencyFormatter.format(
+              .append(mFrequencyFormatter.format((double)mNetworkStatus.getUplinkFrequency() / 1E6d))
-                (double)mNetworkStatus.getUplinkFrequency() / 1E6d) + " [" +
+              .append(" [").append(mNetworkStatus.getIdentifier()).append("-").append(mNetworkStatus.getChannel())
-                mNetworkStatus.getIdentifier() + "-" +
+              .append("]\n");
-                mNetworkStatus.getChannel() + "]\n");
         }
         else if(mNetworkStatusExtended != null)
         {
-            sb.append("\nSERVICES:\t" + SystemService.toString(
+            sb.append("\nSERVICES:").append(SystemService.toString(mNetworkStatusExtended.getSystemServiceClass()))
-                mNetworkStatusExtended.getSystemServiceClass()));
+                .append("\n");
-            sb.append("\nPCCH:\tDNLINK " + mFrequencyFormatter.format(
+            sb.append(DIVIDER2);
-                (double)mNetworkStatusExtended.getDownlinkFrequency() / 1E6d) +
+            sb.append("PCCH DOWNLINK ")
-                " [" + mNetworkStatusExtended.getTransmitIdentifier() + "-" +
+              .append(mFrequencyFormatter.format((double)mNetworkStatusExtended.getDownlinkFrequency() / 1E6d))
-                mNetworkStatusExtended.getTransmitChannel() + "]\n");
+              .append(" [").append(mNetworkStatusExtended.getTransmitIdentifier()).append("-")
-            sb.append("\tUPLINK " + mFrequencyFormatter.format(
+              .append(mNetworkStatusExtended.getTransmitChannel()).append("] UPLINK ")
-                (double)mNetworkStatusExtended.getUplinkFrequency() / 1E6d) +
+              .append(mFrequencyFormatter.format((double)mNetworkStatusExtended.getUplinkFrequency() / 1E6d))
-                " [" + mNetworkStatusExtended.getReceiveIdentifier() + "-" +
+              .append(" [").append(mNetworkStatusExtended.getReceiveIdentifier()).append("-")
-                mNetworkStatusExtended.getReceiveChannel() + "]");
+              .append(mNetworkStatusExtended.getReceiveChannel()).append("]\n");
         }
 
         if(mSecondaryControlChannels.isEmpty())
         {
-            sb.append("\nSCCH:\tNONE");
+            sb.append("SCCH: NONE\n");
         }
         else
         {
-            for(module.decode.p25.message.tsbk.osp.control.SecondaryControlChannelBroadcast
+            for(module.decode.p25.message.tsbk.osp.control.SecondaryControlChannelBroadcast sec : mSecondaryControlChannels)
-                sec : mSecondaryControlChannels)
             {
-                sb.append("\nSCCH:\tDNLINK " + mFrequencyFormatter.format(
+                sb.append("SCCH DOWNLINK ")
-                    (double)sec.getDownlinkFrequency1() / 1E6d) +
+                    .append(mFrequencyFormatter.format((double)sec.getDownlinkFrequency1() / 1E6d))
-                    " [" + sec.getIdentifier1() + "-" + sec.getChannel1() + "]\n");
+                    .append(" [").append(sec.getIdentifier1()).append("-").append(sec.getChannel1()).append("] UPLINK ")
-                sb.append("\tUPLINK " + mFrequencyFormatter.format(
+                    .append(mFrequencyFormatter.format((double)sec.getUplinkFrequency1() / 1E6d))
-                    (double)sec.getUplinkFrequency1() / 1E6d) + " [" +
+                    .append(" [").append(sec.getIdentifier1()).append("-").append(sec.getChannel1()).append("]");
-                    sec.getIdentifier1() + "-" + sec.getChannel1() + "]\n");
 
                 if(sec.hasChannel2())
                 {
-                    sb.append("\nSCCH:\tDNLINK " + mFrequencyFormatter.format(
+                    sb.append("  SCCH 2 DOWNLINK ")
-                        (double)sec.getDownlinkFrequency2() / 1E6d) +
+                        .append(mFrequencyFormatter.format((double)sec.getDownlinkFrequency2() / 1E6d))
-                        " [" + sec.getIdentifier2() + "-" + sec.getChannel2() + "]\n");
+                        .append(" [").append(sec.getIdentifier2()).append("-").append(sec.getChannel2())
-                    sb.append("\tUPLINK " + mFrequencyFormatter.format(
+                        .append("] UPLINK ").append(mFrequencyFormatter.format((double)sec.getUplinkFrequency2() / 1E6d))
-                        (double)sec.getUplinkFrequency2() / 1E6d) + " [" +
+                        .append(" [").append(sec.getIdentifier2()).append("-").append(sec.getChannel2()).append("]");
-                        sec.getIdentifier2() + "-" + sec.getChannel2() + "]");
                 }
+
+                sb.append("\n");
             }
         }
 
+
         if(mSNDCPDataChannel != null)
         {
-            sb.append("\nSNDCP:");
+            sb.append("SNDCP DOWNLINK ")
-            sb.append("\tDNLINK " + mFrequencyFormatter.format(
+                .append(mFrequencyFormatter.format((double)mSNDCPDataChannel.getDownlinkFrequency() / 1E6D))
-                (double)mSNDCPDataChannel.getDownlinkFrequency() / 1E6D) +
+                .append(" [").append(mSNDCPDataChannel.getTransmitChannel()).append("]").append(" UPLINK ")
-                " [" + mSNDCPDataChannel.getTransmitChannel() + "]");
+                .append(mFrequencyFormatter.format((double)mSNDCPDataChannel.getUplinkFrequency() / 1E6D))
-            sb.append("\tUPLINK " + mFrequencyFormatter.format(
+                .append(" [").append(mSNDCPDataChannel.getReceiveChannel()).append("]\n");
-                (double)mSNDCPDataChannel.getUplinkFrequency() / 1E6D) +
-                " [" + mSNDCPDataChannel.getReceiveChannel() + "]");
         }
 
         if(mProtectionParameterBroadcast != null)
         {
-            sb.append("\nENCRYPTION:");
+            sb.append(DIVIDER2);
-            sb.append("\nTYPE:\t" + mProtectionParameterBroadcast
+            sb.append("ENCRYPTION TYPE:").append(mProtectionParameterBroadcast.getEncryptionType().name());
-                .getEncryptionType().name());
+            sb.append(" ALGORITHM:").append(mProtectionParameterBroadcast.getAlgorithmID());
-            sb.append("\nALGORITHM:\t" + mProtectionParameterBroadcast
+            sb.append(" KEY:").append(mProtectionParameterBroadcast.getKeyID());
-                .getAlgorithmID());
+            sb.append(" INBOUND IV:").append(mProtectionParameterBroadcast.getInboundInitializationVector());
-            sb.append("\nKEY:\t" + mProtectionParameterBroadcast.getKeyID());
+            sb.append(" OUTBOUND IV:").append(mProtectionParameterBroadcast.getOutboundInitializationVector());
-            sb.append("\nINBOUND IV:\t" + mProtectionParameterBroadcast
+            sb.append("\n");
-                .getInboundInitializationVector());
-            sb.append("\nOUTBOUND IV:\t" + mProtectionParameterBroadcast
-                .getOutboundInitializationVector());
         }
 
         List<Integer> identifiers = new ArrayList<>(mBands.keySet());
 
         Collections.sort(identifiers);
 
-        sb.append("\nFREQUENCY BANDS:");
+        sb.append(DIVIDER2).append("FREQUENCY BANDS:\n");
         for(Integer id : identifiers)
         {
             IBandIdentifier band = mBands.get(id);
-
+            sb.append(band.toString()).append("\n");
-            sb.append("\n\t" + id);
+//            sb.append("  ").append(id);
-            sb.append("- BASE: " + mFrequencyFormatter.format(
+//            sb.append(" - BASE: " + mFrequencyFormatter.format(
-                (double)band.getBaseFrequency() / 1E6d));
+//                (double)band.getBaseFrequency() / 1E6d));
-            sb.append(" CHANNEL SIZE: " + mFrequencyFormatter.format(
+//            sb.append(" CHANNEL SIZE: " + mFrequencyFormatter.format(
-                (double)band.getChannelSpacing() / 1E6d));
+//                (double)band.getChannelSpacing() / 1E6d));
-            sb.append(" UPLINK OFFSET: " + mFrequencyFormatter.format(
+//            sb.append(" UPLINK OFFSET: " + mFrequencyFormatter.format(
-                (double)band.getTransmitOffset() / 1E6D));
+//                (double)band.getTransmitOffset() / 1E6D));
+//            sb.append("\n");
         }
 
-        sb.append("\n\n=================== NEIGHBORS ======================");
+        sb.append(DIVIDER2).append("NEIGHBOR SITES: ");
 
         if(mNeighborMap.isEmpty())
         {
-            sb.append("\n\tNONE\n");
+            sb.append("NONE\n");
-            sb.append("\n----------------------------------------------------");
         }
         else
         {
             for(IAdjacentSite neighbor : mNeighborMap.values())
             {
-                sb.append("\nNAC:\t" + ((P25Message)neighbor).getNAC());
+                sb.append("\n");
-                sb.append("\nSYSTEM:\t" + neighbor.getSystemID());
+                sb.append("NAC:").append(((P25Message)neighbor).getNAC());
-                sb.append("\nLRA:\t" + neighbor.getLRA());
+                sb.append("h SYSTEM:" + neighbor.getSystemID());
+                sb.append("h LRA:" + neighbor.getLRA());
 
                 String neighborID = neighbor.getRFSS() + "-" + neighbor.getSiteID();
-                sb.append("\nRFSS-SITE:\t" + neighborID);
+                sb.append("h RFSS-SITE:" + neighborID);
+
+                sb.append("h ");
 
                 if(hasAliasList())
                 {
@@ -3514,18 +3544,16 @@ public class P25DecoderState extends DecoderState
 
                     if(siteAlias != null)
                     {
-                        sb.append(" " + siteAlias.getName());
+                        sb.append(siteAlias.getName());
                     }
                 }
 
-                sb.append("\nPCCH:\tDNLINK " + mFrequencyFormatter.format(
+                sb.append("\n  PCCH: DOWNLINK ")
-                    (double)neighbor.getDownlinkFrequency() / 1E6d) +
+                  .append(mFrequencyFormatter.format((double)neighbor.getDownlinkFrequency() / 1E6d))
-                    " [" + neighbor.getDownlinkChannel() + "]");
+                  .append(" [").append(neighbor.getDownlinkChannel()).append("] UPLINK:")
-                sb.append("\n\tUPLINK:" + mFrequencyFormatter.format(
+                  .append(mFrequencyFormatter.format((double)neighbor.getUplinkFrequency() / 1E6d))
-                    (double)neighbor.getUplinkFrequency() / 1E6d) +
+                  .append(" [").append(neighbor.getDownlinkChannel()).append("] SERVICES: ")
-                    " [" + neighbor.getDownlinkChannel() + "]\n");
+                  .append(neighbor.getSystemServiceClass());
-                sb.append("\nSERVICES:\t" + neighbor.getSystemServiceClass());
-                sb.append("\n----------------------------------------------------");
             }
         }
 

src/module/decode/p25/P25_C4FMDecoder.java

@@ -47,12 +47,10 @@ public class P25_C4FMDecoder extends P25Decoder
 	private final static Logger mLog = LoggerFactory.getLogger( P25_C4FMDecoder.class );
 	
     /* Instrumentation Taps */
-	private static final String INSTRUMENT_FILTER_OUTPUT = "Tap Point: Pre-Filter Output";
 	private static final String INSTRUMENT_C4FM_SYMBOL_FILTER_OUTPUT = "Tap Point: Symbol Filter Output";
 	private static final String INSTRUMENT_C4FM_SLICER_OUTPUT = "Tap Point: C4FM Slicer Output";
 
 	private List<TapGroup> mAvailableTaps;
-	private RealFIRFilter_RB_RB mC4FMPreFilter;
 	private C4FMSymbolFilter mSymbolFilter;
 	private C4FMSlicer mC4FMSlicer;
 	private P25MessageFramer mMessageFramer;
@@ -74,14 +72,8 @@ public class P25_C4FMDecoder extends P25Decoder
 	{
 		super( aliasList );
 		
-		/* Filter demodulated sample buffers */
-		float[] filter = FilterFactory.getLowPass( 48000, 2500, 4000, 80, WindowType.HANNING, true );
-
-		mC4FMPreFilter = new RealFIRFilter_RB_RB( filter, 1.0f );
-
 		/* Shape gain and frequency offsets to optimize sample stream */
 		mSymbolFilter = new C4FMSymbolFilter( frequencyCorrectionMaximum );
-		mC4FMPreFilter.setListener( mSymbolFilter );
 
 		/* Convert samples to symbols */
 		mC4FMSlicer = new C4FMSlicer();
@@ -100,9 +92,6 @@ public class P25_C4FMDecoder extends P25Decoder
 	{
 		super.dispose();
 		
-		mC4FMPreFilter.dispose();
-		mC4FMPreFilter = null;
-		
 		mSymbolFilter.dispose();
 		mSymbolFilter = null;
 		
@@ -121,7 +110,7 @@ public class P25_C4FMDecoder extends P25Decoder
 	@Override
 	public Listener<RealBuffer> getFilteredRealBufferListener()
 	{
-		return mC4FMPreFilter;
+		return mSymbolFilter;
 	}
 	
 	/**
@@ -136,8 +125,6 @@ public class P25_C4FMDecoder extends P25Decoder
 
 			TapGroup group = new TapGroup( "P25 C4FM Decoder" );
 			
-			group.add( new FloatBufferTap( INSTRUMENT_FILTER_OUTPUT, 0, 1.0f ) );
-			
 			group.add( new FloatTap( INSTRUMENT_C4FM_SYMBOL_FILTER_OUTPUT, 0, 0.1f ) );
 			group.add( new DibitTap( INSTRUMENT_C4FM_SLICER_OUTPUT, 0, 0.1f ) );
 
@@ -165,11 +152,6 @@ public class P25_C4FMDecoder extends P25Decoder
 		
 		switch( tap.getName() )
 		{
-			case INSTRUMENT_FILTER_OUTPUT:
-				FloatBufferTap filterOutput = (FloatBufferTap)tap;
-				mC4FMPreFilter.setListener( filterOutput );
-				filterOutput.setListener( mSymbolFilter );
-				break;
 			case INSTRUMENT_C4FM_SYMBOL_FILTER_OUTPUT:
 				FloatTap symbolTap = (FloatTap)tap;
 				mSymbolFilter.setListener( symbolTap );
@@ -201,9 +183,6 @@ public class P25_C4FMDecoder extends P25Decoder
 		
 		switch( tap.getName() )
 		{
-			case INSTRUMENT_FILTER_OUTPUT:
-				mC4FMPreFilter.setListener( mSymbolFilter );
-				break;
 			case INSTRUMENT_C4FM_SYMBOL_FILTER_OUTPUT:
 				mSymbolFilter.setListener( mC4FMSlicer );
 				break;

src/module/decode/p25/message/IBandIdentifier.java

@@ -1,3 +1,21 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 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 module.decode.p25.message;
 
 public interface IBandIdentifier
@@ -29,4 +47,18 @@ public interface IBandIdentifier
      */
     public abstract long getTransmitOffset();
 
+	/**
+	 * Downlink (tower to mobile) Frequency for the specified channel
+	 */
+	public abstract long getDownlinkFrequency(int channelNumber);
+
+	/**
+	 * Uplink (mobile to tower) Frequency for the specified channel
+	 */
+	public abstract long getUplinkFrequency(int channelNumber);
+
+    /**
+     * Indicates if this band is an FDMA (false) or TDMA (true) band
+     */
+	public boolean isTDMA();
 }

src/module/decode/p25/message/P25Message.java

@@ -1,214 +1,188 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 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 module.decode.p25.message;
 
-import java.text.SimpleDateFormat;
-
-import map.Plottable;
-import message.Message;
-import module.decode.p25.reference.DataUnitID;
 import alias.Alias;
 import alias.AliasList;
 import bits.BinaryMessage;
 import edac.CRC;
+import map.Plottable;
+import message.Message;
+import module.decode.p25.reference.DataUnitID;
+
+import java.text.SimpleDateFormat;
 
 public class P25Message extends Message
 {
-    public enum DuplexMode { HALF, FULL };
+    public enum DuplexMode {HALF, FULL};
-    public enum SessionMode { PACKET, CIRCUIT };
+    public enum SessionMode {PACKET, CIRCUIT};
 
-	public static final int[] NAC = { 0,1,2,3,4,5,6,7,8,9,10,11 };
+    public static final int[] NAC = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11};
-	public static final int[] DUID = { 12,13,14,15 };
+    public static final int[] DUID = {12, 13, 14, 15};
-	public static final int[] BCH = { 16,17,18,19,20,21,22,23,24,25,26,27,28,29,
+    public static final int[] BCH = {16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
-		30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,
+        36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63};
-		54,55,56,57,58,59,60,61,62,63 };
 
-	protected SimpleDateFormat mTimeDurationFormat = 
+    protected SimpleDateFormat mTimeDurationFormat = new SimpleDateFormat("HH:mm:ss.SSS");
-							new SimpleDateFormat( "HH:mm:ss.SSS");
 
-	protected BinaryMessage mMessage;
+    protected BinaryMessage mMessage;
-	protected DataUnitID mDUID;
+    protected DataUnitID mDUID;
-	protected AliasList mAliasList;
+    protected AliasList mAliasList;
 
-	protected CRC[] mCRC;
+    protected CRC[] mCRC;
 
-	public P25Message( BinaryMessage message, 
+    public P25Message(BinaryMessage message, DataUnitID duid, AliasList aliasList)
-	                   DataUnitID duid,
+    {
-	                   AliasList aliasList )
+        super();
-	{
-		super();
 
-		mMessage = message;
+        mMessage = message;
-		mDUID = duid;
+        mDUID = duid;
-		mAliasList = aliasList;
+        mAliasList = aliasList;
-	}
+    }
 
-	public CRC[] getCRCResults()
+    public CRC[] getCRCResults()
-	{
+    {
-		return mCRC;
+        return mCRC;
-	}
+    }
 
-	public BinaryMessage getSourceMessage()
+    public BinaryMessage getSourceMessage()
-	{
+    {
-		return mMessage;
+        return mMessage;
-	}
+    }
 
-	public AliasList getAliasList()
+    public AliasList getAliasList()
-	{
+    {
-		return mAliasList;
+        return mAliasList;
-	}
+    }
 
-	public String getNAC()
+    public String getNAC()
-	{
+    {
-		return mMessage.getHex( NAC, 3 );
+        return mMessage.getHex(NAC, 3);
-	}
+    }
 
-	public DataUnitID getDUID()
+    public DataUnitID getDUID()
-	{
+    {
-		return mDUID;
+        return mDUID;
-	}
+    }
 
-	@Override
+    @Override
     public String getErrorStatus()
     {
-		if( mCRC == null )
+        if(mCRC == null)
-		{
+        {
-			return "UNKNOWN";
+            return "UNKNOWN";
-		}
+        }
 
-		return CRC.format( mCRC );
+        return CRC.format(mCRC);
     }
 
-	@Override
+    @Override
     public String getMessage()
     {
-		StringBuilder sb = new StringBuilder();
+        StringBuilder sb = new StringBuilder();
 
-		sb.append( "NAC:" );
+        sb.append("NAC:");
-		sb.append( getNAC() );
+        sb.append(getNAC());
-		sb.append( " " );
+        sb.append(" ");
-		sb.append( getDUID().getLabel() );
+        sb.append(getDUID().getLabel());
-		sb.append( " DATA UNIT ID:" + mMessage.getInt( DUID ) );
+        sb.append(" DATA UNIT ID:" + mMessage.getInt(DUID));
 
-	    return sb.toString();
+        return sb.toString();
     }
 
-	@Override
+    @Override
     public String getBinaryMessage()
     {
-	    return mMessage.toString();
+        return mMessage.toString();
     }
 
-	@Override
+    @Override
     public String getProtocol()
     {
-	    return "P25 Phase 1";
+        return "P25 Phase 1";
     }
 
-	@Override
+    @Override
     public String getEventType()
     {
-	    return mDUID.name();
+        return mDUID.name();
     }
 
-	@Override
+    @Override
     public String getFromID()
     {
-	    return null;
+        return null;
     }
 
-	@Override
+    @Override
     public Alias getFromIDAlias()
     {
-        if( mAliasList != null )
+        if(mAliasList != null)
         {
-            return mAliasList.getTalkgroupAlias( getFromID() );
+            return mAliasList.getTalkgroupAlias(getFromID());
         }
 
         return null;
     }
 
-	@Override
+    @Override
     public String getToID()
     {
-	    return null;
+        return null;
     }
 
-	@Override
+    @Override
     public Alias getToIDAlias()
     {
-	    if( mAliasList != null )
+        if(mAliasList != null)
-	    {
+        {
-	        return mAliasList.getTalkgroupAlias( getToID() );
+            return mAliasList.getTalkgroupAlias(getToID());
-	    }
+        }
 
-	    return null;
+        return null;
     }
 
-	@Override
+    @Override
     public Plottable getPlottable()
     {
-	    return null;
+        return null;
     }
 
-	@Override
+    @Override
     public String toString()
     {
-	    return getMessage();
+        return getMessage();
     }
 
-	@Override
+    @Override
     public boolean isValid()
     {
-		if( mCRC != null )
+        if(mCRC != null)
-		{
+        {
-			for( CRC crc: mCRC )
+            for(CRC crc : mCRC)
-			{
+            {
-				if( crc == CRC.FAILED_CRC )
+                if(crc == CRC.FAILED_CRC)
-				{
+                {
-					return false;
+                    return false;
-				}
+                }
-			}
+            }
-		}
+        }
 
-		return true;
+        return true;
     }
-
-	/**
-	 * Calculates the frequency of the uplink channel using the channel number
-	 * and the IdentifierUpdate message.
-	 * 
-	 * @param iden - Identifier Update message
-	 * @param channel - channel number
-	 * @return - frequency in Hertz
-	 */
-	protected static long calculateUplink( IBandIdentifier iden, int channel )
-	{
-		long downlink = calculateDownlink( iden, channel );
-		
-		if( downlink > 0 && iden != null )
-		{
-			return downlink + iden.getTransmitOffset();
-		}
-		
-		return 0;
-	}
-	
-	/**
-	 * Calculates the frequency of the downlink channel using the channel number
-	 * and the IdentifierUpdate message.
-	 * 
-	 * @param iden - Identifier Update message
-	 * @param channel - channel number
-	 * @return - frequency in Hertz
-	 */
-	protected static long calculateDownlink( IBandIdentifier iden, int channel )
-	{
-		if( iden != null )
-		{
-			return iden.getBaseFrequency() + 
-					( channel * iden.getChannelSpacing() );
-		}
-		
-		return 0;
-	}
-	
 }

src/module/decode/p25/message/ldu/lc/AdjacentSiteStatusBroadcast.java

@@ -1,3 +1,21 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 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 module.decode.p25.message.ldu.lc;
 
 import module.decode.p25.message.IAdjacentSite;
@@ -7,26 +25,22 @@ import module.decode.p25.message.ldu.LDU1Message;
 import module.decode.p25.message.tsbk.osp.control.SystemService;
 import module.decode.p25.reference.LinkControlOpcode;
 
-public class AdjacentSiteStatusBroadcast extends LDU1Message
+public class AdjacentSiteStatusBroadcast extends LDU1Message implements IdentifierReceiver, IAdjacentSite
-					 implements IdentifierReceiver, IAdjacentSite
 {
-	public static final int[] LRA = { 364,365,366,367,372,373,374,375 };
+    public static final int[] LRA = {364, 365, 366, 367, 372, 373, 374, 375};
-	public static final int[] SYSTEM_ID = { 384,385,386,387,536,537,538,539,540,
+    public static final int[] SYSTEM_ID = {384, 385, 386, 387, 536, 537, 538, 539, 540, 541, 546, 547};
-		541,546,547 };
+    public static final int[] RFSS_ID = {548, 549, 550, 551, 556, 557, 558, 559};
-	public static final int[] RFSS_ID = { 548,549,550,551,556,557,558,559 };
+    public static final int[] SITE_ID = {560, 561, 566, 567, 568, 569, 570, 571};
-	public static final int[] SITE_ID = { 560,561,566,567,568,569,570,571 };
+    public static final int[] IDENTIFIER = {720, 721, 722, 723};
-	public static final int[] IDENTIFIER = { 720,721,722,723 };
+    public static final int[] CHANNEL = {724, 725, 730, 731, 732, 733, 734, 735, 740, 741, 742, 743};
-	public static final int[] CHANNEL = { 724,725,730,731,732,733,734,735,740,
+    public static final int[] SYSTEM_SERVICE_CLASS = {744, 745, 750, 751, 752, 753, 754, 755};
-		741,742,743 };
-	public static final int[] SYSTEM_SERVICE_CLASS = { 744,745,750,751,752,753,
-		754,755 };
 
-	private IBandIdentifier mIdentifierUpdate;
+    private IBandIdentifier mIdentifierUpdate;
 
-	public AdjacentSiteStatusBroadcast( LDU1Message message )
+    public AdjacentSiteStatusBroadcast(LDU1Message message)
-	{
+    {
-		super( message );
+        super(message);
-	}
+    }
 
     @Override
     public String getEventType()
@@ -34,115 +48,125 @@ public class AdjacentSiteStatusBroadcast extends LDU1Message
         return LinkControlOpcode.ADJACENT_SITE_STATUS_BROADCAST.getDescription();
     }
 
-	@Override
+    @Override
-	public String getMessage()
+    public String getMessage()
-	{
+    {
-		StringBuilder sb = new StringBuilder();
+        StringBuilder sb = new StringBuilder();
 
-		sb.append( getMessageStub() );
+        sb.append(getMessageStub());
 
-		sb.append( " LRA:" + getLRA() );
+        sb.append(" LRA:" + getLRA());
 
-		sb.append( " SYS:" + getSystemID() );
+        sb.append(" SYS:" + getSystemID());
 
-		sb.append( " SITE:" + getRFSS() + "-" + getSiteID() );
+        sb.append(" SITE:" + getRFSS() + "-" + getSiteID());
 
-		sb.append( " CHAN:" + getChannel() );
+        sb.append(" CHAN:" + getChannel());
 
-		sb.append( " " + getSystemServiceClass() );
+        sb.append(" " + getSystemServiceClass());
 
-		return sb.toString();
+        return sb.toString();
-	}
+    }
 
     public String getUniqueID()
     {
-    	StringBuilder sb = new StringBuilder();
+        StringBuilder sb = new StringBuilder();
 
-    	sb.append( getSystemID() );
+        sb.append(getSystemID());
-    	sb.append( ":" );
+        sb.append(":");
-    	sb.append( getRFSS() );
+        sb.append(getRFSS());
-    	sb.append( ":" );
+        sb.append(":");
-    	sb.append( getSiteID() );
+        sb.append(getSiteID());
 
-    	return sb.toString();
+        return sb.toString();
     }
 
-	public String getLRA()
+    public String getLRA()
-	{
-		return mMessage.getHex( LRA, 2 );
-	}
-	
-	public String getSystemID()
-	{
-		return mMessage.getHex( SYSTEM_ID, 3 );
-	}
-	
-	public String getRFSS()
-	{
-		return mMessage.getHex( RFSS_ID, 2 );
-	}
-	
-	public String getSiteID()
-	{
-		return mMessage.getHex( SITE_ID, 2 );
-	}
-	
-	public int getIdentifier()
-	{
-		return mMessage.getInt( IDENTIFIER );
-	}
-	
-	public String getChannel()
-	{
-		return getIdentifier() + "-" + getChannelNumber();
-	}
-	
-	public int getChannelNumber()
-	{
-		return mMessage.getInt( CHANNEL );
-	}
-	
-	public String getSystemServiceClass()
-	{
-		return SystemService.toString( mMessage.getInt( SYSTEM_SERVICE_CLASS ) );
-	}
-
-	@Override
-    public void setIdentifierMessage( int identifier, IBandIdentifier message )
     {
-		mIdentifierUpdate = message;
+        return mMessage.getHex(LRA, 2);
     }
 
-	@Override
+    public String getSystemID()
+    {
+        return mMessage.getHex(SYSTEM_ID, 3);
+    }
+
+    public String getRFSS()
+    {
+        return mMessage.getHex(RFSS_ID, 2);
+    }
+
+    public String getSiteID()
+    {
+        return mMessage.getHex(SITE_ID, 2);
+    }
+
+    public int getIdentifier()
+    {
+        return mMessage.getInt(IDENTIFIER);
+    }
+
+    public String getChannel()
+    {
+        return getIdentifier() + "-" + getChannelNumber();
+    }
+
+    public int getChannelNumber()
+    {
+        return mMessage.getInt(CHANNEL);
+    }
+
+    public String getSystemServiceClass()
+    {
+        return SystemService.toString(mMessage.getInt(SYSTEM_SERVICE_CLASS));
+    }
+
+    @Override
+    public void setIdentifierMessage(int identifier, IBandIdentifier message)
+    {
+        mIdentifierUpdate = message;
+    }
+
+    @Override
     public int[] getIdentifiers()
     {
-	    int[] identifiers = new int[ 1 ];
+        int[] identifiers = new int[1];
 
-	    identifiers[ 0 ] = getIdentifier();
+        identifiers[0] = getIdentifier();
 
-	    return identifiers;
+        return identifiers;
     }
 
 
     @Override
-	public String getDownlinkChannel()
+    public String getDownlinkChannel()
-	{
-		return getChannel();
-	}
-
-	@Override
-	public String getUplinkChannel()
-	{
-		return getChannel();
-	}
-
-	public long getDownlinkFrequency()
     {
-    	return calculateDownlink( mIdentifierUpdate, getChannelNumber() );
+        return getChannel();
+    }
+
+    @Override
+    public String getUplinkChannel()
+    {
+        return getChannel();
+    }
+
+    public long getDownlinkFrequency()
+    {
+        if(mIdentifierUpdate != null)
+        {
+            return mIdentifierUpdate.getDownlinkFrequency(getChannelNumber());
+        }
+
+        return 0;
     }
 
     public long getUplinkFrequency()
     {
-    	return calculateUplink( mIdentifierUpdate, getChannelNumber() );
+        if(mIdentifierUpdate != null)
+        {
+            return mIdentifierUpdate.getUplinkFrequency(getChannelNumber());
+        }
+
+        return 0;
     }
 }

src/module/decode/p25/message/ldu/lc/AdjacentSiteStatusBroadcastExplicit.java

@@ -1,3 +1,21 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 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 module.decode.p25.message.ldu.lc;
 
 import module.decode.p25.message.IAdjacentSite;
@@ -6,27 +24,23 @@ import module.decode.p25.message.IdentifierReceiver;
 import module.decode.p25.message.ldu.LDU1Message;
 import module.decode.p25.reference.LinkControlOpcode;
 
-public class AdjacentSiteStatusBroadcastExplicit extends LDU1Message
+public class AdjacentSiteStatusBroadcastExplicit extends LDU1Message implements IdentifierReceiver, IAdjacentSite
-					implements IdentifierReceiver, IAdjacentSite
 {
-	public static final int[] LRA = { 364,365,366,367,372,373,374,375 };
+    public static final int[] LRA = {364, 365, 366, 367, 372, 373, 374, 375};
-	public static final int[] TRANSMIT_IDENTIFIER = { 376,377,382,383 };
+    public static final int[] TRANSMIT_IDENTIFIER = {376, 377, 382, 383};
-	public static final int[] TRANSMIT_CHANNEL = { 384,385,386,387,536,537,538,
+    public static final int[] TRANSMIT_CHANNEL = {384, 385, 386, 387, 536, 537, 538, 539, 540, 541, 546, 547};
-		539,540,541,546,547 };
+    public static final int[] RFSS_ID = {548, 549, 550, 551, 556, 557, 558, 559};
-	public static final int[] RFSS_ID = { 548,549,550,551,556,557,558,559 };
+    public static final int[] SITE_ID = {560, 561, 566, 567, 568, 569, 570, 571};
-	public static final int[] SITE_ID = { 560,561,566,567,568,569,570,571 };
+    public static final int[] RECEIVE_IDENTIFIER = {720, 721, 722, 723};
+    public static final int[] RECEIVE_CHANNEL = {724, 725, 730, 731, 732, 733, 734, 735, 740, 741, 742, 743};
 
-	public static final int[] RECEIVE_IDENTIFIER = { 720,721,722,723 };
+    private IBandIdentifier mTransmitBand;
-	public static final int[] RECEIVE_CHANNEL = { 724,725,730,731,732,733,734,
+    private IBandIdentifier mReceiveBand;
-		735,740,741,742,743 };
 
-	private IBandIdentifier mTransmitBand;
+    public AdjacentSiteStatusBroadcastExplicit(LDU1Message message)
-	private IBandIdentifier mReceiveBand;
+    {
-	
+        super(message);
-	public AdjacentSiteStatusBroadcastExplicit( LDU1Message message )
+    }
-	{
-		super( message );
-	}
 
     @Override
     public String getEventType()
@@ -34,126 +48,136 @@ public class AdjacentSiteStatusBroadcastExplicit extends LDU1Message
         return LinkControlOpcode.ADJACENT_SITE_STATUS_BROADCAST_EXPLICIT.getDescription();
     }
 
-	@Override
+    @Override
-	public String getMessage()
+    public String getMessage()
-	{
+    {
-		StringBuilder sb = new StringBuilder();
+        StringBuilder sb = new StringBuilder();
 
-		sb.append( getMessageStub() );
+        sb.append(getMessageStub());
 
-		sb.append( " LRA:" + getLRA() );
+        sb.append(" LRA:" + getLRA());
 
-		sb.append( " SITE:" + getRFSS() + "-" + getSiteID() );
+        sb.append(" SITE:" + getRFSS() + "-" + getSiteID());
 
-		sb.append( " DNLINK:" + getDownlinkChannel() );
+        sb.append(" DNLINK:" + getDownlinkChannel());
 
-		sb.append( " UPLINK:" + getUplinkChannel() );
+        sb.append(" UPLINK:" + getUplinkChannel());
 
-		return sb.toString();
+        return sb.toString();
-	}
+    }
 
     public String getUniqueID()
     {
-    	StringBuilder sb = new StringBuilder();
+        StringBuilder sb = new StringBuilder();
 
-    	sb.append( getSystemID() );
+        sb.append(getSystemID());
-    	sb.append( ":" );
+        sb.append(":");
-    	sb.append( getRFSS() );
+        sb.append(getRFSS());
-    	sb.append( ":" );
+        sb.append(":");
-    	sb.append( getSiteID() );
+        sb.append(getSiteID());
 
-    	return sb.toString();
+        return sb.toString();
     }
 
-	public String getLRA()
+    public String getLRA()
-	{
+    {
-		return mMessage.getHex( LRA, 2 );
+        return mMessage.getHex(LRA, 2);
-	}
+    }
 
-	public String getRFSS()
+    public String getRFSS()
-	{
+    {
-		return mMessage.getHex( RFSS_ID, 2 );
+        return mMessage.getHex(RFSS_ID, 2);
-	}
+    }
 
-	public String getSystemID()
+    public String getSystemID()
-	{
+    {
-		return "***";
+        return "***";
-	}
+    }
 
-	public String getSiteID()
+    public String getSiteID()
-	{
+    {
-		return mMessage.getHex( SITE_ID, 2 );
+        return mMessage.getHex(SITE_ID, 2);
-	}
+    }
 
-	public int getTransmitIdentifier()
+    public int getTransmitIdentifier()
-	{
+    {
-		return mMessage.getInt( TRANSMIT_IDENTIFIER );
+        return mMessage.getInt(TRANSMIT_IDENTIFIER);
-	}
+    }
 
-	public int getTransmitChannel()
+    public int getTransmitChannel()
-	{
+    {
-		return mMessage.getInt( TRANSMIT_CHANNEL );
+        return mMessage.getInt(TRANSMIT_CHANNEL);
-	}
+    }
 
-	public String getDownlinkChannel()
+    public String getDownlinkChannel()
-	{
+    {
-		return getTransmitIdentifier() + "-" + getTransmitChannel();
+        return getTransmitIdentifier() + "-" + getTransmitChannel();
-	}
+    }
 
-	public int getReceiveIdentifier()
+    public int getReceiveIdentifier()
-	{
+    {
-		return mMessage.getInt( RECEIVE_IDENTIFIER );
+        return mMessage.getInt(RECEIVE_IDENTIFIER);
-	}
+    }
 
-	public int getReceiveChannel()
+    public int getReceiveChannel()
-	{
+    {
-		return mMessage.getInt( RECEIVE_CHANNEL );
+        return mMessage.getInt(RECEIVE_CHANNEL);
-	}
+    }
 
-	public String getUplinkChannel()
+    public String getUplinkChannel()
-	{
+    {
-		return getReceiveIdentifier() + "-" + getReceiveChannel();
+        return getReceiveIdentifier() + "-" + getReceiveChannel();
-	}
+    }
 
-	@Override
+    @Override
-	public String getSystemServiceClass()
+    public String getSystemServiceClass()
-	{
+    {
-		return "[]";
+        return "[]";
-	}
+    }
 
     public long getDownlinkFrequency()
     {
-    	return calculateDownlink( mTransmitBand, getTransmitChannel() );
+        if(mTransmitBand != null)
+        {
+            return mTransmitBand.getDownlinkFrequency(getTransmitChannel());
+        }
+
+        return 0;
     }
 
     public long getUplinkFrequency()
     {
-    	return calculateUplink( mReceiveBand, getReceiveChannel() );
+        if(mReceiveBand != null)
+        {
+            return mReceiveBand.getUplinkFrequency(getReceiveChannel());
+        }
+
+        return 0;
     }
 
-	@Override
+    @Override
-	public void setIdentifierMessage( int identifier, IBandIdentifier message )
+    public void setIdentifierMessage(int identifier, IBandIdentifier message)
-	{
+    {
-		if( identifier == getTransmitIdentifier() )
+        if(identifier == getTransmitIdentifier())
-		{
+        {
-			mTransmitBand = message;
+            mTransmitBand = message;
-		}
+        }
 
-		if( identifier == getReceiveIdentifier() )
+        if(identifier == getReceiveIdentifier())
-		{
+        {
-			mReceiveBand = message;
+            mReceiveBand = message;
-		}
+        }
-	}
+    }
 
-	@Override
+    @Override
-	public int[] getIdentifiers()
+    public int[] getIdentifiers()
-	{
+    {
-		int[] identifiers = new int[ 2 ];
+        int[] identifiers = new int[2];
 
-		identifiers[ 0 ] = getTransmitIdentifier();
+        identifiers[0] = getTransmitIdentifier();
-		identifiers[ 1 ] = getReceiveIdentifier();
+        identifiers[1] = getReceiveIdentifier();
 
-		return identifiers;
+        return identifiers;
-	}
+    }
 
 }

src/module/decode/p25/message/ldu/lc/ChannelIdentifierUpdate.java

@@ -1,26 +1,43 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 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 module.decode.p25.message.ldu.lc;
 
 import module.decode.p25.message.IBandIdentifier;
 import module.decode.p25.message.ldu.LDU1Message;
 import module.decode.p25.reference.LinkControlOpcode;
 
-public class ChannelIdentifierUpdate extends LDU1Message
+public class ChannelIdentifierUpdate extends LDU1Message implements IBandIdentifier
-									 implements IBandIdentifier
 {
-	public static final int[] IDENTIFIER = { 364,365,366,367 };
+    public static final int[] IDENTIFIER = {364, 365, 366, 367};
-	public static final int[] BANDWIDTH = { 372,373,374,375,376,377,382,383,384 };
+    public static final int[] BANDWIDTH = {372, 373, 374, 375, 376, 377, 382, 383, 384};
-	public static final int[] TRANSMIT_OFFSET = { 385,386,387,536,537,538,539,
+    public static final int[] TRANSMIT_OFFSET = {385, 386, 387, 536, 537, 538, 539,
-		540,541 };
+        540, 541};
-	public static final int[] CHANNEL_SPACING = { 546,547,548,549,550,551,556,
+    public static final int[] CHANNEL_SPACING = {546, 547, 548, 549, 550, 551, 556,
-		557,558,559 };
+        557, 558, 559};
-	public static final int[] BASE_FREQUENCY = { 560,561,566,567,568,569,570,
+    public static final int[] BASE_FREQUENCY = {560, 561, 566, 567, 568, 569, 570,
-		571,720,721,722,723,724,725,730,731,732,733,734,735,740,741,742,743,744,
+        571, 720, 721, 722, 723, 724, 725, 730, 731, 732, 733, 734, 735, 740, 741, 742, 743, 744,
-		745,750,751,752,753,754,755 };
+        745, 750, 751, 752, 753, 754, 755};
 
-	public ChannelIdentifierUpdate( LDU1Message message )
+    public ChannelIdentifierUpdate(LDU1Message message)
-	{
+    {
-		super( message );
+        super(message);
-	}
+    }
 
     @Override
     public String getEventType()
@@ -28,56 +45,74 @@ public class ChannelIdentifierUpdate extends LDU1Message
         return LinkControlOpcode.CHANNEL_IDENTIFIER_UPDATE.getDescription();
     }
 
-	@Override
+    @Override
-	public String getMessage()
+    public String getMessage()
-	{
+    {
-		StringBuilder sb = new StringBuilder();
+        StringBuilder sb = new StringBuilder();
 
-		sb.append( getMessageStub() );
+        sb.append(getMessageStub());
 
-        sb.append( " IDEN:" + getIdentifier() );
+        sb.append(" IDEN:" + getIdentifier());
 
-        sb.append( " BASE:" + getBaseFrequency() );
+        sb.append(" BASE:" + getBaseFrequency());
 
-        sb.append( " BW:" + getBandwidth() );
+        sb.append(" BW:" + getBandwidth());
 
-        sb.append( " SPACING:" + getChannelSpacing() );
+        sb.append(" SPACING:" + getChannelSpacing());
 
-        sb.append( " OFFSET:" + getTransmitOffset() );
+        sb.append(" OFFSET:" + getTransmitOffset());
 
-		return sb.toString();
+        return sb.toString();
-	}
+    }
 
-	@Override
+    @Override
-	public int getIdentifier()
+    public int getIdentifier()
-	{
+    {
-		return mMessage.getInt( IDENTIFIER );
+        return mMessage.getInt(IDENTIFIER);
-	}
+    }
 
-	/**
+    /**
      * Channel bandwidth in hertz
      */
     @Override
     public int getBandwidth()
     {
-    	return mMessage.getInt( BANDWIDTH ) * 125;
+        return mMessage.getInt(BANDWIDTH) * 125;
     }
 
     @Override
     public long getChannelSpacing()
     {
-    	return mMessage.getLong( CHANNEL_SPACING ) * 125l;
+        return mMessage.getLong(CHANNEL_SPACING) * 125l;
     }
 
     @Override
     public long getBaseFrequency()
     {
-        return mMessage.getLong( BASE_FREQUENCY ) * 5l;
+        return mMessage.getLong(BASE_FREQUENCY) * 5l;
     }
 
-	@Override
+    @Override
     public long getTransmitOffset()
     {
-		return  -1 * mMessage.getLong( TRANSMIT_OFFSET ) * 250000l;
+        return -1 * mMessage.getLong(TRANSMIT_OFFSET) * 250000l;
+    }
+
+    @Override
+    public long getDownlinkFrequency(int channelNumber)
+    {
+        return getBaseFrequency() + (channelNumber * getChannelSpacing());
+    }
+
+    @Override
+    public long getUplinkFrequency(int channelNumber)
+    {
+        return getDownlinkFrequency(channelNumber) + getTransmitOffset();
+    }
+
+    @Override
+    public boolean isTDMA()
+    {
+        return false;
     }
 }

src/module/decode/p25/message/ldu/lc/ChannelIdentifierUpdateExplicit.java

@@ -4,8 +4,7 @@ import module.decode.p25.message.IBandIdentifier;
 import module.decode.p25.message.ldu.LDU1Message;
 import module.decode.p25.reference.LinkControlOpcode;
 
-public class ChannelIdentifierUpdateExplicit extends LDU1Message
+public class ChannelIdentifierUpdateExplicit extends LDU1Message implements IBandIdentifier
-									 implements IBandIdentifier
 {
 	public static final int[] IDENTIFIER = { 364,365,366,367 };
 	public static final int[] BANDWIDTH = { 372,373,374,375 };
@@ -80,4 +79,22 @@ public class ChannelIdentifierUpdateExplicit extends LDU1Message
     {
 		return  -1 * mMessage.getLong( TRANSMIT_OFFSET ) * 250000l;
     }
+
+	@Override
+	public long getDownlinkFrequency(int channelNumber)
+	{
+		return getBaseFrequency() + ( channelNumber * getChannelSpacing() );
+	}
+
+	@Override
+	public long getUplinkFrequency(int channelNumber)
+	{
+		return getDownlinkFrequency(channelNumber) + getTransmitOffset();
+	}
+
+	@Override
+	public boolean isTDMA()
+	{
+		return false;
+	}
 }

src/module/decode/p25/message/ldu/lc/GroupVoiceChannelUpdate.java

@@ -1,3 +1,21 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 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 module.decode.p25.message.ldu.lc;
 
 import module.decode.p25.message.IBandIdentifier;
@@ -5,33 +23,24 @@ import module.decode.p25.message.IdentifierReceiver;
 import module.decode.p25.message.ldu.LDU1Message;
 import module.decode.p25.reference.LinkControlOpcode;
 
-import org.slf4j.Logger;
+public class GroupVoiceChannelUpdate extends LDU1Message implements IdentifierReceiver
-import org.slf4j.LoggerFactory;
-
-public class GroupVoiceChannelUpdate extends LDU1Message
-									 implements IdentifierReceiver
 {
-	private final static Logger mLog = 
+    public static final int[] IDENTIFIER_A = {364, 365, 366, 367};
-			LoggerFactory.getLogger( GroupVoiceChannelUpdate.class );
+    public static final int[] CHANNEL_A = {372, 373, 374, 375, 376, 377, 382, 383, 384, 385, 386, 387};
+    public static final int[] GROUP_ADDRESS_A = {536, 537, 538, 539, 540, 541, 546, 547, 548, 549, 550, 551, 556, 557,
+        558, 559};
+    public static final int[] IDENTIFIER_B = {560, 561, 566, 567};
+    public static final int[] CHANNEL_B = {568, 569, 570, 571, 720, 721, 722, 723, 724, 725, 730, 731};
+    public static final int[] GROUP_ADDRESS_B = {732, 733, 734, 735, 740, 741, 742, 743, 744, 745, 750, 751, 752, 753,
+        754, 755};
 
-	public static final int[] IDENTIFIER_A = { 364,365,366,367 };
+    private IBandIdentifier mIdentifierUpdateA;
-	public static final int[] CHANNEL_A = { 372,373,374,375,376,377,382,383,384,
+    private IBandIdentifier mIdentifierUpdateB;
-		385,386,387 };
-	public static final int[] GROUP_ADDRESS_A = { 536,537,538,539,540,541,546,
-		547,548,549,550,551,556,557,558,559 };
-	public static final int[] IDENTIFIER_B = { 560,561,566,567 };
-	public static final int[] CHANNEL_B = { 568,569,570,571,720,721,722,723,724,
-		725,730,731 };
-	public static final int[] GROUP_ADDRESS_B = { 732,733,734,735,740,741,742,
-		743,744,745,750,751,752,753,754,755 };
 
-	private IBandIdentifier mIdentifierUpdateA;
+    public GroupVoiceChannelUpdate(LDU1Message message)
-	private IBandIdentifier mIdentifierUpdateB;
+    {
-	
+        super(message);
-	public GroupVoiceChannelUpdate( LDU1Message message )
+    }
-	{
-		super( message );
-	}
 
     @Override
     public String getEventType()
@@ -39,122 +48,142 @@ public class GroupVoiceChannelUpdate extends LDU1Message
         return LinkControlOpcode.GROUP_VOICE_CHANNEL_UPDATE.getDescription();
     }
 
-	@Override
+    @Override
-	public String getMessage()
+    public String getMessage()
-	{
+    {
-		StringBuilder sb = new StringBuilder();
+        StringBuilder sb = new StringBuilder();
 
-		sb.append( getMessageStub() );
+        sb.append(getMessageStub());
 
-		sb.append( " CHAN A:" + getChannelA() );
+        sb.append(" CHAN A:" + getChannelA());
 
-		sb.append( " GRP A:" + getGroupAddressA() );
+        sb.append(" GRP A:" + getGroupAddressA());
 
-		if( hasChannelB() )
+        if(hasChannelB())
-		{
+        {
-			sb.append( " CHAN B:" + getChannelA() );
+            sb.append(" CHAN B:" + getChannelA());
 
-			sb.append( " GRP B:" + getGroupAddressA() );
+            sb.append(" GRP B:" + getGroupAddressA());
-		}
+        }
 
-		return sb.toString();
+        return sb.toString();
-	}
+    }
 
-	public int getChannelIdentifierA()
+    public int getChannelIdentifierA()
-	{
+    {
-		return mMessage.getInt( IDENTIFIER_A );
+        return mMessage.getInt(IDENTIFIER_A);
-	}
+    }
 
     public int getChannelNumberA()
     {
-    	return mMessage.getInt( CHANNEL_A );
+        return mMessage.getInt(CHANNEL_A);
     }
 
     public String getChannelA()
     {
-    	return getChannelIdentifierA() + "-" + getChannelNumberA();
+        return getChannelIdentifierA() + "-" + getChannelNumberA();
     }
 
-	public int getChannelIdentifierB()
+    public int getChannelIdentifierB()
-	{
+    {
-		return mMessage.getInt( IDENTIFIER_B );
+        return mMessage.getInt(IDENTIFIER_B);
-	}
+    }
 
     public int getChannelNumberB()
     {
-    	return mMessage.getInt( CHANNEL_B );
+        return mMessage.getInt(CHANNEL_B);
     }
 
     public String getChannelB()
     {
-    	return getChannelIdentifierB() + "-" + getChannelNumberB();
+        return getChannelIdentifierB() + "-" + getChannelNumberB();
     }
 
     public boolean hasChannelB()
     {
-    	return getChannelNumberB() != 0;
+        return getChannelNumberB() != 0;
     }
 
     public String getGroupAddressA()
     {
-    	return mMessage.getHex( GROUP_ADDRESS_A, 4 );
+        return mMessage.getHex(GROUP_ADDRESS_A, 4);
     }
 
     public String getGroupAddressB()
     {
-    	return mMessage.getHex( GROUP_ADDRESS_B, 4 );
+        return mMessage.getHex(GROUP_ADDRESS_B, 4);
     }
 
-	@Override
+    @Override
-    public void setIdentifierMessage( int identifier, IBandIdentifier message )
+    public void setIdentifierMessage(int identifier, IBandIdentifier message)
     {
-		if( identifier == getChannelIdentifierA() )
+        if(identifier == getChannelIdentifierA())
-		{
+        {
-			mIdentifierUpdateA = message;
+            mIdentifierUpdateA = message;
-		}
+        }
-		if( identifier == getChannelIdentifierB() )
+        if(identifier == getChannelIdentifierB())
-		{
+        {
-			mIdentifierUpdateB = message;
+            mIdentifierUpdateB = message;
-		}
+        }
     }
 
-	@Override
+    @Override
     public int[] getIdentifiers()
     {
-		if( hasChannelB() )
+        if(hasChannelB())
-		{
+        {
-			int[] identifiers = new int[ 2 ];
+            int[] identifiers = new int[2];
-			identifiers[ 0 ] = getChannelIdentifierA();
+            identifiers[0] = getChannelIdentifierA();
-			identifiers[ 1 ] = getChannelIdentifierB();
+            identifiers[1] = getChannelIdentifierB();
 
-			return identifiers;
+            return identifiers;
-		}
+        }
-		else
+        else
-		{
+        {
-			int[] identifiers = new int[ 1 ];
+            int[] identifiers = new int[1];
-			identifiers[ 0 ] = getChannelIdentifierA();
+            identifiers[0] = getChannelIdentifierA();
 
-			return identifiers;
+            return identifiers;
-		}
+        }
     }
 
     public long getDownlinkFrequencyA()
     {
-    	return calculateDownlink( mIdentifierUpdateA, getChannelNumberA() );
+        if(mIdentifierUpdateA != null)
+        {
+            return mIdentifierUpdateA.getDownlinkFrequency(getChannelNumberA());
+        }
+
+        return 0;
     }
 
     public long getUplinkFrequencyA()
     {
-    	return calculateUplink( mIdentifierUpdateA, getChannelNumberA() );
+        if(mIdentifierUpdateA != null)
+        {
+            return mIdentifierUpdateA.getUplinkFrequency(getChannelNumberA());
+        }
+
+        return 0;
     }
 
     public long getDownlinkFrequencyB()
     {
-    	return calculateDownlink( mIdentifierUpdateB, getChannelNumberA() );
+        if(mIdentifierUpdateB != null)
+        {
+            return mIdentifierUpdateB.getDownlinkFrequency(getChannelNumberB());
+        }
+
+        return 0;
     }
 
     public long getUplinkFrequencyB()
     {
-    	return calculateUplink( mIdentifierUpdateB, getChannelNumberA() );
+        if(mIdentifierUpdateB != null)
+        {
+            return mIdentifierUpdateB.getUplinkFrequency(getChannelNumberB());
+        }
+
+        return 0;
     }
 }

src/module/decode/p25/message/ldu/lc/GroupVoiceChannelUpdateExplicit.java

@@ -1,3 +1,21 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 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 module.decode.p25.message.ldu.lc;
 
 import module.decode.p25.message.IBandIdentifier;
@@ -5,35 +23,25 @@ import module.decode.p25.message.IdentifierReceiver;
 import module.decode.p25.message.ldu.LDU1Message;
 import module.decode.p25.reference.LinkControlOpcode;
 
-import org.slf4j.Logger;
+public class GroupVoiceChannelUpdateExplicit extends LDU1Message implements IdentifierReceiver
-import org.slf4j.LoggerFactory;
-
-public class GroupVoiceChannelUpdateExplicit extends LDU1Message
-									 implements IdentifierReceiver
 {
-	private final static Logger mLog = 
-			LoggerFactory.getLogger( GroupVoiceChannelUpdateExplicit.class );
-
     public static final int EMERGENCY_FLAG = 376;
     public static final int ENCRYPTED_CHANNEL_FLAG = 377;
     public static final int DUPLEX_MODE = 382;
     public static final int SESSION_MODE = 383;
-	public static final int[] GROUP_ADDRESS = { 536,537,538,539,540,541,546,547,
+    public static final int[] GROUP_ADDRESS = {536, 537, 538, 539, 540, 541, 546, 547, 548, 549, 550, 551, 556, 557, 558, 559};
-		548,549,550,551,556,557,558,559 };
+    public static final int[] TRANSMIT_IDENTIFIER = {560, 561, 566, 567};
-	public static final int[] TRANSMIT_IDENTIFIER = { 560,561,566,567 };
+    public static final int[] TRANSMIT_CHANNEL = {568, 569, 570, 571, 720, 721, 722, 723, 724, 725, 730, 731};
-	public static final int[] TRANSMIT_CHANNEL = { 568,569,570,571,720,721,722,
+    public static final int[] RECEIVE_IDENTIFIER = {732, 733, 734, 735};
-		723,724,725,730,731 };
+    public static final int[] RECEIVE_CHANNEL = {740, 741, 742, 743, 744, 745, 750, 751, 752, 753, 754, 755};
-	public static final int[] RECEIVE_IDENTIFIER = { 732,733,734,735 };
-	public static final int[] RECEIVE_CHANNEL = { 740,741,742,743,744,745,750,
-		751,752,753,754,755 };
 
-	private IBandIdentifier mTransmitIdentifierUpdate;
+    private IBandIdentifier mTransmitIdentifierUpdate;
-	private IBandIdentifier mReceiveIdentifierUpdate;
+    private IBandIdentifier mReceiveIdentifierUpdate;
 
-	public GroupVoiceChannelUpdateExplicit( LDU1Message message )
+    public GroupVoiceChannelUpdateExplicit(LDU1Message message)
-	{
+    {
-		super( message );
+        super(message);
-	}
+    }
 
     @Override
     public String getEventType()
@@ -41,115 +49,123 @@ public class GroupVoiceChannelUpdateExplicit extends LDU1Message
         return LinkControlOpcode.GROUP_VOICE_CHANNEL_UPDATE_EXPLICIT.getDescription();
     }
 
-	@Override
+    @Override
-	public String getMessage()
+    public String getMessage()
-	{
+    {
-		StringBuilder sb = new StringBuilder();
+        StringBuilder sb = new StringBuilder();
 
-		sb.append( getMessageStub() );
+        sb.append(getMessageStub());
 
-		if( isEmergency() )
+        if(isEmergency())
-		{
+        {
-			sb.append( " EMERGENCY" );
+            sb.append(" EMERGENCY");
-		}
+        }
-		if( isEncryptedChannel() )
+        if(isEncryptedChannel())
-		{
+        {
-			sb.append( " ENCRYPTED CHANNEL" );
+            sb.append(" ENCRYPTED CHANNEL");
-		}
+        }
 
 
-		return sb.toString();
+        return sb.toString();
-	}
+    }
 
     public boolean isEmergency()
     {
-        return mMessage.get( EMERGENCY_FLAG );
+        return mMessage.get(EMERGENCY_FLAG);
     }
 
     public boolean isEncryptedChannel()
     {
-        return mMessage.get( ENCRYPTED_CHANNEL_FLAG );
+        return mMessage.get(ENCRYPTED_CHANNEL_FLAG);
     }
 
     public DuplexMode getDuplexMode()
     {
-        return mMessage.get( DUPLEX_MODE ) ? DuplexMode.FULL : DuplexMode.HALF;
+        return mMessage.get(DUPLEX_MODE) ? DuplexMode.FULL : DuplexMode.HALF;
     }
 
     public SessionMode getSessionMode()
     {
-        return mMessage.get( SESSION_MODE ) ? 
+        return mMessage.get(SESSION_MODE) ?
-                SessionMode.CIRCUIT : SessionMode.PACKET;
+            SessionMode.CIRCUIT : SessionMode.PACKET;
     }
 
     public int getTransmitChannelIdentifier()
-	{
+    {
-		return mMessage.getInt( TRANSMIT_IDENTIFIER );
+        return mMessage.getInt(TRANSMIT_IDENTIFIER);
-	}
+    }
 
     public int getTransmitChannelNumber()
     {
-    	return mMessage.getInt( TRANSMIT_CHANNEL );
+        return mMessage.getInt(TRANSMIT_CHANNEL);
     }
 
     public String getTransmitChannel()
     {
-    	return getTransmitChannelIdentifier() + "-" + getTransmitChannelNumber();
+        return getTransmitChannelIdentifier() + "-" + getTransmitChannelNumber();
     }
 
     public int getReceiveChannelIdentifier()
-	{
+    {
-		return mMessage.getInt( RECEIVE_IDENTIFIER );
+        return mMessage.getInt(RECEIVE_IDENTIFIER);
-	}
+    }
 
     public int getReceiveChannelNumber()
     {
-    	return mMessage.getInt( RECEIVE_CHANNEL );
+        return mMessage.getInt(RECEIVE_CHANNEL);
     }
 
     public String getReceiveChannel()
     {
-    	return getReceiveChannelIdentifier() + "-" + getReceiveChannelNumber();
+        return getReceiveChannelIdentifier() + "-" + getReceiveChannelNumber();
     }
 
     public String getGroupAddress()
     {
-    	return mMessage.getHex( GROUP_ADDRESS, 4 );
+        return mMessage.getHex(GROUP_ADDRESS, 4);
     }
 
-	@Override
+    @Override
-    public void setIdentifierMessage( int identifier, IBandIdentifier message )
+    public void setIdentifierMessage(int identifier, IBandIdentifier message)
     {
-		if( identifier == getTransmitChannelIdentifier() )
+        if(identifier == getTransmitChannelIdentifier())
-		{
+        {
-			mTransmitIdentifierUpdate = message;
+            mTransmitIdentifierUpdate = message;
-		}
+        }
-		if( identifier == getReceiveChannelIdentifier() )
+        if(identifier == getReceiveChannelIdentifier())
-		{
+        {
-			mReceiveIdentifierUpdate = message;
+            mReceiveIdentifierUpdate = message;
-		}
+        }
     }
 
-	@Override
+    @Override
     public int[] getIdentifiers()
     {
-		int[] identifiers = new int[ 2 ];
+        int[] identifiers = new int[2];
 
-		identifiers[ 0 ] = getTransmitChannelIdentifier();
+        identifiers[0] = getTransmitChannelIdentifier();
-		identifiers[ 1 ] = getReceiveChannelIdentifier();
+        identifiers[1] = getReceiveChannelIdentifier();
 
-		return identifiers;
+        return identifiers;
     }
 
     public long getDownlinkFrequency()
     {
-    	return calculateDownlink( mTransmitIdentifierUpdate, 
+        if(mTransmitIdentifierUpdate != null)
-    			getTransmitChannelNumber() );
+        {
+            return mTransmitIdentifierUpdate.getDownlinkFrequency(getTransmitChannelNumber());
+        }
+
+        return 0;
     }
 
     public long getUplinkFrequency()
     {
-    	return calculateUplink( mReceiveIdentifierUpdate, 
+        if(mReceiveIdentifierUpdate != null)
-    			getReceiveChannelNumber() );
+        {
+            return mReceiveIdentifierUpdate.getUplinkFrequency(getReceiveChannelNumber());
+        }
+
+        return 0;
     }
 }

src/module/decode/p25/message/ldu/lc/NetworkStatusBroadcast.java

@@ -1,3 +1,21 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 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 module.decode.p25.message.ldu.lc;
 
 import module.decode.p25.message.IBandIdentifier;
@@ -6,30 +24,21 @@ import module.decode.p25.message.ldu.LDU1Message;
 import module.decode.p25.reference.LinkControlOpcode;
 import module.decode.p25.reference.Service;
 
-import org.slf4j.Logger;
+public class NetworkStatusBroadcast extends LDU1Message implements IdentifierReceiver
-import org.slf4j.LoggerFactory;
-
-public class NetworkStatusBroadcast extends LDU1Message
-									implements IdentifierReceiver
 {
-	private final static Logger mLog = 
+    public static final int[] NETWORK_ID = {376, 377, 382, 383, 384, 385, 386, 387, 536, 537, 538, 539, 540, 541, 546,
-			LoggerFactory.getLogger( NetworkStatusBroadcast.class );
+        547, 548, 549, 550, 551};
-	public static final int[] NETWORK_ID = { 376,377,382,383,384,385,386,387,
+    public static final int[] SYSTEM_ID = {556, 557, 558, 559, 560, 561, 566, 567, 568, 569, 570, 571};
-		536,537,538,539,540,541,546,547,548,549,550,551 };
+    public static final int[] IDENTIFIER = {720, 721, 722, 723};
-	public static final int[] SYSTEM_ID = { 556,557,558,559,560,561,566,567,568,
+    public static final int[] CHANNEL = {724, 725, 730, 731, 732, 733, 734, 735, 740, 741, 742, 743};
-		569,570,571 };
+    public static final int[] SYSTEM_SERVICE_CLASS = {744, 745, 750, 751, 752, 753, 754, 755};
-	public static final int[] IDENTIFIER = { 720,721,722,723 };
-	public static final int[] CHANNEL = { 724,725,730,731,732,733,734,735,740,
-		741,742,743 };
-	public static final int[] SYSTEM_SERVICE_CLASS = { 744,745,750,751,752,753,
-		754,755 };
 
-	private IBandIdentifier mIdentifierUpdate;
+    private IBandIdentifier mIdentifierUpdate;
 
-	public NetworkStatusBroadcast( LDU1Message source )
+    public NetworkStatusBroadcast(LDU1Message source)
-	{
+    {
-		super( source );
+        super(source);
-	}
+    }
 
     @Override
     public String getEventType()
@@ -37,74 +46,84 @@ public class NetworkStatusBroadcast extends LDU1Message
         return LinkControlOpcode.NETWORK_STATUS_BROADCAST.getDescription();
     }
 
-	@Override
+    @Override
-	public String getMessage()
+    public String getMessage()
-	{
-		StringBuilder sb = new StringBuilder();
-		
-		sb.append( getMessageStub() );
-
-		sb.append( " NETWORK:" + getNetworkID() );
-		sb.append( " SYS:" + getSystem() );
-		sb.append( " CHAN:" + getChannel() );
-		sb.append( " " + Service.getServices( getSystemServiceClass() ).toString() );
-		
-		return sb.toString();
-	}
-	
-	public String getNetworkID()
-	{
-		return mMessage.getHex( NETWORK_ID, 5 );
-	}
-	
-	public String getSystem()
-	{
-		return mMessage.getHex( SYSTEM_ID, 3 );
-	}
-
-	public int getIdentifier()
-	{
-		return mMessage.getInt( IDENTIFIER );
-	}
-	
-	public int getChannelNumber()
-	{
-		return mMessage.getInt( CHANNEL );
-	}
-	
-	public String getChannel()
-	{
-		return getIdentifier() + "-" + getChannelNumber();
-	}
-	
-	public int getSystemServiceClass()
-	{
-		return mMessage.getInt( SYSTEM_SERVICE_CLASS );
-	}
-
-	@Override
-    public void setIdentifierMessage( int identifier, IBandIdentifier message )
     {
-		mIdentifierUpdate = message;
+        StringBuilder sb = new StringBuilder();
+
+        sb.append(getMessageStub());
+
+        sb.append(" NETWORK:" + getNetworkID());
+        sb.append(" SYS:" + getSystem());
+        sb.append(" CHAN:" + getChannel());
+        sb.append(" " + Service.getServices(getSystemServiceClass()).toString());
+
+        return sb.toString();
     }
 
-	@Override
+    public String getNetworkID()
+    {
+        return mMessage.getHex(NETWORK_ID, 5);
+    }
+
+    public String getSystem()
+    {
+        return mMessage.getHex(SYSTEM_ID, 3);
+    }
+
+    public int getIdentifier()
+    {
+        return mMessage.getInt(IDENTIFIER);
+    }
+
+    public int getChannelNumber()
+    {
+        return mMessage.getInt(CHANNEL);
+    }
+
+    public String getChannel()
+    {
+        return getIdentifier() + "-" + getChannelNumber();
+    }
+
+    public int getSystemServiceClass()
+    {
+        return mMessage.getInt(SYSTEM_SERVICE_CLASS);
+    }
+
+    @Override
+    public void setIdentifierMessage(int identifier, IBandIdentifier message)
+    {
+        mIdentifierUpdate = message;
+    }
+
+    @Override
     public int[] getIdentifiers()
     {
-	    int[] identifiers = new int[ 1 ];
+        int[] identifiers = new int[1];
 
-	    identifiers[ 0 ] = getIdentifier();
+        identifiers[0] = getIdentifier();
 
-	    return identifiers;
+        return identifiers;
     }
 
     public long getDownlinkFrequency()
     {
-    	return calculateDownlink( mIdentifierUpdate, getChannelNumber() );
+        if(mIdentifierUpdate != null)
+        {
+            return mIdentifierUpdate.getDownlinkFrequency(getChannelNumber());
+        }
+
+        return 0;
     }
 
     public long getUplinkFrequency()
     {
-    	return calculateUplink( mIdentifierUpdate, getChannelNumber() );
+        if(mIdentifierUpdate != null)
+        {
+            return mIdentifierUpdate.getUplinkFrequency(getChannelNumber());
+        }
+
+        return 0;
     }
 }

src/module/decode/p25/message/ldu/lc/NetworkStatusBroadcastExplicit.java

@@ -1,36 +1,47 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 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 module.decode.p25.message.ldu.lc;
 
 import module.decode.p25.message.IBandIdentifier;
 import module.decode.p25.message.IdentifierReceiver;
 import module.decode.p25.message.ldu.LDU1Message;
 import module.decode.p25.reference.LinkControlOpcode;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class NetworkStatusBroadcastExplicit extends LDU1Message
+public class NetworkStatusBroadcastExplicit extends LDU1Message implements IdentifierReceiver
-									implements IdentifierReceiver
 {
-	private final static Logger mLog = 
+    public static final int[] NETWORK_ID = {364, 365, 366, 367, 372, 373, 374, 375, 376, 377, 382, 383, 384, 385, 386,
-			LoggerFactory.getLogger( NetworkStatusBroadcastExplicit.class );
+        387, 536, 537, 538, 539};
-	public static final int[] NETWORK_ID = { 364,365,366,367,372,373,374,375,
+    public static final int[] SYSTEM_ID = {540, 541, 546, 547, 548, 549, 550, 551, 556, 557, 558, 559};
-		376,377,382,383,384,385,386,387,536,537,538,539 };
+    public static final int[] TRANSMIT_IDENTIFIER = {560, 561, 566, 567};
-	public static final int[] SYSTEM_ID = { 540,541,546,547,548,549,550,551,556,
+    public static final int[] TRANSMIT_CHANNEL = {568, 569, 570, 571, 720, 721, 722, 723, 724, 725, 730, 731};
-		557,558,559 };
+    public static final int[] RECEIVE_IDENTIFIER = {732, 733, 734, 735};
-	public static final int[] TRANSMIT_IDENTIFIER = { 560,561,566,567 };
+    public static final int[] RECEIVE_CHANNEL = {740, 741, 742, 743, 744, 745, 750, 751, 752, 753, 754, 755};
-	public static final int[] TRANSMIT_CHANNEL = { 568,569,570,571,720,721,722,
-		723,724,725,730,731 };
-	public static final int[] RECEIVE_IDENTIFIER = { 732,733,734,735 };
-	public static final int[] RECEIVE_CHANNEL = { 740,741,742,743,744,745,750,
-		751,752,753,754,755 };
 
-	private IBandIdentifier mTransmitIdentifierUpdate;
+    private IBandIdentifier mTransmitIdentifierUpdate;
-	private IBandIdentifier mReceiveIdentifierUpdate;
+    private IBandIdentifier mReceiveIdentifierUpdate;
 
-	public NetworkStatusBroadcastExplicit( LDU1Message message )
+    public NetworkStatusBroadcastExplicit(LDU1Message message)
-	{
+    {
-		super( message );
+        super(message);
-	}
+    }
 
     @Override
     public String getEventType()
@@ -38,94 +49,102 @@ public class NetworkStatusBroadcastExplicit extends LDU1Message
         return LinkControlOpcode.NETWORK_STATUS_BROADCAST_EXPLICIT.getDescription();
     }
 
-	@Override
+    @Override
-	public String getMessage()
+    public String getMessage()
-	{
-		StringBuilder sb = new StringBuilder();
-		
-		sb.append( getMessageStub() );
-
-		sb.append( " NETWORK:" + getNetworkID() );
-		sb.append( " SYS:" + getSystem() );
-		sb.append( " TRANSMIT:" + getTransmitChannel() );
-		sb.append( " RECEIVE:" + getReceiveChannel() );
-		
-		return sb.toString();
-	}
-	
-	public String getNetworkID()
-	{
-		return mMessage.getHex( NETWORK_ID, 5 );
-	}
-	
-	public String getSystem()
-	{
-		return mMessage.getHex( SYSTEM_ID, 3 );
-	}
-
-	public int getTransmitIdentifier()
-	{
-		return mMessage.getInt( TRANSMIT_IDENTIFIER );
-	}
-	
-	public int getTransmitChannelNumber()
-	{
-		return mMessage.getInt( TRANSMIT_CHANNEL );
-	}
-	
-	public String getTransmitChannel()
-	{
-		return getTransmitIdentifier() + "-" + getTransmitChannelNumber();
-	}
-	
-	public int getReceiveIdentifier()
-	{
-		return mMessage.getInt( RECEIVE_IDENTIFIER );
-	}
-	
-	public int getReceiveChannelNumber()
-	{
-		return mMessage.getInt( RECEIVE_CHANNEL );
-	}
-	
-	public String getReceiveChannel()
-	{
-		return getReceiveIdentifier() + "-" + getReceiveChannelNumber();
-	}
-
-	@Override
-    public void setIdentifierMessage( int identifier, IBandIdentifier message )
     {
-		if( identifier == getTransmitIdentifier() )
+        StringBuilder sb = new StringBuilder();
-		{
+
-			mTransmitIdentifierUpdate = message;
+        sb.append(getMessageStub());
-		}
+
-		if( identifier == getReceiveIdentifier() )
+        sb.append(" NETWORK:" + getNetworkID());
-		{
+        sb.append(" SYS:" + getSystem());
-			mReceiveIdentifierUpdate = message;
+        sb.append(" TRANSMIT:" + getTransmitChannel());
-		}
+        sb.append(" RECEIVE:" + getReceiveChannel());
+
+        return sb.toString();
     }
 
-	@Override
+    public String getNetworkID()
+    {
+        return mMessage.getHex(NETWORK_ID, 5);
+    }
+
+    public String getSystem()
+    {
+        return mMessage.getHex(SYSTEM_ID, 3);
+    }
+
+    public int getTransmitIdentifier()
+    {
+        return mMessage.getInt(TRANSMIT_IDENTIFIER);
+    }
+
+    public int getTransmitChannelNumber()
+    {
+        return mMessage.getInt(TRANSMIT_CHANNEL);
+    }
+
+    public String getTransmitChannel()
+    {
+        return getTransmitIdentifier() + "-" + getTransmitChannelNumber();
+    }
+
+    public int getReceiveIdentifier()
+    {
+        return mMessage.getInt(RECEIVE_IDENTIFIER);
+    }
+
+    public int getReceiveChannelNumber()
+    {
+        return mMessage.getInt(RECEIVE_CHANNEL);
+    }
+
+    public String getReceiveChannel()
+    {
+        return getReceiveIdentifier() + "-" + getReceiveChannelNumber();
+    }
+
+    @Override
+    public void setIdentifierMessage(int identifier, IBandIdentifier message)
+    {
+        if(identifier == getTransmitIdentifier())
+        {
+            mTransmitIdentifierUpdate = message;
+        }
+        if(identifier == getReceiveIdentifier())
+        {
+            mReceiveIdentifierUpdate = message;
+        }
+    }
+
+    @Override
     public int[] getIdentifiers()
     {
-	    int[] identifiers = new int[ 2 ];
+        int[] identifiers = new int[2];
 
-	    identifiers[ 0 ] = getTransmitIdentifier();
+        identifiers[0] = getTransmitIdentifier();
-	    identifiers[ 1 ] = getReceiveIdentifier();
+        identifiers[1] = getReceiveIdentifier();
 
-	    return identifiers;
+        return identifiers;
     }
 
     public long getDownlinkFrequency()
     {
-    	return calculateDownlink( mTransmitIdentifierUpdate, 
+        if(mTransmitIdentifierUpdate != null)
-    				getTransmitChannelNumber() );
+        {
+            return mTransmitIdentifierUpdate.getDownlinkFrequency(getTransmitChannelNumber());
+        }
+
+        return 0;
     }
 
     public long getUplinkFrequency()
     {
-    	return calculateUplink( mReceiveIdentifierUpdate, 
+        if(mReceiveIdentifierUpdate != null)
-    			getReceiveChannelNumber() );
+        {
+            return mReceiveIdentifierUpdate.getUplinkFrequency(getReceiveChannelNumber());
+        }
+
+        return 0;
     }
 }

src/module/decode/p25/message/ldu/lc/RFSSStatusBroadcast.java

@@ -1,3 +1,21 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 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 module.decode.p25.message.ldu.lc;
 
 import module.decode.p25.message.IBandIdentifier;
@@ -6,32 +24,22 @@ import module.decode.p25.message.ldu.LDU1Message;
 import module.decode.p25.message.tsbk.osp.control.SystemService;
 import module.decode.p25.reference.LinkControlOpcode;
 
-import org.slf4j.Logger;
+public class RFSSStatusBroadcast extends LDU1Message implements IdentifierReceiver
-import org.slf4j.LoggerFactory;
-
-public class RFSSStatusBroadcast extends LDU1Message 
-								 implements IdentifierReceiver
 {
-	private final static Logger mLog = 
+    public static final int[] LRA = {364, 365, 366, 367, 372, 373, 374, 375};
-			LoggerFactory.getLogger( RFSSStatusBroadcast.class );
+    public static final int[] SYSTEM_ID = {384, 385, 386, 387, 536, 537, 538, 539, 540, 541, 546, 547};
+    public static final int[] RFSS_ID = {548, 549, 550, 551, 556, 557, 558, 559};
+    public static final int[] SITE_ID = {560, 561, 566, 567, 568, 569, 570, 571};
+    public static final int[] IDENTIFIER = {720, 721, 722, 723};
+    public static final int[] CHANNEL = {724, 725, 730, 731, 732, 733, 734, 735, 740, 741, 742, 743};
+    public static final int[] SYSTEM_SERVICE_CLASS = {744, 745, 750, 751, 752, 753, 754, 755};
 
-	public static final int[] LRA = { 364,365,366,367,372,373,374,375 };
+    private IBandIdentifier mIdentifierUpdate;
-	public static final int[] SYSTEM_ID = { 384,385,386,387,536,537,538,539,540,
-		541,546,547 };
-	public static final int[] RFSS_ID = { 548,549,550,551,556,557,558,559 };
-	public static final int[] SITE_ID = { 560,561,566,567,568,569,570,571 };
-	public static final int[] IDENTIFIER = { 720,721,722,723 };
-	public static final int[] CHANNEL = { 724,725,730,731,732,733,734,735,740,
-		741,742,743 };
-	public static final int[] SYSTEM_SERVICE_CLASS = { 744,745,750,751,752,753,
-		754,755 };
 
-	private IBandIdentifier mIdentifierUpdate;
+    public RFSSStatusBroadcast(LDU1Message message)
-	
+    {
-	public RFSSStatusBroadcast( LDU1Message message )
+        super(message);
-	{
+    }
-		super( message );
-	}
 
     @Override
     public String getEventType()
@@ -39,92 +47,101 @@ public class RFSSStatusBroadcast extends LDU1Message
         return LinkControlOpcode.RFSS_STATUS_BROADCAST.getDescription();
     }
 
-	@Override
+    @Override
-	public String getMessage()
+    public String getMessage()
-	{
-		StringBuilder sb = new StringBuilder();
-		
-		sb.append( getMessageStub() );
-		
-		sb.append( " LRA:" + getLocationRegistrationArea() );
-		
-		sb.append( " SYS:" + getSystem() );
-
-		sb.append( " SITE:" + getRFSubsystemID() + "-" + getSiteID() );
-		
-		sb.append( " CHAN:" + getChannelNumber() );
-		
-        sb.append( " " + SystemService.toString( getSystemServiceClass() ) );
-		
-        sb.append( " " + mMessage.toString() );
-        
-		return sb.toString();
-	}
-	
-	public String getLocationRegistrationArea()
-	{
-		return mMessage.getHex( LRA, 2 );
-	}
-	
-	public String getSystem()
-	{
-		return mMessage.getHex( SYSTEM_ID, 3 );
-	}
-	
-	public String getRFSubsystemID()
-	{
-		return mMessage.getHex( RFSS_ID, 2 );
-	}
-	
-	public String getSiteID()
-	{
-		return mMessage.getHex( SITE_ID, 2 );
-	}
-	
-	public int getIdentifier()
-	{
-		return mMessage.getInt( IDENTIFIER );
-	}
-	
-	public String getChannel()
-	{
-		return getIdentifier() + "-" + getChannelNumber();
-	}
-	
-	public int getChannelNumber()
-	{
-		return mMessage.getInt( CHANNEL );
-	}
-	
-	public int getSystemServiceClass()
-	{
-		return mMessage.getInt( SYSTEM_SERVICE_CLASS );
-	}
-
-	@Override
-    public void setIdentifierMessage( int identifier, IBandIdentifier message )
     {
-	    mIdentifierUpdate = message;
+        StringBuilder sb = new StringBuilder();
+
+        sb.append(getMessageStub());
+
+        sb.append(" LRA:" + getLocationRegistrationArea());
+
+        sb.append(" SYS:" + getSystem());
+
+        sb.append(" SITE:" + getRFSubsystemID() + "-" + getSiteID());
+
+        sb.append(" CHAN:" + getChannelNumber());
+
+        sb.append(" " + SystemService.toString(getSystemServiceClass()));
+
+        sb.append(" " + mMessage.toString());
+
+        return sb.toString();
     }
 
-	@Override
+    public String getLocationRegistrationArea()
+    {
+        return mMessage.getHex(LRA, 2);
+    }
+
+    public String getSystem()
+    {
+        return mMessage.getHex(SYSTEM_ID, 3);
+    }
+
+    public String getRFSubsystemID()
+    {
+        return mMessage.getHex(RFSS_ID, 2);
+    }
+
+    public String getSiteID()
+    {
+        return mMessage.getHex(SITE_ID, 2);
+    }
+
+    public int getIdentifier()
+    {
+        return mMessage.getInt(IDENTIFIER);
+    }
+
+    public String getChannel()
+    {
+        return getIdentifier() + "-" + getChannelNumber();
+    }
+
+    public int getChannelNumber()
+    {
+        return mMessage.getInt(CHANNEL);
+    }
+
+    public int getSystemServiceClass()
+    {
+        return mMessage.getInt(SYSTEM_SERVICE_CLASS);
+    }
+
+    @Override
+    public void setIdentifierMessage(int identifier, IBandIdentifier message)
+    {
+        mIdentifierUpdate = message;
+    }
+
+    @Override
     public int[] getIdentifiers()
     {
-		int[] identifiers = new int[ 1 ];
+        int[] identifiers = new int[1];
 
-		identifiers[ 0 ] = getIdentifier();
+        identifiers[0] = getIdentifier();
 
-	    return identifiers;
+        return identifiers;
     }
 
     public long getDownlinkFrequency()
     {
-    	return calculateDownlink( mIdentifierUpdate, getChannelNumber() );
+        if(mIdentifierUpdate != null)
+        {
+            return mIdentifierUpdate.getDownlinkFrequency(getChannelNumber());
+        }
+
+        return 0;
     }
 
     public long getUplinkFrequency()
     {
-    	return calculateUplink( mIdentifierUpdate, getChannelNumber() );
+        if(mIdentifierUpdate != null)
-    }
+        {
+            return mIdentifierUpdate.getUplinkFrequency(getChannelNumber());
+        }
 
+        return 0;
+    }
 }

src/module/decode/p25/message/ldu/lc/RFSSStatusBroadcastExplicit.java

@@ -1,3 +1,21 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 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 module.decode.p25.message.ldu.lc;
 
 import module.decode.p25.message.IBandIdentifier;
@@ -5,34 +23,27 @@ import module.decode.p25.message.IdentifierReceiver;
 import module.decode.p25.message.ldu.LDU1Message;
 import module.decode.p25.message.tsbk.osp.control.SystemService;
 import module.decode.p25.reference.LinkControlOpcode;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class RFSSStatusBroadcastExplicit extends LDU1Message 
+public class RFSSStatusBroadcastExplicit extends LDU1Message implements IdentifierReceiver
-								 implements IdentifierReceiver
 {
-	private final static Logger mLog = 
+    public static final int[] LRA = {364, 365, 366, 367, 372, 373, 374, 375};
-			LoggerFactory.getLogger( RFSSStatusBroadcastExplicit.class );
+    public static final int[] RECEIVE_IDENTIFIER = {376, 377, 382, 383};
+    public static final int[] RECEIVE_CHANNEL = {384, 385, 386, 387, 536, 537, 538, 539, 540, 541, 546, 547};
+    public static final int[] RFSS_ID = {548, 549, 550, 551, 556, 557, 558, 559};
+    public static final int[] SITE_ID = {560, 561, 566, 567, 568, 569, 570, 571};
+    public static final int[] TRANSMIT_IDENTIFIER = {720, 721, 722, 723};
+    public static final int[] TRANSMIT_CHANNEL = {724, 725, 730, 731, 732, 733, 734, 735, 740, 741, 742, 743};
+    public static final int[] SYSTEM_SERVICE_CLASS = {744, 745, 750, 751, 752, 753, 754, 755};
 
-	public static final int[] LRA = { 364,365,366,367,372,373,374,375 };
+    private IBandIdentifier mTransmitIdentifierUpdate;
-	public static final int[] RECEIVE_IDENTIFIER = { 376,377,382,383 };
+    private IBandIdentifier mReceiveIdentifierUpdate;
-	public static final int[] RECEIVE_CHANNEL = { 384,385,386,387,536,537,538,
-		539,540,541,546,547 };
-	public static final int[] RFSS_ID = { 548,549,550,551,556,557,558,559 };
-	public static final int[] SITE_ID = { 560,561,566,567,568,569,570,571 };
-	public static final int[] TRANSMIT_IDENTIFIER = { 720,721,722,723 };
-	public static final int[] TRANSMIT_CHANNEL = { 724,725,730,731,732,733,734,
-		735,740,741,742,743 };
-	public static final int[] SYSTEM_SERVICE_CLASS = { 744,745,750,751,752,753,754,755 };
 
-	private IBandIdentifier mTransmitIdentifierUpdate;
+    public RFSSStatusBroadcastExplicit(LDU1Message source)
-	private IBandIdentifier mReceiveIdentifierUpdate;
+    {
-	
+        super(source);
-	public RFSSStatusBroadcastExplicit( LDU1Message source )
+    }
-	{
-		super( source );
-	}
 
     @Override
     public String getEventType()
@@ -40,111 +51,120 @@ public class RFSSStatusBroadcastExplicit extends LDU1Message
         return LinkControlOpcode.RFSS_STATUS_BROADCAST_EXPLICIT.getDescription();
     }
 
-	@Override
+    @Override
-	public String getMessage()
+    public String getMessage()
-	{
-		StringBuilder sb = new StringBuilder();
-		
-		sb.append( getMessageStub() );
-		
-		sb.append( " LRA:" + getLocationRegistrationArea() );
-		
-		sb.append( " SITE:" + getRFSubsystemID() + "-" + getSiteID() );
-		
-		sb.append( " TRANSMIT:" + getTransmitChannelNumber() );
-		
-		sb.append( " RECEIVE:" + getReceiveChannelNumber() );
-		
-        sb.append( " " + SystemService.toString( getSystemServiceClass() ) );
-		
-        sb.append( " " + mMessage.toString() );
-        
-		return sb.toString();
-	}
-	
-	public String getLocationRegistrationArea()
-	{
-		return mMessage.getHex( LRA, 2 );
-	}
-	
-	public String getRFSubsystemID()
-	{
-		return mMessage.getHex( RFSS_ID, 2 );
-	}
-	
-	public String getSiteID()
-	{
-		return mMessage.getHex( SITE_ID, 2 );
-	}
-	
-	public int getTransmitIdentifier()
-	{
-		return mMessage.getInt( TRANSMIT_IDENTIFIER );
-	}
-	
-	public String getTransmitChannel()
-	{
-		return getTransmitIdentifier() + "-" + getTransmitChannelNumber();
-	}
-	
-	public int getTransmitChannelNumber()
-	{
-		return mMessage.getInt( TRANSMIT_CHANNEL );
-	}
-	
-	public int getReceiveIdentifier()
-	{
-		return mMessage.getInt( RECEIVE_IDENTIFIER );
-	}
-	
-	public String getReceiveChannel()
-	{
-		return getReceiveIdentifier() + "-" + getReceiveChannelNumber();
-	}
-	
-	public int getReceiveChannelNumber()
-	{
-		return mMessage.getInt( RECEIVE_CHANNEL );
-	}
-	
-	public int getSystemServiceClass()
-	{
-		return mMessage.getInt( SYSTEM_SERVICE_CLASS );
-	}
-
-	@Override
-    public void setIdentifierMessage( int identifier, IBandIdentifier message )
     {
-		if( identifier == getTransmitIdentifier() )
+        StringBuilder sb = new StringBuilder();
-		{
-			mTransmitIdentifierUpdate = message;
-		}
 
-		if( identifier == getReceiveIdentifier() )
+        sb.append(getMessageStub());
-		{
+
-			mReceiveIdentifierUpdate = message;
+        sb.append(" LRA:" + getLocationRegistrationArea());
-		}
+
+        sb.append(" SITE:" + getRFSubsystemID() + "-" + getSiteID());
+
+        sb.append(" TRANSMIT:" + getTransmitChannelNumber());
+
+        sb.append(" RECEIVE:" + getReceiveChannelNumber());
+
+        sb.append(" " + SystemService.toString(getSystemServiceClass()));
+
+        sb.append(" " + mMessage.toString());
+
+        return sb.toString();
     }
 
-	@Override
+    public String getLocationRegistrationArea()
+    {
+        return mMessage.getHex(LRA, 2);
+    }
+
+    public String getRFSubsystemID()
+    {
+        return mMessage.getHex(RFSS_ID, 2);
+    }
+
+    public String getSiteID()
+    {
+        return mMessage.getHex(SITE_ID, 2);
+    }
+
+    public int getTransmitIdentifier()
+    {
+        return mMessage.getInt(TRANSMIT_IDENTIFIER);
+    }
+
+    public String getTransmitChannel()
+    {
+        return getTransmitIdentifier() + "-" + getTransmitChannelNumber();
+    }
+
+    public int getTransmitChannelNumber()
+    {
+        return mMessage.getInt(TRANSMIT_CHANNEL);
+    }
+
+    public int getReceiveIdentifier()
+    {
+        return mMessage.getInt(RECEIVE_IDENTIFIER);
+    }
+
+    public String getReceiveChannel()
+    {
+        return getReceiveIdentifier() + "-" + getReceiveChannelNumber();
+    }
+
+    public int getReceiveChannelNumber()
+    {
+        return mMessage.getInt(RECEIVE_CHANNEL);
+    }
+
+    public int getSystemServiceClass()
+    {
+        return mMessage.getInt(SYSTEM_SERVICE_CLASS);
+    }
+
+    @Override
+    public void setIdentifierMessage(int identifier, IBandIdentifier message)
+    {
+        if(identifier == getTransmitIdentifier())
+        {
+            mTransmitIdentifierUpdate = message;
+        }
+
+        if(identifier == getReceiveIdentifier())
+        {
+            mReceiveIdentifierUpdate = message;
+        }
+    }
+
+    @Override
     public int[] getIdentifiers()
     {
-		int[] identifiers = new int[ 2 ];
+        int[] identifiers = new int[2];
 
-		identifiers[ 0 ] = getTransmitIdentifier();
+        identifiers[0] = getTransmitIdentifier();
-		identifiers[ 1 ] = getReceiveIdentifier();
+        identifiers[1] = getReceiveIdentifier();
 
-	    return identifiers;
+        return identifiers;
     }
 
     public long getDownlinkFrequency()
     {
-    	return calculateDownlink( mTransmitIdentifierUpdate, getTransmitChannelNumber() );
+        if(mTransmitIdentifierUpdate != null)
+        {
+            return mTransmitIdentifierUpdate.getDownlinkFrequency(getTransmitChannelNumber());
+        }
+
+        return 0;
     }
 
     public long getUplinkFrequency()
     {
-    	return calculateUplink( mReceiveIdentifierUpdate, getReceiveChannelNumber() );
+        if(mReceiveIdentifierUpdate != null)
-    }
+        {
+            return mReceiveIdentifierUpdate.getUplinkFrequency(getReceiveChannelNumber());
+        }
 
+        return 0;
+    }
 }

src/module/decode/p25/message/ldu/lc/SecondaryControlChannelBroadcast.java

@@ -1,3 +1,21 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 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 module.decode.p25.message.ldu.lc;
 
 import module.decode.p25.message.IBandIdentifier;
@@ -6,33 +24,24 @@ import module.decode.p25.message.ldu.LDU1Message;
 import module.decode.p25.message.tsbk.osp.control.SystemService;
 import module.decode.p25.reference.LinkControlOpcode;
 
-import org.slf4j.Logger;
+public class SecondaryControlChannelBroadcast extends LDU1Message implements IdentifierReceiver
-import org.slf4j.LoggerFactory;
-
-public class SecondaryControlChannelBroadcast extends LDU1Message
-						implements IdentifierReceiver
 {
-	private final static Logger mLog = 
+    public static final int[] RFSS_ID = {364, 365, 366, 367, 372, 373, 374, 375};
-			LoggerFactory.getLogger( SecondaryControlChannelBroadcast.class );
+    public static final int[] SITE_ID = {376, 377, 382, 383, 384, 385, 386, 387};
+    public static final int[] IDENTIFIER_A = {536, 537, 538, 539};
+    public static final int[] CHANNEL_A = {540, 541, 546, 547, 548, 549, 550, 551, 556, 557, 558, 559};
+    public static final int[] SYSTEM_SERVICE_CLASS_A = {560, 561, 566, 567, 568, 569, 570, 571};
+    public static final int[] IDENTIFIER_B = {720, 721, 722, 723};
+    public static final int[] CHANNEL_B = {724, 725, 730, 731, 732, 733, 734, 735, 740, 741, 742, 743};
+    public static final int[] SYSTEM_SERVICE_CLASS_B = {744, 745, 750, 751, 752, 753, 754, 755};
 
-	public static final int[] RFSS_ID = { 364,365,366,367,372,373,374,375 };
+    private IBandIdentifier mIdentifierProviderA;
-	public static final int[] SITE_ID = { 376,377,382,383,384,385,386,387 };
+    private IBandIdentifier mIdentifierProviderB;
-	public static final int[] IDENTIFIER_A = { 536,537,538,539 };
-	public static final int[] CHANNEL_A = { 540,541,546,547,548,549,550,551,
-		556,557,558,559 };
-	public static final int[] SYSTEM_SERVICE_CLASS_A = { 560,561,566,567,568,569,570,571 };
-	public static final int[] IDENTIFIER_B = { 720,721,722,723 };
-	public static final int[] CHANNEL_B = { 724,725,730,731,732,733,734,735,740,
-		741,742,743 };
-	public static final int[] SYSTEM_SERVICE_CLASS_B = { 744,745,750,751,752,753,754,755 };
 
-	private IBandIdentifier mIdentifierProviderA;
+    public SecondaryControlChannelBroadcast(LDU1Message message)
-	private IBandIdentifier mIdentifierProviderB;
+    {
-	
+        super(message);
-	public SecondaryControlChannelBroadcast( LDU1Message message )
+    }
-	{
-		super( message );
-	}
 
     @Override
     public String getEventType()
@@ -40,117 +49,137 @@ public class SecondaryControlChannelBroadcast extends LDU1Message
         return LinkControlOpcode.SECONDARY_CONTROL_CHANNEL_BROADCAST.getDescription();
     }
 
-	@Override
+    @Override
-	public String getMessage()
+    public String getMessage()
-	{
-		StringBuilder sb = new StringBuilder();
-		
-		sb.append( getMessageStub() );
-		
-		sb.append( " SITE:" + getRFSubsystemID() + "-" + getSiteID() );
-		
-		sb.append( " CHAN A:" + getChannelA() );
-		
-        sb.append( " " + SystemService.toString( getSystemServiceClassA() ) );
-		
-		sb.append( " CHAN B:" + getChannelB() );
-		
-        sb.append( " " + SystemService.toString( getSystemServiceClassB() ) );
-		
-		return sb.toString();
-	}
-	
-	public String getRFSubsystemID()
-	{
-		return mMessage.getHex( RFSS_ID, 2 );
-	}
-	
-	public String getSiteID()
-	{
-		return mMessage.getHex( SITE_ID, 2 );
-	}
-	
-	public int getIdentifierA()
-	{
-		return mMessage.getInt( IDENTIFIER_A );
-	}
-	
-	public int getChannelA()
-	{
-		return mMessage.getInt( CHANNEL_A );
-	}
-	
-	public String getChannelNumberA()
-	{
-		return getIdentifierA() + "-" + getChannelA();
-	}
-	
-	public int getIdentifierB()
-	{
-		return mMessage.getInt( IDENTIFIER_B );
-	}
-	
-	public int getChannelB()
-	{
-		return mMessage.getInt( CHANNEL_B );
-	}
-	
-	public String getChannelNumberB()
-	{
-		return getIdentifierB() + "-" + getChannelB();
-	}
-	
-	public int getSystemServiceClassA()
-	{
-		return mMessage.getInt( SYSTEM_SERVICE_CLASS_A );
-	}
-
-	public int getSystemServiceClassB()
-	{
-		return mMessage.getInt( SYSTEM_SERVICE_CLASS_B );
-	}
-	
-	@Override
-    public void setIdentifierMessage( int identifier, IBandIdentifier message )
     {
-		if( identifier == getIdentifierA() )
+        StringBuilder sb = new StringBuilder();
-		{
+
-			mIdentifierProviderA = message;
+        sb.append(getMessageStub());
-		}
+
-		if( identifier == getIdentifierB() )
+        sb.append(" SITE:" + getRFSubsystemID() + "-" + getSiteID());
-		{
+
-			mIdentifierProviderB = message;
+        sb.append(" CHAN A:" + getChannelA());
-		}
+
+        sb.append(" " + SystemService.toString(getSystemServiceClassA()));
+
+        sb.append(" CHAN B:" + getChannelB());
+
+        sb.append(" " + SystemService.toString(getSystemServiceClassB()));
+
+        return sb.toString();
     }
 
-	@Override
+    public String getRFSubsystemID()
+    {
+        return mMessage.getHex(RFSS_ID, 2);
+    }
+
+    public String getSiteID()
+    {
+        return mMessage.getHex(SITE_ID, 2);
+    }
+
+    public int getIdentifierA()
+    {
+        return mMessage.getInt(IDENTIFIER_A);
+    }
+
+    public int getChannelA()
+    {
+        return mMessage.getInt(CHANNEL_A);
+    }
+
+    public String getChannelNumberA()
+    {
+        return getIdentifierA() + "-" + getChannelA();
+    }
+
+    public int getIdentifierB()
+    {
+        return mMessage.getInt(IDENTIFIER_B);
+    }
+
+    public int getChannelB()
+    {
+        return mMessage.getInt(CHANNEL_B);
+    }
+
+    public String getChannelNumberB()
+    {
+        return getIdentifierB() + "-" + getChannelB();
+    }
+
+    public int getSystemServiceClassA()
+    {
+        return mMessage.getInt(SYSTEM_SERVICE_CLASS_A);
+    }
+
+    public int getSystemServiceClassB()
+    {
+        return mMessage.getInt(SYSTEM_SERVICE_CLASS_B);
+    }
+
+    @Override
+    public void setIdentifierMessage(int identifier, IBandIdentifier message)
+    {
+        if(identifier == getIdentifierA())
+        {
+            mIdentifierProviderA = message;
+        }
+        if(identifier == getIdentifierB())
+        {
+            mIdentifierProviderB = message;
+        }
+    }
+
+    @Override
     public int[] getIdentifiers()
     {
-		int[] identifiers = new int[ 2 ];
+        int[] identifiers = new int[2];
 
-		identifiers[ 0 ] = getIdentifierA();
+        identifiers[0] = getIdentifierA();
-		identifiers[ 1 ] = getIdentifierB();
+        identifiers[1] = getIdentifierB();
 
-		return identifiers;
+        return identifiers;
     }
 
     public long getDownlinkFrequencyA()
     {
-    	return calculateDownlink( mIdentifierProviderA, getChannelA() );
+        if(mIdentifierProviderA != null)
+        {
+            return mIdentifierProviderA.getDownlinkFrequency(getChannelA());
+        }
+
+        return 0;
     }
 
     public long getUplinkFrequencyA()
     {
-    	return calculateUplink( mIdentifierProviderA, getChannelA() );
+        if(mIdentifierProviderA != null)
+        {
+            return mIdentifierProviderA.getUplinkFrequency(getChannelA());
+        }
+
+        return 0;
     }
 
     public long getDownlinkFrequencyB()
     {
-    	return calculateDownlink( mIdentifierProviderB, getChannelB() );
+        if(mIdentifierProviderB != null)
+        {
+            return mIdentifierProviderB.getDownlinkFrequency(getChannelB());
+        }
+
+        return 0;
     }
 
     public long getUplinkFrequencyB()
     {
-    	return calculateUplink( mIdentifierProviderB, getChannelB() );
+        if(mIdentifierProviderB != null)
+        {
+            return mIdentifierProviderB.getUplinkFrequency(getChannelB());
+        }
+
+        return 0;
     }
 }

src/module/decode/p25/message/ldu/lc/SecondaryControlChannelBroadcastExplicit.java

@@ -1,3 +1,21 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 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 module.decode.p25.message.ldu.lc;
 
 import module.decode.p25.message.IBandIdentifier;
@@ -6,33 +24,23 @@ import module.decode.p25.message.ldu.LDU1Message;
 import module.decode.p25.message.tsbk.osp.control.SystemService;
 import module.decode.p25.reference.LinkControlOpcode;
 
-import org.slf4j.Logger;
+public class SecondaryControlChannelBroadcastExplicit extends LDU1Message implements IdentifierReceiver
-import org.slf4j.LoggerFactory;
-
-public class SecondaryControlChannelBroadcastExplicit 
-	extends LDU1Message implements IdentifierReceiver
 {
-	private final static Logger mLog = 
+    public static final int[] RFSS_ID = {364, 365, 366, 367, 372, 373, 374, 375};
-			LoggerFactory.getLogger( SecondaryControlChannelBroadcastExplicit.class );
+    public static final int[] SITE_ID = {376, 377, 382, 383, 384, 385, 386, 387};
+    public static final int[] TRANSMIT_IDENTIFIER = {536, 537, 538, 539};
+    public static final int[] TRANSMIT_CHANNEL = {540, 541, 546, 547, 548, 549, 550, 551, 556, 557, 558, 559};
+    public static final int[] RECEIVE_IDENTIFIER = {560, 561, 566, 567};
+    public static final int[] RECEIVE_CHANNEL = {568, 569, 570, 571, 720, 721, 722, 723, 724, 725, 730, 731};
+    public static final int[] SYSTEM_SERVICE_CLASS = {732, 733, 734, 735, 740, 741, 742, 743};
 
-	public static final int[] RFSS_ID = { 364,365,366,367,372,373,374,375 };
+    private IBandIdentifier mTransmitIdentifierProvider;
-	public static final int[] SITE_ID = { 376,377,382,383,384,385,386,387 };
+    private IBandIdentifier mReceiveIdentifierProvider;
-	public static final int[] TRANSMIT_IDENTIFIER = { 536,537,538,539 };
-	public static final int[] TRANSMIT_CHANNEL = { 540,541,546,547,548,549,550,
-		551,556,557,558,559 };
-	public static final int[] RECEIVE_IDENTIFIER = { 560,561,566,567 };
-	public static final int[] RECEIVE_CHANNEL = { 568,569,570,571,720,721,722,
-		723,724,725,730,731 };
-	public static final int[] SYSTEM_SERVICE_CLASS = { 732,733,734,735,740,741,
-		742,743 };
 
-	private IBandIdentifier mTransmitIdentifierProvider;
+    public SecondaryControlChannelBroadcastExplicit(LDU1Message message)
-	private IBandIdentifier mReceiveIdentifierProvider;
+    {
-	
+        super(message);
-	public SecondaryControlChannelBroadcastExplicit( LDU1Message message )
+    }
-	{
-		super( message );
-	}
 
     @Override
     public String getEventType()
@@ -40,102 +48,110 @@ public class SecondaryControlChannelBroadcastExplicit
         return LinkControlOpcode.SECONDARY_CONTROL_CHANNEL_BROADCAST_EXPLICIT.getDescription();
     }
 
-	@Override
+    @Override
-	public String getMessage()
+    public String getMessage()
-	{
-		StringBuilder sb = new StringBuilder();
-		
-		sb.append( getMessageStub() );
-		
-		sb.append( " SITE:" + getRFSubsystemID() + "-" + getSiteID() );
-		
-		sb.append( " TRANSMIT:" + getTransmitChannel() );
-
-		sb.append( " RECEIVE:" + getReceiveChannel() );
-		
-        sb.append( " " + SystemService.toString( getSystemServiceClass() ) );
-		
-		return sb.toString();
-	}
-	
-	public String getRFSubsystemID()
-	{
-		return mMessage.getHex( RFSS_ID, 2 );
-	}
-	
-	public String getSiteID()
-	{
-		return mMessage.getHex( SITE_ID, 2 );
-	}
-	
-	public int getTransmitIdentifier()
-	{
-		return mMessage.getInt( TRANSMIT_IDENTIFIER );
-	}
-	
-	public int getTransmitChannelNumber()
-	{
-		return mMessage.getInt( TRANSMIT_CHANNEL );
-	}
-	
-	public String getTransmitChannel()
-	{
-		return getTransmitIdentifier() + "-" + getTransmitChannelNumber();
-	}
-	
-	public int getReceiveIdentifier()
-	{
-		return mMessage.getInt( RECEIVE_IDENTIFIER );
-	}
-	
-	public int getReceiveChannelNumber()
-	{
-		return mMessage.getInt( RECEIVE_CHANNEL );
-	}
-	
-	public String getReceiveChannel()
-	{
-		return getReceiveIdentifier() + "-" + getReceiveChannelNumber();
-	}
-	
-	public int getSystemServiceClass()
-	{
-		return mMessage.getInt( SYSTEM_SERVICE_CLASS );
-	}
-
-	@Override
-    public void setIdentifierMessage( int identifier, IBandIdentifier message )
     {
-		if( identifier == getTransmitIdentifier() )
+        StringBuilder sb = new StringBuilder();
-		{
+
-			mTransmitIdentifierProvider = message;
+        sb.append(getMessageStub());
-		}
+
-		if( identifier == getReceiveIdentifier() )
+        sb.append(" SITE:" + getRFSubsystemID() + "-" + getSiteID());
-		{
+
-			mReceiveIdentifierProvider = message;
+        sb.append(" TRANSMIT:" + getTransmitChannel());
-		}
+
+        sb.append(" RECEIVE:" + getReceiveChannel());
+
+        sb.append(" " + SystemService.toString(getSystemServiceClass()));
+
+        return sb.toString();
     }
 
-	@Override
+    public String getRFSubsystemID()
+    {
+        return mMessage.getHex(RFSS_ID, 2);
+    }
+
+    public String getSiteID()
+    {
+        return mMessage.getHex(SITE_ID, 2);
+    }
+
+    public int getTransmitIdentifier()
+    {
+        return mMessage.getInt(TRANSMIT_IDENTIFIER);
+    }
+
+    public int getTransmitChannelNumber()
+    {
+        return mMessage.getInt(TRANSMIT_CHANNEL);
+    }
+
+    public String getTransmitChannel()
+    {
+        return getTransmitIdentifier() + "-" + getTransmitChannelNumber();
+    }
+
+    public int getReceiveIdentifier()
+    {
+        return mMessage.getInt(RECEIVE_IDENTIFIER);
+    }
+
+    public int getReceiveChannelNumber()
+    {
+        return mMessage.getInt(RECEIVE_CHANNEL);
+    }
+
+    public String getReceiveChannel()
+    {
+        return getReceiveIdentifier() + "-" + getReceiveChannelNumber();
+    }
+
+    public int getSystemServiceClass()
+    {
+        return mMessage.getInt(SYSTEM_SERVICE_CLASS);
+    }
+
+    @Override
+    public void setIdentifierMessage(int identifier, IBandIdentifier message)
+    {
+        if(identifier == getTransmitIdentifier())
+        {
+            mTransmitIdentifierProvider = message;
+        }
+        if(identifier == getReceiveIdentifier())
+        {
+            mReceiveIdentifierProvider = message;
+        }
+    }
+
+    @Override
     public int[] getIdentifiers()
     {
-		int[] identifiers = new int[ 2 ];
+        int[] identifiers = new int[2];
 
-		identifiers[ 0 ] = getTransmitIdentifier();
+        identifiers[0] = getTransmitIdentifier();
-		identifiers[ 1 ] = getReceiveIdentifier();
+        identifiers[1] = getReceiveIdentifier();
 
-		return identifiers;
+        return identifiers;
     }
 
     public long getDownlinkFrequency()
     {
-    	return calculateDownlink( mTransmitIdentifierProvider, 
+        if(mTransmitIdentifierProvider != null)
-    						getTransmitChannelNumber() );
+        {
+            return mTransmitIdentifierProvider.getDownlinkFrequency(getTransmitChannelNumber());
+        }
+
+        return 0;
     }
 
     public long getUplinkFrequency()
     {
-    	return calculateUplink( mReceiveIdentifierProvider, 
+        if(mReceiveIdentifierProvider != null)
-    			getReceiveChannelNumber() );
+        {
+            return mReceiveIdentifierProvider.getUplinkFrequency(getReceiveChannelNumber());
+        }
+
+        return 0;
     }
 }

src/module/decode/p25/message/pdu/UnitToUnitChannelGrantExtended.java

@@ -1,14 +1,31 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 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 module.decode.p25.message.pdu;
 
-import module.decode.p25.message.IBandIdentifier;
-import module.decode.p25.message.IdentifierReceiver;
-import module.decode.p25.reference.DataUnitID;
 import alias.AliasList;
 import bits.BinaryMessage;
 import edac.CRCP25;
+import module.decode.p25.message.IBandIdentifier;
+import module.decode.p25.message.IdentifierReceiver;
+import module.decode.p25.reference.DataUnitID;
 
-public abstract class UnitToUnitChannelGrantExtended extends PDUMessage 
+public abstract class UnitToUnitChannelGrantExtended extends PDUMessage implements IdentifierReceiver
-								implements IdentifierReceiver
 {
     /* Service Options */
     public static final int EMERGENCY_FLAG = 128;
@@ -16,184 +33,188 @@ public abstract class UnitToUnitChannelGrantExtended extends PDUMessage
     public static final int DUPLEX_MODE = 130;
     public static final int SESSION_MODE = 131;
 
-	public static final int[] SOURCE_ADDRESS = { 88,89,90,91,92,93,94,95,96,97,
+    public static final int[] SOURCE_ADDRESS = {88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104,
-		98,99,100,101,102,103,104,105,106,107,108,109,110,111 };
+        105, 106, 107, 108, 109, 110, 111};
-	public static final int[] SERVICE_OPTIONS = { 128,129,130,131,132,133,134,
+    public static final int[] SERVICE_OPTIONS = {128, 129, 130, 131, 132, 133, 134, 135};
-		135 };
+    public static final int[] SOURCE_WACN = {160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174,
-	public static final int[] SOURCE_WACN = { 160,161,162,163,164,165,166,167,
+        175, 176, 177, 178, 179};
-		168,169,170,171,172,173,174,175,176,177,178,179 };
+    public static final int[] SOURCE_SYSTEM_ID = {180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191};
-	public static final int[] SOURCE_SYSTEM_ID = { 180,181,182,183,184,185,186,
+    public static final int[] SOURCE_ID = {192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206,
-		187,188,189,190,191 };
+        207, 208, 209, 210, 211, 212, 213, 214, 215};
-	public static final int[] SOURCE_ID = { 192,193,194,195,196,197,198,199,200,
+    public static final int[] TARGET_ADDRESS = {216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229,
-		201,202,203,204,205,206,207,208,209,210,211,212,213,214,215 };
+        230, 231, 232, 233, 234, 235, 236, 237, 238, 239};
-	public static final int[] TARGET_ADDRESS = { 216,217,218,219,220,221,222,
+    public static final int[] TRANSMIT_IDENTIFIER = {240, 241, 242, 243};
-		223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239	};
+    public static final int[] TRANSMIT_NUMBER = {244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255};
-	public static final int[] TRANSMIT_IDENTIFIER = { 240,241,242,243 };
+    public static final int[] RECEIVE_IDENTIFIER = {256, 257, 258, 259};
-	public static final int[] TRANSMIT_NUMBER = { 244,245,246,247,248,249,250,
+    public static final int[] RECEIVE_NUMBER = {260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271};
-		251,252,253,254,255 };
+    public static final int[] MULTIPLE_BLOCK_CRC = {320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332,
-	public static final int[] RECEIVE_IDENTIFIER = { 256,257,258,259 };
+        333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351};
-	public static final int[] RECEIVE_NUMBER = { 260,261,262,263,264,265,266,
-		267,268,269,270,271 };
-	public static final int[] MULTIPLE_BLOCK_CRC = { 320,321,322,323,324,325,
-		326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,
-		343,344,345,346,347,348,349,350,351 };
 
-	private IBandIdentifier mTransmitIdentifierUpdate;
+    private IBandIdentifier mTransmitIdentifierUpdate;
-	private IBandIdentifier mReceiveIdentifierUpdate;
+    private IBandIdentifier mReceiveIdentifierUpdate;
 
-	public UnitToUnitChannelGrantExtended( BinaryMessage message,
+    public UnitToUnitChannelGrantExtended(BinaryMessage message, DataUnitID duid, AliasList aliasList)
-            DataUnitID duid, AliasList aliasList )
     {
-	    super( message, duid, aliasList );
+        super(message, duid, aliasList);
 
 	    /* Header block is already error detected/corrected - perform error
-	     * detection correction on the intermediate and final data blocks */
+         * detection correction on the intermediate and final data blocks */
-	    mMessage = CRCP25.correctPDU2( mMessage );
+        mMessage = CRCP25.correctPDU2(mMessage);
-	    mCRC[ 1 ] = mMessage.getCRC();
+        mCRC[1] = mMessage.getCRC();
     }
 
     public String getMessage()
     {
         StringBuilder sb = new StringBuilder();
 
-        sb.append( getMessageStub() );
+        sb.append(getMessageStub());
 
-        if( isEmergency() )
+        if(isEmergency())
         {
-            sb.append( " EMERGENCY" );
+            sb.append(" EMERGENCY");
         }
 
-        sb.append( " FROM ADDR:" );
+        sb.append(" FROM ADDR:");
-        sb.append( getSourceAddress() );
+        sb.append(getSourceAddress());
 
-        sb.append( " ID:" );
+        sb.append(" ID:");
-        sb.append( getSourceID() );
+        sb.append(getSourceID());
 
-        sb.append( " TO:" );
+        sb.append(" TO:");
-        sb.append( getTargetAddress() );
+        sb.append(getTargetAddress());
 
-        sb.append( " WACN:" );
+        sb.append(" WACN:");
-        sb.append( getSourceWACN() );
+        sb.append(getSourceWACN());
 
-        sb.append( " SYS:" );
+        sb.append(" SYS:");
-        sb.append( getSourceSystemID() );
+        sb.append(getSourceSystemID());
 
-        sb.append( " CHAN DN:" + getTransmitChannelIdentifier() + "-" + getTransmitChannelNumber() );
+        sb.append(" CHAN DN:" + getTransmitChannelIdentifier() + "-" + getTransmitChannelNumber());
-        sb.append( " " + getDownlinkFrequency() );
+        sb.append(" " + getDownlinkFrequency());
 
-        sb.append( " CHAN UP:" + getReceiveChannelIdentifier() + "-" + getReceiveChannelNumber() );
+        sb.append(" CHAN UP:" + getReceiveChannelIdentifier() + "-" + getReceiveChannelNumber());
-        sb.append( " " + getUplinkFrequency() );
+        sb.append(" " + getUplinkFrequency());
 
         return sb.toString();
     }
 
     public boolean isEmergency()
     {
-        return mMessage.get( EMERGENCY_FLAG );
+        return mMessage.get(EMERGENCY_FLAG);
     }
 
     public boolean isEncrypted()
     {
-        return mMessage.get( ENCRYPTED_CHANNEL_FLAG );
+        return mMessage.get(ENCRYPTED_CHANNEL_FLAG);
     }
 
     public DuplexMode getDuplexMode()
     {
-        return mMessage.get( DUPLEX_MODE ) ? DuplexMode.FULL : DuplexMode.HALF;
+        return mMessage.get(DUPLEX_MODE) ? DuplexMode.FULL : DuplexMode.HALF;
     }
 
     public SessionMode getSessionMode()
     {
-        return mMessage.get( SESSION_MODE ) ? 
+        return mMessage.get(SESSION_MODE) ?
-                SessionMode.CIRCUIT : SessionMode.PACKET;
+            SessionMode.CIRCUIT : SessionMode.PACKET;
     }
 
     public String getSourceAddress()
     {
-    	return mMessage.getHex( SOURCE_ADDRESS, 6 );
+        return mMessage.getHex(SOURCE_ADDRESS, 6);
     }
 
     public String getSourceID()
     {
-    	return mMessage.getHex( SOURCE_ID, 6 );
+        return mMessage.getHex(SOURCE_ID, 6);
     }
 
     public String getSourceWACN()
     {
-    	return mMessage.getHex( SOURCE_WACN, 5 );
+        return mMessage.getHex(SOURCE_WACN, 5);
     }
 
     public String getSourceSystemID()
     {
-    	return mMessage.getHex( SOURCE_SYSTEM_ID, 3 );
+        return mMessage.getHex(SOURCE_SYSTEM_ID, 3);
     }
 
     public String getTargetAddress()
     {
-    	return mMessage.getHex( TARGET_ADDRESS, 6 );
+        return mMessage.getHex(TARGET_ADDRESS, 6);
     }
 
-	public int getTransmitChannelIdentifier()
+    public int getTransmitChannelIdentifier()
-	{
+    {
-		return mMessage.getInt( TRANSMIT_IDENTIFIER );
+        return mMessage.getInt(TRANSMIT_IDENTIFIER);
-	}
+    }
 
-	public int getTransmitChannelNumber()
+    public int getTransmitChannelNumber()
-	{
+    {
-		return mMessage.getInt( TRANSMIT_NUMBER );
+        return mMessage.getInt(TRANSMIT_NUMBER);
-	}
+    }
 
-	public String getTransmitChannel()
+    public String getTransmitChannel()
-	{
+    {
-		return getTransmitChannelIdentifier() + "-" + getTransmitChannelNumber();
+        return getTransmitChannelIdentifier() + "-" + getTransmitChannelNumber();
-	}
+    }
 
-	public int getReceiveChannelIdentifier()
+    public int getReceiveChannelIdentifier()
-	{
+    {
-		return mMessage.getInt( RECEIVE_IDENTIFIER );
+        return mMessage.getInt(RECEIVE_IDENTIFIER);
-	}
+    }
 
-	public int getReceiveChannelNumber()
+    public int getReceiveChannelNumber()
-	{
+    {
-		return mMessage.getInt( RECEIVE_NUMBER );
+        return mMessage.getInt(RECEIVE_NUMBER);
-	}
+    }
 
-	public String getReceiveChannel()
+    public String getReceiveChannel()
-	{
+    {
-		return getReceiveChannelIdentifier() + "-" + getReceiveChannelNumber();
+        return getReceiveChannelIdentifier() + "-" + getReceiveChannelNumber();
-	}
+    }
 
     public long getDownlinkFrequency()
     {
-    	return calculateDownlink( mTransmitIdentifierUpdate, getTransmitChannelNumber() );
+        if(mTransmitIdentifierUpdate != null)
+        {
+            return mTransmitIdentifierUpdate.getDownlinkFrequency(getTransmitChannelNumber());
+        }
+
+        return 0;
     }
 
     public long getUplinkFrequency()
     {
-    	return calculateUplink( mReceiveIdentifierUpdate, getReceiveChannelNumber() );
+        if(mReceiveIdentifierUpdate != null)
+        {
+            return mReceiveIdentifierUpdate.getUplinkFrequency(getReceiveChannelNumber());
+        }
+
+        return 0;
     }
 
-	@Override
+    @Override
-    public void setIdentifierMessage( int identifier, IBandIdentifier message )
+    public void setIdentifierMessage(int identifier, IBandIdentifier message)
     {
-		if( identifier == getTransmitChannelIdentifier() )
+        if(identifier == getTransmitChannelIdentifier())
-		{
+        {
-			mTransmitIdentifierUpdate = message;
+            mTransmitIdentifierUpdate = message;
-		}
+        }
 
-		if( identifier == getReceiveChannelIdentifier() )
+        if(identifier == getReceiveChannelIdentifier())
-		{
+        {
-			mReceiveIdentifierUpdate = message;
+            mReceiveIdentifierUpdate = message;
-		}
+        }
     }
 
-	public int[] getIdentifiers()
+    public int[] getIdentifiers()
-	{
+    {
-		int[] idens = new int[ 2 ];
+        int[] idens = new int[2];
 
-		idens[ 0 ] = getTransmitChannelIdentifier();
+        idens[0] = getTransmitChannelIdentifier();
-		idens[ 1 ] = getReceiveChannelIdentifier();
+        idens[1] = getReceiveChannelIdentifier();
 
-		return idens;
+        return idens;
-	}
+    }
 }

src/module/decode/p25/message/pdu/osp/control/AdjacentStatusBroadcastExtended.java

@@ -1,5 +1,26 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 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 module.decode.p25.message.pdu.osp.control;
 
+import alias.AliasList;
+import bits.BinaryMessage;
+import edac.CRCP25;
 import module.decode.p25.message.IAdjacentSite;
 import module.decode.p25.message.IBandIdentifier;
 import module.decode.p25.message.IdentifierReceiver;
@@ -7,43 +28,32 @@ import module.decode.p25.message.pdu.PDUMessage;
 import module.decode.p25.message.tsbk.osp.control.SystemService;
 import module.decode.p25.reference.DataUnitID;
 import module.decode.p25.reference.Opcode;
-import alias.AliasList;
-import bits.BinaryMessage;
-import edac.CRCP25;
 
-public class AdjacentStatusBroadcastExtended extends PDUMessage 
+public class AdjacentStatusBroadcastExtended extends PDUMessage implements IdentifierReceiver, IAdjacentSite
-								implements IdentifierReceiver, IAdjacentSite
 {
-	public static final int[] LRA = { 88,89,90,91,92,93,94,95 };
+    public static final int[] LRA = {88, 89, 90, 91, 92, 93, 94, 95};
-	public static final int[] SYSTEM_ID = { 100,101,102,103,104,105,106,107,108,
+    public static final int[] SYSTEM_ID = {100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111};
-		109,110,111 };
+    public static final int[] RF_SUBSYSTEM_ID = {128, 129, 130, 131, 132, 133, 134, 135};
-	public static final int[] RF_SUBSYSTEM_ID = { 128,129,130,131,132,133,134,
+    public static final int[] SITE_ID = {136, 137, 138, 139, 140, 141, 142, 143};
-		135 };
+    public static final int[] TRANSMIT_IDENTIFIER = {160, 161, 162, 163};
-	public static final int[] SITE_ID = { 136,137,138,139,140,141,142,143 };
+    public static final int[] TRANSMIT_CHANNEL = {164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175};
-	public static final int[] TRANSMIT_IDENTIFIER = { 160,161,162,163 };
+    public static final int[] RECEIVE_IDENTIFIER = {176, 177, 178, 179};
-	public static final int[] TRANSMIT_CHANNEL = { 164,165,166,167,168,169,170,
+    public static final int[] RECEIVE_CHANNEL = {180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191};
-		171,172,173,174,175 };
+    public static final int[] SYSTEM_SERVICE_CLASS = {192, 193, 194, 195, 196, 197, 198, 199};
-	public static final int[] RECEIVE_IDENTIFIER = { 176,177,178,179 };
+    public static final int[] MULTIPLE_BLOCK_CRC = {224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236,
-	public static final int[] RECEIVE_CHANNEL = { 180,181,182,183,184,185,186,
+        237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255};
-		187,188,189,190,191 };
-	public static final int[] SYSTEM_SERVICE_CLASS = { 192,193,194,195,196,197,
-		198,199 };
-	public static final int[] MULTIPLE_BLOCK_CRC = { 224,225,226,227,228,229,
-		230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,
-		248,249,250,251,252,253,254,255 };
 
-	private IBandIdentifier mTransmitIdentifierProvider;
+    private IBandIdentifier mTransmitIdentifierProvider;
-	private IBandIdentifier mReceiveIdentifierProvider;
+    private IBandIdentifier mReceiveIdentifierProvider;
 
-	public AdjacentStatusBroadcastExtended( BinaryMessage message,
+    public AdjacentStatusBroadcastExtended(BinaryMessage message, DataUnitID duid, AliasList aliasList)
-            DataUnitID duid, AliasList aliasList )
     {
-	    super( message, duid, aliasList );
+        super(message, duid, aliasList);
 
 	    /* Header block is already error detected/corrected - perform error
-	     * detection correction on the intermediate and final data blocks */
+         * detection correction on the intermediate and final data blocks */
-	    mMessage = CRCP25.correctPDU1( mMessage );
+        mMessage = CRCP25.correctPDU1(mMessage);
-	    mCRC[ 1 ] = mMessage.getCRC();
+        mCRC[1] = mMessage.getCRC();
     }
 
     @Override
@@ -56,133 +66,143 @@ public class AdjacentStatusBroadcastExtended extends PDUMessage
     {
         StringBuilder sb = new StringBuilder();
 
-        sb.append( getMessageStub() );
+        sb.append(getMessageStub());
 
-        sb.append( " LRA:" + getLRA() );
+        sb.append(" LRA:" + getLRA());
 
-        sb.append( " SYS:" + getSystemID() );
+        sb.append(" SYS:" + getSystemID());
 
-        sb.append( " RFSS:" + getRFSS() );
+        sb.append(" RFSS:" + getRFSS());
 
-        sb.append( " SITE:" + getSiteID() );
+        sb.append(" SITE:" + getSiteID());
 
-		sb.append( " CTRL CHAN:" + getTransmitIdentifier() + "-" + getTransmitChannel() );
+        sb.append(" CTRL CHAN:" + getTransmitIdentifier() + "-" + getTransmitChannel());
 
-        sb.append( " DN:" + getDownlinkFrequency() );
+        sb.append(" DN:" + getDownlinkFrequency());
 
-		sb.append( " " + getReceiveIdentifier() + "-" + getReceiveChannel() );
+        sb.append(" " + getReceiveIdentifier() + "-" + getReceiveChannel());
 
-		sb.append( " UP:" + getUplinkFrequency() );
+        sb.append(" UP:" + getUplinkFrequency());
 
-        sb.append( " SYS SVC CLASS:" + getSystemServiceClass() );
+        sb.append(" SYS SVC CLASS:" + getSystemServiceClass());
 
         return sb.toString();
     }
 
     public String getUniqueID()
     {
-    	StringBuilder sb = new StringBuilder();
+        StringBuilder sb = new StringBuilder();
 
-    	sb.append( getSystemID() );
+        sb.append(getSystemID());
-    	sb.append( ":" );
+        sb.append(":");
-    	sb.append( getRFSS() );
+        sb.append(getRFSS());
-    	sb.append( ":" );
+        sb.append(":");
-    	sb.append( getSiteID() );
+        sb.append(getSiteID());
 
-    	return sb.toString();
+        return sb.toString();
     }
 
-	public String getSystemID()
+    public String getSystemID()
-	{
+    {
-		return mMessage.getHex( SYSTEM_ID, 3 );
+        return mMessage.getHex(SYSTEM_ID, 3);
-	}
+    }
 
-	public String getSiteID()
+    public String getSiteID()
-	{
+    {
-		return mMessage.getHex( SITE_ID, 2 );
+        return mMessage.getHex(SITE_ID, 2);
-	}
+    }
 
-	public int getTransmitIdentifier()
+    public int getTransmitIdentifier()
-	{
+    {
-		return mMessage.getInt( TRANSMIT_IDENTIFIER );
+        return mMessage.getInt(TRANSMIT_IDENTIFIER);
-	}
+    }
 
-	public int getTransmitChannel()
+    public int getTransmitChannel()
-	{
+    {
-		return mMessage.getInt( TRANSMIT_CHANNEL );
+        return mMessage.getInt(TRANSMIT_CHANNEL);
-	}
+    }
 
-	public int getReceiveIdentifier()
+    public int getReceiveIdentifier()
-	{
+    {
-		return mMessage.getInt( RECEIVE_IDENTIFIER );
+        return mMessage.getInt(RECEIVE_IDENTIFIER);
-	}
+    }
 
-	public int getReceiveChannel()
+    public int getReceiveChannel()
-	{
+    {
-		return mMessage.getInt( RECEIVE_CHANNEL );
+        return mMessage.getInt(RECEIVE_CHANNEL);
-	}
+    }
 
     public long getDownlinkFrequency()
     {
-    	return calculateDownlink( mTransmitIdentifierProvider, getTransmitChannel() );
+        if(mTransmitIdentifierProvider != null)
+        {
+            return mTransmitIdentifierProvider.getDownlinkFrequency(getTransmitChannel());
+        }
+
+        return 0;
     }
 
     public long getUplinkFrequency()
     {
-    	return calculateUplink( mReceiveIdentifierProvider, getReceiveChannel() );
+        if(mReceiveIdentifierProvider != null)
+        {
+            return mReceiveIdentifierProvider.getUplinkFrequency(getReceiveChannel());
+        }
+
+        return 0;
     }
 
-	@Override
+    @Override
-    public void setIdentifierMessage( int identifier, IBandIdentifier message )
+    public void setIdentifierMessage(int identifier, IBandIdentifier message)
     {
-		if( identifier == getTransmitIdentifier() )
+        if(identifier == getTransmitIdentifier())
-		{
+        {
-			mTransmitIdentifierProvider = message;
+            mTransmitIdentifierProvider = message;
-		}
+        }
 
-		if( identifier == getReceiveIdentifier() )
+        if(identifier == getReceiveIdentifier())
-		{
+        {
-			mReceiveIdentifierProvider = message;
+            mReceiveIdentifierProvider = message;
-		}
+        }
     }
 
-	public int[] getIdentifiers()
+    public int[] getIdentifiers()
-	{
+    {
-		int[] idens = new int[ 2 ];
+        int[] idens = new int[2];
 
-		idens[ 0 ] = getTransmitIdentifier();
+        idens[0] = getTransmitIdentifier();
-		idens[ 1 ] = getReceiveIdentifier();
+        idens[1] = getReceiveIdentifier();
 
-		return idens;
+        return idens;
-	}
+    }
 
-	@Override
+    @Override
-	public String getRFSS()
+    public String getRFSS()
-	{
+    {
-		return mMessage.getHex( RF_SUBSYSTEM_ID, 2 );
+        return mMessage.getHex(RF_SUBSYSTEM_ID, 2);
-	}
+    }
 
-	@Override
+    @Override
-	public String getLRA()
+    public String getLRA()
-	{
+    {
-		return mMessage.getHex( LRA, 2 );
+        return mMessage.getHex(LRA, 2);
-	}
+    }
 
-	@Override
+    @Override
-	public String getSystemServiceClass()
+    public String getSystemServiceClass()
-	{
+    {
-		return SystemService.toString( mMessage.getInt( SYSTEM_SERVICE_CLASS ) );
+        return SystemService.toString(mMessage.getInt(SYSTEM_SERVICE_CLASS));
-	}
+    }
 
-	@Override
+    @Override
-	public String getDownlinkChannel()
+    public String getDownlinkChannel()
-	{
+    {
-		return getTransmitIdentifier() + "-" + getTransmitChannel();
+        return getTransmitIdentifier() + "-" + getTransmitChannel();
-	}
+    }
 
-	@Override
+    @Override
-	public String getUplinkChannel()
+    public String getUplinkChannel()
-	{
+    {
-		return getReceiveIdentifier() + "-" + getReceiveChannel();
+        return getReceiveIdentifier() + "-" + getReceiveChannel();
-	}
+    }
 }

src/module/decode/p25/message/pdu/osp/control/NetworkStatusBroadcastExtended.java

@@ -1,5 +1,26 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 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 module.decode.p25.message.pdu.osp.control;
 
+import alias.AliasList;
+import bits.BinaryMessage;
+import edac.CRCP25;
 import module.decode.p25.message.IBandIdentifier;
 import module.decode.p25.message.IdentifierReceiver;
 import module.decode.p25.message.pdu.PDUMessage;
@@ -7,42 +28,32 @@ import module.decode.p25.message.tsbk.osp.control.SystemService;
 import module.decode.p25.reference.DataUnitID;
 import module.decode.p25.reference.Opcode;
 import module.decode.p25.reference.P25NetworkCallsign;
-import alias.AliasList;
-import bits.BinaryMessage;
-import edac.CRCP25;
 
-public class NetworkStatusBroadcastExtended extends PDUMessage 
+public class NetworkStatusBroadcastExtended extends PDUMessage implements IdentifierReceiver
-								implements IdentifierReceiver
 {
-	public static final int[] LRA = { 88,89,90,91,92,93,94,95 };
+    public static final int[] LRA = {88, 89, 90, 91, 92, 93, 94, 95};
-	public static final int[] SYSTEM_ID = { 100,101,102,103,104,105,106,107,108,
+    public static final int[] SYSTEM_ID = {100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111};
-		109,110,111 };
+    public static final int[] WACN = {160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
-	public static final int[] WACN = { 160,161,162,163,164,165,166,167,168,169,
+        176, 177, 178, 179};
-		170,171,172,173,174,175,176,177,178,179 };
+    public static final int[] TRANSMIT_IDENTIFIER = {184, 185, 186, 187};
-	public static final int[] TRANSMIT_IDENTIFIER = { 184,185,186,187 };
+    public static final int[] TRANSMIT_CHANNEL = {188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199};
-	public static final int[] TRANSMIT_CHANNEL = { 188,189,190,191,192,193,194,
+    public static final int[] RECEIVE_IDENTIFIER = {200, 201, 202, 203};
-		195,196,197,198,199 };
+    public static final int[] RECEIVE_CHANNEL = {204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215};
-	public static final int[] RECEIVE_IDENTIFIER = { 200,201,202,203 };
+    public static final int[] SYSTEM_SERVICE_CLASS = {216, 217, 218, 219, 220, 221, 222, 223};
-	public static final int[] RECEIVE_CHANNEL = { 204,205,206,207,208,209,210,
+    public static final int[] MULTIPLE_BLOCK_CRC = {224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236,
-		211,212,213,214,215 };
+        237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255};
-	public static final int[] SYSTEM_SERVICE_CLASS = { 216,217,218,219,220,221,
-		222,223 };
-	public static final int[] MULTIPLE_BLOCK_CRC = { 224,225,226,227,228,229,
-		230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,
-		248,249,250,251,252,253,254,255 };
 
-	private IBandIdentifier mTransmitIdentifierUpdate;
+    private IBandIdentifier mTransmitIdentifierUpdate;
-	private IBandIdentifier mReceiveIdentifierUpdate;
+    private IBandIdentifier mReceiveIdentifierUpdate;
 
-	public NetworkStatusBroadcastExtended( BinaryMessage message,
+    public NetworkStatusBroadcastExtended(BinaryMessage message, DataUnitID duid, AliasList aliasList)
-            DataUnitID duid, AliasList aliasList )
     {
-	    super( message, duid, aliasList );
+        super(message, duid, aliasList);
 
 	    /* Header block is already error detected/corrected - perform error
-	     * detection correction on the intermediate and final data blocks */
+         * detection correction on the intermediate and final data blocks */
-	    mMessage = CRCP25.correctPDU1( mMessage );
+        mMessage = CRCP25.correctPDU1(mMessage);
-	    mCRC[ 1 ] = mMessage.getCRC();
+        mCRC[1] = mMessage.getCRC();
     }
 
     @Override
@@ -55,106 +66,116 @@ public class NetworkStatusBroadcastExtended extends PDUMessage
     {
         StringBuilder sb = new StringBuilder();
 
-        sb.append( getMessageStub() );
+        sb.append(getMessageStub());
 
-        sb.append( " LRA:" + getLocationRegistrationArea() );
+        sb.append(" LRA:" + getLocationRegistrationArea());
 
-        sb.append( " WACN:" + getWACN() );
+        sb.append(" WACN:" + getWACN());
 
-        sb.append( " SYS:" + getSystemID() );
+        sb.append(" SYS:" + getSystemID());
 
-        sb.append( " CTRL CHAN:" + getReceiveIdentifier() + "-" + getReceiveChannel() );
+        sb.append(" CTRL CHAN:" + getReceiveIdentifier() + "-" + getReceiveChannel());
 
-        sb.append( " DN:" + getDownlinkFrequency() );
+        sb.append(" DN:" + getDownlinkFrequency());
 
-        sb.append( " " + getTransmitIdentifier() + "-" + getTransmitChannel() );
+        sb.append(" " + getTransmitIdentifier() + "-" + getTransmitChannel());
 
-        sb.append( " UP:" + getUplinkFrequency() );
+        sb.append(" UP:" + getUplinkFrequency());
 
-        sb.append( " SYS SVC CLASS:" + 
+        sb.append(" SYS SVC CLASS:" +
-                SystemService.toString( getSystemServiceClass() ) );
+            SystemService.toString(getSystemServiceClass()));
 
         return sb.toString();
     }
 
 
-	public String getLocationRegistrationArea()
+    public String getLocationRegistrationArea()
-	{
+    {
-		return mMessage.getHex( LRA, 2 );
+        return mMessage.getHex(LRA, 2);
-	}
+    }
 
-	public String getSystemID()
+    public String getSystemID()
-	{
+    {
-		return mMessage.getHex( SYSTEM_ID, 3 );
+        return mMessage.getHex(SYSTEM_ID, 3);
-	}
+    }
 
-	public String getWACN()
+    public String getWACN()
-	{
+    {
-		return mMessage.getHex( WACN, 5 );
+        return mMessage.getHex(WACN, 5);
-	}
+    }
 
-	public String getNetworkCallsign()
+    public String getNetworkCallsign()
-	{
+    {
-		return P25NetworkCallsign.getCallsign( mMessage.getInt( WACN ), 
+        return P25NetworkCallsign.getCallsign(mMessage.getInt(WACN),
-											   mMessage.getInt( SYSTEM_ID ) );
+            mMessage.getInt(SYSTEM_ID));
-	}
+    }
 
-	public int getTransmitIdentifier()
+    public int getTransmitIdentifier()
-	{
+    {
-		return mMessage.getInt( TRANSMIT_IDENTIFIER );
+        return mMessage.getInt(TRANSMIT_IDENTIFIER);
-	}
+    }
 
-	public int getTransmitChannel()
+    public int getTransmitChannel()
-	{
+    {
-		return mMessage.getInt( TRANSMIT_CHANNEL );
+        return mMessage.getInt(TRANSMIT_CHANNEL);
-	}
+    }
 
-	public int getReceiveIdentifier()
+    public int getReceiveIdentifier()
-	{
+    {
-		return mMessage.getInt( RECEIVE_IDENTIFIER );
+        return mMessage.getInt(RECEIVE_IDENTIFIER);
-	}
+    }
 
-	public int getReceiveChannel()
+    public int getReceiveChannel()
-	{
+    {
-		return mMessage.getInt( RECEIVE_CHANNEL );
+        return mMessage.getInt(RECEIVE_CHANNEL);
-	}
+    }
 
     public int getSystemServiceClass()
     {
-        return mMessage.getInt( SYSTEM_SERVICE_CLASS );
+        return mMessage.getInt(SYSTEM_SERVICE_CLASS);
     }
 
     public long getDownlinkFrequency()
     {
-    	return calculateDownlink( mTransmitIdentifierUpdate, getTransmitChannel() );
+        if(mTransmitIdentifierUpdate != null)
+        {
+            return mTransmitIdentifierUpdate.getDownlinkFrequency(getTransmitChannel());
+        }
+
+        return 0;
     }
 
     public long getUplinkFrequency()
     {
-    	return calculateUplink( mReceiveIdentifierUpdate, getReceiveChannel() );
+        if(mReceiveIdentifierUpdate != null)
+        {
+            return mReceiveIdentifierUpdate.getUplinkFrequency(getReceiveChannel());
+        }
+
+        return 0;
     }
 
-	@Override
+    @Override
-    public void setIdentifierMessage( int identifier, IBandIdentifier message )
+    public void setIdentifierMessage(int identifier, IBandIdentifier message)
     {
-		if( identifier == getTransmitIdentifier() )
+        if(identifier == getTransmitIdentifier())
-		{
+        {
-			mTransmitIdentifierUpdate = message;
+            mTransmitIdentifierUpdate = message;
-		}
+        }
 
-		if( identifier == getReceiveIdentifier() )
+        if(identifier == getReceiveIdentifier())
-		{
+        {
-			mReceiveIdentifierUpdate = message;
+            mReceiveIdentifierUpdate = message;
-		}
+        }
     }
 
-	public int[] getIdentifiers()
+    public int[] getIdentifiers()
-	{
+    {
-		int[] idens = new int[ 2 ];
+        int[] idens = new int[2];
 
-		idens[ 0 ] = getTransmitIdentifier();
+        idens[0] = getTransmitIdentifier();
-		idens[ 1 ] = getReceiveIdentifier();
+        idens[1] = getReceiveIdentifier();
 
-		return idens;
+        return idens;
-	}
+    }
 }

src/module/decode/p25/message/pdu/osp/control/RFSSStatusBroadcastExtended.java

@@ -1,48 +1,59 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 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 module.decode.p25.message.pdu.osp.control;
 
+import alias.AliasList;
+import bits.BinaryMessage;
+import edac.CRCP25;
 import module.decode.p25.message.IBandIdentifier;
 import module.decode.p25.message.IdentifierReceiver;
 import module.decode.p25.message.pdu.PDUMessage;
 import module.decode.p25.message.tsbk.osp.control.SystemService;
 import module.decode.p25.reference.DataUnitID;
 import module.decode.p25.reference.Opcode;
-import alias.AliasList;
-import bits.BinaryMessage;
-import edac.CRCP25;
 
-public class RFSSStatusBroadcastExtended extends PDUMessage 
+public class RFSSStatusBroadcastExtended extends PDUMessage implements IdentifierReceiver
-								implements IdentifierReceiver
 {
-	public static final int[] LRA = { 88,89,90,91,92,93,94,95 };
+    public static final int[] LRA = {88, 89, 90, 91, 92, 93, 94, 95};
-	public static final int ACTIVE_NETWORK_CONNECTION_INDICATOR = 99;
+    public static final int ACTIVE_NETWORK_CONNECTION_INDICATOR = 99;
-	public static final int[] SYSTEM_ID = { 100,101,102,103,104,105,106,107,108,
+    public static final int[] SYSTEM_ID = {100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111};
-		109,110,111 };
+    public static final int[] RFSS_ID = {160, 161, 162, 163, 164, 165, 166, 167};
-	public static final int[] RFSS_ID = { 160,161,162,163,164,165,166,167 };
+    public static final int[] SITE_ID = {168, 169, 170, 171, 172, 173, 174, 175};
-	public static final int[] SITE_ID = { 168,169,170,171,172,173,174,175 };
+    public static final int[] TRANSMIT_IDENTIFIER = {184, 185, 186, 187};
-	public static final int[] TRANSMIT_IDENTIFIER = { 184,185,186,187 };
+    public static final int[] TRANSMIT_CHANNEL = {188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199};
-	public static final int[] TRANSMIT_CHANNEL = { 188,189,190,191,192,193,194,
+    public static final int[] RECEIVE_IDENTIFIER = {200, 201, 202, 203};
-		195,196,197,198,199 };
+    public static final int[] RECEIVE_CHANNEL = {204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215};
-	public static final int[] RECEIVE_IDENTIFIER = { 200,201,202,203 };
+    public static final int[] SYSTEM_SERVICE_CLASS = {216, 217, 218, 219, 220, 221, 222, 223};
-	public static final int[] RECEIVE_CHANNEL = { 204,205,206,207,208,209,210,
+    public static final int[] MULTIPLE_BLOCK_CRC = {224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236,
-		211,212,213,214,215 };
+        237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255};
-	public static final int[] SYSTEM_SERVICE_CLASS = { 216,217,218,219,220,221,
-		222,223 };
-	public static final int[] MULTIPLE_BLOCK_CRC = { 224,225,226,227,228,229,
-		230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,
-		248,249,250,251,252,253,254,255 };
 
-	private IBandIdentifier mTransmitIdentifierUpdate;
+    private IBandIdentifier mTransmitIdentifierUpdate;
-	private IBandIdentifier mReceiveIdentifierUpdate;
+    private IBandIdentifier mReceiveIdentifierUpdate;
 
-	public RFSSStatusBroadcastExtended( BinaryMessage message,
+    public RFSSStatusBroadcastExtended(BinaryMessage message, DataUnitID duid, AliasList aliasList)
-            DataUnitID duid, AliasList aliasList )
     {
-	    super( message, duid, aliasList );
+        super(message, duid, aliasList);
 
 	    /* Header block is already error detected/corrected - perform error
-	     * detection correction on the intermediate and final data blocks */
+         * detection correction on the intermediate and final data blocks */
-	    mMessage = CRCP25.correctPDU1( mMessage );
+        mMessage = CRCP25.correctPDU1(mMessage);
-	    mCRC[ 1 ] = mMessage.getCRC();
+        mCRC[1] = mMessage.getCRC();
     }
 
     @Override
@@ -55,110 +66,120 @@ public class RFSSStatusBroadcastExtended extends PDUMessage
     {
         StringBuilder sb = new StringBuilder();
 
-        sb.append( getMessageStub() );
+        sb.append(getMessageStub());
 
-        sb.append( " LRA:" + getLocationRegistrationArea() );
+        sb.append(" LRA:" + getLocationRegistrationArea());
 
-        sb.append( " SYS:" + getSystemID() );
+        sb.append(" SYS:" + getSystemID());
 
-        sb.append( " SITE:" + getRFSubsystemID() + "-" + getSiteID() );
+        sb.append(" SITE:" + getRFSubsystemID() + "-" + getSiteID());
 
-        sb.append( " CTRL CHAN:" + getReceiveIdentifier() + "-" + getReceiveChannel() );
+        sb.append(" CTRL CHAN:" + getReceiveIdentifier() + "-" + getReceiveChannel());
 
-        sb.append( " DN:" + getDownlinkFrequency() );
+        sb.append(" DN:" + getDownlinkFrequency());
 
-        sb.append( " " + getTransmitIdentifier() + "-" + getTransmitChannel() );
+        sb.append(" " + getTransmitIdentifier() + "-" + getTransmitChannel());
 
-        sb.append( " UP:" + getUplinkFrequency() );
+        sb.append(" UP:" + getUplinkFrequency());
 
-        sb.append( " SYS SVC CLASS:" + 
+        sb.append(" SYS SVC CLASS:" +
-                SystemService.toString( getSystemServiceClass() ) );
+            SystemService.toString(getSystemServiceClass()));
 
         return sb.toString();
     }
 
 
-	public String getLocationRegistrationArea()
+    public String getLocationRegistrationArea()
-	{
+    {
-		return mMessage.getHex( LRA, 2 );
+        return mMessage.getHex(LRA, 2);
-	}
+    }
 
-	public boolean hasActiveNetworkConnection()
+    public boolean hasActiveNetworkConnection()
-	{
+    {
-		return mMessage.get( ACTIVE_NETWORK_CONNECTION_INDICATOR );
+        return mMessage.get(ACTIVE_NETWORK_CONNECTION_INDICATOR);
-	}
+    }
 
-	public String getSystemID()
+    public String getSystemID()
-	{
+    {
-		return mMessage.getHex( SYSTEM_ID, 3 );
+        return mMessage.getHex(SYSTEM_ID, 3);
-	}
+    }
 
-	public String getRFSubsystemID()
+    public String getRFSubsystemID()
-	{
+    {
-		return mMessage.getHex( RFSS_ID, 2 );
+        return mMessage.getHex(RFSS_ID, 2);
-	}
+    }
 
-	public String getSiteID()
+    public String getSiteID()
-	{
+    {
-		return mMessage.getHex( SITE_ID, 2 );
+        return mMessage.getHex(SITE_ID, 2);
-	}
+    }
 
-	public int getTransmitIdentifier()
+    public int getTransmitIdentifier()
-	{
+    {
-		return mMessage.getInt( TRANSMIT_IDENTIFIER );
+        return mMessage.getInt(TRANSMIT_IDENTIFIER);
-	}
+    }
 
-	public int getTransmitChannel()
+    public int getTransmitChannel()
-	{
+    {
-		return mMessage.getInt( TRANSMIT_CHANNEL );
+        return mMessage.getInt(TRANSMIT_CHANNEL);
-	}
+    }
 
-	public int getReceiveIdentifier()
+    public int getReceiveIdentifier()
-	{
+    {
-		return mMessage.getInt( RECEIVE_IDENTIFIER );
+        return mMessage.getInt(RECEIVE_IDENTIFIER);
-	}
+    }
 
-	public int getReceiveChannel()
+    public int getReceiveChannel()
-	{
+    {
-		return mMessage.getInt( RECEIVE_CHANNEL );
+        return mMessage.getInt(RECEIVE_CHANNEL);
-	}
+    }
 
     public int getSystemServiceClass()
     {
-        return mMessage.getInt( SYSTEM_SERVICE_CLASS );
+        return mMessage.getInt(SYSTEM_SERVICE_CLASS);
     }
 
     public long getDownlinkFrequency()
     {
-    	return calculateDownlink( mTransmitIdentifierUpdate, getTransmitChannel() );
+        if(mTransmitIdentifierUpdate != null)
+        {
+            return mTransmitIdentifierUpdate.getDownlinkFrequency(getTransmitChannel());
+        }
+
+        return 0;
     }
 
     public long getUplinkFrequency()
     {
-    	return calculateUplink( mReceiveIdentifierUpdate, getReceiveChannel() );
+        if(mReceiveIdentifierUpdate != null)
+        {
+            return mReceiveIdentifierUpdate.getUplinkFrequency(getReceiveChannel());
+        }
+
+        return 0;
     }
 
-	@Override
+    @Override
-    public void setIdentifierMessage( int identifier, IBandIdentifier message )
+    public void setIdentifierMessage(int identifier, IBandIdentifier message)
     {
-		if( identifier == getTransmitIdentifier() )
+        if(identifier == getTransmitIdentifier())
-		{
+        {
-			mTransmitIdentifierUpdate = message;
+            mTransmitIdentifierUpdate = message;
-		}
+        }
 
-		if( identifier == getReceiveIdentifier() )
+        if(identifier == getReceiveIdentifier())
-		{
+        {
-			mReceiveIdentifierUpdate = message;
+            mReceiveIdentifierUpdate = message;
-		}
+        }
     }
 
-	public int[] getIdentifiers()
+    public int[] getIdentifiers()
-	{
+    {
-		int[] idens = new int[ 2 ];
+        int[] idens = new int[2];
 
-		idens[ 0 ] = getTransmitIdentifier();
+        idens[0] = getTransmitIdentifier();
-		idens[ 1 ] = getReceiveIdentifier();
+        idens[1] = getReceiveIdentifier();
 
-		return idens;
+        return idens;
-	}
+    }
 }

src/module/decode/p25/message/pdu/osp/data/GroupDataChannelGrantExtended.java

@@ -1,16 +1,33 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 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 module.decode.p25.message.pdu.osp.data;
 
+import alias.AliasList;
+import bits.BinaryMessage;
+import edac.CRCP25;
 import module.decode.p25.message.IBandIdentifier;
 import module.decode.p25.message.IdentifierReceiver;
 import module.decode.p25.message.pdu.PDUMessage;
 import module.decode.p25.reference.DataUnitID;
 import module.decode.p25.reference.Opcode;
-import alias.AliasList;
-import bits.BinaryMessage;
-import edac.CRCP25;
 
-public class GroupDataChannelGrantExtended extends PDUMessage 
+public class GroupDataChannelGrantExtended extends PDUMessage implements IdentifierReceiver
-								implements IdentifierReceiver
 {
     /* Service Options */
     public static final int EMERGENCY_FLAG = 128;
@@ -18,34 +35,29 @@ public class GroupDataChannelGrantExtended extends PDUMessage
     public static final int DUPLEX_MODE = 130;
     public static final int SESSION_MODE = 131;
 
-	public static final int[] SOURCE_ADDRESS = { 88,89,90,91,92,93,94,95,96,97,
+    public static final int[] SOURCE_ADDRESS = {88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103,
-		98,99,100,101,102,103,104,105,106,107,108,109,110,111 };
+        104, 105, 106, 107, 108, 109, 110, 111};
-	public static final int[] SERVICE_OPTIONS = { 128,129,130,131,132,133,134,
+    public static final int[] SERVICE_OPTIONS = {128, 129, 130, 131, 132, 133, 134, 135};
-		135 };
+    public static final int[] TRANSMIT_IDENTIFIER = {160, 161, 162, 163};
-	public static final int[] TRANSMIT_IDENTIFIER = { 160,161,162,163 };
+    public static final int[] TRANSMIT_NUMBER = {164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175};
-	public static final int[] TRANSMIT_NUMBER = { 164,165,166,167,168,169,170,
+    public static final int[] RECEIVE_IDENTIFIER = {176, 177, 178, 179};
-		171,172,173,174,175 };
+    public static final int[] RECEIVE_NUMBER = {180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191};
-	public static final int[] RECEIVE_IDENTIFIER = { 176,177,178,179 };
+    public static final int[] GROUP_ADDRESS = {192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205,
-	public static final int[] RECEIVE_NUMBER = { 180,181,182,183,184,185,186,
+        206, 207};
-		187,188,189,190,191 };
+    public static final int[] MULTIPLE_BLOCK_CRC = {224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236,
-	public static final int[] GROUP_ADDRESS = { 192,193,194,195,196,197,198,199,
+        237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255};
-		200,201,202,203,204,205,206,207 };
-	public static final int[] MULTIPLE_BLOCK_CRC = { 224,225,226,227,228,229,
-		230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,
-		248,249,250,251,252,253,254,255 };
 
-	private IBandIdentifier mTransmitIdentifierUpdate;
+    private IBandIdentifier mTransmitIdentifierUpdate;
-	private IBandIdentifier mReceiveIdentifierUpdate;
+    private IBandIdentifier mReceiveIdentifierUpdate;
 
-	public GroupDataChannelGrantExtended( BinaryMessage message,
+    public GroupDataChannelGrantExtended(BinaryMessage message, DataUnitID duid, AliasList aliasList)
-            DataUnitID duid, AliasList aliasList )
     {
-	    super( message, duid, aliasList );
+        super(message, duid, aliasList);
 
 	    /* Header block is already error detected/corrected - perform error
-	     * detection correction on the intermediate and final data blocks */
+         * detection correction on the intermediate and final data blocks */
-	    mMessage = CRCP25.correctPDU1( mMessage );
+        mMessage = CRCP25.correctPDU1(mMessage);
-	    mCRC[ 1 ] = mMessage.getCRC();
+        mCRC[1] = mMessage.getCRC();
     }
 
     @Override
@@ -58,120 +70,130 @@ public class GroupDataChannelGrantExtended extends PDUMessage
     {
         StringBuilder sb = new StringBuilder();
 
-        sb.append( getMessageStub() );
+        sb.append(getMessageStub());
 
-        if( isEmergency() )
+        if(isEmergency())
         {
-            sb.append( " EMERGENCY" );
+            sb.append(" EMERGENCY");
         }
 
-        sb.append( " FROM:" );
+        sb.append(" FROM:");
-        sb.append( getSourceAddress() );
+        sb.append(getSourceAddress());
 
-        sb.append( " TO:" );
+        sb.append(" TO:");
-        sb.append( getGroupAddress() );
+        sb.append(getGroupAddress());
 
-        sb.append( " CHAN DN:" + getTransmitChannelIdentifier() + "-" + getTransmitChannelNumber() );
+        sb.append(" CHAN DN:" + getTransmitChannelIdentifier() + "-" + getTransmitChannelNumber());
-        sb.append( " " + getDownlinkFrequency() );
+        sb.append(" " + getDownlinkFrequency());
 
-        sb.append( " CHAN UP:" + getReceiveChannelIdentifier() + "-" + getReceiveChannelNumber() );
+        sb.append(" CHAN UP:" + getReceiveChannelIdentifier() + "-" + getReceiveChannelNumber());
-        sb.append( " " + getUplinkFrequency() );
+        sb.append(" " + getUplinkFrequency());
 
         return sb.toString();
     }
 
     public boolean isEmergency()
     {
-        return mMessage.get( EMERGENCY_FLAG );
+        return mMessage.get(EMERGENCY_FLAG);
     }
 
     public boolean isEncrypted()
     {
-        return mMessage.get( ENCRYPTED_CHANNEL_FLAG );
+        return mMessage.get(ENCRYPTED_CHANNEL_FLAG);
     }
 
     public DuplexMode getDuplexMode()
     {
-        return mMessage.get( DUPLEX_MODE ) ? DuplexMode.FULL : DuplexMode.HALF;
+        return mMessage.get(DUPLEX_MODE) ? DuplexMode.FULL : DuplexMode.HALF;
     }
 
     public SessionMode getSessionMode()
     {
-        return mMessage.get( SESSION_MODE ) ? 
+        return mMessage.get(SESSION_MODE) ?
-                SessionMode.CIRCUIT : SessionMode.PACKET;
+            SessionMode.CIRCUIT : SessionMode.PACKET;
     }
 
     public String getSourceAddress()
     {
-    	return mMessage.getHex( SOURCE_ADDRESS, 6 );
+        return mMessage.getHex(SOURCE_ADDRESS, 6);
     }
 
     public String getGroupAddress()
     {
-    	return mMessage.getHex( GROUP_ADDRESS, 4 );
+        return mMessage.getHex(GROUP_ADDRESS, 4);
     }
 
-	public int getTransmitChannelIdentifier()
+    public int getTransmitChannelIdentifier()
-	{
+    {
-		return mMessage.getInt( TRANSMIT_IDENTIFIER );
+        return mMessage.getInt(TRANSMIT_IDENTIFIER);
-	}
+    }
 
-	public int getTransmitChannelNumber()
+    public int getTransmitChannelNumber()
-	{
+    {
-		return mMessage.getInt( TRANSMIT_NUMBER );
+        return mMessage.getInt(TRANSMIT_NUMBER);
-	}
+    }
 
-	public String getTransmitChannel()
+    public String getTransmitChannel()
-	{
+    {
-		return getTransmitChannelIdentifier() + "-" + getTransmitChannelNumber();
+        return getTransmitChannelIdentifier() + "-" + getTransmitChannelNumber();
-	}
+    }
 
-	public int getReceiveChannelIdentifier()
+    public int getReceiveChannelIdentifier()
-	{
+    {
-		return mMessage.getInt( RECEIVE_IDENTIFIER );
+        return mMessage.getInt(RECEIVE_IDENTIFIER);
-	}
+    }
 
-	public int getReceiveChannelNumber()
+    public int getReceiveChannelNumber()
-	{
+    {
-		return mMessage.getInt( RECEIVE_NUMBER );
+        return mMessage.getInt(RECEIVE_NUMBER);
-	}
+    }
 
-	public String getReceiveChannel()
+    public String getReceiveChannel()
-	{
+    {
-		return getReceiveChannelIdentifier() + "-" + getReceiveChannelNumber();
+        return getReceiveChannelIdentifier() + "-" + getReceiveChannelNumber();
-	}
+    }
 
     public long getDownlinkFrequency()
     {
-    	return calculateDownlink( mTransmitIdentifierUpdate, getTransmitChannelNumber() );
+        if(mTransmitIdentifierUpdate != null)
+        {
+            return mTransmitIdentifierUpdate.getDownlinkFrequency(getTransmitChannelNumber());
+        }
+
+        return 0;
     }
 
     public long getUplinkFrequency()
     {
-    	return calculateUplink( mReceiveIdentifierUpdate, getReceiveChannelNumber() );
+        if(mReceiveIdentifierUpdate != null)
+        {
+            return mReceiveIdentifierUpdate.getUplinkFrequency(getReceiveChannelNumber());
+        }
+
+        return 0;
     }
 
-	@Override
+    @Override
-    public void setIdentifierMessage( int identifier, IBandIdentifier message )
+    public void setIdentifierMessage(int identifier, IBandIdentifier message)
     {
-		if( identifier == getTransmitChannelIdentifier() )
+        if(identifier == getTransmitChannelIdentifier())
-		{
+        {
-			mTransmitIdentifierUpdate = message;
+            mTransmitIdentifierUpdate = message;
-		}
+        }
 
-		if( identifier == getReceiveChannelIdentifier() )
+        if(identifier == getReceiveChannelIdentifier())
-		{
+        {
-			mReceiveIdentifierUpdate = message;
+            mReceiveIdentifierUpdate = message;
-		}
+        }
     }
 
-	public int[] getIdentifiers()
+    public int[] getIdentifiers()
-	{
+    {
-		int[] idens = new int[ 2 ];
+        int[] idens = new int[2];
 
-		idens[ 0 ] = getTransmitChannelIdentifier();
+        idens[0] = getTransmitChannelIdentifier();
-		idens[ 1 ] = getReceiveChannelIdentifier();
+        idens[1] = getReceiveChannelIdentifier();
 
-		return idens;
+        return idens;
-	}
+    }
 }

src/module/decode/p25/message/pdu/osp/voice/GroupVoiceChannelGrantExplicit.java

@@ -1,16 +1,33 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 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 module.decode.p25.message.pdu.osp.voice;
 
+import alias.AliasList;
+import bits.BinaryMessage;
+import edac.CRCP25;
 import module.decode.p25.message.IBandIdentifier;
 import module.decode.p25.message.IdentifierReceiver;
 import module.decode.p25.message.pdu.PDUMessage;
 import module.decode.p25.reference.DataUnitID;
 import module.decode.p25.reference.Opcode;
-import alias.AliasList;
-import bits.BinaryMessage;
-import edac.CRCP25;
 
-public class GroupVoiceChannelGrantExplicit extends PDUMessage 
+public class GroupVoiceChannelGrantExplicit extends PDUMessage implements IdentifierReceiver
-								implements IdentifierReceiver
 {
     /* Service Options */
     public static final int EMERGENCY_FLAG = 128;
@@ -18,34 +35,29 @@ public class GroupVoiceChannelGrantExplicit extends PDUMessage
     public static final int DUPLEX_MODE = 130;
     public static final int SESSION_MODE = 131;
 
-	public static final int[] SOURCE_ADDRESS = { 88,89,90,91,92,93,94,95,96,97,
+    public static final int[] SOURCE_ADDRESS = {88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104,
-		98,99,100,101,102,103,104,105,106,107,108,109,110,111 };
+        105, 106, 107, 108, 109, 110, 111};
-	public static final int[] SERVICE_OPTIONS = { 128,129,130,131,132,133,134,
+    public static final int[] SERVICE_OPTIONS = {128, 129, 130, 131, 132, 133, 134, 135};
-		135 };
+    public static final int[] TRANSMIT_IDENTIFIER = {176, 177, 178, 179};
-	public static final int[] TRANSMIT_IDENTIFIER = { 176,177,178,179 };
+    public static final int[] TRANSMIT_NUMBER = {180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191};
-	public static final int[] TRANSMIT_NUMBER = { 180,181,182,183,184,185,186,
+    public static final int[] RECEIVE_IDENTIFIER = {192, 193, 194, 195};
-		187,188,189,190,191 };
+    public static final int[] RECEIVE_NUMBER = {196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207};
-	public static final int[] RECEIVE_IDENTIFIER = { 192,193,194,195 };
+    public static final int[] GROUP_ADDRESS = {208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221,
-	public static final int[] RECEIVE_NUMBER = { 196,197,198,199,200,201,202,
+        222, 223};
-		203,204,205,206,207 };
+    public static final int[] MULTIPLE_BLOCK_CRC = {224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236,
-	public static final int[] GROUP_ADDRESS = { 208,209,210,211,212,213,214,215,
+        237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255};
-		216,217,218,219,220,221,222,223 };
-	public static final int[] MULTIPLE_BLOCK_CRC = { 224,225,226,227,228,229,
-		230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,
-		248,249,250,251,252,253,254,255 };
 
-	private IBandIdentifier mTransmitIdentifierUpdate;
+    private IBandIdentifier mTransmitIdentifierUpdate;
-	private IBandIdentifier mReceiveIdentifierUpdate;
+    private IBandIdentifier mReceiveIdentifierUpdate;
 
-	public GroupVoiceChannelGrantExplicit( BinaryMessage message,
+    public GroupVoiceChannelGrantExplicit(BinaryMessage message, DataUnitID duid, AliasList aliasList)
-            DataUnitID duid, AliasList aliasList )
     {
-	    super( message, duid, aliasList );
+        super(message, duid, aliasList);
 
 	    /* Header block is already error detected/corrected - perform error
-	     * detection correction on the intermediate and final data blocks */
+         * detection correction on the intermediate and final data blocks */
-	    mMessage = CRCP25.correctPDU1( mMessage );
+        mMessage = CRCP25.correctPDU1(mMessage);
-	    mCRC[ 1 ] = mMessage.getCRC();
+        mCRC[1] = mMessage.getCRC();
     }
 
     @Override
@@ -58,120 +70,130 @@ public class GroupVoiceChannelGrantExplicit extends PDUMessage
     {
         StringBuilder sb = new StringBuilder();
 
-        sb.append( getMessageStub() );
+        sb.append(getMessageStub());
 
-        if( isEmergency() )
+        if(isEmergency())
         {
-            sb.append( " EMERGENCY" );
+            sb.append(" EMERGENCY");
         }
 
-        sb.append( " FROM:" );
+        sb.append(" FROM:");
-        sb.append( getSourceAddress() );
+        sb.append(getSourceAddress());
 
-        sb.append( " GRP:" );
+        sb.append(" GRP:");
-        sb.append( getGroupAddress() );
+        sb.append(getGroupAddress());
 
-        sb.append( " CHAN DN:" + getTransmitChannelIdentifier() + "-" + getTransmitChannelNumber() );
+        sb.append(" CHAN DN:" + getTransmitChannelIdentifier() + "-" + getTransmitChannelNumber());
-        sb.append( " " + getDownlinkFrequency() );
+        sb.append(" " + getDownlinkFrequency());
 
-        sb.append( " CHAN UP:" + getReceiveChannelIdentifier() + "-" + getReceiveChannelNumber() );
+        sb.append(" CHAN UP:" + getReceiveChannelIdentifier() + "-" + getReceiveChannelNumber());
-        sb.append( " " + getUplinkFrequency() );
+        sb.append(" " + getUplinkFrequency());
 
         return sb.toString();
     }
 
     public boolean isEmergency()
     {
-        return mMessage.get( EMERGENCY_FLAG );
+        return mMessage.get(EMERGENCY_FLAG);
     }
 
     public boolean isEncrypted()
     {
-        return mMessage.get( ENCRYPTED_CHANNEL_FLAG );
+        return mMessage.get(ENCRYPTED_CHANNEL_FLAG);
     }
 
     public DuplexMode getDuplexMode()
     {
-        return mMessage.get( DUPLEX_MODE ) ? DuplexMode.FULL : DuplexMode.HALF;
+        return mMessage.get(DUPLEX_MODE) ? DuplexMode.FULL : DuplexMode.HALF;
     }
 
     public SessionMode getSessionMode()
     {
-        return mMessage.get( SESSION_MODE ) ? 
+        return mMessage.get(SESSION_MODE) ?
-                SessionMode.CIRCUIT : SessionMode.PACKET;
+            SessionMode.CIRCUIT : SessionMode.PACKET;
     }
 
     public String getSourceAddress()
     {
-    	return mMessage.getHex( SOURCE_ADDRESS, 6 );
+        return mMessage.getHex(SOURCE_ADDRESS, 6);
     }
 
     public String getGroupAddress()
     {
-    	return mMessage.getHex( GROUP_ADDRESS, 4 );
+        return mMessage.getHex(GROUP_ADDRESS, 4);
     }
 
-	public int getTransmitChannelIdentifier()
+    public int getTransmitChannelIdentifier()
-	{
+    {
-		return mMessage.getInt( TRANSMIT_IDENTIFIER );
+        return mMessage.getInt(TRANSMIT_IDENTIFIER);
-	}
+    }
 
-	public int getTransmitChannelNumber()
+    public int getTransmitChannelNumber()
-	{
+    {
-		return mMessage.getInt( TRANSMIT_NUMBER );
+        return mMessage.getInt(TRANSMIT_NUMBER);
-	}
+    }
 
-	public String getTransmitChannel()
+    public String getTransmitChannel()
-	{
+    {
-		return getTransmitChannelIdentifier() + "-" + getTransmitChannelNumber();
+        return getTransmitChannelIdentifier() + "-" + getTransmitChannelNumber();
-	}
+    }
 
-	public int getReceiveChannelIdentifier()
+    public int getReceiveChannelIdentifier()
-	{
+    {
-		return mMessage.getInt( RECEIVE_IDENTIFIER );
+        return mMessage.getInt(RECEIVE_IDENTIFIER);
-	}
+    }
 
-	public int getReceiveChannelNumber()
+    public int getReceiveChannelNumber()
-	{
+    {
-		return mMessage.getInt( RECEIVE_NUMBER );
+        return mMessage.getInt(RECEIVE_NUMBER);
-	}
+    }
 
-	public String getReceiveChannel()
+    public String getReceiveChannel()
-	{
+    {
-		return getReceiveChannelIdentifier() + "-" + getReceiveChannelNumber();
+        return getReceiveChannelIdentifier() + "-" + getReceiveChannelNumber();
-	}
+    }
 
     public long getDownlinkFrequency()
     {
-    	return calculateDownlink( mTransmitIdentifierUpdate, getTransmitChannelNumber() );
+        if(mTransmitIdentifierUpdate != null)
+        {
+            return mTransmitIdentifierUpdate.getDownlinkFrequency(getTransmitChannelNumber());
+        }
+
+        return 0;
     }
 
     public long getUplinkFrequency()
     {
-    	return calculateUplink( mReceiveIdentifierUpdate, getReceiveChannelNumber() );
+        if(mReceiveIdentifierUpdate != null)
+        {
+            return mReceiveIdentifierUpdate.getUplinkFrequency(getReceiveChannelNumber());
+        }
+
+        return 0;
     }
 
-	@Override
+    @Override
-    public void setIdentifierMessage( int identifier, IBandIdentifier message )
+    public void setIdentifierMessage(int identifier, IBandIdentifier message)
     {
-		if( identifier == getTransmitChannelIdentifier() )
+        if(identifier == getTransmitChannelIdentifier())
-		{
+        {
-			mTransmitIdentifierUpdate = message;
+            mTransmitIdentifierUpdate = message;
-		}
+        }
 
-		if( identifier == getReceiveChannelIdentifier() )
+        if(identifier == getReceiveChannelIdentifier())
-		{
+        {
-			mReceiveIdentifierUpdate = message;
+            mReceiveIdentifierUpdate = message;
-		}
+        }
     }
 
-	public int[] getIdentifiers()
+    public int[] getIdentifiers()
-	{
+    {
-		int[] idens = new int[ 2 ];
+        int[] idens = new int[2];
 
-		idens[ 0 ] = getTransmitChannelIdentifier();
+        idens[0] = getTransmitChannelIdentifier();
-		idens[ 1 ] = getReceiveChannelIdentifier();
+        idens[1] = getReceiveChannelIdentifier();
 
-		return idens;
+        return idens;
-	}
+    }
 }

src/module/decode/p25/message/pdu/osp/voice/TelephoneInterconnectChannelGrantExplicit.java

@@ -1,18 +1,35 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 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 module.decode.p25.message.pdu.osp.voice;
 
-import java.util.Date;
+import alias.AliasList;
-
+import bits.BinaryMessage;
+import edac.CRCP25;
 import module.decode.p25.message.IBandIdentifier;
 import module.decode.p25.message.IdentifierReceiver;
 import module.decode.p25.message.pdu.PDUMessage;
 import module.decode.p25.reference.DataUnitID;
 import module.decode.p25.reference.Opcode;
-import alias.AliasList;
-import bits.BinaryMessage;
-import edac.CRCP25;
 
-public class TelephoneInterconnectChannelGrantExplicit extends PDUMessage 
+import java.util.Date;
-								implements IdentifierReceiver
+
+public class TelephoneInterconnectChannelGrantExplicit extends PDUMessage implements IdentifierReceiver
 {
     /* Service Options */
     public static final int EMERGENCY_FLAG = 128;
@@ -20,34 +37,28 @@ public class TelephoneInterconnectChannelGrantExplicit extends PDUMessage
     public static final int DUPLEX_MODE = 130;
     public static final int SESSION_MODE = 131;
 
-	public static final int[] ADDRESS = { 88,89,90,91,92,93,94,95,96,97,
+    public static final int[] ADDRESS = {88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105,
-		98,99,100,101,102,103,104,105,106,107,108,109,110,111 };
+        106, 107, 108, 109, 110, 111};
-	public static final int[] SERVICE_OPTIONS = { 128,129,130,131,132,133,134,
+    public static final int[] SERVICE_OPTIONS = {128, 129, 130, 131, 132, 133, 134, 135};
-		135 };
+    public static final int[] TRANSMIT_IDENTIFIER = {160, 161, 162, 163};
-	public static final int[] TRANSMIT_IDENTIFIER = { 160,161,162,163 };
+    public static final int[] TRANSMIT_NUMBER = {164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175};
-	public static final int[] TRANSMIT_NUMBER = { 164,165,166,167,168,169,170,
+    public static final int[] RECEIVE_IDENTIFIER = {176, 177, 178, 179};
-		171,172,173,174,175 };
+    public static final int[] RECEIVE_NUMBER = {180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191};
-	public static final int[] RECEIVE_IDENTIFIER = { 176,177,178,179 };
+    public static final int[] CALL_TIMER = {192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207};
-	public static final int[] RECEIVE_NUMBER = { 180,181,182,183,184,185,186,
+    public static final int[] MULTIPLE_BLOCK_CRC = {224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236,
-		187,188,189,190,191 };
+        237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255};
-	public static final int[] CALL_TIMER = { 192,193,194,195,196,197,198,199,
-		200,201,202,203,204,205,206,207 };
-	public static final int[] MULTIPLE_BLOCK_CRC = { 224,225,226,227,228,229,
-		230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,
-		248,249,250,251,252,253,254,255 };
 
-	private IBandIdentifier mTransmitIdentifierUpdate;
+    private IBandIdentifier mTransmitIdentifierUpdate;
-	private IBandIdentifier mReceiveIdentifierUpdate;
+    private IBandIdentifier mReceiveIdentifierUpdate;
 
-	public TelephoneInterconnectChannelGrantExplicit( BinaryMessage message,
+    public TelephoneInterconnectChannelGrantExplicit(BinaryMessage message, DataUnitID duid, AliasList aliasList)
-            DataUnitID duid, AliasList aliasList )
     {
-	    super( message, duid, aliasList );
+        super(message, duid, aliasList);
 
 	    /* Header block is already error detected/corrected - perform error
-	     * detection correction on the intermediate and final data blocks */
+         * detection correction on the intermediate and final data blocks */
-	    mMessage = CRCP25.correctPDU1( mMessage );
+        mMessage = CRCP25.correctPDU1(mMessage);
-	    mCRC[ 1 ] = mMessage.getCRC();
+        mCRC[1] = mMessage.getCRC();
     }
 
     @Override
@@ -60,52 +71,52 @@ public class TelephoneInterconnectChannelGrantExplicit extends PDUMessage
     {
         StringBuilder sb = new StringBuilder();
 
-        sb.append( getMessageStub() );
+        sb.append(getMessageStub());
 
-        if( isEmergency() )
+        if(isEmergency())
         {
-            sb.append( " EMERGENCY" );
+            sb.append(" EMERGENCY");
         }
 
-        sb.append( " ADDR:" );
+        sb.append(" ADDR:");
-        sb.append( getAddress() );
+        sb.append(getAddress());
 
-        sb.append( " CALL TIMER:" );
+        sb.append(" CALL TIMER:");
-        sb.append( mTimeDurationFormat.format( new Date( getCallTimer() ) ) );
+        sb.append(mTimeDurationFormat.format(new Date(getCallTimer())));
 
-        sb.append( " CHAN DN:" + getTransmitChannelIdentifier() + "-" + getTransmitChannelNumber() );
+        sb.append(" CHAN DN:" + getTransmitChannelIdentifier() + "-" + getTransmitChannelNumber());
-        sb.append( " " + getDownlinkFrequency() );
+        sb.append(" " + getDownlinkFrequency());
 
-        sb.append( " CHAN UP:" + getReceiveChannelIdentifier() + "-" + getReceiveChannelNumber() );
+        sb.append(" CHAN UP:" + getReceiveChannelIdentifier() + "-" + getReceiveChannelNumber());
-        sb.append( " " + getUplinkFrequency() );
+        sb.append(" " + getUplinkFrequency());
 
         return sb.toString();
     }
 
     public boolean isEmergency()
     {
-        return mMessage.get( EMERGENCY_FLAG );
+        return mMessage.get(EMERGENCY_FLAG);
     }
 
     public boolean isEncrypted()
     {
-        return mMessage.get( ENCRYPTED_CHANNEL_FLAG );
+        return mMessage.get(ENCRYPTED_CHANNEL_FLAG);
     }
 
     public DuplexMode getDuplexMode()
     {
-        return mMessage.get( DUPLEX_MODE ) ? DuplexMode.FULL : DuplexMode.HALF;
+        return mMessage.get(DUPLEX_MODE) ? DuplexMode.FULL : DuplexMode.HALF;
     }
 
     public SessionMode getSessionMode()
     {
-        return mMessage.get( SESSION_MODE ) ? 
+        return mMessage.get(SESSION_MODE) ?
-                SessionMode.CIRCUIT : SessionMode.PACKET;
+            SessionMode.CIRCUIT : SessionMode.PACKET;
     }
 
     public String getAddress()
     {
-    	return mMessage.getHex( ADDRESS, 6 );
+        return mMessage.getHex(ADDRESS, 6);
     }
 
     /*
@@ -113,72 +124,82 @@ public class TelephoneInterconnectChannelGrantExplicit extends PDUMessage
      */
     public long getCallTimer()
     {
-    	int timer = mMessage.getInt( CALL_TIMER );
+        int timer = mMessage.getInt(CALL_TIMER);
 
-    	return timer / 100;
+        return timer / 100;
     }
 
-	public int getTransmitChannelIdentifier()
+    public int getTransmitChannelIdentifier()
-	{
+    {
-		return mMessage.getInt( TRANSMIT_IDENTIFIER );
+        return mMessage.getInt(TRANSMIT_IDENTIFIER);
-	}
+    }
 
-	public int getTransmitChannelNumber()
+    public int getTransmitChannelNumber()
-	{
+    {
-		return mMessage.getInt( TRANSMIT_NUMBER );
+        return mMessage.getInt(TRANSMIT_NUMBER);
-	}
+    }
 
-	public String getTransmitChannel()
+    public String getTransmitChannel()
-	{
+    {
-		return getTransmitChannelIdentifier() + "-" + getTransmitChannelNumber();
+        return getTransmitChannelIdentifier() + "-" + getTransmitChannelNumber();
-	}
+    }
 
-	public int getReceiveChannelIdentifier()
+    public int getReceiveChannelIdentifier()
-	{
+    {
-		return mMessage.getInt( RECEIVE_IDENTIFIER );
+        return mMessage.getInt(RECEIVE_IDENTIFIER);
-	}
+    }
 
-	public int getReceiveChannelNumber()
+    public int getReceiveChannelNumber()
-	{
+    {
-		return mMessage.getInt( RECEIVE_NUMBER );
+        return mMessage.getInt(RECEIVE_NUMBER);
-	}
+    }
 
-	public String getReceiveChannel()
+    public String getReceiveChannel()
-	{
+    {
-		return getReceiveChannelIdentifier() + "-" + getReceiveChannelNumber();
+        return getReceiveChannelIdentifier() + "-" + getReceiveChannelNumber();
-	}
+    }
 
     public long getDownlinkFrequency()
     {
-    	return calculateDownlink( mTransmitIdentifierUpdate, getTransmitChannelNumber() );
+        if(mTransmitIdentifierUpdate != null)
+        {
+            return mTransmitIdentifierUpdate.getDownlinkFrequency(getTransmitChannelNumber());
+        }
+
+        return 0;
     }
 
     public long getUplinkFrequency()
     {
-    	return calculateUplink( mReceiveIdentifierUpdate, getReceiveChannelNumber() );
+        if(mReceiveIdentifierUpdate != null)
+        {
+            return mReceiveIdentifierUpdate.getUplinkFrequency(getReceiveChannelNumber());
+        }
+
+        return 0;
     }
 
-	@Override
+    @Override
-    public void setIdentifierMessage( int identifier, IBandIdentifier message )
+    public void setIdentifierMessage(int identifier, IBandIdentifier message)
     {
-		if( identifier == getTransmitChannelIdentifier() )
+        if(identifier == getTransmitChannelIdentifier())
-		{
+        {
-			mTransmitIdentifierUpdate = message;
+            mTransmitIdentifierUpdate = message;
-		}
+        }
 
-		if( identifier == getReceiveChannelIdentifier() )
+        if(identifier == getReceiveChannelIdentifier())
-		{
+        {
-			mReceiveIdentifierUpdate = message;
+            mReceiveIdentifierUpdate = message;
-		}
+        }
     }
 
-	public int[] getIdentifiers()
+    public int[] getIdentifiers()
-	{
+    {
-		int[] idens = new int[ 2 ];
+        int[] idens = new int[2];
 
-		idens[ 0 ] = getTransmitChannelIdentifier();
+        idens[0] = getTransmitChannelIdentifier();
-		idens[ 1 ] = getReceiveChannelIdentifier();
+        idens[1] = getReceiveChannelIdentifier();
 
-		return idens;
+        return idens;
-	}
+    }
 }

src/module/decode/p25/message/pdu/osp/voice/UnitToUnitVoiceChannelGrantUpdateExtended.java

@@ -1,16 +1,33 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 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 module.decode.p25.message.pdu.osp.voice;
 
+import alias.AliasList;
+import bits.BinaryMessage;
+import edac.CRCP25;
 import module.decode.p25.message.IBandIdentifier;
 import module.decode.p25.message.IdentifierReceiver;
 import module.decode.p25.message.pdu.PDUMessage;
 import module.decode.p25.reference.DataUnitID;
 import module.decode.p25.reference.Opcode;
-import alias.AliasList;
-import bits.BinaryMessage;
-import edac.CRCP25;
 
-public class UnitToUnitVoiceChannelGrantUpdateExtended extends PDUMessage 
+public class UnitToUnitVoiceChannelGrantUpdateExtended extends PDUMessage implements IdentifierReceiver
-								implements IdentifierReceiver
 {
     /* Service Options */
     public static final int EMERGENCY_FLAG = 128;
@@ -18,40 +35,34 @@ public class UnitToUnitVoiceChannelGrantUpdateExtended extends PDUMessage
     public static final int DUPLEX_MODE = 130;
     public static final int SESSION_MODE = 131;
 
-	public static final int[] SOURCE_ADDRESS = { 88,89,90,91,92,93,94,95,96,97,
+    public static final int[] SOURCE_ADDRESS = {88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104,
-		98,99,100,101,102,103,104,105,106,107,108,109,110,111 };
+        105, 106, 107, 108, 109, 110, 111};
-	public static final int[] SERVICE_OPTIONS = { 128,129,130,131,132,133,134,
+    public static final int[] SERVICE_OPTIONS = {128, 129, 130, 131, 132, 133, 134, 135};
-		135 };
+    public static final int[] SOURCE_WACN = {160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174,
-	public static final int[] SOURCE_WACN = { 160,161,162,163,164,165,166,167,
+        175, 176, 177, 178, 179};
-		168,169,170,171,172,173,174,175,176,177,178,179 };
+    public static final int[] SOURCE_SYSTEM_ID = {180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191};
-	public static final int[] SOURCE_SYSTEM_ID = { 180,181,182,183,184,185,186,
+    public static final int[] SOURCE_ID = {192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206,
-		187,188,189,190,191 };
+        207, 208, 209, 210, 211, 212, 213, 214, 215};
-	public static final int[] SOURCE_ID = { 192,193,194,195,196,197,198,199,200,
+    public static final int[] TARGET_ADDRESS = {216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229,
-		201,202,203,204,205,206,207,208,209,210,211,212,213,214,215 };
+        230, 231, 232, 233, 234, 235, 236, 237, 238, 239};
-	public static final int[] TARGET_ADDRESS = { 216,217,218,219,220,221,222,
+    public static final int[] TRANSMIT_IDENTIFIER = {240, 241, 242, 243};
-		223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239	};
+    public static final int[] TRANSMIT_NUMBER = {244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255};
-	public static final int[] TRANSMIT_IDENTIFIER = { 240,241,242,243 };
+    public static final int[] RECEIVE_IDENTIFIER = {256, 257, 258, 259};
-	public static final int[] TRANSMIT_NUMBER = { 244,245,246,247,248,249,250,
+    public static final int[] RECEIVE_NUMBER = {260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271};
-		251,252,253,254,255 };
+    public static final int[] MULTIPLE_BLOCK_CRC = {320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332,
-	public static final int[] RECEIVE_IDENTIFIER = { 256,257,258,259 };
+        333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351};
-	public static final int[] RECEIVE_NUMBER = { 260,261,262,263,264,265,266,
-		267,268,269,270,271 };
-	public static final int[] MULTIPLE_BLOCK_CRC = { 320,321,322,323,324,325,
-		326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,
-		343,344,345,346,347,348,349,350,351 };
 
-	private IBandIdentifier mTransmitIdentifierUpdate;
+    private IBandIdentifier mTransmitIdentifierUpdate;
-	private IBandIdentifier mReceiveIdentifierUpdate;
+    private IBandIdentifier mReceiveIdentifierUpdate;
 
-	public UnitToUnitVoiceChannelGrantUpdateExtended( BinaryMessage message,
+    public UnitToUnitVoiceChannelGrantUpdateExtended(BinaryMessage message, DataUnitID duid, AliasList aliasList)
-            DataUnitID duid, AliasList aliasList )
     {
-	    super( message, duid, aliasList );
+        super(message, duid, aliasList);
 
 	    /* Header block is already error detected/corrected - perform error
-	     * detection correction on the intermediate and final data blocks */
+         * detection correction on the intermediate and final data blocks */
-	    mMessage = CRCP25.correctPDU2( mMessage );
+        mMessage = CRCP25.correctPDU2(mMessage);
-	    mCRC[ 1 ] = mMessage.getCRC();
+        mCRC[1] = mMessage.getCRC();
     }
 
     @Override
@@ -64,144 +75,154 @@ public class UnitToUnitVoiceChannelGrantUpdateExtended extends PDUMessage
     {
         StringBuilder sb = new StringBuilder();
 
-        sb.append( getMessageStub() );
+        sb.append(getMessageStub());
 
-        if( isEmergency() )
+        if(isEmergency())
         {
-            sb.append( " EMERGENCY" );
+            sb.append(" EMERGENCY");
         }
 
-        sb.append( " FROM ADDR:" );
+        sb.append(" FROM ADDR:");
-        sb.append( getSourceAddress() );
+        sb.append(getSourceAddress());
 
-        sb.append( " ID:" );
+        sb.append(" ID:");
-        sb.append( getSourceID() );
+        sb.append(getSourceID());
 
-        sb.append( " TO:" );
+        sb.append(" TO:");
-        sb.append( getTargetAddress() );
+        sb.append(getTargetAddress());
 
-        sb.append( " WACN:" );
+        sb.append(" WACN:");
-        sb.append( getSourceWACN() );
+        sb.append(getSourceWACN());
 
-        sb.append( " SYS:" );
+        sb.append(" SYS:");
-        sb.append( getSourceSystemID() );
+        sb.append(getSourceSystemID());
 
-        sb.append( " CHAN DN:" + getTransmitChannelIdentifier() + "-" + getTransmitChannelNumber() );
+        sb.append(" CHAN DN:" + getTransmitChannelIdentifier() + "-" + getTransmitChannelNumber());
-        sb.append( " " + getDownlinkFrequency() );
+        sb.append(" " + getDownlinkFrequency());
 
-        sb.append( " CHAN UP:" + getReceiveChannelIdentifier() + "-" + getReceiveChannelNumber() );
+        sb.append(" CHAN UP:" + getReceiveChannelIdentifier() + "-" + getReceiveChannelNumber());
-        sb.append( " " + getUplinkFrequency() );
+        sb.append(" " + getUplinkFrequency());
 
         return sb.toString();
     }
 
     public boolean isEmergency()
     {
-        return mMessage.get( EMERGENCY_FLAG );
+        return mMessage.get(EMERGENCY_FLAG);
     }
 
     public boolean isEncrypted()
     {
-        return mMessage.get( ENCRYPTED_CHANNEL_FLAG );
+        return mMessage.get(ENCRYPTED_CHANNEL_FLAG);
     }
 
     public DuplexMode getDuplexMode()
     {
-        return mMessage.get( DUPLEX_MODE ) ? DuplexMode.FULL : DuplexMode.HALF;
+        return mMessage.get(DUPLEX_MODE) ? DuplexMode.FULL : DuplexMode.HALF;
     }
 
     public SessionMode getSessionMode()
     {
-        return mMessage.get( SESSION_MODE ) ? 
+        return mMessage.get(SESSION_MODE) ?
-                SessionMode.CIRCUIT : SessionMode.PACKET;
+            SessionMode.CIRCUIT : SessionMode.PACKET;
     }
 
     public String getSourceAddress()
     {
-    	return mMessage.getHex( SOURCE_ADDRESS, 6 );
+        return mMessage.getHex(SOURCE_ADDRESS, 6);
     }
 
     public String getSourceID()
     {
-    	return mMessage.getHex( SOURCE_ID, 6 );
+        return mMessage.getHex(SOURCE_ID, 6);
     }
 
     public String getSourceWACN()
     {
-    	return mMessage.getHex( SOURCE_WACN, 5 );
+        return mMessage.getHex(SOURCE_WACN, 5);
     }
 
     public String getSourceSystemID()
     {
-    	return mMessage.getHex( SOURCE_SYSTEM_ID, 3 );
+        return mMessage.getHex(SOURCE_SYSTEM_ID, 3);
     }
 
     public String getTargetAddress()
     {
-    	return mMessage.getHex( TARGET_ADDRESS, 6 );
+        return mMessage.getHex(TARGET_ADDRESS, 6);
     }
 
-	public int getTransmitChannelIdentifier()
+    public int getTransmitChannelIdentifier()
-	{
+    {
-		return mMessage.getInt( TRANSMIT_IDENTIFIER );
+        return mMessage.getInt(TRANSMIT_IDENTIFIER);
-	}
+    }
 
-	public int getTransmitChannelNumber()
+    public int getTransmitChannelNumber()
-	{
+    {
-		return mMessage.getInt( TRANSMIT_NUMBER );
+        return mMessage.getInt(TRANSMIT_NUMBER);
-	}
+    }
 
-	public String getTransmitChannel()
+    public String getTransmitChannel()
-	{
+    {
-		return getTransmitChannelIdentifier() + "-" + getTransmitChannelNumber();
+        return getTransmitChannelIdentifier() + "-" + getTransmitChannelNumber();
-	}
+    }
 
-	public int getReceiveChannelIdentifier()
+    public int getReceiveChannelIdentifier()
-	{
+    {
-		return mMessage.getInt( RECEIVE_IDENTIFIER );
+        return mMessage.getInt(RECEIVE_IDENTIFIER);
-	}
+    }
 
-	public int getReceiveChannelNumber()
+    public int getReceiveChannelNumber()
-	{
+    {
-		return mMessage.getInt( RECEIVE_NUMBER );
+        return mMessage.getInt(RECEIVE_NUMBER);
-	}
+    }
 
-	public String getReceiveChannel()
+    public String getReceiveChannel()
-	{
+    {
-		return getReceiveChannelIdentifier() + "-" + getReceiveChannelNumber();
+        return getReceiveChannelIdentifier() + "-" + getReceiveChannelNumber();
-	}
+    }
 
     public long getDownlinkFrequency()
     {
-    	return calculateDownlink( mTransmitIdentifierUpdate, getTransmitChannelNumber() );
+        if(mTransmitIdentifierUpdate != null)
+        {
+            return mTransmitIdentifierUpdate.getDownlinkFrequency(getTransmitChannelNumber());
+        }
+
+        return 0;
     }
 
     public long getUplinkFrequency()
     {
-    	return calculateUplink( mReceiveIdentifierUpdate, getReceiveChannelNumber() );
+        if(mReceiveIdentifierUpdate != null)
+        {
+            return mReceiveIdentifierUpdate.getUplinkFrequency(getReceiveChannelNumber());
+        }
+
+        return 0;
     }
 
-	@Override
+    @Override
-    public void setIdentifierMessage( int identifier, IBandIdentifier message )
+    public void setIdentifierMessage(int identifier, IBandIdentifier message)
     {
-		if( identifier == getTransmitChannelIdentifier() )
+        if(identifier == getTransmitChannelIdentifier())
-		{
+        {
-			mTransmitIdentifierUpdate = message;
+            mTransmitIdentifierUpdate = message;
-		}
+        }
 
-		if( identifier == getReceiveChannelIdentifier() )
+        if(identifier == getReceiveChannelIdentifier())
-		{
+        {
-			mReceiveIdentifierUpdate = message;
+            mReceiveIdentifierUpdate = message;
-		}
+        }
     }
 
-	public int[] getIdentifiers()
+    public int[] getIdentifiers()
-	{
+    {
-		int[] idens = new int[ 2 ];
+        int[] idens = new int[2];
 
-		idens[ 0 ] = getTransmitChannelIdentifier();
+        idens[0] = getTransmitChannelIdentifier();
-		idens[ 1 ] = getReceiveChannelIdentifier();
+        idens[1] = getReceiveChannelIdentifier();
 
-		return idens;
+        return idens;
-	}
+    }
 }

src/module/decode/p25/message/tdu/lc/AdjacentSiteStatusBroadcast.java

@@ -1,3 +1,21 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 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 module.decode.p25.message.tdu.lc;
 
 import module.decode.p25.message.IAdjacentSite;
@@ -6,26 +24,22 @@ import module.decode.p25.message.IdentifierReceiver;
 import module.decode.p25.message.tsbk.osp.control.SystemService;
 import module.decode.p25.reference.LinkControlOpcode;
 
-public class AdjacentSiteStatusBroadcast extends TDULinkControlMessage
+public class AdjacentSiteStatusBroadcast extends TDULinkControlMessage implements IdentifierReceiver, IAdjacentSite
-					 implements IdentifierReceiver, IAdjacentSite
 {
-	public static final int[] LRA = { 72,73,74,75,88,89,90,91 };
+    public static final int[] LRA = {72, 73, 74, 75, 88, 89, 90, 91};
-	public static final int[] SYSTEM_ID = { 96,97,98,99,112,113,114,115,
+    public static final int[] SYSTEM_ID = {96, 97, 98, 99, 112, 113, 114, 115, 116, 117, 118, 119};
-		116,117,118,119 };
+    public static final int[] RFSS_ID = {120, 121, 122, 123, 136, 137, 138, 139};
-	public static final int[] RFSS_ID = { 120,121,122,123,136,137,138,139 };
+    public static final int[] SITE_ID = {140, 141, 142, 143, 144, 145, 146, 147};
-	public static final int[] SITE_ID = { 140,141,142,143,144,145,146,147 };
+    public static final int[] IDENTIFIER = {160, 161, 162, 163};
-	public static final int[] IDENTIFIER = { 160,161,162,163 };
+    public static final int[] CHANNEL = {164, 165, 166, 167, 168, 169, 170, 171, 184, 185, 186, 187};
-	public static final int[] CHANNEL = { 164,165,166,167,168,169,170,
+    public static final int[] SYSTEM_SERVICE_CLASS = {188, 189, 190, 191, 192, 193, 194, 195};
-		171,184,185,186,187 };
-	public static final int[] SYSTEM_SERVICE_CLASS = { 188,189,190,191,192,193,
-		194,195 };
 
-	private IBandIdentifier mIdentifierUpdate;
+    private IBandIdentifier mIdentifierUpdate;
 
-	public AdjacentSiteStatusBroadcast( TDULinkControlMessage source )
+    public AdjacentSiteStatusBroadcast(TDULinkControlMessage source)
-	{
+    {
-		super( source );
+        super(source);
-	}
+    }
 
     @Override
     public String getEventType()
@@ -33,114 +47,124 @@ public class AdjacentSiteStatusBroadcast extends TDULinkControlMessage
         return LinkControlOpcode.ADJACENT_SITE_STATUS_BROADCAST.getDescription();
     }
 
-	@Override
+    @Override
-	public String getMessage()
+    public String getMessage()
-	{
+    {
-		StringBuilder sb = new StringBuilder();
+        StringBuilder sb = new StringBuilder();
 
-		sb.append( getMessageStub() );
+        sb.append(getMessageStub());
 
-		sb.append( " LRA:" + getLRA() );
+        sb.append(" LRA:" + getLRA());
 
-		sb.append( " SYS:" + getSystemID() );
+        sb.append(" SYS:" + getSystemID());
 
-		sb.append( " SITE:" + getRFSS() + "-" + getSiteID() );
+        sb.append(" SITE:" + getRFSS() + "-" + getSiteID());
 
-		sb.append( " CHAN:" + getChannel() );
+        sb.append(" CHAN:" + getChannel());
 
-		sb.append( " " + getSystemServiceClass() );
+        sb.append(" " + getSystemServiceClass());
 
-		return sb.toString();
+        return sb.toString();
-	}
+    }
 
     public String getUniqueID()
     {
-    	StringBuilder sb = new StringBuilder();
+        StringBuilder sb = new StringBuilder();
 
-    	sb.append( getSystemID() );
+        sb.append(getSystemID());
-    	sb.append( ":" );
+        sb.append(":");
-    	sb.append( getRFSS() );
+        sb.append(getRFSS());
-    	sb.append( ":" );
+        sb.append(":");
-    	sb.append( getSiteID() );
+        sb.append(getSiteID());
 
-    	return sb.toString();
+        return sb.toString();
     }
 
-	public String getLRA()
+    public String getLRA()
-	{
-		return mMessage.getHex( LRA, 2 );
-	}
-	
-	public String getSystemID()
-	{
-		return mMessage.getHex( SYSTEM_ID, 3 );
-	}
-	
-	public String getRFSS()
-	{
-		return mMessage.getHex( RFSS_ID, 2 );
-	}
-	
-	public String getSiteID()
-	{
-		return mMessage.getHex( SITE_ID, 2 );
-	}
-	
-	public int getIdentifier()
-	{
-		return mMessage.getInt( IDENTIFIER );
-	}
-	
-	public String getChannel()
-	{
-		return getIdentifier() + "-" + getChannelNumber();
-	}
-	
-	@Override
-	public String getDownlinkChannel()
-	{
-		return getChannel();
-	}
-
-	@Override
-	public String getUplinkChannel()
-	{
-		return getChannel();
-	}
-
-	public int getChannelNumber()
-	{
-		return mMessage.getInt( CHANNEL );
-	}
-	
-	public String getSystemServiceClass()
-	{
-		return SystemService.toString( mMessage.getInt( SYSTEM_SERVICE_CLASS ) );
-	}
-
-	@Override
-    public void setIdentifierMessage( int identifier, IBandIdentifier message )
     {
-		mIdentifierUpdate = message;
+        return mMessage.getHex(LRA, 2);
     }
 
-	@Override
+    public String getSystemID()
+    {
+        return mMessage.getHex(SYSTEM_ID, 3);
+    }
+
+    public String getRFSS()
+    {
+        return mMessage.getHex(RFSS_ID, 2);
+    }
+
+    public String getSiteID()
+    {
+        return mMessage.getHex(SITE_ID, 2);
+    }
+
+    public int getIdentifier()
+    {
+        return mMessage.getInt(IDENTIFIER);
+    }
+
+    public String getChannel()
+    {
+        return getIdentifier() + "-" + getChannelNumber();
+    }
+
+    @Override
+    public String getDownlinkChannel()
+    {
+        return getChannel();
+    }
+
+    @Override
+    public String getUplinkChannel()
+    {
+        return getChannel();
+    }
+
+    public int getChannelNumber()
+    {
+        return mMessage.getInt(CHANNEL);
+    }
+
+    public String getSystemServiceClass()
+    {
+        return SystemService.toString(mMessage.getInt(SYSTEM_SERVICE_CLASS));
+    }
+
+    @Override
+    public void setIdentifierMessage(int identifier, IBandIdentifier message)
+    {
+        mIdentifierUpdate = message;
+    }
+
+    @Override
     public int[] getIdentifiers()
     {
-	    int[] identifiers = new int[ 1 ];
+        int[] identifiers = new int[1];
 
-	    identifiers[ 0 ] = getIdentifier();
+        identifiers[0] = getIdentifier();
 
-	    return identifiers;
+        return identifiers;
     }
 
     public long getDownlinkFrequency()
     {
-    	return calculateDownlink( mIdentifierUpdate, getChannelNumber() );
+        if(mIdentifierUpdate != null)
+        {
+            return mIdentifierUpdate.getDownlinkFrequency(getChannelNumber());
+        }
+
+        return 0;
     }
 
     public long getUplinkFrequency()
     {
-    	return calculateUplink( mIdentifierUpdate, getChannelNumber() );
+        if(mIdentifierUpdate != null)
+        {
+            return mIdentifierUpdate.getUplinkFrequency(getChannelNumber());
+        }
+
+        return 0;
     }
 }

src/module/decode/p25/message/tdu/lc/AdjacentSiteStatusBroadcastExplicit.java

@@ -1,3 +1,21 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 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 module.decode.p25.message.tdu.lc;
 
 import module.decode.p25.message.IAdjacentSite;
@@ -5,27 +23,26 @@ import module.decode.p25.message.IBandIdentifier;
 import module.decode.p25.message.IdentifierReceiver;
 import module.decode.p25.reference.LinkControlOpcode;
 
-public class AdjacentSiteStatusBroadcastExplicit extends TDULinkControlMessage
+public class AdjacentSiteStatusBroadcastExplicit extends TDULinkControlMessage implements IdentifierReceiver, IAdjacentSite
-			implements IdentifierReceiver, IAdjacentSite
 {
-	public static final int[] LRA = { 72,73,74,75,88,89,90,91 };
+    public static final int[] LRA = {72, 73, 74, 75, 88, 89, 90, 91};
-	public static final int[] TRANSMIT_IDENTIFIER = { 92,93,94,95 };
+    public static final int[] TRANSMIT_IDENTIFIER = {92, 93, 94, 95};
-	public static final int[] TRANSMIT_CHANNEL = { 96,97,98,99,112,113,114,115,
+    public static final int[] TRANSMIT_CHANNEL = {96, 97, 98, 99, 112, 113, 114, 115,
-		116,117,118,119 };
+        116, 117, 118, 119};
-	public static final int[] RFSS_ID = { 120,121,122,123,136,137,138,139 };
+    public static final int[] RFSS_ID = {120, 121, 122, 123, 136, 137, 138, 139};
-	public static final int[] SITE_ID = { 140,141,142,143,144,145,146,147 };
+    public static final int[] SITE_ID = {140, 141, 142, 143, 144, 145, 146, 147};
 
-	public static final int[] RECEIVE_IDENTIFIER = { 160,161,162,163 };
+    public static final int[] RECEIVE_IDENTIFIER = {160, 161, 162, 163};
-	public static final int[] RECEIVE_CHANNEL = { 164,165,166,167,168,169,170,
+    public static final int[] RECEIVE_CHANNEL = {164, 165, 166, 167, 168, 169, 170,
-		171,184,185,186,187 };
+        171, 184, 185, 186, 187};
 
-	private IBandIdentifier mTransmitBand;
+    private IBandIdentifier mTransmitBand;
-	private IBandIdentifier mReceiveBand;
+    private IBandIdentifier mReceiveBand;
 
-	public AdjacentSiteStatusBroadcastExplicit( TDULinkControlMessage source )
+    public AdjacentSiteStatusBroadcastExplicit(TDULinkControlMessage source)
-	{
+    {
-		super( source );
+        super(source);
-	}
+    }
 
     @Override
     public String getEventType()
@@ -33,125 +50,135 @@ public class AdjacentSiteStatusBroadcastExplicit extends TDULinkControlMessage
         return LinkControlOpcode.ADJACENT_SITE_STATUS_BROADCAST_EXPLICIT.getDescription();
     }
 
-	@Override
+    @Override
-	public String getMessage()
+    public String getMessage()
-	{
+    {
-		StringBuilder sb = new StringBuilder();
+        StringBuilder sb = new StringBuilder();
 
-		sb.append( getMessageStub() );
+        sb.append(getMessageStub());
 
-		sb.append( " LRA:" + getLRA() );
+        sb.append(" LRA:" + getLRA());
 
-		sb.append( " SITE:" + getRFSS() + "-" + getSiteID() );
+        sb.append(" SITE:" + getRFSS() + "-" + getSiteID());
 
-		sb.append( " DNLINK:" + getDownlinkChannel() );
+        sb.append(" DNLINK:" + getDownlinkChannel());
 
-		sb.append( " UPLINK:" + getUplinkChannel() );
+        sb.append(" UPLINK:" + getUplinkChannel());
 
-		return sb.toString();
+        return sb.toString();
-	}
+    }
 
     public String getUniqueID()
     {
-    	StringBuilder sb = new StringBuilder();
+        StringBuilder sb = new StringBuilder();
 
-    	sb.append( getSystemID() );
+        sb.append(getSystemID());
-    	sb.append( ":" );
+        sb.append(":");
-    	sb.append( getRFSS() );
+        sb.append(getRFSS());
-    	sb.append( ":" );
+        sb.append(":");
-    	sb.append( getSiteID() );
+        sb.append(getSiteID());
 
-    	return sb.toString();
+        return sb.toString();
     }
 
-	public String getLRA()
+    public String getLRA()
-	{
+    {
-		return mMessage.getHex( LRA, 2 );
+        return mMessage.getHex(LRA, 2);
-	}
+    }
 
-	public String getRFSS()
+    public String getRFSS()
-	{
+    {
-		return mMessage.getHex( RFSS_ID, 2 );
+        return mMessage.getHex(RFSS_ID, 2);
-	}
+    }
 
-	public String getSystemID()
+    public String getSystemID()
-	{
+    {
-		return "***";
+        return "***";
-	}
+    }
 
-	public String getSiteID()
+    public String getSiteID()
-	{
+    {
-		return mMessage.getHex( SITE_ID, 2 );
+        return mMessage.getHex(SITE_ID, 2);
-	}
+    }
 
-	@Override
+    @Override
-	public String getSystemServiceClass()
+    public String getSystemServiceClass()
-	{
+    {
-		return "[]";
+        return "[]";
-	}
+    }
 
-	public int getTransmitIdentifier()
+    public int getTransmitIdentifier()
-	{
+    {
-		return mMessage.getInt( TRANSMIT_IDENTIFIER );
+        return mMessage.getInt(TRANSMIT_IDENTIFIER);
-	}
+    }
 
-	public int getTransmitChannel()
+    public int getTransmitChannel()
-	{
+    {
-		return mMessage.getInt( TRANSMIT_CHANNEL );
+        return mMessage.getInt(TRANSMIT_CHANNEL);
-	}
+    }
 
-	public String getDownlinkChannel()
+    public String getDownlinkChannel()
-	{
+    {
-		return getTransmitIdentifier() + "-" + getTransmitChannel();
+        return getTransmitIdentifier() + "-" + getTransmitChannel();
-	}
+    }
 
-	public int getReceiveIdentifier()
+    public int getReceiveIdentifier()
-	{
+    {
-		return mMessage.getInt( RECEIVE_IDENTIFIER );
+        return mMessage.getInt(RECEIVE_IDENTIFIER);
-	}
+    }
 
-	public int getReceiveChannel()
+    public int getReceiveChannel()
-	{
+    {
-		return mMessage.getInt( RECEIVE_CHANNEL );
+        return mMessage.getInt(RECEIVE_CHANNEL);
-	}
+    }
 
-	public String getUplinkChannel()
+    public String getUplinkChannel()
-	{
+    {
-		return getReceiveIdentifier() + "-" + getReceiveChannel();
+        return getReceiveIdentifier() + "-" + getReceiveChannel();
-	}
+    }
 
     public long getDownlinkFrequency()
     {
-    	return calculateDownlink( mTransmitBand, getTransmitChannel() );
+        if(mTransmitBand != null)
+        {
+            return mTransmitBand.getDownlinkFrequency(getTransmitChannel());
+        }
+
+        return 0;
     }
 
     public long getUplinkFrequency()
     {
-    	return calculateUplink( mReceiveBand, getReceiveChannel() );
+        if(mReceiveBand != null)
+        {
+            return mReceiveBand.getUplinkFrequency(getReceiveChannel());
+        }
+
+        return 0;
     }
 
-	@Override
+    @Override
-	public void setIdentifierMessage( int identifier, IBandIdentifier message )
+    public void setIdentifierMessage(int identifier, IBandIdentifier message)
-	{
+    {
-		if( identifier == getTransmitIdentifier() )
+        if(identifier == getTransmitIdentifier())
-		{
+        {
-			mTransmitBand = message;
+            mTransmitBand = message;
-		}
+        }
 
-		if( identifier == getReceiveIdentifier() )
+        if(identifier == getReceiveIdentifier())
-		{
+        {
-			mReceiveBand = message;
+            mReceiveBand = message;
-		}
+        }
-	}
+    }
 
-	@Override
+    @Override
-	public int[] getIdentifiers()
+    public int[] getIdentifiers()
-	{
+    {
-		int[] identifiers = new int[ 2 ];
+        int[] identifiers = new int[2];
 
-		identifiers[ 0 ] = getTransmitIdentifier();
+        identifiers[0] = getTransmitIdentifier();
-		identifiers[ 1 ] = getReceiveIdentifier();
+        identifiers[1] = getReceiveIdentifier();
 
-		return identifiers;
+        return identifiers;
-	}
+    }
 }

src/module/decode/p25/message/tdu/lc/ChannelIdentifierUpdate.java

@@ -1,25 +1,42 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 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 module.decode.p25.message.tdu.lc;
 
 import module.decode.p25.message.IBandIdentifier;
 import module.decode.p25.reference.LinkControlOpcode;
 
-public class ChannelIdentifierUpdate extends TDULinkControlMessage
+public class ChannelIdentifierUpdate extends TDULinkControlMessage implements IBandIdentifier
-									 implements IBandIdentifier
 {
-	public static final int[] IDENTIFIER = { 72,73,74,75 };
+    public static final int[] IDENTIFIER = {72, 73, 74, 75};
-	public static final int[] BANDWIDTH = { 88,89,90,91,92,93,94,95,96 };
+    public static final int[] BANDWIDTH = {88, 89, 90, 91, 92, 93, 94, 95, 96};
-	public static final int[] TRANSMIT_OFFSET = { 97,98,99,112,113,114,115,116,
+    public static final int[] TRANSMIT_OFFSET = {97, 98, 99, 112, 113, 114, 115, 116,
-		117 };
+        117};
-	public static final int[] CHANNEL_SPACING = { 118,119,120,121,122,123,136,
+    public static final int[] CHANNEL_SPACING = {118, 119, 120, 121, 122, 123, 136,
-		137,138,139 };
+        137, 138, 139};
-	public static final int[] BASE_FREQUENCY = { 140,141,142,143,144,145,146,
+    public static final int[] BASE_FREQUENCY = {140, 141, 142, 143, 144, 145, 146,
-		147,160,161,162,163,164,165,166,167,168,169,170,171,184,185,186,
+        147, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 184, 185, 186,
-		187,188,189,190,191,192,193,194,195 };
+        187, 188, 189, 190, 191, 192, 193, 194, 195};
 
-	public ChannelIdentifierUpdate( TDULinkControlMessage source )
+    public ChannelIdentifierUpdate(TDULinkControlMessage source)
-	{
+    {
-		super( source );
+        super(source);
-	}
+    }
 
     @Override
     public String getEventType()
@@ -27,56 +44,74 @@ public class ChannelIdentifierUpdate extends TDULinkControlMessage
         return LinkControlOpcode.CHANNEL_IDENTIFIER_UPDATE.getDescription();
     }
 
-	@Override
+    @Override
-	public String getMessage()
+    public String getMessage()
-	{
+    {
-		StringBuilder sb = new StringBuilder();
+        StringBuilder sb = new StringBuilder();
 
-		sb.append( getMessageStub() );
+        sb.append(getMessageStub());
 
-        sb.append( " IDEN:" + getIdentifier() );
+        sb.append(" IDEN:" + getIdentifier());
 
-        sb.append( " BASE:" + getBaseFrequency() );
+        sb.append(" BASE:" + getBaseFrequency());
 
-        sb.append( " BW:" + getBandwidth() );
+        sb.append(" BW:" + getBandwidth());
 
-        sb.append( " SPACING:" + getChannelSpacing() );
+        sb.append(" SPACING:" + getChannelSpacing());
 
-        sb.append( " OFFSET:" + getTransmitOffset() );
+        sb.append(" OFFSET:" + getTransmitOffset());
 
-		return sb.toString();
+        return sb.toString();
-	}
+    }
 
-	@Override
+    @Override
-	public int getIdentifier()
+    public int getIdentifier()
-	{
+    {
-		return mMessage.getInt( IDENTIFIER );
+        return mMessage.getInt(IDENTIFIER);
-	}
+    }
 
-	/**
+    /**
      * Channel bandwidth in hertz
      */
     @Override
     public int getBandwidth()
     {
-    	return mMessage.getInt( BANDWIDTH ) * 125;
+        return mMessage.getInt(BANDWIDTH) * 125;
     }
 
     @Override
     public long getChannelSpacing()
     {
-    	return mMessage.getLong( CHANNEL_SPACING ) * 125l;
+        return mMessage.getLong(CHANNEL_SPACING) * 125l;
     }
 
     @Override
     public long getBaseFrequency()
     {
-        return mMessage.getLong( BASE_FREQUENCY ) * 5l;
+        return mMessage.getLong(BASE_FREQUENCY) * 5l;
     }
 
-	@Override
+    @Override
     public long getTransmitOffset()
     {
-		return  -1 * mMessage.getLong( TRANSMIT_OFFSET ) * 250000l;
+        return -1 * mMessage.getLong(TRANSMIT_OFFSET) * 250000l;
+    }
+
+    @Override
+    public long getDownlinkFrequency(int channelNumber)
+    {
+        return getBaseFrequency() + (channelNumber * getChannelSpacing());
+    }
+
+    @Override
+    public long getUplinkFrequency(int channelNumber)
+    {
+        return getDownlinkFrequency(channelNumber) + getTransmitOffset();
+    }
+
+    @Override
+    public boolean isTDMA()
+    {
+        return false;
     }
 }

src/module/decode/p25/message/tdu/lc/ChannelIdentifierUpdateExplicit.java

@@ -1,25 +1,39 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 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 module.decode.p25.message.tdu.lc;
 
 import module.decode.p25.message.IBandIdentifier;
 import module.decode.p25.reference.LinkControlOpcode;
 
-public class ChannelIdentifierUpdateExplicit extends TDULinkControlMessage
+public class ChannelIdentifierUpdateExplicit extends TDULinkControlMessage implements IBandIdentifier
-									 implements IBandIdentifier
 {
-	public static final int[] IDENTIFIER = { 72,73,74,75 };
+    public static final int[] IDENTIFIER = {72, 73, 74, 75};
-	public static final int[] BANDWIDTH = { 88,89,90,91 };
+    public static final int[] BANDWIDTH = {88, 89, 90, 91};
-	public static final int[] TRANSMIT_OFFSET = { 92,93,94,95,96,97,98,99,112,
+    public static final int[] TRANSMIT_OFFSET = {92, 93, 94, 95, 96, 97, 98, 99, 112, 113, 114, 115, 116, 117};
-		113,114,115,116,117 };
+    public static final int[] CHANNEL_SPACING = {118, 119, 120, 121, 122, 123, 136, 137, 138, 139};
-	public static final int[] CHANNEL_SPACING = { 118,119,120,121,122,
+    public static final int[] BASE_FREQUENCY = {140, 141, 142, 143, 144, 145, 146, 147, 160, 161, 162, 163, 164, 165,
-		123,136,137,138,139 };
+        166, 167, 168, 169, 170, 171, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195};
-	public static final int[] BASE_FREQUENCY = { 140,141,142,143,144,145,146,
-		147,160,161,162,163,164,165,166,167,168,169,170,171,184,185,186,
-		187,188,189,190,191,192,193,194,195 };
 
-	public ChannelIdentifierUpdateExplicit( TDULinkControlMessage source )
+    public ChannelIdentifierUpdateExplicit(TDULinkControlMessage source)
-	{
+    {
-		super( source );
+        super(source);
-	}
+    }
 
     @Override
     public String getEventType()
@@ -27,56 +41,74 @@ public class ChannelIdentifierUpdateExplicit extends TDULinkControlMessage
         return LinkControlOpcode.CHANNEL_IDENTIFIER_UPDATE_EXPLICIT.getDescription();
     }
 
-	@Override
+    @Override
-	public String getMessage()
+    public String getMessage()
-	{
+    {
-		StringBuilder sb = new StringBuilder();
+        StringBuilder sb = new StringBuilder();
 
-		sb.append( getMessageStub() );
+        sb.append(getMessageStub());
 
-        sb.append( " IDEN:" + getIdentifier() );
+        sb.append(" IDEN:" + getIdentifier());
 
-        sb.append( " BASE:" + getBaseFrequency() );
+        sb.append(" BASE:" + getBaseFrequency());
 
-        sb.append( " BW:" + getBandwidth() );
+        sb.append(" BW:" + getBandwidth());
 
-        sb.append( " SPACING:" + getChannelSpacing() );
+        sb.append(" SPACING:" + getChannelSpacing());
 
-        sb.append( " OFFSET:" + getTransmitOffset() );
+        sb.append(" OFFSET:" + getTransmitOffset());
 
-		return sb.toString();
+        return sb.toString();
-	}
+    }
 
-	@Override
+    @Override
-	public int getIdentifier()
+    public int getIdentifier()
-	{
+    {
-		return mMessage.getInt( IDENTIFIER );
+        return mMessage.getInt(IDENTIFIER);
-	}
+    }
 
-	/**
+    /**
      * Channel bandwidth in hertz
      */
     @Override
     public int getBandwidth()
     {
-    	return mMessage.getInt( BANDWIDTH ) * 125;
+        return mMessage.getInt(BANDWIDTH) * 125;
     }
 
     @Override
     public long getChannelSpacing()
     {
-    	return mMessage.getLong( CHANNEL_SPACING ) * 125l;
+        return mMessage.getLong(CHANNEL_SPACING) * 125l;
     }
 
     @Override
     public long getBaseFrequency()
     {
-        return mMessage.getLong( BASE_FREQUENCY ) * 5l;
+        return mMessage.getLong(BASE_FREQUENCY) * 5l;
     }
 
-	@Override
+    @Override
     public long getTransmitOffset()
     {
-		return  -1 * mMessage.getLong( TRANSMIT_OFFSET ) * 250000l;
+        return -1 * mMessage.getLong(TRANSMIT_OFFSET) * 250000l;
+    }
+
+    @Override
+    public long getDownlinkFrequency(int channelNumber)
+    {
+        return getBaseFrequency() + (channelNumber * getChannelSpacing());
+    }
+
+    @Override
+    public long getUplinkFrequency(int channelNumber)
+    {
+        return getDownlinkFrequency(channelNumber) + getTransmitOffset();
+    }
+
+    @Override
+    public boolean isTDMA()
+    {
+        return false;
     }
 }

src/module/decode/p25/message/tdu/lc/GroupVoiceChannelUpdate.java

@@ -1,38 +1,48 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 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 module.decode.p25.message.tdu.lc;
 
-import java.util.Set;
-import java.util.TreeSet;
-
 import module.decode.p25.message.IBandIdentifier;
 import module.decode.p25.message.IdentifierReceiver;
 import module.decode.p25.reference.LinkControlOpcode;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class GroupVoiceChannelUpdate extends TDULinkControlMessage
+import java.util.Set;
-									 implements IdentifierReceiver
+import java.util.TreeSet;
+
+public class GroupVoiceChannelUpdate extends TDULinkControlMessage implements IdentifierReceiver
 {
-	private final static Logger mLog = 
+    public static final int[] IDENTIFIER_A = {72, 73, 74, 75};
-			LoggerFactory.getLogger( GroupVoiceChannelUpdate.class );
+    public static final int[] CHANNEL_A = {88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99};
+    public static final int[] GROUP_ADDRESS_A = {112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 136, 137, 138, 139};
+    public static final int[] IDENTIFIER_B = {140, 141, 142, 143};
+    public static final int[] CHANNEL_B = {144, 145, 146, 147, 160, 161, 162, 163, 164, 165, 166, 167};
+    public static final int[] GROUP_ADDRESS_B = {168, 169, 170, 171, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195};
 
-	public static final int[] IDENTIFIER_A = { 72,73,74,75 };
+    private IBandIdentifier mIdentifierUpdateA;
-	public static final int[] CHANNEL_A = { 88,89,90,91,92,93,94,95,96,97,98,99 };
+    private IBandIdentifier mIdentifierUpdateB;
-	public static final int[] GROUP_ADDRESS_A = { 112,113,114,115,116,117,118,
-		119,120,121,122,123,136,137,138,139 };
-	public static final int[] IDENTIFIER_B = { 140,141,142,143 };
-	public static final int[] CHANNEL_B = { 144,145,146,147,160,161,162,163,164,
-		165,166,167 };
-	public static final int[] GROUP_ADDRESS_B = { 168,169,170,171,184,185,186,
-		187,188,189,190,191,192,193,194,195 };
 
-	private IBandIdentifier mIdentifierUpdateA;
+    public GroupVoiceChannelUpdate(TDULinkControlMessage source)
-	private IBandIdentifier mIdentifierUpdateB;
+    {
-	
+        super(source);
-	public GroupVoiceChannelUpdate( TDULinkControlMessage source )
+    }
-	{
-		super( source );
-	}
 
     @Override
     public String getEventType()
@@ -40,137 +50,158 @@ public class GroupVoiceChannelUpdate extends TDULinkControlMessage
         return LinkControlOpcode.GROUP_VOICE_CHANNEL_UPDATE.getDescription();
     }
 
-	@Override
+    @Override
-	public String getMessage()
+    public String getMessage()
-	{
+    {
-		StringBuilder sb = new StringBuilder();
+        StringBuilder sb = new StringBuilder();
 
-		sb.append( getMessageStub() );
+        sb.append(getMessageStub());
 
-		sb.append( " CHAN A:" + getChannelA() );
+        sb.append(" CHAN A:" + getChannelA());
 
-		sb.append( " GRP A:" + getGroupAddressA() );
+        sb.append(" GRP A:" + getGroupAddressA());
 
-		if( hasChannelB() )
+        if(hasChannelB())
-		{
+        {
-			sb.append( " CHAN B:" + getChannelA() );
+            sb.append(" CHAN B:" + getChannelA());
 
-			sb.append( " GRP B:" + getGroupAddressA() );
+            sb.append(" GRP B:" + getGroupAddressA());
-		}
+        }
 
-		return sb.toString();
+        return sb.toString();
-	}
+    }
 
-	public int getChannelIdentifierA()
+    public int getChannelIdentifierA()
-	{
+    {
-		return mMessage.getInt( IDENTIFIER_A );
+        return mMessage.getInt(IDENTIFIER_A);
-	}
+    }
 
     public int getChannelNumberA()
     {
-    	return mMessage.getInt( CHANNEL_A );
+        return mMessage.getInt(CHANNEL_A);
     }
 
     public String getChannelA()
     {
-    	return getChannelIdentifierA() + "-" + getChannelNumberA();
+        return getChannelIdentifierA() + "-" + getChannelNumberA();
     }
 
-	public int getChannelIdentifierB()
+    public int getChannelIdentifierB()
-	{
+    {
-		return mMessage.getInt( IDENTIFIER_B );
+        return mMessage.getInt(IDENTIFIER_B);
-	}
+    }
 
     public int getChannelNumberB()
     {
-    	return mMessage.getInt( CHANNEL_B );
+        return mMessage.getInt(CHANNEL_B);
     }
 
     public String getChannelB()
     {
-    	return getChannelIdentifierB() + "-" + getChannelNumberB();
+        return getChannelIdentifierB() + "-" + getChannelNumberB();
     }
 
     public boolean hasChannelB()
     {
-    	return getChannelNumberB() != 0;
+        return getChannelNumberB() != 0;
     }
 
     public String getGroupAddressA()
     {
-    	return mMessage.getHex( GROUP_ADDRESS_A, 4 );
+        return mMessage.getHex(GROUP_ADDRESS_A, 4);
     }
 
     public String getGroupAddressB()
     {
-    	return mMessage.getHex( GROUP_ADDRESS_B, 4 );
+        return mMessage.getHex(GROUP_ADDRESS_B, 4);
     }
 
-	/**
+    /**
-	 * Returns a sorted list of addresses contained in the A and B fields
+     * Returns a sorted list of addresses contained in the A and B fields
-	 * @return
+     *
-	 */
+     * @return
-	public Set<String> getAddresses()
+     */
-	{
+    public Set<String> getAddresses()
-		Set<String> addresses = new TreeSet<String>();
-
-		addresses.add( getGroupAddressA() );
-		addresses.add( getGroupAddressB() );
-
-		return addresses;
-	}
-
-
-	@Override
-    public void setIdentifierMessage( int identifier, IBandIdentifier message )
     {
-		if( identifier == getChannelIdentifierA() )
+        Set<String> addresses = new TreeSet<String>();
-		{
+
-			mIdentifierUpdateA = message;
+        addresses.add(getGroupAddressA());
-		}
+        addresses.add(getGroupAddressB());
-		if( identifier == getChannelIdentifierB() )
+
-		{
+        return addresses;
-			mIdentifierUpdateB = message;
-		}
     }
 
-	@Override
+
+    @Override
+    public void setIdentifierMessage(int identifier, IBandIdentifier message)
+    {
+        if(identifier == getChannelIdentifierA())
+        {
+            mIdentifierUpdateA = message;
+        }
+        if(identifier == getChannelIdentifierB())
+        {
+            mIdentifierUpdateB = message;
+        }
+    }
+
+    @Override
     public int[] getIdentifiers()
     {
-		if( hasChannelB() )
+        if(hasChannelB())
-		{
+        {
-			int[] identifiers = new int[ 2 ];
+            int[] identifiers = new int[2];
-			identifiers[ 0 ] = getChannelIdentifierA();
+            identifiers[0] = getChannelIdentifierA();
-			identifiers[ 1 ] = getChannelIdentifierB();
+            identifiers[1] = getChannelIdentifierB();
 
-			return identifiers;
+            return identifiers;
-		}
+        }
-		else
+        else
-		{
+        {
-			int[] identifiers = new int[ 1 ];
+            int[] identifiers = new int[1];
-			identifiers[ 0 ] = getChannelIdentifierA();
+            identifiers[0] = getChannelIdentifierA();
 
-			return identifiers;
+            return identifiers;
-		}
+        }
     }
 
     public long getDownlinkFrequencyA()
     {
-    	return calculateDownlink( mIdentifierUpdateA, getChannelNumberA() );
+        if(mIdentifierUpdateA != null)
+        {
+            return mIdentifierUpdateA.getDownlinkFrequency(getChannelNumberA());
+        }
+
+        return 0;
     }
 
     public long getUplinkFrequencyA()
     {
-    	return calculateUplink( mIdentifierUpdateA, getChannelNumberA() );
+        if(mIdentifierUpdateA != null)
+        {
+            return mIdentifierUpdateA.getUplinkFrequency(getChannelNumberA());
+        }
+
+        return 0;
     }
 
     public long getDownlinkFrequencyB()
     {
-    	return calculateDownlink( mIdentifierUpdateB, getChannelNumberA() );
+        if(mIdentifierUpdateB != null)
+        {
+            return mIdentifierUpdateB.getDownlinkFrequency(getChannelNumberB());
+        }
+
+        return 0;
     }
 
     public long getUplinkFrequencyB()
     {
-    	return calculateUplink( mIdentifierUpdateB, getChannelNumberA() );
+        if(mIdentifierUpdateB != null)
+        {
+            return mIdentifierUpdateB.getUplinkFrequency(getChannelNumberB());
+        }
+
+        return 0;
     }
 }

src/module/decode/p25/message/tdu/lc/GroupVoiceChannelUpdateExplicit.java

@@ -1,38 +1,52 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 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 module.decode.p25.message.tdu.lc;
 
 import module.decode.p25.message.IBandIdentifier;
 import module.decode.p25.message.IdentifierReceiver;
 import module.decode.p25.reference.LinkControlOpcode;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class GroupVoiceChannelUpdateExplicit extends TDULinkControlMessage
-									 implements IdentifierReceiver
+    implements IdentifierReceiver
 {
-	private final static Logger mLog = 
+    private final static Logger mLog =
-			LoggerFactory.getLogger( GroupVoiceChannelUpdateExplicit.class );
+        LoggerFactory.getLogger(GroupVoiceChannelUpdateExplicit.class);
 
     public static final int EMERGENCY_FLAG = 92;
     public static final int ENCRYPTED_CHANNEL_FLAG = 93;
     public static final int DUPLEX_MODE = 94;
     public static final int SESSION_MODE = 95;
-	public static final int[] GROUP_ADDRESS = { 112,113,114,115,116,117,118,
+    public static final int[] GROUP_ADDRESS = {112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 136, 137, 138, 139};
-		119,120,121,122,123,136,137,138,139 };
+    public static final int[] TRANSMIT_IDENTIFIER = {140, 141, 142, 143};
-	public static final int[] TRANSMIT_IDENTIFIER = { 140,141,142,143 };
+    public static final int[] TRANSMIT_CHANNEL = {144, 145, 146, 147, 160, 161, 162, 163, 164, 165, 166, 167};
-	public static final int[] TRANSMIT_CHANNEL = { 144,145,146,147,160,161,162,
+    public static final int[] RECEIVE_IDENTIFIER = {168, 169, 170, 171};
-		163,164,165,166,167 };
+    public static final int[] RECEIVE_CHANNEL = {184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199};
-	public static final int[] RECEIVE_IDENTIFIER = { 168,169,170,171 };
-	public static final int[] RECEIVE_CHANNEL = { 184,185,186,187,188,189,190,
-		191,192,193,194,195,196,197,198,199 };
 
-	private IBandIdentifier mTransmitIdentifierUpdate;
+    private IBandIdentifier mTransmitIdentifierUpdate;
-	private IBandIdentifier mReceiveIdentifierUpdate;
+    private IBandIdentifier mReceiveIdentifierUpdate;
 
-	public GroupVoiceChannelUpdateExplicit( TDULinkControlMessage source )
+    public GroupVoiceChannelUpdateExplicit(TDULinkControlMessage source)
-	{
+    {
-		super( source );
+        super(source);
-	}
+    }
 
     @Override
     public String getEventType()
@@ -40,115 +54,123 @@ public class GroupVoiceChannelUpdateExplicit extends TDULinkControlMessage
         return LinkControlOpcode.GROUP_VOICE_CHANNEL_UPDATE_EXPLICIT.getDescription();
     }
 
-	@Override
+    @Override
-	public String getMessage()
+    public String getMessage()
-	{
+    {
-		StringBuilder sb = new StringBuilder();
+        StringBuilder sb = new StringBuilder();
 
-		sb.append( getMessageStub() );
+        sb.append(getMessageStub());
 
-		if( isEmergency() )
+        if(isEmergency())
-		{
+        {
-			sb.append( " EMERGENCY" );
+            sb.append(" EMERGENCY");
-		}
+        }
-		if( isEncryptedChannel() )
+        if(isEncryptedChannel())
-		{
+        {
-			sb.append( " ENCRYPTED CHANNEL" );
+            sb.append(" ENCRYPTED CHANNEL");
-		}
+        }
 
 
-		return sb.toString();
+        return sb.toString();
-	}
+    }
 
     public boolean isEmergency()
     {
-        return mMessage.get( EMERGENCY_FLAG );
+        return mMessage.get(EMERGENCY_FLAG);
     }
 
     public boolean isEncryptedChannel()
     {
-        return mMessage.get( ENCRYPTED_CHANNEL_FLAG );
+        return mMessage.get(ENCRYPTED_CHANNEL_FLAG);
     }
 
     public DuplexMode getDuplexMode()
     {
-        return mMessage.get( DUPLEX_MODE ) ? DuplexMode.FULL : DuplexMode.HALF;
+        return mMessage.get(DUPLEX_MODE) ? DuplexMode.FULL : DuplexMode.HALF;
     }
 
     public SessionMode getSessionMode()
     {
-        return mMessage.get( SESSION_MODE ) ? 
+        return mMessage.get(SESSION_MODE) ?
-                SessionMode.CIRCUIT : SessionMode.PACKET;
+            SessionMode.CIRCUIT : SessionMode.PACKET;
     }
 
     public int getTransmitChannelIdentifier()
-	{
+    {
-		return mMessage.getInt( TRANSMIT_IDENTIFIER );
+        return mMessage.getInt(TRANSMIT_IDENTIFIER);
-	}
+    }
 
     public int getTransmitChannelNumber()
     {
-    	return mMessage.getInt( TRANSMIT_CHANNEL );
+        return mMessage.getInt(TRANSMIT_CHANNEL);
     }
 
     public String getTransmitChannel()
     {
-    	return getTransmitChannelIdentifier() + "-" + getTransmitChannelNumber();
+        return getTransmitChannelIdentifier() + "-" + getTransmitChannelNumber();
     }
 
     public int getReceiveChannelIdentifier()
-	{
+    {
-		return mMessage.getInt( RECEIVE_IDENTIFIER );
+        return mMessage.getInt(RECEIVE_IDENTIFIER);
-	}
+    }
 
     public int getReceiveChannelNumber()
     {
-    	return mMessage.getInt( RECEIVE_CHANNEL );
+        return mMessage.getInt(RECEIVE_CHANNEL);
     }
 
     public String getReceiveChannel()
     {
-    	return getReceiveChannelIdentifier() + "-" + getReceiveChannelNumber();
+        return getReceiveChannelIdentifier() + "-" + getReceiveChannelNumber();
     }
 
     public String getGroupAddress()
     {
-    	return mMessage.getHex( GROUP_ADDRESS, 4 );
+        return mMessage.getHex(GROUP_ADDRESS, 4);
     }
 
-	@Override
+    @Override
-    public void setIdentifierMessage( int identifier, IBandIdentifier message )
+    public void setIdentifierMessage(int identifier, IBandIdentifier message)
     {
-		if( identifier == getTransmitChannelIdentifier() )
+        if(identifier == getTransmitChannelIdentifier())
-		{
+        {
-			mTransmitIdentifierUpdate = message;
+            mTransmitIdentifierUpdate = message;
-		}
+        }
-		if( identifier == getReceiveChannelIdentifier() )
+        if(identifier == getReceiveChannelIdentifier())
-		{
+        {
-			mReceiveIdentifierUpdate = message;
+            mReceiveIdentifierUpdate = message;
-		}
+        }
     }
 
-	@Override
+    @Override
     public int[] getIdentifiers()
     {
-		int[] identifiers = new int[ 2 ];
+        int[] identifiers = new int[2];
 
-		identifiers[ 0 ] = getTransmitChannelIdentifier();
+        identifiers[0] = getTransmitChannelIdentifier();
-		identifiers[ 1 ] = getReceiveChannelIdentifier();
+        identifiers[1] = getReceiveChannelIdentifier();
 
-		return identifiers;
+        return identifiers;
     }
 
     public long getDownlinkFrequency()
     {
-    	return calculateDownlink( mTransmitIdentifierUpdate, 
+        if(mTransmitIdentifierUpdate != null)
-    			getTransmitChannelNumber() );
+        {
+            return mTransmitIdentifierUpdate.getDownlinkFrequency(getTransmitChannelNumber());
+        }
+
+        return 0;
     }
 
     public long getUplinkFrequency()
     {
-    	return calculateUplink( mReceiveIdentifierUpdate, 
+        if(mReceiveIdentifierUpdate != null)
-    			getReceiveChannelNumber() );
+        {
+            return mReceiveIdentifierUpdate.getUplinkFrequency(getReceiveChannelNumber());
+        }
+
+        return 0;
     }
 }

src/module/decode/p25/message/tdu/lc/NetworkStatusBroadcast.java

@@ -1,3 +1,21 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 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 module.decode.p25.message.tdu.lc;
 
 import module.decode.p25.message.IBandIdentifier;
@@ -5,31 +23,21 @@ import module.decode.p25.message.IdentifierReceiver;
 import module.decode.p25.reference.LinkControlOpcode;
 import module.decode.p25.reference.Service;
 
-import org.slf4j.Logger;
+public class NetworkStatusBroadcast extends TDULinkControlMessage implements IdentifierReceiver
-import org.slf4j.LoggerFactory;
-
-public class NetworkStatusBroadcast extends TDULinkControlMessage
-									implements IdentifierReceiver
 {
-	private final static Logger mLog = 
+    public static final int[] WACN = {72, 73, 74, 75, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 112, 113, 114,
-			LoggerFactory.getLogger( NetworkStatusBroadcast.class );
+        115, 116, 117, 118, 119, 120, 121, 122, 123};
+    public static final int[] SYSTEM = {136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147};
+    public static final int[] IDENTIFIER = {160, 161, 162, 163};
+    public static final int[] CHANNEL = {164, 165, 166, 167, 168, 169, 170, 171, 184, 185, 186, 187};
+    public static final int[] SYSTEM_SERVICE_CLASS = {188, 189, 190, 191, 192, 193, 194, 195};
 
-	public static final int[] WACN = { 72,73,74,75,88,89,90,91,92,93,94,95,96,
+    private IBandIdentifier mIdentifierUpdate;
-		97,98,99,112,113,114,115,116,117,118,119,120,121,122,123 };
-	public static final int[] SYSTEM = { 136,137,138,139,140,141,142,143,144,
-		145,146,147 };
-	public static final int[] IDENTIFIER = { 160,161,162,163 };
-	public static final int[] CHANNEL = { 164,165,166,167,168,169,170,171,184,
-		185,186,187 };
-	public static final int[] SYSTEM_SERVICE_CLASS = { 188,189,190,191,192,193,
-		194,195 };
 
-	private IBandIdentifier mIdentifierUpdate;
+    public NetworkStatusBroadcast(TDULinkControlMessage source)
-	
+    {
-	public NetworkStatusBroadcast( TDULinkControlMessage source )
+        super(source);
-	{
+    }
-		super( source );
-	}
 
     @Override
     public String getEventType()
@@ -37,74 +45,84 @@ public class NetworkStatusBroadcast extends TDULinkControlMessage
         return LinkControlOpcode.NETWORK_STATUS_BROADCAST.getDescription();
     }
 
-	@Override
+    @Override
-	public String getMessage()
+    public String getMessage()
-	{
-		StringBuilder sb = new StringBuilder();
-		
-		sb.append( getMessageStub() );
-
-		sb.append( " NETWORK:" + getWACN() );
-		sb.append( " SYS:" + getSystem() );
-		sb.append( " CHAN:" + getChannel() );
-		sb.append( " " + Service.getServices( getSystemServiceClass() ).toString() );
-		
-		return sb.toString();
-	}
-	
-	public String getWACN()
-	{
-		return mMessage.getHex( WACN, 5 );
-	}
-	
-	public String getSystem()
-	{
-		return mMessage.getHex( SYSTEM, 3 );
-	}
-
-	public int getIdentifier()
-	{
-		return mMessage.getInt( IDENTIFIER );
-	}
-	
-	public int getChannelNumber()
-	{
-		return mMessage.getInt( CHANNEL );
-	}
-	
-	public String getChannel()
-	{
-		return getIdentifier() + "-" + getChannelNumber();
-	}
-	
-	public int getSystemServiceClass()
-	{
-		return mMessage.getInt( SYSTEM_SERVICE_CLASS );
-	}
-
-	@Override
-    public void setIdentifierMessage( int identifier, IBandIdentifier message )
     {
-		mIdentifierUpdate = message;
+        StringBuilder sb = new StringBuilder();
+
+        sb.append(getMessageStub());
+
+        sb.append(" NETWORK:" + getWACN());
+        sb.append(" SYS:" + getSystem());
+        sb.append(" CHAN:" + getChannel());
+        sb.append(" " + Service.getServices(getSystemServiceClass()).toString());
+
+        return sb.toString();
     }
 
-	@Override
+    public String getWACN()
+    {
+        return mMessage.getHex(WACN, 5);
+    }
+
+    public String getSystem()
+    {
+        return mMessage.getHex(SYSTEM, 3);
+    }
+
+    public int getIdentifier()
+    {
+        return mMessage.getInt(IDENTIFIER);
+    }
+
+    public int getChannelNumber()
+    {
+        return mMessage.getInt(CHANNEL);
+    }
+
+    public String getChannel()
+    {
+        return getIdentifier() + "-" + getChannelNumber();
+    }
+
+    public int getSystemServiceClass()
+    {
+        return mMessage.getInt(SYSTEM_SERVICE_CLASS);
+    }
+
+    @Override
+    public void setIdentifierMessage(int identifier, IBandIdentifier message)
+    {
+        mIdentifierUpdate = message;
+    }
+
+    @Override
     public int[] getIdentifiers()
     {
-	    int[] identifiers = new int[ 1 ];
+        int[] identifiers = new int[1];
 
-	    identifiers[ 0 ] = getIdentifier();
+        identifiers[0] = getIdentifier();
 
-	    return identifiers;
+        return identifiers;
     }
 
     public long getDownlinkFrequency()
     {
-    	return calculateDownlink( mIdentifierUpdate, getChannelNumber() );
+        if(mIdentifierUpdate != null)
+        {
+            return mIdentifierUpdate.getDownlinkFrequency(getChannelNumber());
+        }
+
+        return 0;
     }
 
     public long getUplinkFrequency()
     {
-    	return calculateUplink( mIdentifierUpdate, getChannelNumber() );
+        if(mIdentifierUpdate != null)
+        {
+            return mIdentifierUpdate.getUplinkFrequency(getChannelNumber());
+        }
+
+        return 0;
     }
 }

src/module/decode/p25/message/tdu/lc/NetworkStatusBroadcastExplicit.java

@@ -1,36 +1,43 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 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 module.decode.p25.message.tdu.lc;
 
 import module.decode.p25.message.IBandIdentifier;
 import module.decode.p25.message.IdentifierReceiver;
 import module.decode.p25.reference.LinkControlOpcode;
 
-import org.slf4j.Logger;
+public class NetworkStatusBroadcastExplicit extends TDULinkControlMessage implements IdentifierReceiver
-import org.slf4j.LoggerFactory;
-
-public class NetworkStatusBroadcastExplicit extends TDULinkControlMessage
-									implements IdentifierReceiver
 {
-	private final static Logger mLog = 
+    public static final int[] WACN = {72, 73, 74, 75, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 112, 113, 114, 115};
-			LoggerFactory.getLogger( NetworkStatusBroadcastExplicit.class );
+    public static final int[] SYSTEM = {116, 117, 118, 119, 120, 121, 122, 123, 136, 137, 138, 139};
+    public static final int[] TRANSMIT_IDENTIFIER = {140, 141, 142, 143};
+    public static final int[] TRANSMIT_CHANNEL = {144, 145, 146, 147, 160, 161, 162, 163, 164, 165, 166, 167};
+    public static final int[] RECEIVE_IDENTIFIER = {168, 169, 170, 171};
+    public static final int[] RECEIVE_CHANNEL = {184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195};
 
-	public static final int[] WACN = { 72,73,74,75,88,89,90,91,92,93,94,95,96,
+    private IBandIdentifier mTransmitIdentifierUpdate;
-		97,98,99,112,113,114,115 };
+    private IBandIdentifier mReceiveIdentifierUpdate;
-	public static final int[] SYSTEM = { 116,117,118,119,120,121,122,123,136,
-		137,138,139 };
-	public static final int[] TRANSMIT_IDENTIFIER = { 140,141,142,143 };
-	public static final int[] TRANSMIT_CHANNEL = { 144,145,146,147,160,161,162,
-		163,164,165,166,167 };
-	public static final int[] RECEIVE_IDENTIFIER = { 168,169,170,171 };
-	public static final int[] RECEIVE_CHANNEL = { 184,185,186,187,188,189,190,
-		191,192,193,194,195 };
 
-	private IBandIdentifier mTransmitIdentifierUpdate;
+    public NetworkStatusBroadcastExplicit(TDULinkControlMessage source)
-	private IBandIdentifier mReceiveIdentifierUpdate;
+    {
-	
+        super(source);
-	public NetworkStatusBroadcastExplicit( TDULinkControlMessage source )
+    }
-	{
-		super( source );
-	}
 
     @Override
     public String getEventType()
@@ -38,94 +45,102 @@ public class NetworkStatusBroadcastExplicit extends TDULinkControlMessage
         return LinkControlOpcode.NETWORK_STATUS_BROADCAST_EXPLICIT.getDescription();
     }
 
-	@Override
+    @Override
-	public String getMessage()
+    public String getMessage()
-	{
-		StringBuilder sb = new StringBuilder();
-		
-		sb.append( getMessageStub() );
-
-		sb.append( " NETWORK:" + getWACN() );
-		sb.append( " SYS:" + getSystem() );
-		sb.append( " TRANSMIT:" + getTransmitChannel() );
-		sb.append( " RECEIVE:" + getReceiveChannel() );
-		
-		return sb.toString();
-	}
-	
-	public String getWACN()
-	{
-		return mMessage.getHex( WACN, 5 );
-	}
-	
-	public String getSystem()
-	{
-		return mMessage.getHex( SYSTEM, 3 );
-	}
-
-	public int getTransmitIdentifier()
-	{
-		return mMessage.getInt( TRANSMIT_IDENTIFIER );
-	}
-	
-	public int getTransmitChannelNumber()
-	{
-		return mMessage.getInt( TRANSMIT_CHANNEL );
-	}
-	
-	public String getTransmitChannel()
-	{
-		return getTransmitIdentifier() + "-" + getTransmitChannelNumber();
-	}
-	
-	public int getReceiveIdentifier()
-	{
-		return mMessage.getInt( RECEIVE_IDENTIFIER );
-	}
-	
-	public int getReceiveChannelNumber()
-	{
-		return mMessage.getInt( RECEIVE_CHANNEL );
-	}
-	
-	public String getReceiveChannel()
-	{
-		return getReceiveIdentifier() + "-" + getReceiveChannelNumber();
-	}
-
-	@Override
-    public void setIdentifierMessage( int identifier, IBandIdentifier message )
     {
-		if( identifier == getTransmitIdentifier() )
+        StringBuilder sb = new StringBuilder();
-		{
+
-			mTransmitIdentifierUpdate = message;
+        sb.append(getMessageStub());
-		}
+
-		if( identifier == getReceiveIdentifier() )
+        sb.append(" NETWORK:" + getWACN());
-		{
+        sb.append(" SYS:" + getSystem());
-			mReceiveIdentifierUpdate = message;
+        sb.append(" TRANSMIT:" + getTransmitChannel());
-		}
+        sb.append(" RECEIVE:" + getReceiveChannel());
+
+        return sb.toString();
     }
 
-	@Override
+    public String getWACN()
+    {
+        return mMessage.getHex(WACN, 5);
+    }
+
+    public String getSystem()
+    {
+        return mMessage.getHex(SYSTEM, 3);
+    }
+
+    public int getTransmitIdentifier()
+    {
+        return mMessage.getInt(TRANSMIT_IDENTIFIER);
+    }
+
+    public int getTransmitChannelNumber()
+    {
+        return mMessage.getInt(TRANSMIT_CHANNEL);
+    }
+
+    public String getTransmitChannel()
+    {
+        return getTransmitIdentifier() + "-" + getTransmitChannelNumber();
+    }
+
+    public int getReceiveIdentifier()
+    {
+        return mMessage.getInt(RECEIVE_IDENTIFIER);
+    }
+
+    public int getReceiveChannelNumber()
+    {
+        return mMessage.getInt(RECEIVE_CHANNEL);
+    }
+
+    public String getReceiveChannel()
+    {
+        return getReceiveIdentifier() + "-" + getReceiveChannelNumber();
+    }
+
+    @Override
+    public void setIdentifierMessage(int identifier, IBandIdentifier message)
+    {
+        if(identifier == getTransmitIdentifier())
+        {
+            mTransmitIdentifierUpdate = message;
+        }
+        if(identifier == getReceiveIdentifier())
+        {
+            mReceiveIdentifierUpdate = message;
+        }
+    }
+
+    @Override
     public int[] getIdentifiers()
     {
-	    int[] identifiers = new int[ 2 ];
+        int[] identifiers = new int[2];
 
-	    identifiers[ 0 ] = getTransmitIdentifier();
+        identifiers[0] = getTransmitIdentifier();
-	    identifiers[ 1 ] = getReceiveIdentifier();
+        identifiers[1] = getReceiveIdentifier();
 
-	    return identifiers;
+        return identifiers;
     }
 
     public long getDownlinkFrequency()
     {
-    	return calculateDownlink( mTransmitIdentifierUpdate, 
+        if(mTransmitIdentifierUpdate != null)
-    				getTransmitChannelNumber() );
+        {
+            return mTransmitIdentifierUpdate.getDownlinkFrequency(getTransmitChannelNumber());
+        }
+
+        return 0;
     }
 
     public long getUplinkFrequency()
     {
-    	return calculateUplink( mReceiveIdentifierUpdate, 
+        if(mReceiveIdentifierUpdate != null)
-    			getReceiveChannelNumber() );
+        {
+            return mReceiveIdentifierUpdate.getUplinkFrequency(getReceiveChannelNumber());
+        }
+
+        return 0;
     }
 }

src/module/decode/p25/message/tdu/lc/RFSSStatusBroadcast.java

@@ -1,3 +1,21 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 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 module.decode.p25.message.tdu.lc;
 
 import module.decode.p25.message.IBandIdentifier;
@@ -5,35 +23,22 @@ import module.decode.p25.message.IdentifierReceiver;
 import module.decode.p25.message.tsbk.osp.control.SystemService;
 import module.decode.p25.reference.LinkControlOpcode;
 
-import org.slf4j.Logger;
+public class RFSSStatusBroadcast extends TDULinkControlMessage implements IdentifierReceiver
-import org.slf4j.LoggerFactory;
-
-public class RFSSStatusBroadcast extends TDULinkControlMessage 
-								 implements IdentifierReceiver
 {
-	private final static Logger mLog = 
+    public static final int[] LRA = {72, 73, 74, 75, 88, 89, 90, 91};
-			LoggerFactory.getLogger( RFSSStatusBroadcast.class );
+    public static final int[] SYSTEM_ID = {96, 97, 98, 99, 112, 113, 114, 115, 116, 117, 118, 119};
+    public static final int[] RFSS_ID = {120, 121, 122, 123, 136, 137, 138, 139};
+    public static final int[] SITE_ID = {140, 141, 142, 143, 144, 145, 146, 147};
+    public static final int[] IDENTIFIER = {160, 161, 162, 163};
+    public static final int[] CHANNEL = {164, 165, 166, 167, 168, 169, 170, 171, 184, 185, 186, 187};
+    public static final int[] SYSTEM_SERVICE_CLASS = {188, 189, 190, 191, 192, 193, 194, 195};
 
-	public static final int[] LRA = { 72,73,74,75,88,89,
+    private IBandIdentifier mIdentifierUpdate;
-		90,91 };
-	public static final int[] SYSTEM_ID = { 96,97,98,99,112,113,114,115,116,117,
-		118,119 };
-	public static final int[] RFSS_ID = { 120,121,122,123,136,137,138,
-		139 };
-	public static final int[] SITE_ID = { 140,141,142,143,144,145,146,147 };
 
-	public static final int[] IDENTIFIER = { 160,161,162,163 };
+    public RFSSStatusBroadcast(TDULinkControlMessage source)
-	public static final int[] CHANNEL = { 164,165,166,167,168,169,170,
+    {
-		171,184,185,186,187 };
+        super(source);
-	public static final int[] SYSTEM_SERVICE_CLASS = { 188,189,190,191,192,193,
+    }
-		194,195 };
-	
-	private IBandIdentifier mIdentifierUpdate;
-	
-	public RFSSStatusBroadcast( TDULinkControlMessage source )
-	{
-		super( source );
-	}
 
     @Override
     public String getEventType()
@@ -41,92 +46,101 @@ public class RFSSStatusBroadcast extends TDULinkControlMessage
         return LinkControlOpcode.RFSS_STATUS_BROADCAST.getDescription();
     }
 
-	@Override
+    @Override
-	public String getMessage()
+    public String getMessage()
-	{
-		StringBuilder sb = new StringBuilder();
-		
-		sb.append( getMessageStub() );
-		
-		sb.append( " LRA:" + getLocationRegistrationArea() );
-		
-		sb.append( " SYS:" + getSystem() );
-
-		sb.append( " SITE:" + getRFSubsystemID() + "-" + getSiteID() );
-		
-		sb.append( " CHAN:" + getChannelNumber() );
-		
-        sb.append( " " + SystemService.toString( getSystemServiceClass() ) );
-		
-        sb.append( " " + mMessage.toString() );
-        
-		return sb.toString();
-	}
-	
-	public String getLocationRegistrationArea()
-	{
-		return mMessage.getHex( LRA, 2 );
-	}
-	
-	public String getSystem()
-	{
-		return mMessage.getHex( SYSTEM_ID, 3 );
-	}
-	
-	public String getRFSubsystemID()
-	{
-		return mMessage.getHex( RFSS_ID, 2 );
-	}
-	
-	public String getSiteID()
-	{
-		return mMessage.getHex( SITE_ID, 2 );
-	}
-	
-	public int getIdentifier()
-	{
-		return mMessage.getInt( IDENTIFIER );
-	}
-	
-	public String getChannel()
-	{
-		return getIdentifier() + "-" + getChannelNumber();
-	}
-	
-	public int getChannelNumber()
-	{
-		return mMessage.getInt( CHANNEL );
-	}
-	
-	public int getSystemServiceClass()
-	{
-		return mMessage.getInt( SYSTEM_SERVICE_CLASS );
-	}
-
-	@Override
-    public void setIdentifierMessage( int identifier, IBandIdentifier message )
     {
-	    mIdentifierUpdate = message;
+        StringBuilder sb = new StringBuilder();
+
+        sb.append(getMessageStub());
+
+        sb.append(" LRA:" + getLocationRegistrationArea());
+
+        sb.append(" SYS:" + getSystem());
+
+        sb.append(" SITE:" + getRFSubsystemID() + "-" + getSiteID());
+
+        sb.append(" CHAN:" + getChannelNumber());
+
+        sb.append(" " + SystemService.toString(getSystemServiceClass()));
+
+        sb.append(" " + mMessage.toString());
+
+        return sb.toString();
     }
 
-	@Override
+    public String getLocationRegistrationArea()
+    {
+        return mMessage.getHex(LRA, 2);
+    }
+
+    public String getSystem()
+    {
+        return mMessage.getHex(SYSTEM_ID, 3);
+    }
+
+    public String getRFSubsystemID()
+    {
+        return mMessage.getHex(RFSS_ID, 2);
+    }
+
+    public String getSiteID()
+    {
+        return mMessage.getHex(SITE_ID, 2);
+    }
+
+    public int getIdentifier()
+    {
+        return mMessage.getInt(IDENTIFIER);
+    }
+
+    public String getChannel()
+    {
+        return getIdentifier() + "-" + getChannelNumber();
+    }
+
+    public int getChannelNumber()
+    {
+        return mMessage.getInt(CHANNEL);
+    }
+
+    public int getSystemServiceClass()
+    {
+        return mMessage.getInt(SYSTEM_SERVICE_CLASS);
+    }
+
+    @Override
+    public void setIdentifierMessage(int identifier, IBandIdentifier message)
+    {
+        mIdentifierUpdate = message;
+    }
+
+    @Override
     public int[] getIdentifiers()
     {
-		int[] identifiers = new int[ 1 ];
+        int[] identifiers = new int[1];
 
-		identifiers[ 0 ] = getIdentifier();
+        identifiers[0] = getIdentifier();
 
-	    return identifiers;
+        return identifiers;
     }
 
     public long getDownlinkFrequency()
     {
-    	return calculateDownlink( mIdentifierUpdate, getChannelNumber() );
+        if(mIdentifierUpdate != null)
+        {
+            return mIdentifierUpdate.getDownlinkFrequency(getChannelNumber());
+        }
+
+        return 0;
     }
 
     public long getUplinkFrequency()
     {
-    	return calculateUplink( mIdentifierUpdate, getChannelNumber() );
+        if(mIdentifierUpdate != null)
-    }
+        {
+            return mIdentifierUpdate.getUplinkFrequency(getChannelNumber());
+        }
 
+        return 0;
+    }
 }

src/module/decode/p25/message/tdu/lc/RFSSStatusBroadcastExplicit.java

@@ -1,40 +1,50 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 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 module.decode.p25.message.tdu.lc;
 
 import module.decode.p25.message.IBandIdentifier;
 import module.decode.p25.message.IdentifierReceiver;
 import module.decode.p25.message.tsbk.osp.control.SystemService;
 import module.decode.p25.reference.LinkControlOpcode;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class RFSSStatusBroadcastExplicit extends TDULinkControlMessage 
+public class RFSSStatusBroadcastExplicit extends TDULinkControlMessage implements IdentifierReceiver
-								 implements IdentifierReceiver
 {
-	private final static Logger mLog = 
+    private final static Logger mLog = LoggerFactory.getLogger(RFSSStatusBroadcastExplicit.class);
-			LoggerFactory.getLogger( RFSSStatusBroadcastExplicit.class );
 
-	public static final int[] LRA = { 72,73,74,75,88,89,90,91 };
+    public static final int[] LRA = {72, 73, 74, 75, 88, 89, 90, 91};
-	public static final int[] RECEIVE_IDENTIFIER = { 92,93,94,95 };
+    public static final int[] RECEIVE_IDENTIFIER = {92, 93, 94, 95};
-	public static final int[] RECEIVE_CHANNEL = { 96,97,98,99,112,113,114,115,
+    public static final int[] RECEIVE_CHANNEL = {96, 97, 98, 99, 112, 113, 114, 115, 116, 117, 118, 119};
-		116,117,118,119 };
+    public static final int[] RFSS_ID = {120, 121, 122, 123, 136, 137, 138, 139};
-	public static final int[] RFSS_ID = { 120,121,122,123,136,137,138,
+    public static final int[] SITE_ID = {140, 141, 142, 143, 144, 145, 146, 147};
-		139 };
+    public static final int[] TRANSMIT_IDENTIFIER = {160, 161, 162, 163};
-	public static final int[] SITE_ID = { 140,141,142,143,144,145,146,147 };
+    public static final int[] TRANSMIT_CHANNEL = {164, 165, 166, 167, 168, 169, 170, 171, 184, 185, 186, 187};
+    public static final int[] SYSTEM_SERVICE_CLASS = {188, 189, 190, 191, 192, 193, 194, 195};
 
-	public static final int[] TRANSMIT_IDENTIFIER = { 160,161,162,163 };
+    private IBandIdentifier mTransmitIdentifierUpdate;
-	public static final int[] TRANSMIT_CHANNEL = { 164,165,166,167,168,169,170,
+    private IBandIdentifier mReceiveIdentifierUpdate;
-		171,184,185,186,187 };
-	public static final int[] SYSTEM_SERVICE_CLASS = { 188,189,190,191,192,193,
-		194,195 };
 
-	private IBandIdentifier mTransmitIdentifierUpdate;
+    public RFSSStatusBroadcastExplicit(TDULinkControlMessage source)
-	private IBandIdentifier mReceiveIdentifierUpdate;
+    {
-	
+        super(source);
-	public RFSSStatusBroadcastExplicit( TDULinkControlMessage source )
+    }
-	{
-		super( source );
-	}
 
     @Override
     public String getEventType()
@@ -42,111 +52,120 @@ public class RFSSStatusBroadcastExplicit extends TDULinkControlMessage
         return LinkControlOpcode.RFSS_STATUS_BROADCAST_EXPLICIT.getDescription();
     }
 
-	@Override
+    @Override
-	public String getMessage()
+    public String getMessage()
-	{
-		StringBuilder sb = new StringBuilder();
-		
-		sb.append( getMessageStub() );
-		
-		sb.append( " LRA:" + getLocationRegistrationArea() );
-		
-		sb.append( " SITE:" + getRFSubsystemID() + "-" + getSiteID() );
-		
-		sb.append( " TRANSMIT:" + getTransmitChannelNumber() );
-		
-		sb.append( " RECEIVE:" + getReceiveChannelNumber() );
-		
-        sb.append( " " + SystemService.toString( getSystemServiceClass() ) );
-		
-        sb.append( " " + mMessage.toString() );
-        
-		return sb.toString();
-	}
-	
-	public String getLocationRegistrationArea()
-	{
-		return mMessage.getHex( LRA, 2 );
-	}
-	
-	public String getRFSubsystemID()
-	{
-		return mMessage.getHex( RFSS_ID, 2 );
-	}
-	
-	public String getSiteID()
-	{
-		return mMessage.getHex( SITE_ID, 2 );
-	}
-	
-	public int getTransmitIdentifier()
-	{
-		return mMessage.getInt( TRANSMIT_IDENTIFIER );
-	}
-	
-	public String getTransmitChannel()
-	{
-		return getTransmitIdentifier() + "-" + getTransmitChannelNumber();
-	}
-	
-	public int getTransmitChannelNumber()
-	{
-		return mMessage.getInt( TRANSMIT_CHANNEL );
-	}
-	
-	public int getReceiveIdentifier()
-	{
-		return mMessage.getInt( RECEIVE_IDENTIFIER );
-	}
-	
-	public String getReceiveChannel()
-	{
-		return getReceiveIdentifier() + "-" + getReceiveChannelNumber();
-	}
-	
-	public int getReceiveChannelNumber()
-	{
-		return mMessage.getInt( RECEIVE_CHANNEL );
-	}
-	
-	public int getSystemServiceClass()
-	{
-		return mMessage.getInt( SYSTEM_SERVICE_CLASS );
-	}
-
-	@Override
-    public void setIdentifierMessage( int identifier, IBandIdentifier message )
     {
-		if( identifier == getTransmitIdentifier() )
+        StringBuilder sb = new StringBuilder();
-		{
-			mTransmitIdentifierUpdate = message;
-		}
 
-		if( identifier == getReceiveIdentifier() )
+        sb.append(getMessageStub());
-		{
+
-			mReceiveIdentifierUpdate = message;
+        sb.append(" LRA:" + getLocationRegistrationArea());
-		}
+
+        sb.append(" SITE:" + getRFSubsystemID() + "-" + getSiteID());
+
+        sb.append(" TRANSMIT:" + getTransmitChannelNumber());
+
+        sb.append(" RECEIVE:" + getReceiveChannelNumber());
+
+        sb.append(" " + SystemService.toString(getSystemServiceClass()));
+
+        sb.append(" " + mMessage.toString());
+
+        return sb.toString();
     }
 
-	@Override
+    public String getLocationRegistrationArea()
+    {
+        return mMessage.getHex(LRA, 2);
+    }
+
+    public String getRFSubsystemID()
+    {
+        return mMessage.getHex(RFSS_ID, 2);
+    }
+
+    public String getSiteID()
+    {
+        return mMessage.getHex(SITE_ID, 2);
+    }
+
+    public int getTransmitIdentifier()
+    {
+        return mMessage.getInt(TRANSMIT_IDENTIFIER);
+    }
+
+    public String getTransmitChannel()
+    {
+        return getTransmitIdentifier() + "-" + getTransmitChannelNumber();
+    }
+
+    public int getTransmitChannelNumber()
+    {
+        return mMessage.getInt(TRANSMIT_CHANNEL);
+    }
+
+    public int getReceiveIdentifier()
+    {
+        return mMessage.getInt(RECEIVE_IDENTIFIER);
+    }
+
+    public String getReceiveChannel()
+    {
+        return getReceiveIdentifier() + "-" + getReceiveChannelNumber();
+    }
+
+    public int getReceiveChannelNumber()
+    {
+        return mMessage.getInt(RECEIVE_CHANNEL);
+    }
+
+    public int getSystemServiceClass()
+    {
+        return mMessage.getInt(SYSTEM_SERVICE_CLASS);
+    }
+
+    @Override
+    public void setIdentifierMessage(int identifier, IBandIdentifier message)
+    {
+        if(identifier == getTransmitIdentifier())
+        {
+            mTransmitIdentifierUpdate = message;
+        }
+
+        if(identifier == getReceiveIdentifier())
+        {
+            mReceiveIdentifierUpdate = message;
+        }
+    }
+
+    @Override
     public int[] getIdentifiers()
     {
-		int[] identifiers = new int[ 2 ];
+        int[] identifiers = new int[2];
 
-		identifiers[ 0 ] = getTransmitIdentifier();
+        identifiers[0] = getTransmitIdentifier();
-		identifiers[ 1 ] = getReceiveIdentifier();
+        identifiers[1] = getReceiveIdentifier();
 
-	    return identifiers;
+        return identifiers;
     }
 
     public long getDownlinkFrequency()
     {
-    	return calculateDownlink( mTransmitIdentifierUpdate, getTransmitChannelNumber() );
+        if(mTransmitIdentifierUpdate != null)
+        {
+            return mTransmitIdentifierUpdate.getDownlinkFrequency(getTransmitChannelNumber());
+        }
+
+        return 0;
     }
 
     public long getUplinkFrequency()
     {
-    	return calculateUplink( mReceiveIdentifierUpdate, getReceiveChannelNumber() );
+        if(mReceiveIdentifierUpdate != null)
-    }
+        {
+            return mReceiveIdentifierUpdate.getUplinkFrequency(getReceiveChannelNumber());
+        }
 
+        return 0;
+    }
 }

src/module/decode/p25/message/tdu/lc/SecondaryControlChannelBroadcast.java

@@ -1,3 +1,21 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 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 module.decode.p25.message.tdu.lc;
 
 import module.decode.p25.message.IBandIdentifier;
@@ -5,37 +23,24 @@ import module.decode.p25.message.IdentifierReceiver;
 import module.decode.p25.message.tsbk.osp.control.SystemService;
 import module.decode.p25.reference.LinkControlOpcode;
 
-import org.slf4j.Logger;
+public class SecondaryControlChannelBroadcast extends TDULinkControlMessage implements IdentifierReceiver
-import org.slf4j.LoggerFactory;
-
-public class SecondaryControlChannelBroadcast extends TDULinkControlMessage
-						implements IdentifierReceiver
 {
-	private final static Logger mLog = 
+    public static final int[] RFSS_ID = {72, 73, 74, 75, 88, 89, 90, 91};
-			LoggerFactory.getLogger( SecondaryControlChannelBroadcast.class );
+    public static final int[] SITE_ID = {92, 93, 94, 95, 96, 97, 98, 99};
+    public static final int[] IDENTIFIER_A = {112, 113, 114, 115};
+    public static final int[] CHANNEL_A = {116, 117, 118, 119, 120, 121, 122, 123, 136, 137, 138, 139};
+    public static final int[] SYSTEM_SERVICE_CLASS_A = {140, 141, 142, 143, 144, 145, 146, 147};
+    public static final int[] IDENTIFIER_B = {160, 161, 162, 163};
+    public static final int[] CHANNEL_B = {164, 165, 166, 167, 168, 169, 170, 171, 184, 185, 186, 187};
+    public static final int[] SYSTEM_SERVICE_CLASS_B = {188, 189, 190, 191, 192, 193, 194, 195};
 
-	public static final int[] RFSS_ID = { 72,73,74,75,88,89,90,91 };
+    private IBandIdentifier mIdentifierProviderA;
-	public static final int[] SITE_ID = { 92,93,94,95,96,97,98,99 };
+    private IBandIdentifier mIdentifierProviderB;
-	public static final int[] IDENTIFIER_A = { 112,113,114,115 };
-	public static final int[] CHANNEL_A = { 116,117,118,119,120,121,122,
-		123,136,137,138,139 };
 
-	public static final int[] SYSTEM_SERVICE_CLASS_A = { 140,141,142,143,144,
+    public SecondaryControlChannelBroadcast(TDULinkControlMessage source)
-		145,146,147 };
+    {
-	
+        super(source);
-	public static final int[] IDENTIFIER_B = { 160,161,162,163 };
+    }
-	public static final int[] CHANNEL_B = { 164,165,166,167,168,169,170,
-		171,184,185,186,187 };
-	public static final int[] SYSTEM_SERVICE_CLASS_B = { 188,189,190,191,192,
-		193,194,195 };
-	
-	private IBandIdentifier mIdentifierProviderA;
-	private IBandIdentifier mIdentifierProviderB;
-	
-	public SecondaryControlChannelBroadcast( TDULinkControlMessage source )
-	{
-		super( source );
-	}
 
     @Override
     public String getEventType()
@@ -43,117 +48,137 @@ public class SecondaryControlChannelBroadcast extends TDULinkControlMessage
         return LinkControlOpcode.SECONDARY_CONTROL_CHANNEL_BROADCAST.getDescription();
     }
 
-	@Override
+    @Override
-	public String getMessage()
+    public String getMessage()
-	{
-		StringBuilder sb = new StringBuilder();
-		
-		sb.append( getMessageStub() );
-		
-		sb.append( " SITE:" + getRFSubsystemID() + "-" + getSiteID() );
-		
-		sb.append( " CHAN A:" + getChannelA() );
-		
-        sb.append( " " + SystemService.toString( getSystemServiceClassA() ) );
-		
-		sb.append( " CHAN B:" + getChannelB() );
-		
-        sb.append( " " + SystemService.toString( getSystemServiceClassB() ) );
-		
-		return sb.toString();
-	}
-	
-	public String getRFSubsystemID()
-	{
-		return mMessage.getHex( RFSS_ID, 2 );
-	}
-	
-	public String getSiteID()
-	{
-		return mMessage.getHex( SITE_ID, 2 );
-	}
-	
-	public int getIdentifierA()
-	{
-		return mMessage.getInt( IDENTIFIER_A );
-	}
-	
-	public int getChannelA()
-	{
-		return mMessage.getInt( CHANNEL_A );
-	}
-	
-	public String getChannelNumberA()
-	{
-		return getIdentifierA() + "-" + getChannelA();
-	}
-	
-	public int getIdentifierB()
-	{
-		return mMessage.getInt( IDENTIFIER_B );
-	}
-	
-	public int getChannelB()
-	{
-		return mMessage.getInt( CHANNEL_B );
-	}
-	
-	public String getChannelNumberB()
-	{
-		return getIdentifierB() + "-" + getChannelB();
-	}
-	
-	public int getSystemServiceClassA()
-	{
-		return mMessage.getInt( SYSTEM_SERVICE_CLASS_A );
-	}
-
-	public int getSystemServiceClassB()
-	{
-		return mMessage.getInt( SYSTEM_SERVICE_CLASS_B );
-	}
-	
-	@Override
-    public void setIdentifierMessage( int identifier, IBandIdentifier message )
     {
-		if( identifier == getIdentifierA() )
+        StringBuilder sb = new StringBuilder();
-		{
+
-			mIdentifierProviderA = message;
+        sb.append(getMessageStub());
-		}
+
-		if( identifier == getIdentifierB() )
+        sb.append(" SITE:" + getRFSubsystemID() + "-" + getSiteID());
-		{
+
-			mIdentifierProviderB = message;
+        sb.append(" CHAN A:" + getChannelA());
-		}
+
+        sb.append(" " + SystemService.toString(getSystemServiceClassA()));
+
+        sb.append(" CHAN B:" + getChannelB());
+
+        sb.append(" " + SystemService.toString(getSystemServiceClassB()));
+
+        return sb.toString();
     }
 
-	@Override
+    public String getRFSubsystemID()
+    {
+        return mMessage.getHex(RFSS_ID, 2);
+    }
+
+    public String getSiteID()
+    {
+        return mMessage.getHex(SITE_ID, 2);
+    }
+
+    public int getIdentifierA()
+    {
+        return mMessage.getInt(IDENTIFIER_A);
+    }
+
+    public int getChannelA()
+    {
+        return mMessage.getInt(CHANNEL_A);
+    }
+
+    public String getChannelNumberA()
+    {
+        return getIdentifierA() + "-" + getChannelA();
+    }
+
+    public int getIdentifierB()
+    {
+        return mMessage.getInt(IDENTIFIER_B);
+    }
+
+    public int getChannelB()
+    {
+        return mMessage.getInt(CHANNEL_B);
+    }
+
+    public String getChannelNumberB()
+    {
+        return getIdentifierB() + "-" + getChannelB();
+    }
+
+    public int getSystemServiceClassA()
+    {
+        return mMessage.getInt(SYSTEM_SERVICE_CLASS_A);
+    }
+
+    public int getSystemServiceClassB()
+    {
+        return mMessage.getInt(SYSTEM_SERVICE_CLASS_B);
+    }
+
+    @Override
+    public void setIdentifierMessage(int identifier, IBandIdentifier message)
+    {
+        if(identifier == getIdentifierA())
+        {
+            mIdentifierProviderA = message;
+        }
+        if(identifier == getIdentifierB())
+        {
+            mIdentifierProviderB = message;
+        }
+    }
+
+    @Override
     public int[] getIdentifiers()
     {
-		int[] identifiers = new int[ 2 ];
+        int[] identifiers = new int[2];
 
-		identifiers[ 0 ] = getIdentifierA();
+        identifiers[0] = getIdentifierA();
-		identifiers[ 1 ] = getIdentifierB();
+        identifiers[1] = getIdentifierB();
 
-		return identifiers;
+        return identifiers;
     }
 
     public long getDownlinkFrequencyA()
     {
-    	return calculateDownlink( mIdentifierProviderA, getChannelA() );
+        if(mIdentifierProviderA != null)
+        {
+            return mIdentifierProviderA.getDownlinkFrequency(getChannelA());
+        }
+
+        return 0;
     }
 
     public long getUplinkFrequencyA()
     {
-    	return calculateUplink( mIdentifierProviderA, getChannelA() );
+        if(mIdentifierProviderA != null)
+        {
+            return mIdentifierProviderA.getUplinkFrequency(getChannelA());
+        }
+
+        return 0;
     }
 
     public long getDownlinkFrequencyB()
     {
-    	return calculateDownlink( mIdentifierProviderB, getChannelB() );
+        if(mIdentifierProviderB != null)
+        {
+            return mIdentifierProviderB.getDownlinkFrequency(getChannelB());
+        }
+
+        return 0;
     }
 
     public long getUplinkFrequencyB()
     {
-    	return calculateUplink( mIdentifierProviderB, getChannelB() );
+        if(mIdentifierProviderB != null)
+        {
+            return mIdentifierProviderB.getUplinkFrequency(getChannelB());
+        }
+
+        return 0;
     }
 }

src/module/decode/p25/message/tdu/lc/SecondaryControlChannelBroadcastExplicit.java

@@ -1,3 +1,21 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 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 module.decode.p25.message.tdu.lc;
 
 import module.decode.p25.message.IBandIdentifier;
@@ -5,33 +23,23 @@ import module.decode.p25.message.IdentifierReceiver;
 import module.decode.p25.message.tsbk.osp.control.SystemService;
 import module.decode.p25.reference.LinkControlOpcode;
 
-import org.slf4j.Logger;
+public class SecondaryControlChannelBroadcastExplicit extends TDULinkControlMessage implements IdentifierReceiver
-import org.slf4j.LoggerFactory;
-
-public class SecondaryControlChannelBroadcastExplicit 
-	extends TDULinkControlMessage implements IdentifierReceiver
 {
-	private final static Logger mLog = 
+    public static final int[] RFSS_ID = {72, 73, 74, 75, 88, 89, 90, 91};
-			LoggerFactory.getLogger( SecondaryControlChannelBroadcastExplicit.class );
+    public static final int[] SITE_ID = {92, 93, 94, 95, 96, 97, 98, 99};
+    public static final int[] TRANSMIT_IDENTIFIER = {112, 113, 114, 115};
+    public static final int[] TRANSMIT_CHANNEL = {116, 117, 118, 119, 120, 121, 122, 123, 136, 137, 138, 139};
+    public static final int[] RECEIVE_IDENTIFIER = {140, 141, 142, 143};
+    public static final int[] RECEIVE_CHANNEL = {144, 145, 146, 147, 160, 161, 162, 163, 164, 165, 166, 167};
+    public static final int[] SYSTEM_SERVICE_CLASS = {168, 169, 170, 171, 184, 185, 186, 187};
 
-	public static final int[] RFSS_ID = { 72,73,74,75,88,89,90,91 };
+    private IBandIdentifier mTransmitIdentifierProvider;
-	public static final int[] SITE_ID = { 92,93,94,95,96,97,98,99 };
+    private IBandIdentifier mReceiveIdentifierProvider;
-	public static final int[] TRANSMIT_IDENTIFIER = { 112,113,114,115 };
-	public static final int[] TRANSMIT_CHANNEL = { 116,117,118,119,120,121,122,
-		123,136,137,138,139 };
-	public static final int[] RECEIVE_IDENTIFIER = { 140,141,142,143 };
-	public static final int[] RECEIVE_CHANNEL = { 144,145,146,147,160,161,162,
-		163,164,165,166,167 };
-	public static final int[] SYSTEM_SERVICE_CLASS = { 168,169,170,171,184,
-		185,186,187 };
 
-	private IBandIdentifier mTransmitIdentifierProvider;
+    public SecondaryControlChannelBroadcastExplicit(TDULinkControlMessage source)
-	private IBandIdentifier mReceiveIdentifierProvider;
+    {
-	
+        super(source);
-	public SecondaryControlChannelBroadcastExplicit( TDULinkControlMessage source )
+    }
-	{
-		super( source );
-	}
 
     @Override
     public String getEventType()
@@ -39,102 +47,110 @@ public class SecondaryControlChannelBroadcastExplicit
         return LinkControlOpcode.SECONDARY_CONTROL_CHANNEL_BROADCAST_EXPLICIT.getDescription();
     }
 
-	@Override
+    @Override
-	public String getMessage()
+    public String getMessage()
-	{
-		StringBuilder sb = new StringBuilder();
-		
-		sb.append( getMessageStub() );
-		
-		sb.append( " SITE:" + getRFSubsystemID() + "-" + getSiteID() );
-		
-		sb.append( " TRANSMIT:" + getTransmitChannel() );
-
-		sb.append( " RECEIVE:" + getReceiveChannel() );
-		
-        sb.append( " " + SystemService.toString( getSystemServiceClass() ) );
-		
-		return sb.toString();
-	}
-	
-	public String getRFSubsystemID()
-	{
-		return mMessage.getHex( RFSS_ID, 2 );
-	}
-	
-	public String getSiteID()
-	{
-		return mMessage.getHex( SITE_ID, 2 );
-	}
-	
-	public int getTransmitIdentifier()
-	{
-		return mMessage.getInt( TRANSMIT_IDENTIFIER );
-	}
-	
-	public int getTransmitChannelNumber()
-	{
-		return mMessage.getInt( TRANSMIT_CHANNEL );
-	}
-	
-	public String getTransmitChannel()
-	{
-		return getTransmitIdentifier() + "-" + getTransmitChannelNumber();
-	}
-	
-	public int getReceiveIdentifier()
-	{
-		return mMessage.getInt( RECEIVE_IDENTIFIER );
-	}
-	
-	public int getReceiveChannelNumber()
-	{
-		return mMessage.getInt( RECEIVE_CHANNEL );
-	}
-	
-	public String getReceiveChannel()
-	{
-		return getReceiveIdentifier() + "-" + getReceiveChannelNumber();
-	}
-	
-	public int getSystemServiceClass()
-	{
-		return mMessage.getInt( SYSTEM_SERVICE_CLASS );
-	}
-
-	@Override
-    public void setIdentifierMessage( int identifier, IBandIdentifier message )
     {
-		if( identifier == getTransmitIdentifier() )
+        StringBuilder sb = new StringBuilder();
-		{
+
-			mTransmitIdentifierProvider = message;
+        sb.append(getMessageStub());
-		}
+
-		if( identifier == getReceiveIdentifier() )
+        sb.append(" SITE:" + getRFSubsystemID() + "-" + getSiteID());
-		{
+
-			mReceiveIdentifierProvider = message;
+        sb.append(" TRANSMIT:" + getTransmitChannel());
-		}
+
+        sb.append(" RECEIVE:" + getReceiveChannel());
+
+        sb.append(" " + SystemService.toString(getSystemServiceClass()));
+
+        return sb.toString();
     }
 
-	@Override
+    public String getRFSubsystemID()
+    {
+        return mMessage.getHex(RFSS_ID, 2);
+    }
+
+    public String getSiteID()
+    {
+        return mMessage.getHex(SITE_ID, 2);
+    }
+
+    public int getTransmitIdentifier()
+    {
+        return mMessage.getInt(TRANSMIT_IDENTIFIER);
+    }
+
+    public int getTransmitChannelNumber()
+    {
+        return mMessage.getInt(TRANSMIT_CHANNEL);
+    }
+
+    public String getTransmitChannel()
+    {
+        return getTransmitIdentifier() + "-" + getTransmitChannelNumber();
+    }
+
+    public int getReceiveIdentifier()
+    {
+        return mMessage.getInt(RECEIVE_IDENTIFIER);
+    }
+
+    public int getReceiveChannelNumber()
+    {
+        return mMessage.getInt(RECEIVE_CHANNEL);
+    }
+
+    public String getReceiveChannel()
+    {
+        return getReceiveIdentifier() + "-" + getReceiveChannelNumber();
+    }
+
+    public int getSystemServiceClass()
+    {
+        return mMessage.getInt(SYSTEM_SERVICE_CLASS);
+    }
+
+    @Override
+    public void setIdentifierMessage(int identifier, IBandIdentifier message)
+    {
+        if(identifier == getTransmitIdentifier())
+        {
+            mTransmitIdentifierProvider = message;
+        }
+        if(identifier == getReceiveIdentifier())
+        {
+            mReceiveIdentifierProvider = message;
+        }
+    }
+
+    @Override
     public int[] getIdentifiers()
     {
-		int[] identifiers = new int[ 2 ];
+        int[] identifiers = new int[2];
 
-		identifiers[ 0 ] = getTransmitIdentifier();
+        identifiers[0] = getTransmitIdentifier();
-		identifiers[ 1 ] = getReceiveIdentifier();
+        identifiers[1] = getReceiveIdentifier();
 
-		return identifiers;
+        return identifiers;
     }
 
     public long getDownlinkFrequency()
     {
-    	return calculateDownlink( mTransmitIdentifierProvider, 
+        if(mTransmitIdentifierProvider != null)
-    						getTransmitChannelNumber() );
+        {
+            return mTransmitIdentifierProvider.getDownlinkFrequency(getTransmitChannelNumber());
+        }
+
+        return 0;
     }
 
     public long getUplinkFrequency()
     {
-    	return calculateUplink( mReceiveIdentifierProvider, 
+        if(mReceiveIdentifierProvider != null)
-    			getReceiveChannelNumber() );
+        {
+            return mReceiveIdentifierProvider.getUplinkFrequency(getReceiveChannelNumber());
+        }
+
+        return 0;
     }
 }

src/module/decode/p25/message/tsbk/ChannelGrant.java

@@ -1,26 +1,53 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 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 module.decode.p25.message.tsbk;
 
+import alias.AliasList;
+import bits.BinaryMessage;
 import module.decode.p25.message.IBandIdentifier;
 import module.decode.p25.message.IdentifierReceiver;
 import module.decode.p25.reference.DataUnitID;
-import alias.AliasList;
-import bits.BinaryMessage;
 
-public abstract class ChannelGrant extends ServiceMessage 
+public abstract class ChannelGrant extends ServiceMessage implements IdentifierReceiver
-								   implements IdentifierReceiver
 {
-    public static final int[] PRIORITY = { 85,86,87 };
+    public static final int[] PRIORITY = {85, 86, 87};
-    public static final int[] CHANNEL_IDENTIFIER = { 88,89,90,91 };
+    public static final int[] CHANNEL_IDENTIFIER = {88, 89, 90, 91};
-    public static final int[] CHANNEL_NUMBER = { 92,93,94,95,96,97,98,99,100,
+    public static final int[] CHANNEL_NUMBER = {92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103};
-        101,102,103 };
 
     private IBandIdentifier mIdentifierUpdate;
 
-    public ChannelGrant( BinaryMessage message, 
+    public ChannelGrant(BinaryMessage message, DataUnitID duid, AliasList aliasList)
-    					 DataUnitID duid,
-    					 AliasList aliasList ) 
     {
-        super( message, duid, aliasList );
+        super(message, duid, aliasList);
+    }
+
+    /**
+     * Indicates if this channel grant is for a TDMA channel
+     */
+    public boolean isTDMAChannel()
+    {
+        if(mIdentifierUpdate != null)
+        {
+            return mIdentifierUpdate.isTDMA();
+        }
+
+        return false;
     }
 
     /**
@@ -28,47 +55,56 @@ public abstract class ChannelGrant extends ServiceMessage
      */
     public int getPriority()
     {
-        return mMessage.getInt( PRIORITY );
+        return mMessage.getInt(PRIORITY);
     }
 
     public int getChannelIdentifier()
     {
-        return mMessage.getInt( CHANNEL_IDENTIFIER );
+        return mMessage.getInt(CHANNEL_IDENTIFIER);
     }
 
     public int getChannelNumber()
     {
-        return mMessage.getInt( CHANNEL_NUMBER );
+        return mMessage.getInt(CHANNEL_NUMBER);
     }
 
     public String getChannel()
     {
-    	return getChannelIdentifier() + "-" + getChannelNumber();
+        return getChannelIdentifier() + "-" + getChannelNumber();
     }
 
-	@Override
+    @Override
-    public void setIdentifierMessage( int identifier, IBandIdentifier message )
+    public void setIdentifierMessage(int identifier, IBandIdentifier message)
     {
-		mIdentifierUpdate = message;
+        mIdentifierUpdate = message;
     }
 
-	@Override
+    @Override
     public int[] getIdentifiers()
     {
-		int[] identifiers = new int[ 1 ];
+        int[] identifiers = new int[1];
-		identifiers[ 0 ] = getChannelIdentifier();
+        identifiers[0] = getChannelIdentifier();
 
-		return identifiers;
+        return identifiers;
     }
 
     public long getDownlinkFrequency()
     {
-    	return calculateDownlink( mIdentifierUpdate, getChannelNumber() );
+        if(mIdentifierUpdate != null)
+        {
+            return mIdentifierUpdate.getDownlinkFrequency(getChannelNumber());
+        }
+
+        return 0;
     }
 
     public long getUplinkFrequency()
     {
-    	return calculateUplink( mIdentifierUpdate, getChannelNumber() );
+        if(mIdentifierUpdate != null)
-    }
+        {
+            return mIdentifierUpdate.getUplinkFrequency(getChannelNumber());
+        }
 
+        return 0;
+    }
 }

src/module/decode/p25/message/tsbk/GroupChannelGrantExplicit.java

@@ -1,120 +1,155 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 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 module.decode.p25.message.tsbk;
 
-import module.decode.p25.message.IBandIdentifier;
-import module.decode.p25.reference.DataUnitID;
 import alias.AliasList;
 import bits.BinaryMessage;
+import module.decode.p25.message.IBandIdentifier;
+import module.decode.p25.reference.DataUnitID;
 
 public abstract class GroupChannelGrantExplicit extends ChannelGrant
 {
-    public static final int[] TRANSMIT_IDENTIFIER = { 96,97,98,99 };
+    public static final int[] TRANSMIT_IDENTIFIER = {96, 97, 98, 99};
-    public static final int[] TRANSMIT_NUMBER = { 100,101,102,103,
+    public static final int[] TRANSMIT_NUMBER = {100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111};
-        104,105,106,107,108,109,110,111 };
+    public static final int[] RECEIVE_IDENTIFIER = {112, 113, 114, 115};
-    public static final int[] RECEIVE_IDENTIFIER = { 112,113,114,115 };
+    public static final int[] RECEIVE_NUMBER = {116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127};
-    public static final int[] RECEIVE_NUMBER = { 116,117,118,119,
+    public static final int[] GROUP_ADDRESS = {128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141,
-        120,121,122,123,124,125,126,127 };
+        142, 143};
-    public static final int[] GROUP_ADDRESS = { 128,129,130,131,132,133,134,135,
-        136,137,138,139,140,141,142,143 };
 
     private IBandIdentifier mTransmitIdentifierUpdate;
     private IBandIdentifier mReceiveIdentifierUpdate;
 
-    public GroupChannelGrantExplicit( BinaryMessage message, 
+    public GroupChannelGrantExplicit(BinaryMessage message, DataUnitID duid, AliasList aliasList)
-                                   DataUnitID duid,
-                                   AliasList aliasList ) 
     {
-        super( message, duid, aliasList );
+        super(message, duid, aliasList);
+    }
+
+    @Override
+    public boolean isTDMAChannel()
+    {
+        if(mTransmitIdentifierUpdate != null)
+        {
+            return mTransmitIdentifierUpdate.isTDMA();
+        }
+
+        return false;
     }
 
     public String getMessage()
     {
         StringBuilder sb = new StringBuilder();
 
-        sb.append( getMessageStub() );
+        sb.append(getMessageStub());
 
-        if( isEmergency() )
+        if(isEmergency())
         {
-            sb.append( " EMERGENCY" );
+            sb.append(" EMERGENCY");
         }
 
-        sb.append( " XMIT:" );
+        sb.append(" XMIT:");
-        sb.append( getTransmitChannelIdentifier() + "/" + getTransmitChannelNumber() );
+        sb.append(getTransmitChannelIdentifier() + "/" + getTransmitChannelNumber());
 
-        sb.append( " RCV:" );
+        sb.append(" RCV:");
-        sb.append( getReceiveChannelIdentifier() + "/" + getReceiveChannelNumber() );
+        sb.append(getReceiveChannelIdentifier() + "/" + getReceiveChannelNumber());
 
-        sb.append( " GRP:" );
+        sb.append(" GRP:");
-        sb.append( getGroupAddress() );
+        sb.append(getGroupAddress());
 
         return sb.toString();
     }
 
     public int getTransmitChannelIdentifier()
     {
-        return mMessage.getInt( TRANSMIT_IDENTIFIER );
+        return mMessage.getInt(TRANSMIT_IDENTIFIER);
     }
 
     public int getTransmitChannelNumber()
     {
-        return mMessage.getInt( TRANSMIT_NUMBER );
+        return mMessage.getInt(TRANSMIT_NUMBER);
     }
 
     public String getTransmitChannel()
     {
-    	return getTransmitChannelIdentifier() + "-" + getTransmitChannelNumber();
+        return getTransmitChannelIdentifier() + "-" + getTransmitChannelNumber();
     }
 
     public int getReceiveChannelIdentifier()
     {
-        return mMessage.getInt( RECEIVE_IDENTIFIER );
+        return mMessage.getInt(RECEIVE_IDENTIFIER);
     }
 
     public int getReceiveChannelNumber()
     {
-        return mMessage.getInt( RECEIVE_NUMBER );
+        return mMessage.getInt(RECEIVE_NUMBER);
     }
 
     public String getReceiveChannel()
     {
-    	return getReceiveChannelIdentifier() + "-" + getReceiveChannelNumber();
+        return getReceiveChannelIdentifier() + "-" + getReceiveChannelNumber();
     }
 
     public String getGroupAddress()
     {
-        return mMessage.getHex( GROUP_ADDRESS, 4 );
+        return mMessage.getHex(GROUP_ADDRESS, 4);
     }
 
-	@Override
+    @Override
-    public void setIdentifierMessage( int identifier, IBandIdentifier message )
+    public void setIdentifierMessage(int identifier, IBandIdentifier message)
     {
-		if( identifier == getTransmitChannelIdentifier() )
+        if(identifier == getTransmitChannelIdentifier())
-		{
+        {
-			mTransmitIdentifierUpdate = message;
+            mTransmitIdentifierUpdate = message;
-		}
+        }
 
-		if( identifier == getReceiveChannelIdentifier() )
+        if(identifier == getReceiveChannelIdentifier())
-		{
+        {
-			mReceiveIdentifierUpdate = message;
+            mReceiveIdentifierUpdate = message;
-		}
+        }
     }
 
-	@Override
+    @Override
     public int[] getIdentifiers()
     {
-		int[] identifiers = new int[ 2 ];
+        int[] identifiers = new int[2];
-		identifiers[ 0 ] = getTransmitChannelIdentifier();
+        identifiers[0] = getTransmitChannelIdentifier();
-		identifiers[ 1 ] = getReceiveChannelIdentifier();
+        identifiers[1] = getReceiveChannelIdentifier();
 
-		return identifiers;
+        return identifiers;
     }
 
     public long getDownlinkFrequency()
     {
-    	return calculateDownlink( mTransmitIdentifierUpdate, getTransmitChannelNumber() );
+        if(mTransmitIdentifierUpdate != null)
+        {
+            return mTransmitIdentifierUpdate.getDownlinkFrequency(getTransmitChannelNumber());
+        }
+
+        return 0;
     }
 
     public long getUplinkFrequency()
     {
-    	return calculateUplink( mReceiveIdentifierUpdate, getReceiveChannelNumber() );
+        if(mReceiveIdentifierUpdate != null)
+        {
+            return mReceiveIdentifierUpdate.getUplinkFrequency(getReceiveChannelNumber());
+        }
+
+        return 0;
     }
 }

src/module/decode/p25/message/tsbk/GroupMultiChannelGrant.java

@@ -1,55 +1,65 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 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 module.decode.p25.message.tsbk;
 
+import alias.AliasList;
+import bits.BinaryMessage;
 import module.decode.p25.message.IBandIdentifier;
 import module.decode.p25.message.IdentifierReceiver;
 import module.decode.p25.reference.DataUnitID;
-import alias.AliasList;
-import bits.BinaryMessage;
 
-public abstract class GroupMultiChannelGrant extends ChannelGrant
+public abstract class GroupMultiChannelGrant extends ChannelGrant implements IdentifierReceiver
-									implements IdentifierReceiver
 {
-    public static final int[] CHANNEL_IDENTIFIER_1 = { 80,81,82,83 };
+    public static final int[] CHANNEL_IDENTIFIER_1 = {80, 81, 82, 83};
-    public static final int[] CHANNEL_NUMBER_1 = { 84,85,86,87,
+    public static final int[] CHANNEL_NUMBER_1 = {84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95};
-        88,89,90,91,92,93,94,95 };
+    public static final int[] GROUP_ADDRESS_1 = {96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111};
-    public static final int[] GROUP_ADDRESS_1 = { 96,97,98,99,100,101,102,103,
+    public static final int[] CHANNEL_IDENTIFIER_2 = {112, 113, 114, 115};
-    	104,105,106,107,108,109,110,111 };
+    public static final int[] CHANNEL_NUMBER_2 = {116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127};
-    
+    public static final int[] GROUP_ADDRESS_2 = {128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143};
-    public static final int[] CHANNEL_IDENTIFIER_2 = { 112,113,114,115 };
-    public static final int[] CHANNEL_NUMBER_2 = { 116,117,118,119,120,121,122,
-    	123,124,125,126,127 };
-    public static final int[] GROUP_ADDRESS_2 = { 128,129,130,131,132,133,134,
-    	135,136,137,138,139,140,141,142,143 };
 
     private IBandIdentifier mIdentifierUpdate1;
     private IBandIdentifier mIdentifierUpdate2;
 
-    public GroupMultiChannelGrant( BinaryMessage message, 
+    public GroupMultiChannelGrant(BinaryMessage message, DataUnitID duid, AliasList aliasList)
-                              DataUnitID duid,
-                              AliasList aliasList ) 
     {
-        super( message, duid, aliasList );
+        super(message, duid, aliasList);
     }
 
     public String getMessage()
     {
         StringBuilder sb = new StringBuilder();
 
-        sb.append( getMessageStub() );
+        sb.append(getMessageStub());
 
-        sb.append( " CHAN1:" );
+        sb.append(" CHAN1:");
-        sb.append( getChannelIdentifier1() + "/" + getChannelNumber1() );
+        sb.append(getChannelIdentifier1() + "/" + getChannelNumber1());
 
-        sb.append( " GRP1:" );
+        sb.append(" GRP1:");
-        sb.append( getGroupAddress1() );
+        sb.append(getGroupAddress1());
 
-        if( hasChannelNumber2() )
+        if(hasChannelNumber2())
         {
-            sb.append( " CHAN2:" );
+            sb.append(" CHAN2:");
-            sb.append( getChannelIdentifier2() + "/" + getChannelNumber2() );
+            sb.append(getChannelIdentifier2() + "/" + getChannelNumber2());
 
-            sb.append( " GRP2:" );
+            sb.append(" GRP2:");
-            sb.append( getGroupAddress2() );
+            sb.append(getGroupAddress2());
         }
 
         return sb.toString();
@@ -57,48 +67,48 @@ public abstract class GroupMultiChannelGrant extends ChannelGrant
 
     public int getChannelIdentifier1()
     {
-        return mMessage.getInt( CHANNEL_IDENTIFIER_1 );
+        return mMessage.getInt(CHANNEL_IDENTIFIER_1);
     }
 
     public int getChannelNumber1()
     {
-        return mMessage.getInt( CHANNEL_NUMBER_1 );
+        return mMessage.getInt(CHANNEL_NUMBER_1);
     }
 
     public String getChannel1()
     {
-    	return getChannelIdentifier1() + "-" + getChannelNumber1();
+        return getChannelIdentifier1() + "-" + getChannelNumber1();
     }
 
     public String getGroupAddress1()
     {
-        return mMessage.getHex( GROUP_ADDRESS_1, 4 );
+        return mMessage.getHex(GROUP_ADDRESS_1, 4);
     }
 
     public int getChannelIdentifier2()
     {
-        return mMessage.getInt( CHANNEL_IDENTIFIER_2 );
+        return mMessage.getInt(CHANNEL_IDENTIFIER_2);
     }
 
     public int getChannelNumber2()
     {
-        return mMessage.getInt( CHANNEL_NUMBER_2 );
+        return mMessage.getInt(CHANNEL_NUMBER_2);
     }
 
     public String getChannel2()
     {
-    	return getChannelIdentifier2() + "-" + getChannelNumber2();
+        return getChannelIdentifier2() + "-" + getChannelNumber2();
     }
 
     public String getGroupAddress2()
     {
-        return mMessage.getHex( GROUP_ADDRESS_2, 4 );
+        return mMessage.getHex(GROUP_ADDRESS_2, 4);
     }
 
     public boolean hasChannelNumber2()
     {
-    	return mMessage.getInt( CHANNEL_NUMBER_2 ) != 
+        return mMessage.getInt(CHANNEL_NUMBER_2) !=
-    		   mMessage.getInt( CHANNEL_NUMBER_1 );
+            mMessage.getInt(CHANNEL_NUMBER_1);
     }
 
     @Override
@@ -113,58 +123,98 @@ public abstract class GroupMultiChannelGrant extends ChannelGrant
         return getGroupAddress2();
     }
 
-	@Override
+    @Override
-    public void setIdentifierMessage( int identifier, IBandIdentifier message )
+    public void setIdentifierMessage(int identifier, IBandIdentifier message)
     {
-		if( identifier == getChannelIdentifier1() )
+        if(identifier == getChannelIdentifier1())
-		{
+        {
-			mIdentifierUpdate1 = message;
+            mIdentifierUpdate1 = message;
-		}
+        }
 
-		if( hasChannelNumber2() && identifier == getChannelIdentifier2() )
+        if(hasChannelNumber2() && identifier == getChannelIdentifier2())
-		{
+        {
-			mIdentifierUpdate2 = message;
+            mIdentifierUpdate2 = message;
-		}
+        }
     }
 
-	@Override
+    @Override
     public int[] getIdentifiers()
     {
-		int[] identifiers;
+        int[] identifiers;
 
-		if( hasChannelNumber2() )
+        if(hasChannelNumber2())
-		{
+        {
-			identifiers = new int[ 2 ];
+            identifiers = new int[2];
-			identifiers[ 0 ] = getChannelIdentifier1();
+            identifiers[0] = getChannelIdentifier1();
-			identifiers[ 1 ] = getChannelIdentifier2();
+            identifiers[1] = getChannelIdentifier2();
-		}
+        }
-		else
+        else
-		{
+        {
-			identifiers = new int[ 1 ];
+            identifiers = new int[1];
-			identifiers[ 0 ] = getChannelIdentifier1();
+            identifiers[0] = getChannelIdentifier1();
-		}
+        }
 
-		return identifiers;
+        return identifiers;
     }
 
     public long getDownlinkFrequency1()
     {
-    	return calculateDownlink( mIdentifierUpdate1, getChannelNumber1() );
+        if(mIdentifierUpdate1 != null)
+        {
+            return mIdentifierUpdate1.getDownlinkFrequency(getChannelNumber1());
+        }
+
+        return 0;
+    }
+
+    public boolean isTDMAChannel1()
+    {
+        if(mIdentifierUpdate1 != null)
+        {
+            return mIdentifierUpdate1.isTDMA();
+        }
+
+        return false;
     }
 
     public long getUplinkFrequency1()
     {
-    	return calculateUplink( mIdentifierUpdate1, getChannelNumber1() );
+        if(mIdentifierUpdate1 != null)
+        {
+            return mIdentifierUpdate1.getUplinkFrequency(getChannelNumber1());
+        }
+
+        return 0;
     }
 
     public long getDownlinkFrequency2()
     {
-    	return calculateDownlink( mIdentifierUpdate2, getChannelNumber2() );
+        if(mIdentifierUpdate2 != null)
+        {
+            return mIdentifierUpdate2.getDownlinkFrequency(getChannelNumber2());
+        }
+
+        return 0;
+    }
+
+    public boolean isTDMAChannel2()
+    {
+        if(mIdentifierUpdate2 != null)
+        {
+            return mIdentifierUpdate2.isTDMA();
+        }
+
+        return false;
     }
 
     public long getUplinkFrequency2()
     {
-    	return calculateUplink( mIdentifierUpdate2, getChannelNumber2() );
+        if(mIdentifierUpdate2 != null)
+        {
+            return mIdentifierUpdate2.getUplinkFrequency(getChannelNumber2());
+        }
+
+        return 0;
     }
 
 }

src/module/decode/p25/message/tsbk/UnitChannelGrant.java

@@ -1,53 +1,68 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 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 module.decode.p25.message.tsbk;
 
-import module.decode.p25.reference.DataUnitID;
 import alias.Alias;
 import alias.AliasList;
 import bits.BinaryMessage;
+import module.decode.p25.reference.DataUnitID;
 
 public abstract class UnitChannelGrant extends ChannelGrant
 {
-    public static final int[] TARGET_ADDRESS = { 96,97,98,99,100,101,102,103,
+    public static final int[] TARGET_ADDRESS = {96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110,
-        104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119 };
+        111, 112, 113, 114, 115, 116, 117, 118, 119};
+    public static final int[] SOURCE_ADDRESS = {120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133,
+        134, 135, 136, 137, 138, 139, 140, 141, 142, 143};
 
-    public static final int[] SOURCE_ADDRESS = { 120,121,122,123,124,125,126,
+    public UnitChannelGrant(BinaryMessage message, DataUnitID duid, AliasList aliasList)
-        127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 };
-    
-    public UnitChannelGrant( BinaryMessage message, 
-                                   DataUnitID duid,
-                                   AliasList aliasList ) 
     {
-        super( message, duid, aliasList );
+        super(message, duid, aliasList);
     }
 
     public String getMessage()
     {
         StringBuilder sb = new StringBuilder();
 
-        sb.append( getMessageStub() );
+        sb.append(getMessageStub());
 
-        if( isEmergency() )
+        if(isEmergency())
         {
-            sb.append( " EMERGENCY" );
+            sb.append(" EMERGENCY");
         }
 
-        sb.append( " FROM:" );
+        sb.append(" FROM:");
-        sb.append( getSourceAddress() );
+        sb.append(getSourceAddress());
 
-        sb.append( " TO:" );
+        sb.append(" TO:");
-        sb.append( getTargetAddress() );
+        sb.append(getTargetAddress());
 
         return sb.toString();
     }
 
     public String getTargetAddress()
     {
-        return mMessage.getHex( TARGET_ADDRESS, 6 );
+        return mMessage.getHex(TARGET_ADDRESS, 6);
     }
 
     public String getSourceAddress()
     {
-        return mMessage.getHex( SOURCE_ADDRESS, 6 );
+        return mMessage.getHex(SOURCE_ADDRESS, 6);
     }
 
     @Override
@@ -59,9 +74,9 @@ public abstract class UnitChannelGrant extends ChannelGrant
     @Override
     public Alias getFromIDAlias()
     {
-        if( mAliasList != null )
+        if(mAliasList != null)
         {
-            return mAliasList.getTalkgroupAlias( getFromID() );
+            return mAliasList.getTalkgroupAlias(getFromID());
         }
 
         return null;

src/module/decode/p25/message/tsbk/motorola/ControlChannelBaseStationIdentification.java

@@ -1,34 +1,48 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 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 module.decode.p25.message.tsbk.motorola;
 
+import alias.AliasList;
+import bits.BinaryMessage;
 import module.decode.p25.message.IBandIdentifier;
 import module.decode.p25.message.IdentifierReceiver;
 import module.decode.p25.reference.DataUnitID;
-import alias.AliasList;
-import bits.BinaryMessage;
 
-public class ControlChannelBaseStationIdentification extends MotorolaTSBKMessage 
+public class ControlChannelBaseStationIdentification extends MotorolaTSBKMessage implements IdentifierReceiver
-						implements IdentifierReceiver
 {
-    public static final int[] CHARACTER_1 = { 80,81,82,83,84,85 };
+    public static final int[] CHARACTER_1 = {80, 81, 82, 83, 84, 85};
-    public static final int[] CHARACTER_2 = { 86,87,88,89,90,91 };
+    public static final int[] CHARACTER_2 = {86, 87, 88, 89, 90, 91};
-    public static final int[] CHARACTER_3 = { 92,93,94,95,96,97 };
+    public static final int[] CHARACTER_3 = {92, 93, 94, 95, 96, 97};
-    public static final int[] CHARACTER_4 = { 98,99,100,101,102,103 };
+    public static final int[] CHARACTER_4 = {98, 99, 100, 101, 102, 103};
-    public static final int[] CHARACTER_5 = { 104,105,106,107,108,109 };
+    public static final int[] CHARACTER_5 = {104, 105, 106, 107, 108, 109};
-    public static final int[] CHARACTER_6 = { 110,111,112,113,114,115 };
+    public static final int[] CHARACTER_6 = {110, 111, 112, 113, 114, 115};
-    public static final int[] CHARACTER_7 = { 116,117,118,119,120,121 };
+    public static final int[] CHARACTER_7 = {116, 117, 118, 119, 120, 121};
-    public static final int[] CHARACTER_8 = { 122,123,124,125,126,127 };
+    public static final int[] CHARACTER_8 = {122, 123, 124, 125, 126, 127};
 
-    public static final int[] IDENTIFIER = { 128,129,130,131 };
+    public static final int[] IDENTIFIER = {128, 129, 130, 131};
-    public static final int[] CHANNEL = { 132,133,134,135,136,137,138,139,140,
+    public static final int[] CHANNEL = {132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143};
-    	141,142,143 };
 
     private IBandIdentifier mIdentifierUpdate;
 
-    public ControlChannelBaseStationIdentification( BinaryMessage message, 
+    public ControlChannelBaseStationIdentification(BinaryMessage message, DataUnitID duid, AliasList aliasList)
-                                DataUnitID duid,
-                                AliasList aliasList ) 
     {
-    	super( message, duid, aliasList );
+        super(message, duid, aliasList);
     }
 
     @Override
@@ -41,15 +55,15 @@ public class ControlChannelBaseStationIdentification extends MotorolaTSBKMessage
     {
         StringBuilder sb = new StringBuilder();
 
-        sb.append( getMessageStub() );
+        sb.append(getMessageStub());
 
-        sb.append( " CHAN:" + getIdentifier() + "-" + getChannel() );
+        sb.append(" CHAN:" + getIdentifier() + "-" + getChannel());
 
-        sb.append( " CWID:" + getCWID() );
+        sb.append(" CWID:" + getCWID());
 
-        sb.append( " DN:" + getDownlinkFrequency() );
+        sb.append(" DN:" + getDownlinkFrequency());
 
-        sb.append( " UP:" + getUplinkFrequency() );
+        sb.append(" UP:" + getUplinkFrequency());
 
         return sb.toString();
     }
@@ -57,65 +71,75 @@ public class ControlChannelBaseStationIdentification extends MotorolaTSBKMessage
 
     public String getCWID()
     {
-    	StringBuilder sb = new StringBuilder();
+        StringBuilder sb = new StringBuilder();
 
-    	sb.append( getCharacter( CHARACTER_1 ) );
+        sb.append(getCharacter(CHARACTER_1));
-    	sb.append( getCharacter( CHARACTER_2 ) );
+        sb.append(getCharacter(CHARACTER_2));
-    	sb.append( getCharacter( CHARACTER_3 ) );
+        sb.append(getCharacter(CHARACTER_3));
-    	sb.append( getCharacter( CHARACTER_4 ) );
+        sb.append(getCharacter(CHARACTER_4));
-    	sb.append( getCharacter( CHARACTER_5 ) );
+        sb.append(getCharacter(CHARACTER_5));
-    	sb.append( getCharacter( CHARACTER_6 ) );
+        sb.append(getCharacter(CHARACTER_6));
-    	sb.append( getCharacter( CHARACTER_7 ) );
+        sb.append(getCharacter(CHARACTER_7));
-    	sb.append( getCharacter( CHARACTER_8 ) );
+        sb.append(getCharacter(CHARACTER_8));
 
-		return sb.toString();
+        return sb.toString();
     }
 
-    private String getCharacter( int[] field )
+    private String getCharacter(int[] field)
     {
-    	int value = mMessage.getInt( field );
+        int value = mMessage.getInt(field);
 
-    	if( value != 0 )
+        if(value != 0)
-    	{
+        {
-    		return String.valueOf( (char)( value + 43 ) );
+            return String.valueOf((char)(value + 43));
-    	}
+        }
 
-    	return null;
+        return null;
     }
 
     public int getIdentifier()
     {
-    	return mMessage.getInt( IDENTIFIER );
+        return mMessage.getInt(IDENTIFIER);
     }
 
     public int getChannel()
     {
-    	return mMessage.getInt( CHANNEL );
+        return mMessage.getInt(CHANNEL);
     }
 
     public long getUplinkFrequency()
     {
-    	return calculateUplink( mIdentifierUpdate, getChannel() );
+        if(mIdentifierUpdate != null)
+        {
+            mIdentifierUpdate.getUplinkFrequency(getChannel());
+        }
+
+        return 0;
     }
 
     public long getDownlinkFrequency()
     {
-    	return calculateDownlink( mIdentifierUpdate, getChannel() );
+        if(mIdentifierUpdate != null)
+        {
+            mIdentifierUpdate.getDownlinkFrequency(getChannel());
+        }
+
+        return 0;
     }
 
-	@Override
+    @Override
-    public void setIdentifierMessage( int identifier, IBandIdentifier message )
+    public void setIdentifierMessage(int identifier, IBandIdentifier message)
     {
-		mIdentifierUpdate = message;
+        mIdentifierUpdate = message;
     }
 
-	@Override
+    @Override
     public int[] getIdentifiers()
     {
-		int[] identifiers = new int[ 1 ];
+        int[] identifiers = new int[1];
 
-		identifiers[ 0 ] = getIdentifier();
+        identifiers[0] = getIdentifier();
 
-	    return identifiers;
+        return identifiers;
     }
 }

src/module/decode/p25/message/tsbk/motorola/PatchGroupVoiceChannelGrant.java

@@ -1,13 +1,30 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 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 module.decode.p25.message.tsbk.motorola;
 
+import alias.AliasList;
+import bits.BinaryMessage;
 import module.decode.p25.message.IBandIdentifier;
 import module.decode.p25.message.IdentifierReceiver;
 import module.decode.p25.reference.DataUnitID;
-import alias.AliasList;
-import bits.BinaryMessage;
 
-public class PatchGroupVoiceChannelGrant extends MotorolaTSBKMessage
+public class PatchGroupVoiceChannelGrant extends MotorolaTSBKMessage implements IdentifierReceiver
-												  implements IdentifierReceiver
 {
     /* Service Options */
     public static final int EMERGENCY_FLAG = 80;
@@ -15,89 +32,98 @@ public class PatchGroupVoiceChannelGrant extends MotorolaTSBKMessage
     public static final int DUPLEX_MODE = 82;
     public static final int SESSION_MODE = 83;
 
-    public static final int[] PRIORITY = { 85,86,87 };
+    public static final int[] PRIORITY = {85, 86, 87};
-	public static final int[] IDENTIFIER = { 88,89,90,91 };
+    public static final int[] IDENTIFIER = {88, 89, 90, 91};
-	public static final int[] CHANNEL = { 92,93,94,95,96,97,98,99,100,101,102,103 };
+    public static final int[] CHANNEL = {92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103};
-	public static final int[] PATCH_GROUP_ADDRESS = { 104,105,106,107,108,109,
+    public static final int[] PATCH_GROUP_ADDRESS = {104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
-		110,111,112,113,114,115,116,117,118,119 };
+        117, 118, 119};
-	public static final int[] SOURCE_ADDRESS = { 120,121,122,123,124,125,126,
+    public static final int[] SOURCE_ADDRESS = {120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133,
-		127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 };
+        134, 135, 136, 137, 138, 139, 140, 141, 142, 143};
 
     private IBandIdentifier mIdentifierUpdate;
 
-    public PatchGroupVoiceChannelGrant( BinaryMessage message, DataUnitID duid,
+    public PatchGroupVoiceChannelGrant(BinaryMessage message, DataUnitID duid, AliasList aliasList)
-            AliasList aliasList )
     {
-	    super( message, duid, aliasList );
+        super(message, duid, aliasList);
     }
 
-	@Override
+    public boolean isTDMAChannel()
+    {
+        if(mIdentifierUpdate != null)
+        {
+            return mIdentifierUpdate.isTDMA();
+        }
+
+        return false;
+    }
+
+    @Override
     public String getEventType()
     {
-	    return MotorolaOpcode.PATCH_GROUP_CHANNEL_GRANT.getLabel();
+        return MotorolaOpcode.PATCH_GROUP_CHANNEL_GRANT.getLabel();
     }
 
-	@Override
+    @Override
     public String getMessage()
     {
-		StringBuilder sb = new StringBuilder();
+        StringBuilder sb = new StringBuilder();
 
-		sb.append( getMessageStub() );
+        sb.append(getMessageStub());
 
-		if( isEmergency() )
+        if(isEmergency())
-		{
+        {
-			sb.append( " EMERGENCY" );
+            sb.append(" EMERGENCY");
-		}
+        }
 
-		sb.append( " PATCH GROUP:" );
+        sb.append(" PATCH GROUP:");
-		sb.append( getPatchGroupAddress() );
+        sb.append(getPatchGroupAddress());
-		sb.append( " FROM:" );
+        sb.append(" FROM:");
-		sb.append( getSourceAddress() );
+        sb.append(getSourceAddress());
-		sb.append( " PRI:" );
+        sb.append(" PRI:");
-		sb.append( getPriority() );
+        sb.append(getPriority());
 
-		sb.append( " CHAN:" );
+        sb.append(" CHAN:");
-        sb.append( getChannelIdentifier() + "-" + getChannelNumber() );
+        sb.append(getChannelIdentifier() + "-" + getChannelNumber());
 
-        sb.append( " DN:" + getDownlinkFrequency() );
+        sb.append(" DN:" + getDownlinkFrequency());
 
-        sb.append( " UP:" + getUplinkFrequency() );
+        sb.append(" UP:" + getUplinkFrequency());
 
-        sb.append( " SESSION MODE:");
+        sb.append(" SESSION MODE:");
-        sb.append( getSessionMode().name() );
+        sb.append(getSessionMode().name());
 
-	    return sb.toString();
+        return sb.toString();
     }
 
     public String getPatchGroupAddress()
     {
-        return mMessage.getHex( PATCH_GROUP_ADDRESS, 4 );
+        return mMessage.getHex(PATCH_GROUP_ADDRESS, 4);
     }
 
     public String getSourceAddress()
     {
-        return mMessage.getHex( SOURCE_ADDRESS, 6 );
+        return mMessage.getHex(SOURCE_ADDRESS, 6);
     }
 
     public boolean isEmergency()
     {
-        return mMessage.get( EMERGENCY_FLAG );
+        return mMessage.get(EMERGENCY_FLAG);
     }
 
     public boolean isEncryptedChannel()
     {
-        return mMessage.get( ENCRYPTED_CHANNEL_FLAG );
+        return mMessage.get(ENCRYPTED_CHANNEL_FLAG);
     }
 
     public DuplexMode getDuplexMode()
     {
-        return mMessage.get( DUPLEX_MODE ) ? DuplexMode.FULL : DuplexMode.HALF;
+        return mMessage.get(DUPLEX_MODE) ? DuplexMode.FULL : DuplexMode.HALF;
     }
 
     public SessionMode getSessionMode()
     {
-        return mMessage.get( SESSION_MODE ) ? 
+        return mMessage.get(SESSION_MODE) ?
-                SessionMode.CIRCUIT : SessionMode.PACKET;
+            SessionMode.CIRCUIT : SessionMode.PACKET;
     }
 
     /**
@@ -105,47 +131,57 @@ public class PatchGroupVoiceChannelGrant extends MotorolaTSBKMessage
      */
     public int getPriority()
     {
-        return mMessage.getInt( PRIORITY );
+        return mMessage.getInt(PRIORITY);
     }
 
     public int getChannelIdentifier()
     {
-        return mMessage.getInt( IDENTIFIER );
+        return mMessage.getInt(IDENTIFIER);
     }
 
     public int getChannelNumber()
     {
-        return mMessage.getInt( CHANNEL );
+        return mMessage.getInt(CHANNEL);
     }
 
     public String getChannel()
     {
-    	return getChannelIdentifier() + "-" + getChannelNumber();
+        return getChannelIdentifier() + "-" + getChannelNumber();
     }
 
-	@Override
+    @Override
-    public void setIdentifierMessage( int identifier, IBandIdentifier message )
+    public void setIdentifierMessage(int identifier, IBandIdentifier message)
     {
-		mIdentifierUpdate = message;
+        mIdentifierUpdate = message;
     }
 
-	@Override
+    @Override
     public int[] getIdentifiers()
     {
-		int[] identifiers = new int[ 1 ];
+        int[] identifiers = new int[1];
-		identifiers[ 0 ] = getChannelIdentifier();
+        identifiers[0] = getChannelIdentifier();
 
-		return identifiers;
+        return identifiers;
     }
 
     public long getDownlinkFrequency()
     {
-    	return calculateDownlink( mIdentifierUpdate, getChannelNumber() );
+        if(mIdentifierUpdate != null)
+        {
+            return mIdentifierUpdate.getDownlinkFrequency(getChannelNumber());
+        }
+
+        return 0;
     }
 
     public long getUplinkFrequency()
     {
-    	return calculateUplink( mIdentifierUpdate, getChannelNumber() );
+        if(mIdentifierUpdate != null)
+        {
+            return mIdentifierUpdate.getUplinkFrequency(getChannelNumber());
+        }
+
+        return 0;
     }
 
 }

src/module/decode/p25/message/tsbk/motorola/PatchGroupVoiceChannelGrantUpdate.java

@@ -1,146 +1,197 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 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 module.decode.p25.message.tsbk.motorola;
 
+import alias.AliasList;
+import bits.BinaryMessage;
 import module.decode.p25.message.IBandIdentifier;
 import module.decode.p25.message.IdentifierReceiver;
 import module.decode.p25.reference.DataUnitID;
-import alias.AliasList;
-import bits.BinaryMessage;
 
-public class PatchGroupVoiceChannelGrantUpdate extends MotorolaTSBKMessage
+public class PatchGroupVoiceChannelGrantUpdate extends MotorolaTSBKMessage implements IdentifierReceiver
-												  implements IdentifierReceiver
 {
-	public static final int[] IDENTIFIER_1 = { 80,81,82,83 };
+    public static final int[] IDENTIFIER_1 = {80, 81, 82, 83};
-	public static final int[] CHANNEL_1 = { 84,85,86,87,88,89,90,91,92,93,94,
+    public static final int[] CHANNEL_1 = {84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95};
-		95 };
+    public static final int[] PATCH_GROUP_ADDRESS_1 = {96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111};
-	public static final int[] PATCH_GROUP_ADDRESS_1 = { 96,97,98,99,100,101,102,
+    public static final int[] IDENTIFIER_2 = {112, 113, 114, 115};
-		103,104,105,106,107,108,109,110,111 };
+    public static final int[] CHANNEL_2 = {116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127};
-	public static final int[] IDENTIFIER_2 = { 112,113,114,115 };
+    public static final int[] PATCH_GROUP_ADDRESS_2 = {128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143};
-	public static final int[] CHANNEL_2 = { 116,117,118,119,120,121,122,123,
-		124,125,126,127 };
-	public static final int[] PATCH_GROUP_ADDRESS_2 = { 128,129,130,131,132,133,
-		134,135,136,137,138,139,140,141,142,143 };
 
     private IBandIdentifier mIdentifierUpdate1;
     private IBandIdentifier mIdentifierUpdate2;
 
-    public PatchGroupVoiceChannelGrantUpdate( BinaryMessage message, 
+    public PatchGroupVoiceChannelGrantUpdate(BinaryMessage message, DataUnitID duid, AliasList aliasList)
-    		DataUnitID duid, AliasList aliasList )
     {
-	    super( message, duid, aliasList );
+        super(message, duid, aliasList);
     }
 
-	@Override
+    @Override
     public String getEventType()
     {
-	    return MotorolaOpcode.PATCH_GROUP_CHANNEL_GRANT_UPDATE.getLabel();
+        return MotorolaOpcode.PATCH_GROUP_CHANNEL_GRANT_UPDATE.getLabel();
     }
 
-	@Override
+    @Override
     public String getMessage()
     {
-		StringBuilder sb = new StringBuilder();
+        StringBuilder sb = new StringBuilder();
 
-		sb.append( getMessageStub() );
+        sb.append(getMessageStub());
 
 
-		sb.append( " PATCH GRP1:" );
+        sb.append(" PATCH GRP1:");
-		sb.append( getPatchGroupAddress1() );
+        sb.append(getPatchGroupAddress1());
-		sb.append( " GRP2:" );
+        sb.append(" GRP2:");
-		sb.append( getPatchGroupAddress2() );
+        sb.append(getPatchGroupAddress2());
 
-		sb.append( " CHAN 1:" );
+        sb.append(" CHAN 1:");
-        sb.append( getChannel1() );
+        sb.append(getChannel1());
-        sb.append( " DN:" + getDownlinkFrequency1() );
+        sb.append(" DN:" + getDownlinkFrequency1());
 
-		sb.append( " CHAN 2:" );
+        sb.append(" CHAN 2:");
-        sb.append( getChannel2() );
+        sb.append(getChannel2());
-        sb.append( " DN:" + getDownlinkFrequency2() );
+        sb.append(" DN:" + getDownlinkFrequency2());
 
-	    return sb.toString();
+        return sb.toString();
     }
 
     public String getPatchGroupAddress1()
     {
-        return mMessage.getHex( PATCH_GROUP_ADDRESS_1, 4 );
+        return mMessage.getHex(PATCH_GROUP_ADDRESS_1, 4);
     }
 
     public String getPatchGroupAddress2()
     {
-        return mMessage.getHex( PATCH_GROUP_ADDRESS_2, 4 );
+        return mMessage.getHex(PATCH_GROUP_ADDRESS_2, 4);
     }
 
     public int getChannelIdentifier1()
     {
-        return mMessage.getInt( IDENTIFIER_1 );
+        return mMessage.getInt(IDENTIFIER_1);
     }
 
     public int getChannelNumber1()
     {
-        return mMessage.getInt( CHANNEL_1 );
+        return mMessage.getInt(CHANNEL_1);
     }
 
     public String getChannel1()
     {
-    	return getChannelIdentifier1() + "-" + getChannelNumber1();
+        return getChannelIdentifier1() + "-" + getChannelNumber1();
     }
 
     public int getChannelIdentifier2()
     {
-        return mMessage.getInt( IDENTIFIER_2 );
+        return mMessage.getInt(IDENTIFIER_2);
     }
 
     public int getChannelNumber2()
     {
-        return mMessage.getInt( CHANNEL_2 );
+        return mMessage.getInt(CHANNEL_2);
     }
 
     public String getChannel2()
     {
-    	return getChannelIdentifier2() + "-" + getChannelNumber2();
+        return getChannelIdentifier2() + "-" + getChannelNumber2();
     }
 
-	@Override
+    @Override
-    public void setIdentifierMessage( int identifier, IBandIdentifier message )
+    public void setIdentifierMessage(int identifier, IBandIdentifier message)
     {
-		if( identifier == getChannelIdentifier1() )
+        if(identifier == getChannelIdentifier1())
-		{
+        {
-			mIdentifierUpdate1 = message;
+            mIdentifierUpdate1 = message;
-		}
+        }
 
-		if( identifier == getChannelIdentifier2() )
+        if(identifier == getChannelIdentifier2())
-		{
+        {
-			mIdentifierUpdate2 = message;
+            mIdentifierUpdate2 = message;
-		}
+        }
     }
 
-	@Override
+    @Override
     public int[] getIdentifiers()
     {
-		int[] identifiers = new int[ 2 ];
+        int[] identifiers = new int[2];
-		identifiers[ 0 ] = getChannelIdentifier1();
+        identifiers[0] = getChannelIdentifier1();
-		identifiers[ 1 ] = getChannelIdentifier2();
+        identifiers[1] = getChannelIdentifier2();
 
-		return identifiers;
+        return identifiers;
     }
 
     public long getDownlinkFrequency1()
     {
-    	return calculateDownlink( mIdentifierUpdate1, getChannelNumber1() );
+        if(mIdentifierUpdate1 != null)
+        {
+            return mIdentifierUpdate1.getDownlinkFrequency(getChannelNumber1());
+        }
+
+        return 0;
+    }
+
+    public boolean isTDMAChannel1()
+    {
+        if(mIdentifierUpdate1 != null)
+        {
+            return mIdentifierUpdate1.isTDMA();
+        }
+
+        return false;
     }
 
     public long getUplinkFrequency1()
     {
-    	return calculateUplink( mIdentifierUpdate1, getChannelNumber1() );
+        if(mIdentifierUpdate1 != null)
+        {
+            return mIdentifierUpdate1.getUplinkFrequency(getChannelNumber1());
+        }
+
+        return 0;
     }
 
     public long getDownlinkFrequency2()
     {
-    	return calculateDownlink( mIdentifierUpdate2, getChannelNumber2() );
+        if(mIdentifierUpdate2 != null)
+        {
+            return mIdentifierUpdate2.getDownlinkFrequency(getChannelNumber2());
+        }
+
+        return 0;
+    }
+
+    public boolean isTDMAChannel2()
+    {
+        if(mIdentifierUpdate2 != null)
+        {
+            return mIdentifierUpdate2.isTDMA();
+        }
+
+        return false;
     }
 
     public long getUplinkFrequency2()
     {
-    	return calculateUplink( mIdentifierUpdate2, getChannelNumber2() );
+        if(mIdentifierUpdate2 != null)
-    }
+        {
+            return mIdentifierUpdate2.getUplinkFrequency(getChannelNumber2());
+        }
 
+        return 0;
+    }
 }

src/module/decode/p25/message/tsbk/osp/control/AdjacentStatusBroadcast.java

@@ -1,40 +1,51 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 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 module.decode.p25.message.tsbk.osp.control;
 
+import alias.AliasList;
+import bits.BinaryMessage;
 import module.decode.p25.message.IAdjacentSite;
 import module.decode.p25.message.IBandIdentifier;
 import module.decode.p25.message.IdentifierReceiver;
 import module.decode.p25.message.tsbk.TSBKMessage;
 import module.decode.p25.reference.DataUnitID;
 import module.decode.p25.reference.Opcode;
-import alias.AliasList;
-import bits.BinaryMessage;
 
-public class AdjacentStatusBroadcast extends TSBKMessage 
+public class AdjacentStatusBroadcast extends TSBKMessage implements IdentifierReceiver, IAdjacentSite
-		implements IdentifierReceiver, IAdjacentSite
 {
-    public static final int[] LOCATION_REGISTRATION_AREA = { 80,81,82,83,84,85,
+    public static final int[] LOCATION_REGISTRATION_AREA = {80, 81, 82, 83, 84, 85, 86, 87};
-        86,87 };
     public static final int CONVENTIONAL_CHANNEL_FLAG = 88;
     public static final int SITE_FAILURE_CONDITION_FLAG = 89;
     public static final int VALID_FLAG = 90;
     public static final int ACTIVE_NETWORK_CONNECTION_FLAG = 91;
-    public static final int[] SYSTEM_ID = { 92,93,94,95,96,97,98,99,100,101,
+    public static final int[] SYSTEM_ID = {92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103};
-        102,103 };
+    public static final int[] RFSS_ID = {104, 105, 106, 107, 108, 109, 110, 111};
-    public static final int[] RFSS_ID = { 104,105,106,107,108,109,110,111 };
+    public static final int[] SITE_ID = {112, 113, 114, 115, 116, 117, 118, 119};
-    public static final int[] SITE_ID = { 112,113,114,115,116,117,118,119 };
+    public static final int[] IDENTIFIER = {120, 121, 122, 123};
-    public static final int[] IDENTIFIER = { 120,121,122,123 };
+    public static final int[] CHANNEL = {124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135};
-    public static final int[] CHANNEL = { 124,125,126,127,128,129,130,131,132,
+    public static final int[] SYSTEM_SERVICE_CLASS = {136, 137, 138, 139, 140, 141, 142, 143};
-    	133,134,135 };
-    public static final int[] SYSTEM_SERVICE_CLASS = { 136,137,138,139,140,141,
-        142,143 };
 
     private IBandIdentifier mIdentifierUpdate;
 
-    public AdjacentStatusBroadcast( BinaryMessage message, 
+    public AdjacentStatusBroadcast(BinaryMessage message, DataUnitID duid, AliasList aliasList)
-    								DataUnitID duid,
-    								AliasList aliasList ) 
     {
-        super( message, duid, aliasList );
+        super(message, duid, aliasList);
     }
 
     @Override
@@ -47,149 +58,159 @@ public class AdjacentStatusBroadcast extends TSBKMessage
     {
         StringBuilder sb = new StringBuilder();
 
-        sb.append( getMessageStub() );
+        sb.append(getMessageStub());
 
-        sb.append( " LRA:" + getLRA() );
+        sb.append(" LRA:" + getLRA());
 
-        sb.append( " SYS:" + getSystemID() );
+        sb.append(" SYS:" + getSystemID());
 
-        sb.append( " SITE:" + getRFSS() + "-" + getSiteID() );
+        sb.append(" SITE:" + getRFSS() + "-" + getSiteID());
 
-        sb.append( " CHAN:" + getIdentifier() + "-" + getChannel() );
+        sb.append(" CHAN:" + getIdentifier() + "-" + getChannel());
 
-        sb.append( " DN:" + getDownlinkFrequency() );
+        sb.append(" DN:" + getDownlinkFrequency());
 
-        sb.append( " UP:" + getUplinkFrequency() );
+        sb.append(" UP:" + getUplinkFrequency());
 
-        if( isConventionalChannel() )
+        if(isConventionalChannel())
         {
-            sb.append( " CONVENTIONAL" );
+            sb.append(" CONVENTIONAL");
         }
 
-        if( isSiteFailureCondition() )
+        if(isSiteFailureCondition())
         {
-            sb.append( " FAILURE-CONDITION" );
+            sb.append(" FAILURE-CONDITION");
         }
 
-        if( isValidSiteInformation() )
+        if(isValidSiteInformation())
         {
-            sb.append( " VALID-INFO" );
+            sb.append(" VALID-INFO");
         }
 
-        if( hasActiveNetworkConnection() )
+        if(hasActiveNetworkConnection())
         {
-            sb.append( " ACTIVE-NETWORK-CONN" );
+            sb.append(" ACTIVE-NETWORK-CONN");
         }
 
-        sb.append( getSystemServiceClass() );
+        sb.append(getSystemServiceClass());
 
         return sb.toString();
     }
 
     @Override
-	public String getDownlinkChannel()
+    public String getDownlinkChannel()
-	{
-    	return getIdentifier() + "-" + getChannel();
-	}
-
-	@Override
-	public String getUplinkChannel()
-	{
-    	return getIdentifier() + "-" + getChannel();
-	}
-
-	public String getLRA()
     {
-        return mMessage.getHex( LOCATION_REGISTRATION_AREA, 2 );
+        return getIdentifier() + "-" + getChannel();
+    }
+
+    @Override
+    public String getUplinkChannel()
+    {
+        return getIdentifier() + "-" + getChannel();
+    }
+
+    public String getLRA()
+    {
+        return mMessage.getHex(LOCATION_REGISTRATION_AREA, 2);
     }
 
     public boolean isConventionalChannel()
     {
-        return mMessage.get( CONVENTIONAL_CHANNEL_FLAG );
+        return mMessage.get(CONVENTIONAL_CHANNEL_FLAG);
     }
 
     public boolean isSiteFailureCondition()
     {
-        return mMessage.get( SITE_FAILURE_CONDITION_FLAG );
+        return mMessage.get(SITE_FAILURE_CONDITION_FLAG);
     }
 
     public boolean isValidSiteInformation()
     {
-        return mMessage.get( VALID_FLAG );
+        return mMessage.get(VALID_FLAG);
     }
 
     public boolean hasActiveNetworkConnection()
     {
-        return mMessage.get( ACTIVE_NETWORK_CONNECTION_FLAG );
+        return mMessage.get(ACTIVE_NETWORK_CONNECTION_FLAG);
     }
 
     public String getUniqueID()
     {
-    	StringBuilder sb = new StringBuilder();
+        StringBuilder sb = new StringBuilder();
 
-    	sb.append( getSystemID() );
+        sb.append(getSystemID());
-    	sb.append( ":" );
+        sb.append(":");
-    	sb.append( getRFSS() );
+        sb.append(getRFSS());
-    	sb.append( ":" );
+        sb.append(":");
-    	sb.append( getSiteID() );
+        sb.append(getSiteID());
 
-    	return sb.toString();
+        return sb.toString();
     }
 
     public String getSystemID()
     {
-        return mMessage.getHex( SYSTEM_ID, 3 );
+        return mMessage.getHex(SYSTEM_ID, 3);
     }
 
     public String getRFSS()
     {
-        return mMessage.getHex( RFSS_ID, 2 );
+        return mMessage.getHex(RFSS_ID, 2);
     }
 
     public String getSiteID()
     {
-        return mMessage.getHex( SITE_ID, 2 );
+        return mMessage.getHex(SITE_ID, 2);
     }
 
     public int getChannel()
     {
-        return mMessage.getInt( CHANNEL );
+        return mMessage.getInt(CHANNEL);
     }
 
     public int getIdentifier()
     {
-    	return mMessage.getInt( IDENTIFIER );
+        return mMessage.getInt(IDENTIFIER);
     }
 
     public String getSystemServiceClass()
     {
-        return SystemService.toString( mMessage.getInt( SYSTEM_SERVICE_CLASS ) );
+        return SystemService.toString(mMessage.getInt(SYSTEM_SERVICE_CLASS));
     }
 
     public long getDownlinkFrequency()
     {
-    	return calculateDownlink( mIdentifierUpdate, getChannel() );
+        if(mIdentifierUpdate != null)
+        {
+            return mIdentifierUpdate.getDownlinkFrequency(getChannel());
+        }
+
+        return 0;
     }
 
     public long getUplinkFrequency()
     {
-    	return calculateUplink( mIdentifierUpdate, getChannel() );
+        if(mIdentifierUpdate != null)
+        {
+            return mIdentifierUpdate.getUplinkFrequency(getChannel());
+        }
+
+        return 0;
     }
 
 
-	@Override
+    @Override
-    public void setIdentifierMessage( int identifier, IBandIdentifier message )
+    public void setIdentifierMessage(int identifier, IBandIdentifier message)
     {
-		/* we're only expecting 1 identifier, so use whatever is received */
+        /* we're only expecting 1 identifier, so use whatever is received */
-		mIdentifierUpdate = message;
+        mIdentifierUpdate = message;
     }
 
-	public int[] getIdentifiers()
+    public int[] getIdentifiers()
-	{
+    {
-		int[] idens = new int[ 1 ];
+        int[] idens = new int[1];
 
-		idens[ 0 ] = getIdentifier();
+        idens[0] = getIdentifier();
 
-		return idens;
+        return idens;
-	}
+    }
 }

src/module/decode/p25/message/tsbk/osp/control/IdentifierUpdate.java

@@ -1,3 +1,21 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 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 module.decode.p25.message.tsbk.osp.control;
 
 import module.decode.p25.message.IBandIdentifier;
@@ -6,8 +24,7 @@ import module.decode.p25.reference.DataUnitID;
 import alias.AliasList;
 import bits.BinaryMessage;
 
-public abstract class IdentifierUpdate extends TSBKMessage 
+public abstract class IdentifierUpdate extends TSBKMessage implements IBandIdentifier
-									   implements IBandIdentifier
 {
     public static final int[] IDENTIFIER = { 80,81,82,83 };
 
@@ -45,4 +62,22 @@ public abstract class IdentifierUpdate extends TSBKMessage
     
     @Override
     public abstract long getTransmitOffset();
+
+    @Override
+    public long getDownlinkFrequency(int channelNumber)
+    {
+        return getBaseFrequency() + ( channelNumber * getChannelSpacing() );
+    }
+
+    @Override
+    public long getUplinkFrequency(int channelNumber)
+    {
+        return getDownlinkFrequency(channelNumber) + getTransmitOffset();
+    }
+
+    @Override
+    public boolean isTDMA()
+    {
+        return false;
+    }
 }

src/module/decode/p25/message/tsbk/osp/control/IdentifierUpdateNonVUHF.java

@@ -31,15 +31,19 @@ public class IdentifierUpdateNonVUHF extends IdentifierUpdate
         StringBuilder sb = new StringBuilder();
         
         sb.append( getMessageStub() );
+        sb.append(toString());
 
-        sb.append( " IDEN:" + getIdentifier() );
+        return sb.toString();
+    }
 
+    public String toString()
+    {
+        StringBuilder sb = new StringBuilder();
+
+        sb.append( " ID:" + getIdentifier() );
         sb.append( " BASE:" + getBaseFrequency() );
-        
+        sb.append( " BANDWIDTH:" + getBandwidth() );
-        sb.append( " BW:" + getBandwidth() );
-        
         sb.append( " SPACING:" + getChannelSpacing() );
-        
         sb.append( " OFFSET:" + getTransmitOffset() );
 
         return sb.toString();

src/module/decode/p25/message/tsbk/osp/control/IdentifierUpdateTDMA.java

@@ -30,18 +30,26 @@ public class IdentifierUpdateTDMA extends IdentifierUpdate
         StringBuilder sb = new StringBuilder();
         
         sb.append( getMessageStub() );
-
+        sb.append(toString());
-        sb.append( " IDEN:" + getIdentifier() );
-        sb.append( " BASE:" + getBaseFrequency() );
-        sb.append( " BW:" + getBandwidth() );
-        sb.append( " SPACING:" + getChannelSpacing() );
-        sb.append( " OFFSET:" + getTransmitOffset() );
-        sb.append( " TYPE:" + getChannelType().toString() );
 
         return sb.toString();
     }
 
-    public ChannelType getChannelType()
+	public String toString()
+	{
+		StringBuilder sb = new StringBuilder();
+
+		sb.append( " ID:" + getIdentifier() );
+		sb.append( " BASE:" + getBaseFrequency() );
+		sb.append( " BW:" + getBandwidth() );
+		sb.append( " SPACING:" + getChannelSpacing() );
+		sb.append( " OFFSET:" + getTransmitOffset() );
+		sb.append( " TYPE:" + getChannelType().toString() );
+
+		return sb.toString();
+	}
+
+	public ChannelType getChannelType()
     {
     	return ChannelType.fromValue( mMessage.getInt( CHANNEL_TYPE) );
     }
@@ -73,6 +81,25 @@ public class IdentifierUpdateTDMA extends IdentifierUpdate
         }
     }
 
+    @Override
+    public long getDownlinkFrequency(int channelNumber)
+    {
+        if(isTDMA())
+        {
+            return getBaseFrequency() + ( (channelNumber / getChannelType().getSlotsPerCarrier()) * getChannelSpacing() );
+        }
+        else
+        {
+            return super.getDownlinkFrequency(channelNumber);
+        }
+    }
+
+    @Override
+    public boolean isTDMA()
+    {
+        return getChannelType().getAccessType() == AccessType.TDMA;
+    }
+
     public enum ChannelType
     {
     	TYPE_0( AccessType.FDMA, 12500, 1, Vocoder.HALF_RATE ),
@@ -109,7 +136,7 @@ public class IdentifierUpdateTDMA extends IdentifierUpdate
     		}
     		
     		sb.append( mAccessType.name() );
-    		sb.append( " BW:" + mBandwidth );
+    		sb.append( " BANDWIDTH:" + mBandwidth );
     		sb.append( " SLOT/CARRIER:" + mSlotsPerCarrier );
     		sb.append( " VOCODER:" + mVocoder.name() );
     		

src/module/decode/p25/message/tsbk/osp/control/IdentifierUpdateVUHF.java

@@ -32,15 +32,19 @@ public class IdentifierUpdateVUHF extends IdentifierUpdate
         StringBuilder sb = new StringBuilder();
         
         sb.append( getMessageStub() );
+        sb.append(toString());
 
-        sb.append( " IDEN:" + getIdentifier() );
+        return sb.toString();
+    }
 
+    public String toString()
+    {
+        StringBuilder sb = new StringBuilder();
+
+        sb.append( " ID:" + getIdentifier() );
         sb.append( " BASE:" + getBaseFrequency() );
-        
+        sb.append( " BANDWIDTH:" + getBandwidth() );
-        sb.append( " BW:" + getBandwidth() );
-        
         sb.append( " SPACING:" + getChannelSpacing() );
-        
         sb.append( " OFFSET:" + getTransmitOffset() );
 
         return sb.toString();

src/module/decode/p25/message/tsbk/osp/control/NetworkStatusBroadcast.java

@@ -1,35 +1,46 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 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 module.decode.p25.message.tsbk.osp.control;
 
+import alias.AliasList;
+import bits.BinaryMessage;
 import module.decode.p25.message.IBandIdentifier;
 import module.decode.p25.message.IdentifierReceiver;
 import module.decode.p25.message.tsbk.TSBKMessage;
 import module.decode.p25.reference.DataUnitID;
 import module.decode.p25.reference.Opcode;
 import module.decode.p25.reference.P25NetworkCallsign;
-import alias.AliasList;
-import bits.BinaryMessage;
 
 public class NetworkStatusBroadcast extends TSBKMessage implements IdentifierReceiver
 {
-    public static final int[] LOCATION_REGISTRATION_AREA = { 80,81,82,83,84,85,
+    public static final int[] LOCATION_REGISTRATION_AREA = {80, 81, 82, 83, 84, 85, 86, 87};
-        86,87 };
+    public static final int[] WACN = {88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107};
-    public static final int[] WACN = { 88,89,90,91,92,93,94,95,96,97,98,99,100,
+    public static final int[] SYSTEM_ID = {108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119};
-        101,102,103,104,105,106,107 };
+    public static final int[] IDENTIFIER = {120, 121, 122, 123};
-    public static final int[] SYSTEM_ID = { 108,109,110,111,112,113,114,115,116,
+    public static final int[] CHANNEL = {124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135};
-        117,118,119 };
+    public static final int[] SYSTEM_SERVICE_CLASS = {136, 137, 138, 139, 140, 141, 142, 143};
-    public static final int[] IDENTIFIER = { 120,121,122,123 };
-    public static final int[] CHANNEL = { 124,125,126,127,128,129,130,131,132,
-    	133,134,135 };
-    public static final int[] SYSTEM_SERVICE_CLASS = { 136,137,138,139,140,141,
-        142,143 };
 
     private IBandIdentifier mIdentifierUpdate;
 
-    public NetworkStatusBroadcast( BinaryMessage message, 
+    public NetworkStatusBroadcast(BinaryMessage message, DataUnitID duid, AliasList aliasList)
-                                DataUnitID duid,
-                                AliasList aliasList ) 
     {
-        super( message, duid, aliasList );
+        super(message, duid, aliasList);
     }
 
     @Override
@@ -42,85 +53,95 @@ public class NetworkStatusBroadcast extends TSBKMessage implements IdentifierRec
     {
         StringBuilder sb = new StringBuilder();
 
-        sb.append( getMessageStub() );
+        sb.append(getMessageStub());
 
-        sb.append( " LRA:" + getLocationRegistrationArea() );
+        sb.append(" LRA:" + getLocationRegistrationArea());
 
-        sb.append( " WACN:" + getWACN() );
+        sb.append(" WACN:" + getWACN());
 
-        sb.append( " SYS:" + getSystemID() );
+        sb.append(" SYS:" + getSystemID());
 
-        sb.append( " CTRL CHAN:" + getIdentifier() + "-" + getChannel() );
+        sb.append(" CTRL CHAN:" + getIdentifier() + "-" + getChannel());
 
-        sb.append( " DN:" + getDownlinkFrequency() );
+        sb.append(" DN:" + getDownlinkFrequency());
 
-        sb.append( " UP:" + getUplinkFrequency() );
+        sb.append(" UP:" + getUplinkFrequency());
 
-        sb.append( " SYS SVC CLASS:" + 
+        sb.append(" SYS SVC CLASS:" +
-                SystemService.toString( getSystemServiceClass() ) );
+            SystemService.toString(getSystemServiceClass()));
 
         return sb.toString();
     }
 
     public String getLocationRegistrationArea()
     {
-        return mMessage.getHex( LOCATION_REGISTRATION_AREA, 2 );
+        return mMessage.getHex(LOCATION_REGISTRATION_AREA, 2);
     }
 
     public String getWACN()
     {
-        return mMessage.getHex( WACN, 5 );
+        return mMessage.getHex(WACN, 5);
     }
 
     public String getSystemID()
     {
-        return mMessage.getHex( SYSTEM_ID, 3 );
+        return mMessage.getHex(SYSTEM_ID, 3);
     }
 
-	public String getNetworkCallsign()
+    public String getNetworkCallsign()
-	{
+    {
-		return P25NetworkCallsign.getCallsign( mMessage.getInt( WACN ), 
+        return P25NetworkCallsign.getCallsign(mMessage.getInt(WACN),
-											   mMessage.getInt( SYSTEM_ID ) );
+            mMessage.getInt(SYSTEM_ID));
-	}
+    }
 
     public int getIdentifier()
     {
-    	return mMessage.getInt( IDENTIFIER );
+        return mMessage.getInt(IDENTIFIER);
     }
 
     public int getChannel()
     {
-        return mMessage.getInt( CHANNEL );
+        return mMessage.getInt(CHANNEL);
     }
 
     public int getSystemServiceClass()
     {
-        return mMessage.getInt( SYSTEM_SERVICE_CLASS );
+        return mMessage.getInt(SYSTEM_SERVICE_CLASS);
     }
 
     public long getDownlinkFrequency()
     {
-    	return calculateDownlink( mIdentifierUpdate, getChannel() );
+        if(mIdentifierUpdate != null)
+        {
+            return mIdentifierUpdate.getDownlinkFrequency(getChannel());
+        }
+
+        return 0;
     }
 
     public long getUplinkFrequency()
     {
-    	return calculateUplink( mIdentifierUpdate, getChannel() );
+        if(mIdentifierUpdate != null)
+        {
+            return mIdentifierUpdate.getUplinkFrequency(getChannel());
+        }
+
+        return 0;
     }
 
-	@Override
+    @Override
-    public void setIdentifierMessage( int identifier, IBandIdentifier message )
+    public void setIdentifierMessage(int identifier, IBandIdentifier message)
     {
-		/* we're only expecting 1 identifier, so use whatever is received */
+        /* we're only expecting 1 identifier, so use whatever is received */
-		mIdentifierUpdate = message;
+        mIdentifierUpdate = message;
     }
 
-	public int[] getIdentifiers()
+    public int[] getIdentifiers()
-	{
+    {
-		int[] idens = new int[ 1 ];
+        int[] idens = new int[1];
 
-		idens[ 0 ] = getIdentifier();
+        idens[0] = getIdentifier();
 
-		return idens;
+        return idens;
-	}
+    }
 }

src/module/decode/p25/message/tsbk/osp/control/RFSSStatusBroadcast.java

@@ -1,35 +1,47 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 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 module.decode.p25.message.tsbk.osp.control;
 
+import alias.AliasList;
+import bits.BinaryMessage;
 import module.decode.p25.message.IBandIdentifier;
 import module.decode.p25.message.IdentifierReceiver;
 import module.decode.p25.message.tsbk.TSBKMessage;
 import module.decode.p25.reference.DataUnitID;
 import module.decode.p25.reference.Opcode;
-import alias.AliasList;
-import bits.BinaryMessage;
 
 public class RFSSStatusBroadcast extends TSBKMessage implements IdentifierReceiver
 {
-    public static final int[] LOCATION_REGISTRATION_AREA = { 80,81,82,83,84,85,
+    public static final int[] LOCATION_REGISTRATION_AREA = {80, 81, 82, 83, 84, 85, 86, 87};
-        86,87 };
     public static final int ACTIVE_NETWORK_CONNECTION_FLAG = 91;
-    public static final int[] SYSTEM_ID = { 92,93,94,95,96,97,98,99,100,101,
+    public static final int[] SYSTEM_ID = {92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103};
-        102,103 };
+    public static final int[] RFSS_ID = {104, 105, 106, 107, 108, 109, 110, 111};
-    public static final int[] RFSS_ID = { 104,105,106,107,108,109,110,111 };
+    public static final int[] SITE_ID = {112, 113, 114, 115, 116, 117, 118, 119};
-    public static final int[] SITE_ID = { 112,113,114,115,116,117,118,119 };
+    public static final int[] IDENTIFIER = {120, 121, 122, 123};
-    public static final int[] IDENTIFIER = { 120,121,122,123 };
+    public static final int[] CHANNEL = {124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135};
-    public static final int[] CHANNEL = { 124,125,126,127,128,129,130,131,132,
+    public static final int[] SYSTEM_SERVICE_CLASS = {136, 137, 138, 139, 140, 141, 142, 143};
-    	133,134,135 };
-    public static final int[] SYSTEM_SERVICE_CLASS = { 136,137,138,139,140,141,
-        142,143 };
 
     private IBandIdentifier mIdentifierUpdate;
 
-    public RFSSStatusBroadcast( BinaryMessage message, 
+    public RFSSStatusBroadcast(BinaryMessage message, DataUnitID duid, AliasList aliasList)
-                                DataUnitID duid,
-                                AliasList aliasList ) 
     {
-        super( message, duid, aliasList );
+        super(message, duid, aliasList);
     }
 
     @Override
@@ -42,95 +54,105 @@ public class RFSSStatusBroadcast extends TSBKMessage implements IdentifierReceiv
     {
         StringBuilder sb = new StringBuilder();
 
-        sb.append( getMessageStub() );
+        sb.append(getMessageStub());
 
-        sb.append( " LRA:" + getLocationRegistrationArea() );
+        sb.append(" LRA:" + getLocationRegistrationArea());
 
-        sb.append( " SYSID:" + getSystemID() );
+        sb.append(" SYSID:" + getSystemID());
 
-        sb.append( " RFSS:" + getRFSubsystemID() );
+        sb.append(" RFSS:" + getRFSubsystemID());
 
-        sb.append( " SITE:" + getSiteID() );
+        sb.append(" SITE:" + getSiteID());
 
-        sb.append( " CHAN:" + getIdentifier() + "-" + getChannel() );
+        sb.append(" CHAN:" + getIdentifier() + "-" + getChannel());
 
-        sb.append( " DN:" + getDownlinkFrequency() );
+        sb.append(" DN:" + getDownlinkFrequency());
 
-        sb.append( " UP:" + getUplinkFrequency() );
+        sb.append(" UP:" + getUplinkFrequency());
 
-        if( hasActiveNetworkConnection() )
+        if(hasActiveNetworkConnection())
         {
-            sb.append( " ACTIVE-NETWORK-CONN" );
+            sb.append(" ACTIVE-NETWORK-CONN");
         }
 
-        sb.append( SystemService.toString( getSystemServiceClass() ) );
+        sb.append(SystemService.toString(getSystemServiceClass()));
 
         return sb.toString();
     }
 
     public String getLocationRegistrationArea()
     {
-        return mMessage.getHex( LOCATION_REGISTRATION_AREA, 2 );
+        return mMessage.getHex(LOCATION_REGISTRATION_AREA, 2);
     }
 
     public boolean hasActiveNetworkConnection()
     {
-        return mMessage.get( ACTIVE_NETWORK_CONNECTION_FLAG );
+        return mMessage.get(ACTIVE_NETWORK_CONNECTION_FLAG);
     }
 
     public String getSystemID()
     {
-        return mMessage.getHex( SYSTEM_ID, 3 );
+        return mMessage.getHex(SYSTEM_ID, 3);
     }
 
     public String getRFSubsystemID()
     {
-        return mMessage.getHex( RFSS_ID, 2 );
+        return mMessage.getHex(RFSS_ID, 2);
     }
 
     public String getSiteID()
     {
-        return mMessage.getHex( SITE_ID, 2 );
+        return mMessage.getHex(SITE_ID, 2);
     }
 
     public int getIdentifier()
     {
-    	return mMessage.getInt( IDENTIFIER );
+        return mMessage.getInt(IDENTIFIER);
     }
 
     public int getChannel()
     {
-        return mMessage.getInt( CHANNEL );
+        return mMessage.getInt(CHANNEL);
     }
 
     public int getSystemServiceClass()
     {
-        return mMessage.getInt( SYSTEM_SERVICE_CLASS );
+        return mMessage.getInt(SYSTEM_SERVICE_CLASS);
     }
 
     public long getDownlinkFrequency()
     {
-    	return calculateDownlink( mIdentifierUpdate, getChannel() );
+        if(mIdentifierUpdate != null)
+        {
+            return mIdentifierUpdate.getDownlinkFrequency(getChannel());
+        }
+
+        return 0;
     }
 
     public long getUplinkFrequency()
     {
-    	return calculateUplink( mIdentifierUpdate, getChannel() );
+        if(mIdentifierUpdate != null)
+        {
+            return mIdentifierUpdate.getUplinkFrequency(getChannel());
+        }
+
+        return 0;
     }
 
-	@Override
+    @Override
-    public void setIdentifierMessage( int identifier, IBandIdentifier message )
+    public void setIdentifierMessage(int identifier, IBandIdentifier message)
     {
-		/* we're only expecting 1 identifier, so use whatever is received */
+        /* we're only expecting 1 identifier, so use whatever is received */
-		mIdentifierUpdate = message;
+        mIdentifierUpdate = message;
     }
 
-	public int[] getIdentifiers()
+    public int[] getIdentifiers()
-	{
+    {
-		int[] idens = new int[ 1 ];
+        int[] idens = new int[1];
 
-		idens[ 0 ] = getIdentifier();
+        idens[0] = getIdentifier();
 
-		return idens;
+        return idens;
-	}
+    }
 }

src/module/decode/p25/message/tsbk/osp/control/SecondaryControlChannelBroadcast.java

@@ -1,44 +1,50 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 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 module.decode.p25.message.tsbk.osp.control;
 
+import alias.AliasList;
+import bits.BinaryMessage;
 import module.decode.p25.message.IBandIdentifier;
 import module.decode.p25.message.IdentifierReceiver;
 import module.decode.p25.message.tsbk.TSBKMessage;
 import module.decode.p25.reference.DataUnitID;
 import module.decode.p25.reference.Opcode;
 
-import org.slf4j.Logger;
+public class SecondaryControlChannelBroadcast extends TSBKMessage implements IdentifierReceiver, Comparable<SecondaryControlChannelBroadcast>
-import org.slf4j.LoggerFactory;
-
-import alias.AliasList;
-import bits.BinaryMessage;
-
-public class SecondaryControlChannelBroadcast extends TSBKMessage 
-	implements IdentifierReceiver, Comparable<SecondaryControlChannelBroadcast>
 {
-	private final static Logger mLog = 
+    public static final int[] RFSS_ID = {80, 81, 82, 83, 84, 85, 86, 87};
-			LoggerFactory.getLogger( SecondaryControlChannelBroadcast.class );
+    public static final int[] SITE_ID = {88, 89, 90, 91, 92, 93, 94, 95};
-
+    public static final int[] IDENTIFIER_1 = {96, 97, 98, 99};
-	public static final int[] RFSS_ID = { 80,81,82,83,84,85,86,87 };
+    public static final int[] CHANNEL_1 = {100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111};
-    public static final int[] SITE_ID = { 88,89,90,91,92,93,94,95 };
+    public static final int[] SYSTEM_SERVICE_CLASS_1 = {112, 113, 114, 115, 116, 117, 118, 119};
-    public static final int[] IDENTIFIER_1 = { 96,97,98,99 };
+    public static final int[] IDENTIFIER_2 = {120, 121, 122, 123};
-    public static final int[] CHANNEL_1 = { 100,101,102,103,104,105,106,107,108,
+    public static final int[] CHANNEL_2 = {124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135};
-    	109,110,111 };
+    public static final int[] SYSTEM_SERVICE_CLASS_2 = {136, 137, 138, 139, 140, 141, 142, 143};
-    public static final int[] SYSTEM_SERVICE_CLASS_1 = { 112,113,114,115,116,
-    	117,118,119 };
-    public static final int[] IDENTIFIER_2 = { 120,121,122,123 };
-    public static final int[] CHANNEL_2 = { 124,125,126,127,128,129,130,131,132,
-    	133,134,135 };
-    public static final int[] SYSTEM_SERVICE_CLASS_2 = { 136,137,138,139,140,
-    	141,142,143 };
 
     private IBandIdentifier mIdentifierUpdate1;
     private IBandIdentifier mIdentifierUpdate2;
 
-    public SecondaryControlChannelBroadcast( BinaryMessage message, 
+    public SecondaryControlChannelBroadcast(BinaryMessage message,
-                                DataUnitID duid,
+                                            DataUnitID duid,
-                                AliasList aliasList ) 
+                                            AliasList aliasList)
     {
-        super( message, duid, aliasList );
+        super(message, duid, aliasList);
     }
 
     @Override
@@ -51,29 +57,27 @@ public class SecondaryControlChannelBroadcast extends TSBKMessage
     {
         StringBuilder sb = new StringBuilder();
 
-        sb.append( getMessageStub() );
+        sb.append(getMessageStub());
 
-        sb.append( " SITE:" + getRFSS() + "-" + getSiteID() );
+        sb.append(" SITE:" + getRFSS() + "-" + getSiteID());
 
-        sb.append( " CHAN1:" + getIdentifier1() + "-" + getChannel1() );
+        sb.append(" CHAN1:" + getIdentifier1() + "-" + getChannel1());
 
-        sb.append( " DN1:" + getDownlinkFrequency1() );
+        sb.append(" DN1:" + getDownlinkFrequency1());
 
-        sb.append( " UP1:" + getUplinkFrequency1() );
+        sb.append(" UP1:" + getUplinkFrequency1());
 
-        sb.append( " SVC1:" + 
+        sb.append(" SVC1:" + SystemService.toString(getSystemServiceClass1()));
-        		SystemService.toString( getSystemServiceClass1() ) );
 
-        if( hasChannel2() )
+        if(hasChannel2())
         {
-            sb.append( " CHAN2:" + getIdentifier2() + "-" + getChannel2() );
+            sb.append(" CHAN2:" + getIdentifier2() + "-" + getChannel2());
 
-            sb.append( " DN2:" + getDownlinkFrequency2() );
+            sb.append(" DN2:" + getDownlinkFrequency2());
 
-            sb.append( " UP2:" + getUplinkFrequency2() );
+            sb.append(" UP2:" + getUplinkFrequency2());
 
-            sb.append( " SVC2:" + 
+            sb.append(" SVC2:" + SystemService.toString(getSystemServiceClass2()));
-            		SystemService.toString( getSystemServiceClass2() ) );
         }
 
         return sb.toString();
@@ -81,127 +85,182 @@ public class SecondaryControlChannelBroadcast extends TSBKMessage
 
     public String getRFSS()
     {
-        return mMessage.getHex( RFSS_ID, 2 );
+        return mMessage.getHex(RFSS_ID, 2);
     }
 
     public String getSiteID()
     {
-        return mMessage.getHex( SITE_ID, 2 );
+        return mMessage.getHex(SITE_ID, 2);
     }
 
     public int getIdentifier1()
     {
-    	return mMessage.getInt( IDENTIFIER_1 );
+        return mMessage.getInt(IDENTIFIER_1);
     }
 
     public int getChannel1()
     {
-        return mMessage.getInt( CHANNEL_1 );
+        return mMessage.getInt(CHANNEL_1);
     }
 
     public int getSystemServiceClass1()
     {
-        return mMessage.getInt( SYSTEM_SERVICE_CLASS_1 );
+        return mMessage.getInt(SYSTEM_SERVICE_CLASS_1);
     }
 
     public int getIdentifier2()
     {
-    	return mMessage.getInt( IDENTIFIER_2 );
+        return mMessage.getInt(IDENTIFIER_2);
     }
 
     public int getChannel2()
     {
-        return mMessage.getInt( CHANNEL_2 );
+        return mMessage.getInt(CHANNEL_2);
     }
 
     public int getSystemServiceClass2()
     {
-        return mMessage.getInt( SYSTEM_SERVICE_CLASS_2 );
+        return mMessage.getInt(SYSTEM_SERVICE_CLASS_2);
     }
 
     public boolean hasChannel2()
     {
-    	return getSystemServiceClass2() != 0;
+        return getSystemServiceClass2() != 0;
     }
 
 
     public long getDownlinkFrequency1()
     {
-    	return calculateDownlink( mIdentifierUpdate1, getChannel1() );
+        if(mIdentifierUpdate1 != null)
+        {
+            return mIdentifierUpdate1.getDownlinkFrequency(getChannel1());
+        }
+
+        return 0;
     }
 
     public long getUplinkFrequency1()
     {
-    	return calculateUplink( mIdentifierUpdate1, getChannel1() );
+        if(mIdentifierUpdate1 != null)
+        {
+            return mIdentifierUpdate1.getUplinkFrequency(getChannel1());
+        }
+
+        return 0;
     }
 
     public long getDownlinkFrequency2()
     {
-    	return calculateDownlink( mIdentifierUpdate2, getChannel2() );
+        if(mIdentifierUpdate2 != null)
+        {
+            return mIdentifierUpdate2.getDownlinkFrequency(getChannel2());
+        }
+
+        return 0;
     }
 
     public long getUplinkFrequency2()
     {
-    	return calculateUplink( mIdentifierUpdate2, getChannel2() );
+        if(mIdentifierUpdate2 != null)
+        {
+            return mIdentifierUpdate2.getUplinkFrequency(getChannel2());
+        }
+
+        return 0;
     }
 
-	@Override
+    @Override
-    public void setIdentifierMessage( int identifier, IBandIdentifier message )
+    public void setIdentifierMessage(int identifier, IBandIdentifier message)
     {
-		if( identifier == getIdentifier1() )
+        if(identifier == getIdentifier1())
-		{
+        {
-			mIdentifierUpdate1 = message;
+            mIdentifierUpdate1 = message;
-		}
+        }
 
-		if( identifier == getIdentifier2() )
+        if(identifier == getIdentifier2())
-		{
+        {
-			mIdentifierUpdate2 = message;
+            mIdentifierUpdate2 = message;
-		}
+        }
     }
 
-	public int[] getIdentifiers()
+    public int[] getIdentifiers()
-	{
-		int[] idens;
-		
-		if( hasChannel2() )
-		{
-			idens = new int[ 2 ];
-			
-			idens[ 0 ] = getIdentifier1();
-			idens[ 1 ] = getIdentifier2();
-		}
-		else
-		{
-			idens = new int[ 1 ];
-			
-			idens[ 0 ] = getIdentifier1();
-		}
-		
-		return idens;
-	}
-
-	@Override
-    public int compareTo( SecondaryControlChannelBroadcast other )
     {
-		if( other.getSiteID().contentEquals( getSiteID() ) &&
+        int[] idens;
-			other.getIdentifier1() == getIdentifier1() &&
+
-			other.getChannel1() == getChannel1() &&
+        if(hasChannel2())
-			other.getChannel2() == getChannel2() && 
+        {
-			other.getIdentifier2() == getIdentifier2() &&
+            idens = new int[2];
-			other.getDownlinkFrequency1() == getDownlinkFrequency1() &&
+
-			other.getUplinkFrequency1() == getUplinkFrequency1() &&
+            idens[0] = getIdentifier1();
-			other.getDownlinkFrequency2() == getDownlinkFrequency2() &&
+            idens[1] = getIdentifier2();
-			other.getUplinkFrequency2() == getUplinkFrequency2() )
+        }
-		{
+        else
-			return 0;
+        {
-		}
+            idens = new int[1];
-		else if( other.getIdentifier1() < getIdentifier1() )
+
-		{
+            idens[0] = getIdentifier1();
-			return -1;
+        }
-		}
+
-		else
+        return idens;
-		{
+    }
-			return 1;
+
-		}
+    @Override
+    public int compareTo(SecondaryControlChannelBroadcast other)
+    {
+        if(other.getRFSS().contentEquals(getRFSS()) &&
+            other.getSiteID().contentEquals(getSiteID()) &&
+            other.getIdentifier1() == getIdentifier1() &&
+            other.getChannel1() == getChannel1())
+        {
+            return 0;
+        }
+        else if(other.getIdentifier1() < getIdentifier1())
+        {
+            return -1;
+        }
+        else
+        {
+            return 1;
+        }
+    }
+
+    @Override
+    public boolean equals(Object o)
+    {
+        if(this == o)
+        {
+            return true;
+        }
+        if(!(o instanceof SecondaryControlChannelBroadcast))
+        {
+            return false;
+        }
+
+        SecondaryControlChannelBroadcast that = (SecondaryControlChannelBroadcast)o;
+
+        if(getRFSS() != that.getRFSS())
+        {
+            return false;
+        }
+        if(getSiteID() != that.getSiteID())
+        {
+            return false;
+        }
+        if(getIdentifier1() != that.getIdentifier1())
+        {
+            return false;
+        }
+
+        return getChannel1() == that.getChannel1();
+    }
+
+    @Override
+    public int hashCode()
+    {
+        int result = getRFSS() != null ? getRFSS().hashCode() : 0;
+        result = 31 * result + getSiteID() != null ? getSiteID().hashCode() : 0;
+        result = 31 * result + getIdentifier1();
+        result = 31 * result + getChannel1();
+        return result;
     }
 }

src/module/decode/p25/message/tsbk/osp/data/GroupDataChannelGrant.java

@@ -1,19 +1,35 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 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 module.decode.p25.message.tsbk.osp.data;
 
+import alias.AliasList;
+import bits.BinaryMessage;
 import module.decode.p25.message.tsbk.GroupChannelGrant;
 import module.decode.p25.reference.DataUnitID;
 import module.decode.p25.reference.Opcode;
-import alias.AliasList;
-import bits.BinaryMessage;
 
 public class GroupDataChannelGrant extends GroupChannelGrant
 
 {
-    public GroupDataChannelGrant( BinaryMessage message, 
+    public GroupDataChannelGrant(BinaryMessage message, DataUnitID duid, AliasList aliasList)
-                                   DataUnitID duid,
-                                   AliasList aliasList ) 
     {
-        super( message, duid, aliasList );
+        super(message, duid, aliasList);
     }
 
     @Override

src/module/decode/p25/message/tsbk/osp/data/SNDCPDataChannelAnnouncementExplicit.java

@@ -1,158 +1,178 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 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 module.decode.p25.message.tsbk.osp.data;
 
+import alias.AliasList;
+import bits.BinaryMessage;
 import module.decode.p25.message.IBandIdentifier;
 import module.decode.p25.message.IdentifierReceiver;
 import module.decode.p25.reference.DataUnitID;
-import alias.AliasList;
-import bits.BinaryMessage;
 
-public class SNDCPDataChannelAnnouncementExplicit extends SNDCPData 
+public class SNDCPDataChannelAnnouncementExplicit extends SNDCPData implements IdentifierReceiver
-					implements IdentifierReceiver
 {
-	public static final int AUTONOMOUS_ACCESS_AVAILABLE_INDICATOR = 88;
+    public static final int AUTONOMOUS_ACCESS_AVAILABLE_INDICATOR = 88;
-	public static final int REQUESTED_ACCESS_AVAILABLE_INDICATOR = 89;
+    public static final int REQUESTED_ACCESS_AVAILABLE_INDICATOR = 89;
-	
+    public static final int[] TRANSMIT_IDENTIFIER = {96, 97, 98, 99};
-	public static final int[] TRANSMIT_IDENTIFIER = { 96,97,98,99 };
+    public static final int[] TRANSMIT_NUMBER = {100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111};
-    public static final int[] TRANSMIT_NUMBER = { 100,101,102,103,104,105,106,
+    public static final int[] RECEIVE_IDENTIFIER = {112, 113, 114, 115};
-    	107,108,109,110,111 };
+    public static final int[] RECEIVE_NUMBER = {116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127};
-	public static final int[] RECEIVE_IDENTIFIER = { 112,113,114,115 };
+    public static final int[] DATA_ACCESS_CONTROL = {128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143};
-    public static final int[] RECEIVE_NUMBER = { 116,117,118,119,120,121,122,
-    	123,124,125,126,127 };
-    
-    public static final int[] DATA_ACCESS_CONTROL = { 128,129,130,131,132,133,
-    	134,135,136,137,138,139,140,141,142,143 };
 
     private IBandIdentifier mIdentifierUpdateTransmit;
     private IBandIdentifier mIdentifierUpdateReceive;
 
-    public SNDCPDataChannelAnnouncementExplicit( BinaryMessage message, 
+    public SNDCPDataChannelAnnouncementExplicit(BinaryMessage message, DataUnitID duid, AliasList aliasList)
-								  DataUnitID duid,
-								  AliasList aliasList )
     {
-	    super( message, duid, aliasList );
+        super(message, duid, aliasList);
     }
 
     public String getMessage()
     {
         StringBuilder sb = new StringBuilder();
 
-        sb.append( getMessageStub() );
+        sb.append(getMessageStub());
 
-        if( isEmergency() )
+        if(isEmergency())
         {
-            sb.append( " EMERGENCY" );
+            sb.append(" EMERGENCY");
         }
 
-        if( isAutonomousAccessAvailable() )
+        if(isAutonomousAccessAvailable())
         {
-        	sb.append( " AUTONOMOUS ACCESS" );
+            sb.append(" AUTONOMOUS ACCESS");
         }
 
-        if( isRequestedAccessAvailable() )
+        if(isRequestedAccessAvailable())
         {
-            sb.append( " DOWNLINK:" );
+            sb.append(" DOWNLINK:");
-            sb.append( getTransmitChannelIdentifier() + "-" + getTransmitChannelNumber() );
+            sb.append(getTransmitChannelIdentifier() + "-" + getTransmitChannelNumber());
 
-            sb.append( " " + getUplinkFrequency() );
+            sb.append(" " + getUplinkFrequency());
 
-            sb.append( " UPLINK:" );
+            sb.append(" UPLINK:");
-            sb.append( getReceiveChannelIdentifier() + "-" + getReceiveChannelNumber() );
+            sb.append(getReceiveChannelIdentifier() + "-" + getReceiveChannelNumber());
 
-            sb.append( " " + getDownlinkFrequency() );
+            sb.append(" " + getDownlinkFrequency());
 
-            sb.append( " DATA ACCESS CONTROL:" );
+            sb.append(" DATA ACCESS CONTROL:");
         }
         else
         {
-        	sb.append( " ACCESS DENIED TO DATA ACCESS CONTROL:" ); 
+            sb.append(" ACCESS DENIED TO DATA ACCESS CONTROL:");
         }
 
-        sb.append( getDataAccessControl() );
+        sb.append(getDataAccessControl());
 
         return sb.toString();
     }
 
     public boolean isAutonomousAccessAvailable()
     {
-    	return mMessage.get( AUTONOMOUS_ACCESS_AVAILABLE_INDICATOR );
+        return mMessage.get(AUTONOMOUS_ACCESS_AVAILABLE_INDICATOR);
     }
 
     public boolean isRequestedAccessAvailable()
     {
-    	return mMessage.get( REQUESTED_ACCESS_AVAILABLE_INDICATOR );
+        return mMessage.get(REQUESTED_ACCESS_AVAILABLE_INDICATOR);
     }
 
     public int getTransmitChannelIdentifier()
     {
-        return mMessage.getInt( TRANSMIT_IDENTIFIER );
+        return mMessage.getInt(TRANSMIT_IDENTIFIER);
     }
 
     public int getTransmitChannelNumber()
     {
-        return mMessage.getInt( TRANSMIT_NUMBER );
+        return mMessage.getInt(TRANSMIT_NUMBER);
     }
 
     public String getTransmitChannel()
     {
-    	return getTransmitChannelIdentifier() + "-" + getTransmitChannelNumber();
+        return getTransmitChannelIdentifier() + "-" + getTransmitChannelNumber();
     }
 
     public int getReceiveChannelIdentifier()
     {
-        return mMessage.getInt( RECEIVE_IDENTIFIER );
+        return mMessage.getInt(RECEIVE_IDENTIFIER);
     }
 
     public int getReceiveChannelNumber()
     {
-        return mMessage.getInt( RECEIVE_NUMBER );
+        return mMessage.getInt(RECEIVE_NUMBER);
     }
 
     public String getReceiveChannel()
     {
-    	return getReceiveChannelIdentifier() + "-" + getReceiveChannelNumber();
+        return getReceiveChannelIdentifier() + "-" + getReceiveChannelNumber();
     }
 
     public String getDataAccessControl()
     {
-    	return mMessage.getHex( DATA_ACCESS_CONTROL, 4 );
+        return mMessage.getHex(DATA_ACCESS_CONTROL, 4);
     }
 
-	@Override
+    @Override
-    public void setIdentifierMessage( int identifier, IBandIdentifier message )
+    public void setIdentifierMessage(int identifier, IBandIdentifier message)
     {
-		if( identifier == getTransmitChannelIdentifier() )
+        if(identifier == getTransmitChannelIdentifier())
-		{
+        {
-			mIdentifierUpdateTransmit = message;
+            mIdentifierUpdateTransmit = message;
-		}
+        }
-		else if( identifier == getReceiveChannelIdentifier() )
+        else if(identifier == getReceiveChannelIdentifier())
-		{
+        {
-			mIdentifierUpdateReceive = message;
+            mIdentifierUpdateReceive = message;
-		}
+        }
-		else
+        else
-		{
+        {
-			throw new IllegalArgumentException( "unexpected channel band "
+            throw new IllegalArgumentException("unexpected channel band "
-					+ "identifier [" + identifier + "]" );
+                + "identifier [" + identifier + "]");
-		}
+        }
     }
 
-	@Override
+    @Override
     public int[] getIdentifiers()
     {
-		int[] identifiers = new int[ 2 ];
+        int[] identifiers = new int[2];
 
-		identifiers[ 0 ] = getTransmitChannelIdentifier();
+        identifiers[0] = getTransmitChannelIdentifier();
-		identifiers[ 1 ] = getReceiveChannelIdentifier();
+        identifiers[1] = getReceiveChannelIdentifier();
 
-	    return identifiers;
+        return identifiers;
     }
 
     public long getDownlinkFrequency()
     {
-    	return calculateDownlink( mIdentifierUpdateTransmit, getReceiveChannelNumber() );
+        if(mIdentifierUpdateTransmit != null)
+        {
+            return mIdentifierUpdateTransmit.getDownlinkFrequency(getTransmitChannelNumber());
+        }
+
+        return 0;
     }
 
     public long getUplinkFrequency()
     {
-    	return calculateUplink( mIdentifierUpdateReceive, getTransmitChannelNumber() );
+        if(mIdentifierUpdateReceive != null)
+        {
+            mIdentifierUpdateReceive.getUplinkFrequency(getReceiveChannelNumber());
+        }
+
+        return 0;
     }
 }

src/module/decode/p25/message/tsbk/osp/data/SNDCPDataChannelGrant.java

@@ -1,131 +1,164 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 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 module.decode.p25.message.tsbk.osp.data;
 
+import alias.AliasList;
+import bits.BinaryMessage;
 import module.decode.p25.message.IBandIdentifier;
 import module.decode.p25.message.IdentifierReceiver;
 import module.decode.p25.reference.DataUnitID;
-import alias.AliasList;
-import bits.BinaryMessage;
 
 public class SNDCPDataChannelGrant extends SNDCPData implements IdentifierReceiver
 {
-	public static final int[] TRANSMIT_IDENTIFIER = { 88,89,90,91 };
+    public static final int[] TRANSMIT_IDENTIFIER = {88, 89, 90, 91};
-    public static final int[] TRANSMIT_NUMBER = { 92,93,94,95,96,97,98,99,100,
+    public static final int[] TRANSMIT_NUMBER = {92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103};
-    	101,102,103 };
+    public static final int[] RECEIVE_IDENTIFIER = {104, 105, 106, 107};
-	public static final int[] RECEIVE_IDENTIFIER = { 104,105,106,107 };
+    public static final int[] RECEIVE_NUMBER = {108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119};
-    public static final int[] RECEIVE_NUMBER = { 108,109,110,111,112,113,114,
+    public static final int[] TARGET_ADDRESS = {120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133,
-    	115,116,117,118,119 };
+        134, 135, 136, 137, 138, 139, 140, 141, 142, 143};
-    
-    public static final int[] TARGET_ADDRESS = { 120,121,122,123,124,125,126,
-        127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 };
 
     private IBandIdentifier mIdentifierUpdateTransmit;
     private IBandIdentifier mIdentifierUpdateReceive;
 
-    public SNDCPDataChannelGrant( BinaryMessage message, 
+    public SNDCPDataChannelGrant(BinaryMessage message, DataUnitID duid, AliasList aliasList)
-								  DataUnitID duid,
-								  AliasList aliasList )
     {
-	    super( message, duid, aliasList );
+        super(message, duid, aliasList);
+    }
+
+    public boolean isTDMAChannel()
+    {
+        if(mIdentifierUpdateTransmit != null)
+        {
+            return mIdentifierUpdateTransmit.isTDMA();
+        }
+
+        return false;
     }
 
     public String getMessage()
     {
         StringBuilder sb = new StringBuilder();
 
-        sb.append( getMessageStub() );
+        sb.append(getMessageStub());
 
-        if( isEmergency() )
+        if(isEmergency())
         {
-            sb.append( " EMERGENCY" );
+            sb.append(" EMERGENCY");
         }
 
-        sb.append( " UPLINK:" );
+        sb.append(" UPLINK:");
-        sb.append( getTransmitChannelIdentifier() + "-" + getTransmitChannelNumber() );
+        sb.append(getTransmitChannelIdentifier() + "-" + getTransmitChannelNumber());
 
-        sb.append( " " + getUplinkFrequency() );
+        sb.append(" " + getUplinkFrequency());
 
-        sb.append( " DOWNLINK:" );
+        sb.append(" DOWNLINK:");
-        sb.append( getReceiveChannelIdentifier() + "-" + getReceiveChannelNumber() );
+        sb.append(getReceiveChannelIdentifier() + "-" + getReceiveChannelNumber());
 
-        sb.append( " " + getDownlinkFrequency() );
+        sb.append(" " + getDownlinkFrequency());
 
-        sb.append( " TGT:" );
+        sb.append(" TGT:");
-        sb.append( getTargetAddress() );
+        sb.append(getTargetAddress());
 
         return sb.toString();
     }
 
     public int getTransmitChannelIdentifier()
     {
-        return mMessage.getInt( TRANSMIT_IDENTIFIER );
+        return mMessage.getInt(TRANSMIT_IDENTIFIER);
     }
 
     public int getTransmitChannelNumber()
     {
-        return mMessage.getInt( TRANSMIT_NUMBER );
+        return mMessage.getInt(TRANSMIT_NUMBER);
     }
 
     public String getTransmitChannel()
     {
-    	return getTransmitChannelIdentifier() + "-" + getTransmitChannelNumber();
+        return getTransmitChannelIdentifier() + "-" + getTransmitChannelNumber();
     }
 
     public int getReceiveChannelIdentifier()
     {
-        return mMessage.getInt( RECEIVE_IDENTIFIER );
+        return mMessage.getInt(RECEIVE_IDENTIFIER);
     }
 
     public int getReceiveChannelNumber()
     {
-        return mMessage.getInt( RECEIVE_NUMBER );
+        return mMessage.getInt(RECEIVE_NUMBER);
     }
 
     public String getReceiveChannel()
     {
-    	return getReceiveChannelIdentifier() + "-" + getReceiveChannelNumber();
+        return getReceiveChannelIdentifier() + "-" + getReceiveChannelNumber();
     }
 
     public String getTargetAddress()
     {
-        return mMessage.getHex( TARGET_ADDRESS, 6 );
+        return mMessage.getHex(TARGET_ADDRESS, 6);
     }
 
-	@Override
+    @Override
-    public void setIdentifierMessage( int identifier, IBandIdentifier message )
+    public void setIdentifierMessage(int identifier, IBandIdentifier message)
     {
-		if( identifier == getTransmitChannelIdentifier() )
+        if(identifier == getTransmitChannelIdentifier())
-		{
+        {
-			mIdentifierUpdateTransmit = message;
+            mIdentifierUpdateTransmit = message;
-		}
+        }
-		else if( identifier == getReceiveChannelIdentifier() )
+        else if(identifier == getReceiveChannelIdentifier())
-		{
+        {
-			mIdentifierUpdateReceive = message;
+            mIdentifierUpdateReceive = message;
-		}
+        }
-		else
+        else
-		{
+        {
-			throw new IllegalArgumentException( "unexpected channel band "
+            throw new IllegalArgumentException("unexpected channel band "
-					+ "identifier [" + identifier + "]" );
+                + "identifier [" + identifier + "]");
-		}
+        }
     }
 
-	@Override
+    @Override
     public int[] getIdentifiers()
     {
-		int[] identifiers = new int[ 2 ];
+        int[] identifiers = new int[2];
 
-		identifiers[ 0 ] = getTransmitChannelIdentifier();
+        identifiers[0] = getTransmitChannelIdentifier();
-		identifiers[ 1 ] = getReceiveChannelIdentifier();
+        identifiers[1] = getReceiveChannelIdentifier();
 
-	    return identifiers;
+        return identifiers;
     }
 
     public long getDownlinkFrequency()
     {
-    	return calculateDownlink( mIdentifierUpdateTransmit, getTransmitChannelNumber() );
+        if(mIdentifierUpdateTransmit != null)
+        {
+            return mIdentifierUpdateTransmit.getDownlinkFrequency(getTransmitChannelNumber());
+        }
+
+        return 0;
     }
 
     public long getUplinkFrequency()
     {
-    	return calculateUplink( mIdentifierUpdateReceive, getReceiveChannelNumber() );
+        if(mIdentifierUpdateReceive != null)
+        {
+            return mIdentifierUpdateReceive.getUplinkFrequency(getReceiveChannelNumber());
+        }
+
+        return 0;
     }
 }

src/module/demodulate/fm/FMDemodulatorModule.java

@@ -62,6 +62,13 @@ public class FMDemodulatorModule extends Module implements IComplexBufferListene
         mIQFilter.setListener(mDemodulator);
     }
 
+    public FMDemodulatorModule(float[] filter)
+    {
+        mIQFilter = new ComplexFIRFilter_CB_CB(filter, 1.0f);
+        mDemodulator = new FMDemodulator_CB(1.0f);
+        mIQFilter.setListener(mDemodulator);
+    }
+
     @Override
     public Listener<ComplexBuffer> getComplexBufferListener()
     {

src/playlist/PlaylistManager.java

@@ -89,6 +89,7 @@ public class PlaylistManager implements ChannelEventListener
             @Override
             public void receive(AliasEvent t)
             {
+                //Save the playlist for all alias events
                 schedulePlaylistSave();
             }
         });
@@ -98,6 +99,7 @@ public class PlaylistManager implements ChannelEventListener
             @Override
             public void receive(ChannelMapEvent t)
             {
+                //Save the playlist for all channel map events
                 schedulePlaylistSave();
             }
         });
@@ -107,7 +109,23 @@ public class PlaylistManager implements ChannelEventListener
             @Override
             public void receive(BroadcastEvent broadcastEvent)
             {
-                schedulePlaylistSave();
+                switch(broadcastEvent.getEvent())
+                {
+                    case CONFIGURATION_ADD:
+                    case CONFIGURATION_CHANGE:
+                    case CONFIGURATION_DELETE:
+                        schedulePlaylistSave();
+                        break;
+                    case BROADCASTER_ADD:
+                    case BROADCASTER_QUEUE_CHANGE:
+                    case BROADCASTER_STATE_CHANGE:
+                    case BROADCASTER_STREAMED_COUNT_CHANGE:
+                    case BROADCASTER_AGED_OFF_COUNT_CHANGE:
+                    case BROADCASTER_DELETE:
+                    default:
+                        //Do nothing
+                        break;
+                }
             }
         });
     }

src/record/RecorderManager.java

@@ -29,79 +29,102 @@ import util.ThreadPool;
 
 import java.io.File;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.Map;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
 
 public class RecorderManager implements Listener<AudioPacket>
 {
     private static final Logger mLog = LoggerFactory.getLogger(RecorderManager.class);
 
     public static final int AUDIO_SAMPLE_RATE = 8000;
+    public static final long IDLE_RECORDER_REMOVAL_THRESHOLD = 6000; //6 seconds
 
     private Map<String,RealBufferWaveRecorder> mRecorders = new HashMap<>();
+    private ScheduledFuture<?> mRecorderMonitorFuture;
 
     private boolean mCanStartNewRecorders = true;
 
     /**
-     * Manages all audio recording for all processing channels. Reconstructs audio streams and distributes channel
+     * Audio recording manager.  Monitors stream of audio packets produced by decoding channels and automatically starts
-     * audio to each of the recorders, starting and stopping the recorders as needed.
+     * audio recorders when the channel's metadata designates a call as recordable.  Routes call audio to each recorder
+     * based on audio packet metadata.  Recorders are shutdown when the channel sends an end-call audio packet
+     * indicating that the call is complete.  A separate recording monitor periodically checks for idled recorders to
+     * be stopped for cases when the channel fails to send an end-call audio packet.
      */
     public RecorderManager()
     {
+        mRecorderMonitorFuture = ThreadPool.SCHEDULED.scheduleAtFixedRate(new RecorderMonitor(), 2,
+            2, TimeUnit.SECONDS);
     }
 
+    /**
+     * Prepares this class for shutdown
+     */
     public void dispose()
     {
+        if(mRecorderMonitorFuture != null)
+        {
+            mRecorderMonitorFuture.cancel(true);
+        }
     }
 
+    /**
+     * Primary ingest point for audio packets from all decoding channels
+     * @param audioPacket to process
+     */
     @Override
     public void receive(AudioPacket audioPacket)
     {
-        if(audioPacket.hasMetadata() &&
+        if(audioPacket.hasMetadata() && audioPacket.getMetadata().isRecordable())
-            audioPacket.getMetadata().isRecordable())
         {
             String identifier = audioPacket.getMetadata().getUniqueIdentifier();
 
-            if(mRecorders.containsKey(identifier))
+            synchronized(mRecorders)
             {
-                RealBufferWaveRecorder recorder = mRecorders.get(identifier);
+                if(mRecorders.containsKey(identifier))
-
-                if(audioPacket.getType() == AudioPacket.Type.AUDIO)
                 {
-                    recorder.receive(audioPacket.getAudioBuffer());
+                    RealBufferWaveRecorder recorder = mRecorders.get(identifier);
-                }
-                else if(audioPacket.getType() == AudioPacket.Type.END)
-                {
-                    RealBufferWaveRecorder finished = mRecorders.remove(identifier);
-                    finished.stop();
-                }
-            }
-            else if(audioPacket.getType() == AudioPacket.Type.AUDIO)
-            {
-                if(mCanStartNewRecorders)
-                {
-                    String filePrefix = getFilePrefix(audioPacket);
 
-                    RealBufferWaveRecorder recorder = null;
+                    if(audioPacket.getType() == AudioPacket.Type.AUDIO)
-
-                    try
                     {
-                        recorder = new RealBufferWaveRecorder(AUDIO_SAMPLE_RATE, filePrefix);
-
-                        recorder.start(ThreadPool.SCHEDULED);
-
                         recorder.receive(audioPacket.getAudioBuffer());
-                        mRecorders.put(identifier, recorder);
                     }
-                    catch(Exception ioe)
+                    else if(audioPacket.getType() == AudioPacket.Type.END)
                     {
-                        mCanStartNewRecorders = false;
+                        RealBufferWaveRecorder finished = mRecorders.remove(identifier);
+                        finished.stop();
+                    }
+                }
+                else if(audioPacket.getType() == AudioPacket.Type.AUDIO)
+                {
+                    if(mCanStartNewRecorders)
+                    {
+                        String filePrefix = getFilePrefix(audioPacket);
 
-                        mLog.error("Error attempting to start new audio wave recorder. All (future) audio recording " +
+                        RealBufferWaveRecorder recorder = null;
-                            "is disabled", ioe);
 
-                        if(recorder != null)
+                        try
                         {
-                            recorder.stop();
+                            recorder = new RealBufferWaveRecorder(AUDIO_SAMPLE_RATE, filePrefix);
+
+                            recorder.start(ThreadPool.SCHEDULED);
+
+                            recorder.receive(audioPacket.getAudioBuffer());
+                            mRecorders.put(identifier, recorder);
+                        }
+                        catch(Exception ioe)
+                        {
+                            mCanStartNewRecorders = false;
+
+                            mLog.error("Error attempting to start new audio wave recorder. All (future) audio recording " +
+                                "is disabled", ioe);
+
+                            if(recorder != null)
+                            {
+                                recorder.stop();
+                            }
                         }
                     }
                 }
@@ -150,4 +173,31 @@ public class RecorderManager implements Listener<AudioPacket>
 
         return new ComplexBufferWaveRecorder(AUDIO_SAMPLE_RATE, sb.toString());
     }
+
+    /**
+     * Monitors currently running recorders and removes/closes any recorders that are idle more than 6 seconds
+     */
+    public class RecorderMonitor implements Runnable
+    {
+        @Override
+        public void run()
+        {
+            synchronized(mRecorders)
+            {
+                Iterator<Map.Entry<String,RealBufferWaveRecorder>> it = mRecorders.entrySet().iterator();
+
+                while(it.hasNext())
+                {
+                    Map.Entry<String,RealBufferWaveRecorder> entry = it.next();
+
+                    if(entry.getValue().getLastBufferReceived() + IDLE_RECORDER_REMOVAL_THRESHOLD < System.currentTimeMillis())
+                    {
+                        mLog.info("Removing idle recorder [" + entry.getKey() + "]");
+                        it.remove();
+                        entry.getValue().stop();
+                    }
+                }
+            }
+        }
+    }
 }

src/record/wave/MonoWaveReader.java

@@ -18,6 +18,7 @@
  ******************************************************************************/
 package record.wave;
 
+import org.apache.commons.lang3.Validate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import sample.ConversionUtils;
@@ -58,7 +59,7 @@ public class MonoWaveReader implements AutoCloseable
      */
 	public MonoWaveReader(Path path, boolean realTime) throws IOException
 	{
-		assert( path != null );
+        Validate.isTrue(path != null);
 		mPath = path;
         mRealTime = realTime;
 

src/record/wave/RealBufferWaveRecorder.java

@@ -1,22 +1,33 @@
 /*******************************************************************************
- *     SDR Trunk 
+ * sdrtrunk
- *     Copyright (C) 2014,2015 Dennis Sheirer
+ * Copyright (C) 2014-2017 Dennis Sheirer
  *
- *     This program is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
+ * (at your option) any later version.
  *
- *     This program is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
+ * 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/>
  *
- *     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 record.wave;
 
+import module.Module;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import sample.ConversionUtils;
+import sample.Listener;
+import sample.real.IFilteredRealBufferListener;
+import sample.real.RealBuffer;
+import util.TimeStamp;
+
+import javax.sound.sampled.AudioFormat;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -26,206 +37,175 @@ import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import javax.sound.sampled.AudioFormat;
-
-import module.Module;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import sample.ConversionUtils;
-import sample.Listener;
-import sample.real.IFilteredRealBufferListener;
-import sample.real.RealBuffer;
-import util.TimeStamp;
-
 /**
  * WAVE audio recorder module for recording real sample buffers to a wave file
  */
 public class RealBufferWaveRecorder extends Module
-				implements IFilteredRealBufferListener, Listener<RealBuffer>
+    implements IFilteredRealBufferListener, Listener<RealBuffer>
 {
-	private final static Logger mLog = 
+    private final static Logger mLog = LoggerFactory.getLogger(RealBufferWaveRecorder.class);
-			LoggerFactory.getLogger( RealBufferWaveRecorder.class );
 
     private WaveWriter mWriter;
     private String mFilePrefix;
     private Path mFile;
-	private AudioFormat mAudioFormat;
+    private AudioFormat mAudioFormat;
 
-	private BufferProcessor mBufferProcessor;
+    private BufferProcessor mBufferProcessor;
-	private ScheduledFuture<?> mProcessorHandle;
+    private ScheduledFuture<?> mProcessorHandle;
-	private LinkedBlockingQueue<RealBuffer> mBuffers = 
+    private LinkedBlockingQueue<RealBuffer> mBuffers = new LinkedBlockingQueue<>(500);
-			new LinkedBlockingQueue<>( 500 );
+    private long mLastBufferReceived;
-	private long mLastBufferReceived;
 
-	private AtomicBoolean mRunning = new AtomicBoolean();
+    private AtomicBoolean mRunning = new AtomicBoolean();
 
-	public RealBufferWaveRecorder( int sampleRate, String filePrefix )
+    public RealBufferWaveRecorder(int sampleRate, String filePrefix)
-	{
+    {
-		mAudioFormat = 	new AudioFormat( sampleRate,  //SampleRate
+        mAudioFormat = new AudioFormat(sampleRate,  //SampleRate
-										 16,     //Sample Size
+            16,     //Sample Size
-										 1,      //Channels
+            1,      //Channels
-										 true,   //Signed
+            true,   //Signed
-										 false ); //Little Endian
+            false); //Little Endian
 
-		mFilePrefix = filePrefix;
+        mFilePrefix = filePrefix;
-	}
+    }
 
-	/**
+    /**
-	 * Timestamp of when the latest buffer was received by this recorder
+     * Indicates if the recorder is currently running.
-	 */
+     */
-	public long getLastBufferReceived()
+    public boolean isRunning()
-	{
+    {
-		return mLastBufferReceived;
+        return mRunning.get();
-	}
+    }
 
-	public Path getFile()
+    /**
-	{
+     * Timestamp of when the latest buffer was received by this recorder
-		return mFile;
+     */
-	}
+    public long getLastBufferReceived()
+    {
+        return mLastBufferReceived;
+    }
 
-	public void start( ScheduledExecutorService executor )
+    public Path getFile()
-	{
+    {
-		if( mRunning.compareAndSet( false, true ) )
+        return mFile;
-		{
+    }
-			if( mBufferProcessor == null )
-			{
-				mBufferProcessor = new BufferProcessor();
-			}
 
-			try
+    public void start(ScheduledExecutorService executor)
-			{
+    {
-				StringBuilder sb = new StringBuilder();
+        if(mRunning.compareAndSet(false, true))
-				sb.append( mFilePrefix );
+        {
-				sb.append( "_" );
+            if(mBufferProcessor == null)
-				sb.append( TimeStamp.getLongTimeStamp( "_" ) );
+            {
-				sb.append( ".wav" );
+                mBufferProcessor = new BufferProcessor();
+            }
 
-				mFile = Paths.get( sb.toString() );
+            try
+            {
+                StringBuilder sb = new StringBuilder();
+                sb.append(mFilePrefix);
+                sb.append("_");
+                sb.append(TimeStamp.getLongTimeStamp("_"));
+                sb.append(".wav");
 
-				mWriter = new WaveWriter( mAudioFormat, mFile );
+                mFile = Paths.get(sb.toString());
+
+                mWriter = new WaveWriter(mAudioFormat, mFile);
 
 				/* Schedule the processor to run every 500 milliseconds */
-				mProcessorHandle = executor.scheduleAtFixedRate( 
+                mProcessorHandle = executor.scheduleAtFixedRate(mBufferProcessor, 0, 500, TimeUnit.MILLISECONDS);
-					mBufferProcessor, 0, 500, TimeUnit.MILLISECONDS );
-			}
-			catch( IOException io )
-			{
-				mLog.error( "Error starting real buffer recorder", io );
-			}
-		}
-	}
-	
-	public void stop()
-	{
-		/* Signal the buffer processor to end with a poison pill */
-		receive( new PoisonPill() );
-		
-		mRunning.set( false );
-	}
-	
-	@Override
-    public void receive( RealBuffer buffer )
-    {
-		if( mRunning.get() )
-		{
-			boolean success = mBuffers.offer( buffer );
-			
-			if( !success )
-			{
-				mLog.error( "recorder buffer overflow - purging [" + 
-						mFile.toFile().getAbsolutePath() + "]" );
-				
-				mBuffers.clear();
-			}
-			
-			mLastBufferReceived = System.currentTimeMillis();
-		}
-    }
-	
-	@Override
-	public Listener<RealBuffer> getFilteredRealBufferListener()
-	{
-		return this;
-	}
-
-	@Override
-	public void dispose()
-	{
-		stop();
-	}
-
-	@Override
-	public void reset()
-	{
-	}
-	
-	public class BufferProcessor implements Runnable
-    {
-    	public void run()
-    	{
-			try
-            {
-				RealBuffer buffer = mBuffers.poll();
-				
-				while( buffer != null )
-				{
-					if( buffer instanceof PoisonPill )
-					{
-						buffer = null;
-						
-						mBuffers.clear();
-						
-						if( mWriter != null )
-						{
-							try
-							{
-								mWriter.close();
-							}
-							catch( IOException io )
-							{
-								mLog.error( "Error stopping complex wave recorder [" + 
-											getFile() + "]", io );
-							}
-						}
-						
-						if( mProcessorHandle != null )
-						{
-							mProcessorHandle.cancel( true );
-						}
-						
-						mProcessorHandle = null;
-						mWriter = null;
-						mFile = null;
-					}
-					else
-					{
-						mWriter.write( ConversionUtils.convertToSigned16BitSamples( buffer ) );
-						buffer = mBuffers.poll();
-					}
-				}
             }
-			catch ( IOException ioe )
+            catch(IOException io)
-			{
+            {
-				/* Stop this module if/when we get an IO exception */
+                mLog.error("Error starting real buffer recorder", io);
-				mBuffers.clear();
+            }
-				stop();
+        }
-				
-				mLog.error( "IOException while trying to write to the wave "
-						+ "writer", ioe );
-			}
-    	}
     }
 
-	/**
+    public void stop()
-	 * This is used as a sentinel value to signal the buffer processor to end
+    {
-	 */
+        if(mRunning.compareAndSet(true, false))
-	public class PoisonPill extends RealBuffer
+        {
-	{
+            try
-		public PoisonPill()
+            {
-		{
+                write();
-			super( new float[ 1 ] );
+
-		}
+                if(mWriter != null)
-	}
+                {
+                    mWriter.close();
+                    mWriter = null;
+                }
+            }
+            catch(IOException ioe)
+            {
+                mLog.error("Error writing final audio buffers to recording during shutdown", ioe);
+            }
+        }
+    }
+
+    @Override
+    public void receive(RealBuffer buffer)
+    {
+        if(mRunning.get())
+        {
+            boolean success = mBuffers.offer(buffer);
+
+            if(!success)
+            {
+                mLog.error("recorder buffer overflow - purging [" + mFile.toFile().getAbsolutePath() + "]");
+                mBuffers.clear();
+            }
+
+            mLastBufferReceived = System.currentTimeMillis();
+        }
+    }
+
+    @Override
+    public Listener<RealBuffer> getFilteredRealBufferListener()
+    {
+        return this;
+    }
+
+    @Override
+    public void dispose()
+    {
+        stop();
+    }
+
+    @Override
+    public void reset()
+    {
+    }
+
+    /**
+     * Writes all audio currently in the queue to the file
+     * @throws IOException if there are any errors writing the audio
+     */
+    private void write() throws IOException
+    {
+        RealBuffer buffer = mBuffers.poll();
+
+        while(buffer != null)
+        {
+            mWriter.write(ConversionUtils.convertToSigned16BitSamples(buffer));
+            buffer = mBuffers.poll();
+        }
+    }
+
+    public class BufferProcessor implements Runnable
+    {
+        public void run()
+        {
+            try
+            {
+                write();
+            }
+            catch(IOException ioe)
+            {
+				/* Stop this module if/when we get an IO exception */
+                mBuffers.clear();
+                stop();
+
+                mLog.error("IO Exception while trying to write to the wave writer", ioe);
+            }
+        }
+    }
 }

src/record/wave/WaveWriter.java

@@ -1,22 +1,25 @@
 /*******************************************************************************
- *     SDR Trunk 
+ * sdrtrunk
- *     Copyright (C) 2014 Dennis Sheirer
+ * Copyright (C) 2014-2017 Dennis Sheirer
  *
- *     This program is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
+ * (at your option) any later version.
  *
- *     This program is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
+ * 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/>
  *
- *     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 record.wave;
 
+import org.apache.commons.lang3.Validate;
+
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
@@ -32,10 +35,7 @@ import javax.sound.sampled.AudioFormat;
 
 public class WaveWriter implements AutoCloseable 
 {
-//	private final static Logger mLog = LoggerFactory.getLogger( WaveWriter.class );
+	private static final Pattern FILENAME_PATTERN = Pattern.compile( "(.*_)(\\d+)(\\.wav)" );
-
-	private static final Pattern FILENAME_PATTERN = 
-			Pattern.compile( "(.*_)(\\d+)(\\.wav)" );
 	public static final long MAX_WAVE_SIZE = 2l * (long)Integer.MAX_VALUE;
 	
 	private AudioFormat mAudioFormat;
@@ -56,11 +56,10 @@ public class WaveWriter implements AutoCloseable
 	 * @param maxSize - maximum file size ( range: 1 - 4,294,967,294 bytes )
 	 * @throws IOException - if there are any IO issues
 	 */
-	public WaveWriter( AudioFormat format, Path file, long maxSize ) 
+	public WaveWriter( AudioFormat format, Path file, long maxSize ) throws IOException
-			throws IOException
 	{
-		assert( format != null );
+		Validate.isTrue(format != null);
-		assert( file != null );
+		Validate.isTrue( file != null );
 		
 		mAudioFormat = format;
 		mFile = file;
@@ -100,15 +99,11 @@ public class WaveWriter implements AutoCloseable
 		
 		while( Files.exists( mFile ) )
 		{
-			mFile = Paths.get( mFile.toFile().getAbsolutePath()
+			mFile = Paths.get( mFile.toFile().getAbsolutePath().replace( ".wav", "_" + version + ".wav" ) );
-					.replace( ".wav", "_" + version + ".wav" ) );
-			
 			version++;
 		}
 		
-		Files.createFile( mFile );
+		mFileChannel = (FileChannel.open( mFile, StandardOpenOption.WRITE, StandardOpenOption.CREATE_NEW ) );
-		
-		mFileChannel = (FileChannel.open( mFile, StandardOpenOption.WRITE ) );
 
 		ByteBuffer header = WaveUtils.getWaveHeader( mAudioFormat );
 		
@@ -127,9 +122,18 @@ public class WaveWriter implements AutoCloseable
 	{
 		mFileChannel.force( true );
 		mFileChannel.close();
+		mFileChannel = null;
 	}
 
-	/**
+    @Override
+    protected void finalize() throws IOException
+    {
+        mFileChannel.force( true );
+        mFileChannel.close();
+        mFileChannel = null;
+    }
+
+    /**
 	 * Writes the buffer contents to the file.  Assumes that the buffer is full 
 	 * and the first byte of data is at position 0.
 	 */

src/sample/adapter/ChannelShortAdapter.java

@@ -20,6 +20,7 @@ package sample.adapter;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
+import org.apache.commons.lang3.Validate;
 import source.mixer.MixerChannel;
 
 /**
@@ -34,7 +35,7 @@ public class ChannelShortAdapter implements ISampleAdapter
 	public ChannelShortAdapter( MixerChannel channel )
 	{
 		/* Only use with LEFT/RIGHT channels */
-		assert( channel != MixerChannel.MONO );
+		Validate.isTrue(channel != MixerChannel.MONO);
 		
 		mMixerChannel = channel;
 	}