w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-03-22 03:58:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

More tweaks to Echo mode: call to save_echo_params, no display after last echo transmission.

Browse Source
This commit is contained in:
Joe Taylor 2022-08-17 11:19:53 -04:00
parent 75516e8ce4
commit d0a6be96e4
1 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
widgets/mainwindow.cpp
View File

@ -153,7 +153,7 @@ extern "C" {
int savec2_(char const * fname, int* TR_seconds, double* dial_freq, fortran_charlen_t);
void save_echo_params_(int* ndoptotal, int* ndop, int* nfrit, float* f1, double* fspread, short id2[], int* idir);
void save_echo_params_(int* ndoptotal, int* ndop, int* nfrit, float* f1, float* fspread, short id2[], int* idir);
void avecho_( short id2[], int* dop, int* nfrit, int* nauto, int* nqual, float* f1,
float* level, float* sigdb, float* snr, float* dfreq,
@ -1600,39 +1600,42 @@ void MainWindow::dataSink(qint64 frames)
float xlevel=0.0;
float sigdb=0.0;
float dfreq=0.0;
float width=0.0;
float width=m_fSpread;
echocom_.nclearave=m_nclearave;
int nDop=m_fAudioShift;
int nDopTotal=m_fDop;
if(m_diskData) {
int idir=-1;
save_echo_params_(&nDopTotal,&nDop,&nfrit,&f1,&m_fSpread,dec_data.d2,&idir);
width=m_fSpread;
save_echo_params_(&nDopTotal,&nDop,&nfrit,&f1,&width,dec_data.d2,&idir);
}
avecho_(dec_data.d2,&nDop,&nfrit,&nauto,&nqual,&f1,&xlevel,&sigdb,
&dBerr,&dfreq,&width,&m_diskData);
QString t;
t = t.asprintf("%3d %7.1f %7.1f %7.1f %7.1f %7d %7.1f %3d",echocom_.nsum,xlevel,sigdb,
dBerr,dfreq,nDopTotal,width,nqual);
QString t0;
if(m_diskData) {
t0=t0.asprintf("%06d ",m_UTCdisk);
} else {
t0=QDateTime::currentDateTimeUtc().toString("hhmmss ");
}
t = t0 + t;
if (ui) ui->decodedTextBrowser->appendText(t);
if(m_echoGraph->isVisible()) m_echoGraph->plotSpec();
if(m_saveAll) {
int idir=1;
save_echo_params_(&m_fDop,&nDop,&nfrit,&f1,&m_fSpread,dec_data.d2,&idir);
}
m_nclearave=0;
//Don't restart Monitor after an Echo transmission
//Don't restart Monitor after an Echo transmission
if(m_bEchoTxed and !m_auto) {
monitor(false);
m_bEchoTxed=false;
}
if(m_monitoring or m_auto) {
QString t;
t = t.asprintf("%3d %7.1f %7.1f %7.1f %7.1f %7d %7.1f %3d",echocom_.nsum,xlevel,sigdb,
dBerr,dfreq,nDopTotal,width,nqual);
QString t0;
if(m_diskData) {
t0=t0.asprintf("%06d ",m_UTCdisk);
} else {
t0=QDateTime::currentDateTimeUtc().toString("hhmmss ");
}
t = t0 + t;
if (ui) ui->decodedTextBrowser->appendText(t);
}
if(m_echoGraph->isVisible()) m_echoGraph->plotSpec();
if(m_saveAll) {
int idir=1;
save_echo_params_(&m_fDop,&nDop,&nfrit,&f1,&width,dec_data.d2,&idir);
m_fSpread=width;
}
m_nclearave=0;
}
if(m_mode=="FreqCal") {
return;
@ -7931,7 +7934,6 @@ void MainWindow::transmit (double snr)
#endif
Q_EMIT sendMessage (m_mode, 27, 1024.0, 1500.0+m_fDither, 0.0, m_soundOutput,
m_config.audio_output_channel(), false, false, snr, m_TRperiod);
// qDebug() << "aa" << m_s6 << m_freqNominal << m_rigState.frequency() << m_fDither;
}
// In auto-sequencing mode, stop after 5 transmissions of "73" message.
@ -8740,6 +8742,7 @@ void MainWindow::astroUpdate ()
m_transmitting,m_auto,!m_config.tx_QSY_allowed (),m_TRperiod);
m_fDop=correction.dop;
m_fSpread=correction.width;
// qDebug() << "bb" << m_fDop << m_fSpread;
if (m_transmitting && !m_config.tx_QSY_allowed ()) return; // No Tx Doppler correction if rig can't do it
if (!m_astroWidget->doppler_tracking() or m_astroWidget->DopplerMethod()==0) {
@ -8789,8 +8792,6 @@ void MainWindow::astroUpdate ()
}
setRig ();
m_fAudioShift=m_fDop - correction.rx;
// qDebug() << "cc2" << m_hisGrid << m_auto << m_astroWidget->doppler_tracking()
// << m_fSpread << m_fDop << correction.rx << m_fAudioShift;
}
}