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

P25 channel state updates.

Browse Source
This commit is contained in:
dennis.sheirer
2014-12-21 23:05:47 +00:00
parent 1d77f28958
commit d15ff407bd
4 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/controller/state/ChannelState.java
View File

@@ -302,8 +302,14 @@ public abstract class ChannelState implements Listener<Message>
switch( state ) switch( state )
{ {
case CONTROL:
setSquelchState( SquelchState.SQUELCH );
break;
case CALL: case CALL:
setSquelchState( SquelchState.UNSQUELCH ); setSquelchState( SquelchState.UNSQUELCH );
mTimerService.stopResetTimer();
mTimerService.startFadeTimer();
break;
case DATA: case DATA:
mTimerService.stopResetTimer(); mTimerService.stopResetTimer();
mTimerService.startFadeTimer(); mTimerService.startFadeTimer();

18
src/decode/p25/P25ChannelState.java
View File

@@ -484,7 +484,7 @@ public class P25ChannelState extends ChannelState
.details( "AFFILIATION:" + gar.getResponse().name() + .details( "AFFILIATION:" + gar.getResponse().name() +
" FOR " + gar.getAffiliationScope() + " FOR " + gar.getAffiliationScope() +
" GROUP:" + gar.getGroupAddress() + " GROUP:" + gar.getGroupAddress() +
" GROUP ANNOUNCEMENT:" + " ANNOUNCEMENT GROUP:" +
gar.getAnnouncementGroupAddress() ) gar.getAnnouncementGroupAddress() )
.to( gar.getTargetAddress() ) .to( gar.getTargetAddress() )
.build() ); .build() );
@@ -628,7 +628,7 @@ public class P25ChannelState extends ChannelState
.details( "AFFILIATION:" + gar.getResponse().name() + .details( "AFFILIATION:" + gar.getResponse().name() +
" FOR GROUP:" + gar.getGroupWACN() + "-" + " FOR GROUP:" + gar.getGroupWACN() + "-" +
gar.getGroupSystemID() + "-" + gar.getGroupSystemID() + "-" +
gar.getGroupID() + " GROUP ANNOUNCEMENT:" + gar.getGroupID() + " ANNOUNCEMENT GROUP:" +
gar.getAnnouncementGroupID() ) gar.getAnnouncementGroupID() )
.from( gar.getSourceWACN() + "-" + .from( gar.getSourceWACN() + "-" +
gar.getSourceSystemID() + "-" + gar.getSourceSystemID() + "-" +
@@ -1222,14 +1222,18 @@ public class P25ChannelState extends ChannelState
case SNDCP_DATA_CHANNEL_GRANT: case SNDCP_DATA_CHANNEL_GRANT:
SNDCPDataChannelGrant sdcg = (SNDCPDataChannelGrant)message; SNDCPDataChannelGrant sdcg = (SNDCPDataChannelGrant)message;
mCallEventModel.add( CallEvent event =
new P25CallEvent.Builder( CallEventType.DATA_CALL ) new P25CallEvent.Builder( CallEventType.DATA_CALL )
.aliasList( mAliasList ) .aliasList( mAliasList )
.channel( sdcg.getTransmitChannel() ) .channel( sdcg.getTransmitChannel() )
.details( "SNDCP DATA NSAPI:" + sdcg.getNSAPI() ) .details( "SNDCP DATA NSAPI:" + sdcg.getNSAPI() )
.frequency( sdcg.getDownlinkFrequency() ) .frequency( sdcg.getDownlinkFrequency() )
.to( sdcg.getTargetAddress() ) .to( sdcg.getTargetAddress() )
.build() ); .build();
mCallEventModel.add( event );
addCall( event );
break; break;
case TELEPHONE_INTERCONNECT_VOICE_CHANNEL_GRANT: case TELEPHONE_INTERCONNECT_VOICE_CHANNEL_GRANT:
TelephoneInterconnectVoiceChannelGrant tivcg = TelephoneInterconnectVoiceChannelGrant tivcg =
@@ -1445,12 +1449,6 @@ public class P25ChannelState extends ChannelState
} }
} }
@Override
public void setSquelchState( SquelchState state )
{
//do nothing ... we want the squelch state always unsquelched (for now)
}
@Override @Override
public String getActivitySummary() public String getActivitySummary()
{ {

4
src/decode/p25/message/tsbk/osp/control/GroupAffiliationQuery.java
View File

@@ -8,9 +8,9 @@ import decode.p25.reference.Opcode;
public class GroupAffiliationQuery extends TSBKMessage public class GroupAffiliationQuery extends TSBKMessage
{ {
public static final int[] SOURCE_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,111,112,113,114,115,116,117,118,119 }; 104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119 };
public static final int[] TARGET_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,134,135,136,137,138,139,140,141,142,143 }; 127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 };
public GroupAffiliationQuery( BitSetBuffer message, public GroupAffiliationQuery( BitSetBuffer message,

14
src/dsp/fsk/C4FMSymbolFilter.java
View File

@@ -311,13 +311,13 @@ public class C4FMSymbolFilter implements RealSampleListener,
mFineFrequencyCorrection += ( symbolError * K_FINE_FREQUENCY ); mFineFrequencyCorrection += ( symbolError * K_FINE_FREQUENCY );
/* send frequency correction */ // /* send frequency correction */
if( Math.abs( mCoarseFrequencyCorrection ) > COARSE_FREQUENCY_DEADBAND ) // if( Math.abs( mCoarseFrequencyCorrection ) > COARSE_FREQUENCY_DEADBAND )
{ // {
mLog.debug( "Frequency Correction [" + // mLog.debug( "Frequency Correction [" +
( mCoarseFrequencyCorrection > 0 ? "-" : "+" ) + // ( mCoarseFrequencyCorrection > 0 ? "-" : "+" ) +
mCoarseFrequencyCorrection + "]" ); // mCoarseFrequencyCorrection + "]" );
} // }
if( mSymbolSpreadTap != null ) if( mSymbolSpreadTap != null )
{ {