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

P25 - updated automatic and direct frequency control to cleanup the code and allow P25 to better track frequency and PPM changes in the tuner and provide a cleaner implementation of the AFC component in the processing chain of all of the other decoders.

Browse Source 
Changed C4FM symbol filter to reset frequency tracking values when the tuner's frequency or PPM values change.

Moved all frequency control pieces into the source.tuner.frequency package.
This commit is contained in:
dennis.sheirer
2015-05-04 00:55:04 +00:00
parent d2020cdba0
commit bc5080aa4a
44 changed files with 533 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/spectrum/ChannelSpectrumPanel.java
View File

@@ -25,8 +25,8 @@ import settings.Setting;
import settings.SettingChangeListener;
import settings.SettingsManager;
import source.Source.SampleType;
import source.tuner.FrequencyChangeEvent;
import source.tuner.FrequencyChangeEvent.Attribute;
import source.tuner.frequency.FrequencyChangeEvent;
import source.tuner.frequency.FrequencyChangeEvent.Attribute;
import spectrum.converter.DFTResultsConverter;
import spectrum.converter.RealDecibelConverter;
import spectrum.menu.AveragingItem;

6
src/spectrum/DFTProcessor.java
View File

@@ -34,8 +34,8 @@ import sample.Listener;
import sample.complex.ComplexBuffer;
import source.Source;
import source.Source.SampleType;
import source.tuner.FrequencyChangeEvent;
import source.tuner.FrequencyChangeListener;
import source.tuner.frequency.FrequencyChangeEvent;
import source.tuner.frequency.FrequencyChangeListener;
import spectrum.converter.DFTResultsConverter;
import dsp.filter.Window;
import dsp.filter.Window.WindowType;
@@ -460,7 +460,7 @@ public class DFTProcessor implements Listener<ComplexBuffer>,
case SAMPLE_RATE_ERROR:
break;
case SAMPLE_RATE:
mSampleRate = (int)event.getValue();
mSampleRate = event.getValue().intValue();
calculateConsumptionRate();
break;
default:

12
src/spectrum/OverlayPanel.java
View File

@@ -41,9 +41,9 @@ import settings.ColorSetting;
import settings.ColorSetting.ColorSettingName;
import settings.Setting;
import settings.SettingChangeListener;
import source.tuner.FrequencyChangeEvent;
import source.tuner.FrequencyChangeListener;
import source.tuner.TunerChannel;
import source.tuner.frequency.FrequencyChangeEvent;
import source.tuner.frequency.FrequencyChangeListener;
import controller.ResourceManager;
import controller.channel.Channel;
import controller.channel.Channel.ChannelType;
@@ -568,7 +568,7 @@ public class OverlayPanel extends JPanel
switch( event.getAttribute() )
{
case SAMPLE_RATE:
mBandwidth = (int)event.getValue();
mBandwidth = event.getValue().intValue();
if( mBandwidth < 200000 )
{
@@ -580,7 +580,7 @@ public class OverlayPanel extends JPanel
}
break;
case FREQUENCY:
mFrequency = event.getValue();
mFrequency = event.getValue().longValue();
break;
default:
break;
@@ -798,8 +798,8 @@ public class OverlayPanel extends JPanel
switch( event.getAttribute() )
{
case FREQUENCY:
LabelDisplay display =
LabelDisplay.fromFrequency( event.getValue() );
LabelDisplay display = LabelDisplay
.fromFrequency( event.getValue().longValue() );
if( mLabelDisplay != display )
{

6
src/spectrum/SpectralDisplayPanel.java
View File

@@ -56,9 +56,9 @@ import settings.SettingChangeListener;
import settings.SettingsManager;
import source.Source.SampleType;
import source.SourceException;
import source.tuner.FrequencyChangeEvent;
import source.tuner.FrequencyChangeEvent.Attribute;
import source.tuner.FrequencyChangeListener;
import source.tuner.frequency.FrequencyChangeEvent;
import source.tuner.frequency.FrequencyChangeListener;
import source.tuner.frequency.FrequencyChangeEvent.Attribute;
import source.tuner.Tuner;
import source.tuner.TunerSelectionListener;
import spectrum.OverlayPanel.ChannelDisplay;