From e3bceafe3a6a455416352e8330bfd5fbd2682bc0 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Mon, 25 Jul 2022 11:27:36 -0400 Subject: [PATCH] Temporarily save WIP on echo mode. --- widgets/astro.cpp | 1 + widgets/mainwindow.cpp | 18 ++++++------------ widgets/mainwindow.h | 2 +- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/widgets/astro.cpp b/widgets/astro.cpp index 49e0d905e..3e0c9a046 100644 --- a/widgets/astro.cpp +++ b/widgets/astro.cpp @@ -252,6 +252,7 @@ auto Astro::astroUpdate(QDateTime const& t, QString const& mygrid, QString const } correction.wself=width1; correction.wdx=width2; + qDebug() << "AA0" << m_DopplerMethod << m_dop00 << m_dop << correction.rx << correction.wself << correction.wdx; return correction; } diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index 1e90e50e5..e3a232644 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -1579,11 +1579,6 @@ void MainWindow::dataSink(qint64 frames) } } - if(m_mode=="Echo" and m_ihsym==1) { - qDebug() << "bb" << m_fDop << m_astroWidget->nfRIT() - << m_astroWidget->bDither() << m_config.transceiver_resolution () - << m_freqNominal << m_echoFreq << m_wself << m_wdx; - } bool bCallDecoder=false; if(m_ihsym==m_hsymStop) bCallDecoder=true; if(m_mode=="FT8" and !m_diskData) { @@ -7919,9 +7914,9 @@ void MainWindow::transmit (double snr) if(m_astroWidget->bDither()) m_echoFreq=1490.0 + QRandomGenerator::global()->bounded(20.0); //Dither by +/- 10 Hz Q_EMIT sendMessage (m_mode, 27, 1024.0, m_echoFreq, 0.0, m_soundOutput, m_config.audio_output_channel(), false, false, snr, m_TRperiod); - qDebug() << "aa" << m_fDop << m_astroWidget->nfRIT() - << m_astroWidget->bDither() << m_config.transceiver_resolution () - << m_freqNominal << m_echoFreq << m_wself << m_wdx; +// qDebug() << "aa" << m_fDop << m_astroWidget->nfRIT() +// << m_astroWidget->bDither() << m_config.transceiver_resolution () +// << m_freqNominal << m_echoFreq << m_wself << m_wdx; } // In auto-sequencing mode, stop after 5 transmissions of "73" message. @@ -8727,13 +8722,12 @@ void MainWindow::astroUpdate () if (Qt::ControlModifier & QApplication::queryKeyboardModifiers ()) return; auto correction = m_astroWidget->astroUpdate(QDateTime::currentDateTimeUtc (), - m_config.my_grid(), m_hisGrid, - m_freqNominal, - "Echo" == m_mode, m_transmitting, - !m_config.tx_QSY_allowed (), m_TRperiod); + m_config.my_grid(), m_hisGrid,m_freqNominal,"Echo" == m_mode, + m_transmitting,!m_config.tx_QSY_allowed (),m_TRperiod); m_fDop=correction.rx; m_wself=correction.wself; m_wdx=correction.wdx; +// qDebug() << "cc" << m_fDop << m_wself << m_wdx; // no Doppler correction in Tx if rig can't do it if (m_transmitting && !m_config.tx_QSY_allowed ()) return; diff --git a/widgets/mainwindow.h b/widgets/mainwindow.h index 6f55aa76b..b79b9e376 100644 --- a/widgets/mainwindow.h +++ b/widgets/mainwindow.h @@ -432,7 +432,7 @@ private: double m_tRemaining; double m_TRperiod; - double m_echoFreq; + double m_echoFreq=1500.0; double m_wself; double m_wdx;