w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-09-02 21:27:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Temporarily save WIP on echo mode.

Browse Source
This commit is contained in:
Joe Taylor 2022-07-25 11:27:36 -04:00
parent f9ce51c039
commit e3bceafe3a
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
widgets/astro.cpp
View File

@ -252,6 +252,7 @@ auto Astro::astroUpdate(QDateTime const& t, QString const& mygrid, QString const
} }
correction.wself=width1; correction.wself=width1;
correction.wdx=width2; correction.wdx=width2;
qDebug() << "AA0" << m_DopplerMethod << m_dop00 << m_dop << correction.rx << correction.wself << correction.wdx;
return correction; return correction;
} }

18
widgets/mainwindow.cpp
View File

@ -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; bool bCallDecoder=false;
if(m_ihsym==m_hsymStop) bCallDecoder=true; if(m_ihsym==m_hsymStop) bCallDecoder=true;
if(m_mode=="FT8" and !m_diskData) { 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 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, Q_EMIT sendMessage (m_mode, 27, 1024.0, m_echoFreq, 0.0, m_soundOutput,
m_config.audio_output_channel(), false, false, snr, m_TRperiod); m_config.audio_output_channel(), false, false, snr, m_TRperiod);
qDebug() << "aa" << m_fDop << m_astroWidget->nfRIT() // qDebug() << "aa" << m_fDop << m_astroWidget->nfRIT()
<< m_astroWidget->bDither() << m_config.transceiver_resolution () // << m_astroWidget->bDither() << m_config.transceiver_resolution ()
<< m_freqNominal << m_echoFreq << m_wself << m_wdx; // << m_freqNominal << m_echoFreq << m_wself << m_wdx;
} }
// In auto-sequencing mode, stop after 5 transmissions of "73" message. // In auto-sequencing mode, stop after 5 transmissions of "73" message.
@ -8727,13 +8722,12 @@ void MainWindow::astroUpdate ()
if (Qt::ControlModifier & QApplication::queryKeyboardModifiers ()) return; if (Qt::ControlModifier & QApplication::queryKeyboardModifiers ()) return;
auto correction = m_astroWidget->astroUpdate(QDateTime::currentDateTimeUtc (), auto correction = m_astroWidget->astroUpdate(QDateTime::currentDateTimeUtc (),
m_config.my_grid(), m_hisGrid, m_config.my_grid(), m_hisGrid,m_freqNominal,"Echo" == m_mode,
m_freqNominal, m_transmitting,!m_config.tx_QSY_allowed (),m_TRperiod);
"Echo" == m_mode, m_transmitting,
!m_config.tx_QSY_allowed (), m_TRperiod);
m_fDop=correction.rx; m_fDop=correction.rx;
m_wself=correction.wself; m_wself=correction.wself;
m_wdx=correction.wdx; m_wdx=correction.wdx;
// qDebug() << "cc" << m_fDop << m_wself << m_wdx;
// no Doppler correction in Tx if rig can't do it // no Doppler correction in Tx if rig can't do it
if (m_transmitting && !m_config.tx_QSY_allowed ()) return; if (m_transmitting && !m_config.tx_QSY_allowed ()) return;

2
widgets/mainwindow.h
View File

@ -432,7 +432,7 @@ private:
double m_tRemaining; double m_tRemaining;
double m_TRperiod; double m_TRperiod;
double m_echoFreq; double m_echoFreq=1500.0;
double m_wself; double m_wself;
double m_wdx; double m_wdx;