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

More WIP on Echo mode.

Browse Source
This commit is contained in:
Joe Taylor 2022-07-21 13:42:08 -04:00
parent a69e3756b6
commit dbdfbb41a7
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
widgets/astro.cpp
View File

@ -250,6 +250,8 @@ auto Astro::astroUpdate(QDateTime const& t, QString const& mygrid, QString const
//qDebug () << "correction.tx (no tx qsy):" << correction.tx; //qDebug () << "correction.tx (no tx qsy):" << correction.tx;
} }
} }
correction.wself=width1;
correction.wdx=width2;
return correction; return correction;
} }

4
widgets/astro.h
View File

@ -32,6 +32,8 @@ public:
Correction () Correction ()
: rx {0} : rx {0}
, tx {0} , tx {0}
, wself {0}
, wdx {0}
{} {}
Correction (Correction const&) = default; Correction (Correction const&) = default;
Correction& operator = (Correction const&) = default; Correction& operator = (Correction const&) = default;
@ -45,6 +47,8 @@ public:
FrequencyDelta rx; FrequencyDelta rx;
FrequencyDelta tx; FrequencyDelta tx;
double wself;
double wdx;
}; };
Correction astroUpdate(QDateTime const& t, Correction astroUpdate(QDateTime const& t,

13
widgets/mainwindow.cpp
View File

@ -7910,10 +7910,10 @@ void MainWindow::transmit (double snr)
} }
if(m_mode=="Echo") { if(m_mode=="Echo") {
//??? should use "fastMode = true" here ??? m_echoFreq=1500.0;
Q_EMIT sendMessage (m_mode, 27, 1024.0, 1500.0, 0.0, m_soundOutput, if(m_astroWidget->bDither()) m_echoFreq=1490.0 + QRandomGenerator::global()->bounded(20.0); //Dither by +/- 10 Hz
m_config.audio_output_channel(), Q_EMIT sendMessage (m_mode, 27, 1024.0, m_echoFreq, 0.0, m_soundOutput,
false, false, snr, m_TRperiod); m_config.audio_output_channel(), false, false, snr, m_TRperiod);
} }
// In auto-sequencing mode, stop after 5 transmissions of "73" message. // In auto-sequencing mode, stop after 5 transmissions of "73" message.
@ -8723,9 +8723,10 @@ void MainWindow::astroUpdate ()
m_freqNominal, m_freqNominal,
"Echo" == m_mode, m_transmitting, "Echo" == m_mode, m_transmitting,
!m_config.tx_QSY_allowed (), m_TRperiod); !m_config.tx_QSY_allowed (), m_TRperiod);
qDebug() << "aa" << correction.tx << correction.rx << m_astroWidget->nfRIT()
qDebug() << "aa" << correction.rx << m_astroWidget->nfRIT()
<< m_astroWidget->bDither() << m_config.transceiver_resolution () << m_astroWidget->bDither() << m_config.transceiver_resolution ()
<< m_freqNominal; << m_freqNominal << m_echoFreq << correction.wself << correction.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;
if (!m_astroWidget->doppler_tracking ()) return; if (!m_astroWidget->doppler_tracking ()) return;

1
widgets/mainwindow.h
View File

@ -432,6 +432,7 @@ private:
double m_tRemaining; double m_tRemaining;
double m_TRperiod; double m_TRperiod;
double m_echoFreq;
float m_DTtol; float m_DTtol;
float m_t0; float m_t0;