w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-07-22 03:25:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Display full Doppler in Echo mode text output, not just the audio shift.

Browse Source
This commit is contained in:
Joe Taylor 2022-08-16 14:42:22 -04:00
parent a767a7dd1e
commit d08c1e106a
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
widgets/astro.cpp
View File

@ -367,3 +367,8 @@ qint32 Astro::nfRIT()
return 0; return 0;
} }
} }
qint32 Astro::DopplerMethod()
{
return m_DopplerMethod;
}

1
widgets/astro.h
View File

@ -66,6 +66,7 @@ public:
void selectOwnEcho(); void selectOwnEcho();
void selectOnDxEcho(); void selectOnDxEcho();
qint32 nfRIT(); qint32 nfRIT();
qint32 DopplerMethod();
Q_SLOT void nominal_frequency (Frequency rx, Frequency tx); Q_SLOT void nominal_frequency (Frequency rx, Frequency tx);
Q_SIGNAL void tracking_update () const; Q_SIGNAL void tracking_update () const;

7
widgets/mainwindow.cpp
View File

@ -4699,7 +4699,7 @@ void MainWindow::guiUpdate()
//Once per second (onesec) //Once per second (onesec)
if(nsec != m_sec0) { if(nsec != m_sec0) {
// qDebug() << "AAA" << nsec << int(m_config.special_op_id()) << int(m_specOp); // qDebug() << "AAA" << nsec;
if(m_mode=="FST4") chk_FST4_freq_range(); if(m_mode=="FST4") chk_FST4_freq_range();
m_currentBand=m_config.bands()->find(m_freqNominal); m_currentBand=m_config.bands()->find(m_freqNominal);
@ -8742,10 +8742,9 @@ void MainWindow::astroUpdate ()
m_fSpread=correction.width; m_fSpread=correction.width;
if (m_transmitting && !m_config.tx_QSY_allowed ()) return; // No Tx Doppler correction if rig can't do it if (m_transmitting && !m_config.tx_QSY_allowed ()) return; // No Tx Doppler correction if rig can't do it
if (!m_astroWidget->doppler_tracking()) { // We are not using Doppler correction if (!m_astroWidget->doppler_tracking() or m_astroWidget->DopplerMethod()==0) {
// We are not using RF Doppler correction
m_fAudioShift=m_fDop; m_fAudioShift=m_fDop;
// qDebug() << "cc1" << m_hisGrid << m_auto << m_astroWidget->doppler_tracking()
// << m_fSpread << m_fDop << correction.rx << m_fAudioShift;
return; return;
} }
if ((m_monitoring || m_transmitting) if ((m_monitoring || m_transmitting)