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

Changed FrequencyChangeListener interface to an event so that I could describe what event was causing the frequency change and to broadcast frequency and sample rate error values.

Browse Source 
R820T - added a couple more sample rate settings to the enum and modified the periodic sample rate info logger.
This commit is contained in:
dennis.sheirer
2014-09-27 09:46:18 +00:00
parent e441ebf0c9
commit 550aed79d4
28 changed files with 600 additions and 500 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/source/tuner/fcd/proV1/FCD1TunerController.java
View File

@@ -60,7 +60,7 @@ public class FCD1TunerController extends FCDTunerController
sMINIMUM_TUNABLE_FREQUENCY,
sMAXIMUM_TUNABLE_FREQUENCY );
mFrequencyController.setBandwidth( sSAMPLE_RATE );
mFrequencyController.setSampleRate( sSAMPLE_RATE );
try
{

26
src/source/tuner/fcd/proV1/FCD1TunerEditorPanel.java
View File

@@ -30,6 +30,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import source.SourceException;
import source.tuner.FrequencyChangeEvent;
import source.tuner.FrequencyChangeEvent.Attribute;
import source.tuner.FrequencyChangeListener;
import source.tuner.fcd.FCDTuner;
import source.tuner.fcd.FCDTunerDetailsPanel;
@@ -91,17 +93,19 @@ public class FCD1TunerEditorPanel extends JPanel implements FrequencyChangeListe
}
@Override
public void frequencyChanged( long frequency, int bandwidth )
public void frequencyChanged( FrequencyChangeEvent event )
{
//Disregard the bandwidth value, which shouldn't be changing
try
{
mController.setFrequency( frequency );
}
catch ( SourceException e )
{
mLog.error( "FCTProController - error setting frequency [" +
frequency + "]", e );
}
if( event.getAttribute() == Attribute.FREQUENCY )
{
try
{
mController.setFrequency( event.getValue() );
}
catch ( SourceException e )
{
mLog.error( "FCTProController - error setting frequency [" +
event.getValue() + "]", e );
}
}
}
}

2
src/source/tuner/fcd/proplusV2/FCD2TunerController.java
View File

@@ -53,7 +53,7 @@ public class FCD2TunerController extends FCDTunerController
sMINIMUM_TUNABLE_FREQUENCY,
sMAXIMUM_TUNABLE_FREQUENCY );
mFrequencyController.setBandwidth( sSAMPLE_RATE );
mFrequencyController.setSampleRate( sSAMPLE_RATE );
try
{

27
src/source/tuner/fcd/proplusV2/FCD2TunerEditorPanel.java
View File

@@ -30,6 +30,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import source.SourceException;
import source.tuner.FrequencyChangeEvent;
import source.tuner.FrequencyChangeEvent.Attribute;
import source.tuner.FrequencyChangeListener;
import source.tuner.fcd.FCDTuner;
import source.tuner.fcd.FCDTunerDetailsPanel;
@@ -90,17 +92,20 @@ public class FCD2TunerEditorPanel extends JPanel implements FrequencyChangeListe
}
@Override
public void frequencyChanged( long frequency, int bandwidth )
public void frequencyChanged( FrequencyChangeEvent event )
{
//Disregard the bandwidth, which shouldn't be changing
try
{
mController.setFrequency( frequency );
}
catch ( SourceException e )
{
mLog.error( "FCTProController - error setting frequency [" +
frequency + "]", e );
}
if( event.getAttribute() == Attribute.FREQUENCY )
{
//Disregard the bandwidth, which shouldn't be changing
try
{
mController.setFrequency( event.getValue() );
}
catch ( SourceException e )
{
mLog.error( "FCDProController - error setting frequency [" +
event.getValue() + "]", e );
}
}
}
}