From d08c1e106a3efa6171898b92b6043b6781d3e048 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Tue, 16 Aug 2022 14:42:22 -0400 Subject: [PATCH] Display full Doppler in Echo mode text output, not just the audio shift. --- widgets/astro.cpp | 5 +++++ widgets/astro.h | 1 + widgets/mainwindow.cpp | 7 +++---- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/widgets/astro.cpp b/widgets/astro.cpp index fd0671d3c..44add28d9 100644 --- a/widgets/astro.cpp +++ b/widgets/astro.cpp @@ -367,3 +367,8 @@ qint32 Astro::nfRIT() return 0; } } + +qint32 Astro::DopplerMethod() +{ + return m_DopplerMethod; +} diff --git a/widgets/astro.h b/widgets/astro.h index 28654b7d5..b4047e144 100644 --- a/widgets/astro.h +++ b/widgets/astro.h @@ -66,6 +66,7 @@ public: void selectOwnEcho(); void selectOnDxEcho(); qint32 nfRIT(); + qint32 DopplerMethod(); Q_SLOT void nominal_frequency (Frequency rx, Frequency tx); Q_SIGNAL void tracking_update () const; diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index a76938fc7..883cad2be 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -4699,7 +4699,7 @@ void MainWindow::guiUpdate() //Once per second (onesec) 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(); m_currentBand=m_config.bands()->find(m_freqNominal); @@ -8742,10 +8742,9 @@ void MainWindow::astroUpdate () 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_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; -// qDebug() << "cc1" << m_hisGrid << m_auto << m_astroWidget->doppler_tracking() -// << m_fSpread << m_fDop << correction.rx << m_fAudioShift; return; } if ((m_monitoring || m_transmitting)