mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-12 08:37:25 -05:00
and auto-correction for R820T tuners. -Updated TunerModel and TunerViewPanel to add 2 new columns to display the current tuner's PPM setting and (when available) the measured frequency error averaged over 5 second intervals provided by certain decoders (e.g. P25 C4FM and LSM). Frequency error value from P25 decoders is provided from the Costas Loop PLL once 2 or more P25 message sync events have been observed in a short period. -Updated R820T tuner to auto-correct PPM when measured frequency error exceeds the +/- 0.4PPM threshold for a period of 30 seconds or more. Feature can be enabled/disabled by user in the tuner editor panel. Resolved several issues with P25 C4FM/LSM decoders that was impacting performance related to channel misalignment from tuner PPM offsets.
185 lines
6.7 KiB
Java
185 lines
6.7 KiB
Java
/*******************************************************************************
|
|
* SDR Trunk
|
|
* Copyright (C) 2014-2016 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 io.github.dsheirer.source.tuner;
|
|
|
|
import com.jidesoft.swing.JideSplitPane;
|
|
import io.github.dsheirer.sample.Listener;
|
|
import io.github.dsheirer.source.tuner.TunerEvent.Event;
|
|
import net.miginfocom.swing.MigLayout;
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.LoggerFactory;
|
|
|
|
import javax.swing.JLabel;
|
|
import javax.swing.JPanel;
|
|
import javax.swing.JScrollPane;
|
|
import javax.swing.JTable;
|
|
import javax.swing.ListSelectionModel;
|
|
import javax.swing.RowSorter;
|
|
import javax.swing.SortOrder;
|
|
import javax.swing.event.ListSelectionEvent;
|
|
import javax.swing.event.ListSelectionListener;
|
|
import javax.swing.table.DefaultTableCellRenderer;
|
|
import javax.swing.table.TableCellRenderer;
|
|
import javax.swing.table.TableRowSorter;
|
|
import java.awt.Color;
|
|
import java.awt.Component;
|
|
import java.awt.Dimension;
|
|
import java.awt.event.MouseAdapter;
|
|
import java.awt.event.MouseEvent;
|
|
import java.util.ArrayList;
|
|
import java.util.List;
|
|
|
|
public class TunerViewPanel extends JPanel
|
|
{
|
|
private static final long serialVersionUID = 1L;
|
|
private final static Logger mLog = LoggerFactory.getLogger(TunerViewPanel.class);
|
|
|
|
private TunerModel mTunerModel;
|
|
private JTable mTunerTable;
|
|
private TableRowSorter<TunerModel> mRowSorter;
|
|
private JideSplitPane mSplitPane;
|
|
private TunerEditor mTunerEditor;
|
|
|
|
public TunerViewPanel(TunerModel tunerModel)
|
|
{
|
|
mTunerModel = tunerModel;
|
|
mTunerEditor = new TunerEditor(mTunerModel.getTunerConfigurationModel());
|
|
|
|
init();
|
|
}
|
|
|
|
private void init()
|
|
{
|
|
setLayout(new MigLayout("insets 0 0 0 0", "[fill,grow]", "[fill,grow]"));
|
|
|
|
mRowSorter = new TableRowSorter<>(mTunerModel);
|
|
List<RowSorter.SortKey> sortKeys = new ArrayList<>();
|
|
sortKeys.add(new RowSorter.SortKey(TunerModel.TUNER_TYPE, SortOrder.ASCENDING));
|
|
sortKeys.add(new RowSorter.SortKey(TunerModel.TUNER_ID, SortOrder.ASCENDING));
|
|
mRowSorter.setSortKeys(sortKeys);
|
|
|
|
mTunerTable = new JTable(mTunerModel);
|
|
mTunerTable.setRowSorter(mRowSorter);
|
|
mTunerTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
|
|
mTunerTable.getSelectionModel().addListSelectionListener(new ListSelectionListener()
|
|
{
|
|
@Override
|
|
public void valueChanged(ListSelectionEvent event)
|
|
{
|
|
if(!event.getValueIsAdjusting())
|
|
{
|
|
int row = mTunerTable.getSelectedRow();
|
|
|
|
if(row >= 0)
|
|
{
|
|
int modelRow = mTunerTable.convertRowIndexToModel(row);
|
|
mTunerEditor.setItem(mTunerModel.getTuner(modelRow));
|
|
}
|
|
}
|
|
}
|
|
});
|
|
|
|
mTunerModel.addListener(new Listener<TunerEvent>()
|
|
{
|
|
@Override
|
|
public void receive(TunerEvent tunerEvent)
|
|
{
|
|
switch(tunerEvent.getEvent())
|
|
{
|
|
case LOCK_STATE_CHANGE:
|
|
if(tunerEvent.getTuner() != null)
|
|
{
|
|
int row = mTunerTable.getSelectedRow();
|
|
|
|
if(row >= 0)
|
|
{
|
|
int modelRow = mTunerTable.convertRowIndexToModel(row);
|
|
Tuner selectedTuner = mTunerModel.getTuner(modelRow);
|
|
|
|
if(selectedTuner == tunerEvent.getTuner())
|
|
{
|
|
mTunerEditor.setTunerLockState(selectedTuner.getTunerController().isLocked());
|
|
}
|
|
}
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
});
|
|
|
|
mTunerTable.addMouseListener(new MouseAdapter()
|
|
{
|
|
@Override
|
|
public void mouseClicked(MouseEvent e)
|
|
{
|
|
int column = mTunerTable.columnAtPoint(e.getPoint());
|
|
|
|
if(column == TunerModel.SPECTRAL_DISPLAY_NEW)
|
|
{
|
|
int tableRow = mTunerTable.rowAtPoint(e.getPoint());
|
|
int modelRow = mTunerTable.convertRowIndexToModel(tableRow);
|
|
|
|
Tuner tuner = mTunerModel.getTuner(modelRow);
|
|
|
|
if(tuner != null)
|
|
{
|
|
mTunerModel.broadcast(new TunerEvent(tuner,
|
|
Event.REQUEST_NEW_SPECTRAL_DISPLAY));
|
|
}
|
|
}
|
|
}
|
|
});
|
|
|
|
TableCellRenderer renderer = new LinkCellRenderer();
|
|
mTunerTable.getColumnModel().getColumn(TunerModel.SPECTRAL_DISPLAY_NEW).setCellRenderer(renderer);
|
|
|
|
JScrollPane listScroller = new JScrollPane(mTunerTable);
|
|
listScroller.setPreferredSize(new Dimension(400, 20));
|
|
|
|
JScrollPane editorScroller = new JScrollPane(mTunerEditor);
|
|
editorScroller.setPreferredSize(new Dimension(400, 80));
|
|
|
|
mSplitPane = new JideSplitPane();
|
|
mSplitPane.setOrientation(JideSplitPane.VERTICAL_SPLIT);
|
|
mSplitPane.add(listScroller);
|
|
mSplitPane.add(editorScroller);
|
|
|
|
add(mSplitPane);
|
|
}
|
|
|
|
public class LinkCellRenderer extends DefaultTableCellRenderer
|
|
{
|
|
private static final long serialVersionUID = 1L;
|
|
|
|
@Override
|
|
public Component getTableCellRendererComponent(JTable table,
|
|
Object value, boolean isSelected, boolean hasFocus, int row,
|
|
int column)
|
|
{
|
|
JLabel label = (JLabel)super.getTableCellRendererComponent(table,
|
|
value, isSelected, hasFocus, row, column);
|
|
|
|
label.setForeground(Color.BLUE.brighter());
|
|
label.setToolTipText("Show this tuner in a new spectral display");
|
|
|
|
return label;
|
|
}
|
|
}
|
|
}
|