mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-12 16:47:31 -05:00
9c305b0732
specifically for P25 C4FM frequency tracking. -Clarifies frequency change event naming and adds request/notitification events for channel frequency correction type events -Removes DC offset filter from P25 C4FM demodulator which was operating independently of the AFC tracking component within the C4FM symbol filter. -Changed FCD tuner center DC spike buffer size after detecting that the DC center spike was influencing the P25 C4FM filter frequency tracker whenever the tuner's center frequency was changed to bring the channel boundary within 3 kHz of the center spike -- set it to 5 kHz to provide a better buffer. -Updated spectral channel display to provide better indication of automatic frequency control (yellow line) versus channel frequency
123 lines
3.7 KiB
Java
123 lines
3.7 KiB
Java
/*******************************************************************************
|
|
* SDR Trunk
|
|
* Copyright (C) 2014 Dennis Sheirer
|
|
*
|
|
* This program is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
|
******************************************************************************/
|
|
package source.tuner.rtl.r820t;
|
|
|
|
import gui.control.JFrequencyControl;
|
|
|
|
import java.awt.Color;
|
|
import java.awt.EventQueue;
|
|
|
|
import javax.swing.JLabel;
|
|
import javax.swing.JPanel;
|
|
|
|
import net.miginfocom.swing.MigLayout;
|
|
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.LoggerFactory;
|
|
|
|
import source.SourceException;
|
|
import source.tuner.frequency.FrequencyChangeEvent;
|
|
import source.tuner.frequency.FrequencyChangeListener;
|
|
import source.tuner.frequency.FrequencyChangeEvent.Event;
|
|
import source.tuner.rtl.RTL2832InfoPanel;
|
|
|
|
import com.jidesoft.swing.JideTabbedPane;
|
|
|
|
import controller.ResourceManager;
|
|
|
|
public class R820TTunerEditorPanel extends JPanel implements FrequencyChangeListener
|
|
{
|
|
private final static Logger mLog =
|
|
LoggerFactory.getLogger( R820TTunerEditorPanel.class );
|
|
|
|
private static final long serialVersionUID = 1L;
|
|
|
|
private R820TTunerController mController;
|
|
private ResourceManager mResourceManager;
|
|
|
|
private JFrequencyControl mFrequencyControl;
|
|
|
|
public R820TTunerEditorPanel( R820TTunerController controller,
|
|
ResourceManager resourceManager )
|
|
{
|
|
mController = controller;
|
|
mResourceManager = resourceManager;
|
|
|
|
initGUI();
|
|
}
|
|
|
|
private void initGUI()
|
|
{
|
|
setLayout( new MigLayout( "fill,wrap 2", "[right][grow]", "[][][grow]" ) );
|
|
|
|
add( new JLabel( "RTL2832 with R820T Tuner" ), "span 2, align center, wrap" );
|
|
|
|
mFrequencyControl = new JFrequencyControl();
|
|
|
|
mFrequencyControl.addListener( this );
|
|
|
|
/* Add frequency control as frequency change listener. */
|
|
mController.addListener( mFrequencyControl );
|
|
|
|
mFrequencyControl.setFrequency( mController.getFrequency(), false );
|
|
|
|
add( mFrequencyControl, "span 2, align center, wrap" );
|
|
|
|
JideTabbedPane tabs = new JideTabbedPane();
|
|
tabs.setFont( this.getFont() );
|
|
tabs.setForeground( Color.BLACK );
|
|
|
|
tabs.addTab( "Configuration",
|
|
new R820TTunerConfigurationPanel( mResourceManager, mController ) );
|
|
|
|
tabs.addTab( "Info", new RTL2832InfoPanel( mController ) );
|
|
|
|
add( tabs, "grow,push,span" );
|
|
}
|
|
|
|
/**
|
|
* Frequency change listener for the frequency control gui component to
|
|
* apply end-user requested frequency changes against the tuner
|
|
*/
|
|
@Override
|
|
public void frequencyChanged( FrequencyChangeEvent event )
|
|
{
|
|
if( event.getEvent() == Event.FREQUENCY_CHANGE_NOTIFICATION )
|
|
{
|
|
final long frequency = event.getValue().longValue();
|
|
|
|
EventQueue.invokeLater( new Runnable()
|
|
{
|
|
@Override
|
|
public void run()
|
|
{
|
|
try
|
|
{
|
|
mController.setFrequency( frequency );
|
|
}
|
|
catch ( SourceException e )
|
|
{
|
|
mLog.error( "R820T Tuner Controller - error setting frequency [" +
|
|
frequency + "]", e );
|
|
}
|
|
}
|
|
} );
|
|
}
|
|
}
|
|
}
|