diff --git a/Audio/soundin.cpp b/Audio/soundin.cpp index d9bc78446..81d323d54 100644 --- a/Audio/soundin.cpp +++ b/Audio/soundin.cpp @@ -97,7 +97,7 @@ void SoundInput::start(QAudioDeviceInfo const& device, int framesPerBuffer, Audi m_stream->start (sink); checkStream (); cummulative_lost_usec_ = -1; - LOG_DEBUG ("Selected buffer size (bytes): " << m_stream->bufferSize () << " period size: " << m_stream->periodSize ()); +// LOG_DEBUG ("Selected buffer size (bytes): " << m_stream->bufferSize () << " period size: " << m_stream->periodSize ()); } else { diff --git a/Audio/soundout.cpp b/Audio/soundout.cpp index f3ec3dce3..48fe0a4fc 100644 --- a/Audio/soundout.cpp +++ b/Audio/soundout.cpp @@ -111,7 +111,7 @@ void SoundOutput::restart (QIODevice * source) } m_stream->setCategory ("production"); m_stream->start (source); - LOG_DEBUG ("Selected buffer size (bytes): " << m_stream->bufferSize () << " period size: " << m_stream->periodSize ()); +// LOG_DEBUG ("Selected buffer size (bytes): " << m_stream->bufferSize () << " period size: " << m_stream->periodSize ()); } void SoundOutput::suspend () diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index 82094e9d5..1e90e50e5 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -1579,6 +1579,11 @@ 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) { @@ -7914,6 +7919,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; } // In auto-sequencing mode, stop after 5 transmissions of "73" message. @@ -8723,10 +8731,10 @@ void MainWindow::astroUpdate () 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() << "aa" << correction.rx << m_astroWidget->nfRIT() - << m_astroWidget->bDither() << m_config.transceiver_resolution () - << m_freqNominal << m_echoFreq << correction.wself << correction.wdx; // no Doppler correction in Tx if rig can't do it if (m_transmitting && !m_config.tx_QSY_allowed ()) return; if (!m_astroWidget->doppler_tracking ()) return; diff --git a/widgets/mainwindow.h b/widgets/mainwindow.h index d80befc19..6f55aa76b 100644 --- a/widgets/mainwindow.h +++ b/widgets/mainwindow.h @@ -433,6 +433,8 @@ private: double m_tRemaining; double m_TRperiod; double m_echoFreq; + double m_wself; + double m_wdx; float m_DTtol; float m_t0; @@ -501,6 +503,7 @@ private: qint32 m_latestDecodeTime=-1; qint32 m_points=-99; qint32 m_score=0; + qint32 m_fDop=0; bool m_btxok; //True if OK to transmit bool m_diskData;