w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2026-06-07 08:24:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use the settings frequency list as a source for cal frequencies

Browse Source 
Some default time  signals have been added to the  frequency list so a
base  set   can  be   obtained  by   resetting  the   frequency  list,
alternatively they can be added ad hoc in the normal fashion.

FreqCal  mode behavior  is to  select  the lowest  cal frequency  upon
entering  FreqCal   mode  and  cycling  through   each  cal  frequency
repeatedly. Ctrl+F10 jumps directly to the next higher frequency.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7463 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville
2017-01-08 23:58:09 +00:00
parent 92cd8d9959
commit ea507b6ec8
4 changed files with 39 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mainwindow.cpp
+12 -7
View File
@@ -44,7 +44,6 @@
#include "Radio.hpp"
#include "Bands.hpp"
#include "TransceiverFactory.hpp"
#include "FrequencyList.hpp"
#include "StationList.hpp"
#include "LiveFrequencyValidator.hpp"
#include "MessageClient.hpp"
@@ -220,6 +219,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
m_nWSPRdecodes {0},
m_k0 {9999999},
m_nPick {0},
m_current_frequency_list_iter {m_config.frequencies ()->end ()},
m_TRperiodFast {-1},
m_nTx73 {0},
m_btxok {false},
@@ -4546,6 +4546,7 @@ void MainWindow::on_actionFreqCal_triggered()
m_mode="FreqCal";
ui->actionFreqCal->setChecked(true);
switch_mode(Modes::FreqCal);
m_current_frequency_list_iter = m_config.frequencies ()->begin ();
m_wideGraph->setMode(m_mode);
statusChanged();
m_TRperiod=30;
@@ -4560,6 +4561,7 @@ void MainWindow::on_actionFreqCal_triggered()
setup_status_bar (true);
// 18:15:47 0 1 1500 1550.349 0.100 3.5 10.2
ui->decodedTextLabel->setText(" UTC Freq CAL Offset fMeas DF Level S/N");
on_actionFrequency_calibration_triggered ();
}
void MainWindow::switch_mode (Mode mode)
@@ -6096,12 +6098,15 @@ void MainWindow::on_actionErase_reference_spectrum_triggered()
void MainWindow::on_actionFrequency_calibration_triggered()
{
static int n=-1;
double fMHz[]={0.660,0.880,1.210,2.500,3.330,5.000,
7.850,10.000,14.670,15.000,20.000};
m_freqNominal=1000000.0*fMHz[++n] - m_RxFreq + 0.5;
if(n>=10) n=-1;
on_bandComboBox_activated(-1);
if (m_current_frequency_list_iter != m_config.frequencies ()->end ())
{
setRig (m_current_frequency_list_iter->frequency_ - m_RxFreq + 0.5);
if (++m_current_frequency_list_iter == m_config.frequencies ()->end ())
{
// loop back to beginning
m_current_frequency_list_iter = m_config.frequencies ()->begin ();
}
}
}
void MainWindow::on_sbCQTxFreq_valueChanged(int)