mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-17 02:57:35 -05:00
Resolved issue with recent change to SiteID Alias handling causing a problem in the MPT1327 channel state.
This commit is contained in:
@@ -17,6 +17,9 @@
|
|||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
package decode.mpt1327;
|
package decode.mpt1327;
|
||||||
|
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import message.Message;
|
import message.Message;
|
||||||
import sample.Listener;
|
import sample.Listener;
|
||||||
import source.config.SourceConfigTuner;
|
import source.config.SourceConfigTuner;
|
||||||
@@ -36,6 +39,8 @@ import decode.mpt1327.MPT1327Message.IdentType;
|
|||||||
|
|
||||||
public class MPT1327ChannelState extends ChannelState
|
public class MPT1327ChannelState extends ChannelState
|
||||||
{
|
{
|
||||||
|
private final static Logger mLog = LoggerFactory.getLogger( MPT1327ChannelState.class );
|
||||||
|
|
||||||
private String mSite;
|
private String mSite;
|
||||||
private String mFromTalkgroup;
|
private String mFromTalkgroup;
|
||||||
private String mToTalkgroup;
|
private String mToTalkgroup;
|
||||||
@@ -153,13 +158,18 @@ public class MPT1327ChannelState extends ChannelState
|
|||||||
.build() );
|
.build() );
|
||||||
break;
|
break;
|
||||||
case ALH:
|
case ALH:
|
||||||
String sys = mpt.getSiteID();
|
String site = mpt.getSiteID();
|
||||||
|
|
||||||
if( sys != null && !sys.contentEquals( mSite ) )
|
if( mSite == null )
|
||||||
{
|
{
|
||||||
mSite = sys;
|
mSite = site;
|
||||||
|
}
|
||||||
|
else if( site != null && !site.contentEquals( mSite ) )
|
||||||
|
{
|
||||||
|
mSite = site;
|
||||||
broadcastChange( ChangedAttribute.CHANNEL_SITE_NUMBER );
|
broadcastChange( ChangedAttribute.CHANNEL_SITE_NUMBER );
|
||||||
}
|
}
|
||||||
|
|
||||||
setState( State.CONTROL );
|
setState( State.CONTROL );
|
||||||
break;
|
break;
|
||||||
case GTC:
|
case GTC:
|
||||||
|
|||||||
Reference in New Issue
Block a user