GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-12 08:37:25 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

P25 - adds direct frequency control for the C4FM symbol filter to adjust the tuner channel for frequency correction.

Browse Source
This commit is contained in:
dennis.sheirer
2015-01-19 16:20:37 +00:00
parent cc5edd4790
commit 1c0da75c01
7 changed files with 146 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/controller/channel/ProcessingChain.java
View File

@@ -46,6 +46,8 @@ import source.RealSource;
import source.Source;
import source.SourceException;
import source.config.SourceConfigMixer;
import source.tuner.DirectFrequencyController;
import source.tuner.FrequencyChangeListener;
import source.tuner.Tuner;
import source.tuner.TunerChannelSource;
import alias.AliasList;
@@ -109,11 +111,28 @@ public class ProcessingChain implements Listener<Message>
}
/**
* Automatic Frequency Control, or null if disabled
* Current frequency correction setting
*/
public AutomaticFrequencyControl getAFC()
public long getFrequencyCorrection()
{
return mAFC;
if( mAFC != null )
{
return mAFC.getErrorCorrection();
}
else if( mDecoder != null &&
mDecoder instanceof DirectFrequencyController )
{
return ( (DirectFrequencyController)mDecoder).getFrequencyCorrection();
}
return 0;
}
public boolean hasFrequencyControl()
{
return mAFC != null ||
( mDecoder != null &&
mDecoder instanceof DirectFrequencyController );
}
public Listener<List<ComplexSample>> getComplexReceiver()
@@ -370,23 +389,31 @@ public class ProcessingChain implements Listener<Message>
mAFC = null;
}
if( mSource instanceof TunerChannelSource &&
mChannel.getDecodeConfiguration().supportsAFC() &&
mChannel.getDecodeConfiguration().isAFCEnabled() )
if( mSource instanceof TunerChannelSource )
{
TunerChannelSource tcs = (TunerChannelSource)mSource;
int maximumCorrection = mChannel
.getDecodeConfiguration().getAFCMaximumCorrection();
mAFC = new AutomaticFrequencyControl( tcs,
maximumCorrection );
if( mChannel.getDecodeConfiguration().supportsAFC() &&
mChannel.getDecodeConfiguration().isAFCEnabled() )
{
int maximumCorrection = mChannel
.getDecodeConfiguration().getAFCMaximumCorrection();
mAFC = new AutomaticFrequencyControl( tcs,
maximumCorrection );
/* Register AFC to receive frequency change events */
tcs.addListener( mAFC );
/* Register AFC to receive frequency change events */
tcs.addListener( mAFC );
/* Add AFC as listener to the decoder */
mDecoder.addUnfilteredRealSampleListener( mAFC );
/* Add AFC as listener to the decoder */
mDecoder.addUnfilteredRealSampleListener( mAFC );
}
else if( mDecoder instanceof DirectFrequencyController )
{
((DirectFrequencyController)mDecoder)
.setListener( (FrequencyChangeListener)tcs );
}
}
}
}