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 - adds SNDCP context management and data packet parsing for IPV4 and UDP/IP packets to include IP addresses and data payload bytes.

Browse Source
This commit is contained in:
dennis.sheirer
2015-01-23 21:06:02 +00:00
parent e5fad7ee22
commit 871705ece8
19 changed files with 1378 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -202,7 +202,7 @@ public class C4FMSymbolFilter implements FrequencyChangeBroadcaster,
private RealSampleListener mListener;
public static final long MAX_FREQUENCY_CORRECTION = 7000;
public static final long MAX_FREQUENCY_CORRECTION = 3000;
private FrequencyChangeListener mFrequencyChangeListener;
private long mFrequencyCorrection;

19
src/dsp/fsk/P25MessageFramer.java
View File

@@ -20,9 +20,10 @@ import decode.p25.message.hdu.HDUMessage;
import decode.p25.message.ldu.LDU1Message;
import decode.p25.message.ldu.LDU2Message;
import decode.p25.message.ldu.lc.LDULCMessageFactory;
import decode.p25.message.pdu.PDUConfirmedMessage;
import decode.p25.message.pdu.PDUMessage;
import decode.p25.message.pdu.PDUMessageFactory;
import decode.p25.message.pdu.confirmed.PDUConfirmedMessage;
import decode.p25.message.pdu.confirmed.PDUConfirmedMessageFactory;
import decode.p25.message.tdu.TDUMessage;
import decode.p25.message.tdu.lc.TDULCMessageFactory;
import decode.p25.message.tdu.lc.TDULinkControlMessage;
@@ -415,8 +416,12 @@ public class P25MessageFramer implements Listener<Dibit>
}
else
{
dispatch( new PDUConfirmedMessage( mMessage.copy(),
mDUID, mAliasList ) );
PDUConfirmedMessage pducm =
new PDUConfirmedMessage( mMessage.copy(),
mAliasList );
/* Translate into correct subclass */
dispatch( PDUConfirmedMessageFactory.getMessage( pducm ) );
mComplete = true;
}
@@ -424,8 +429,12 @@ public class P25MessageFramer implements Listener<Dibit>
}
else
{
dispatch( new PDUConfirmedMessage( mMessage.copy(),
mDUID, mAliasList ) );
PDUConfirmedMessage pducm =
new PDUConfirmedMessage( mMessage.copy(),
mAliasList );
/* Translate into correct subclass */
dispatch( PDUConfirmedMessageFactory.getMessage( pducm ) );
mComplete = true;
}

4
src/dsp/gain/DirectGainControl.java
View File

@@ -71,8 +71,6 @@ public class DirectGainControl implements GainController, RealSampleListener
{
mGain = mMaximum;
}
mLog.debug( "Gain Increased: " + mGain );
}
@Override
@@ -84,8 +82,6 @@ public class DirectGainControl implements GainController, RealSampleListener
{
mGain = mMinimum;
}
mLog.debug( "Gain Decreased: " + mGain );
}
public void setListener( RealSampleListener listener )

2
src/dsp/nbfm/FilteringNBFMDemodulator.java
View File

@@ -55,7 +55,7 @@ public class FilteringNBFMDemodulator implements Listener<ComplexSample>
*/
public FilteringNBFMDemodulator()
{
this( FilterFactory.getLowPass( 48000, 4000, 6000, 48, WindowType.HAMMING, true ),
this( FilterFactory.getLowPass( 48000, 5000, 7000, 48, WindowType.HAMMING, true ),
1.0002,
FilterFactory.getLowPass( 48000, 3000, 6000, 48, WindowType.HAMMING, true ),
2 );