w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-21 19:55:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feat-boost-log

Browse Source
This commit is contained in:
Bill Somerville 2020-09-22 11:23:33 +01:00
commit 86c76be111
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
4 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
models/FrequencyList.cpp
View File

@ -48,7 +48,7 @@ namespace
{136000, Modes::WSPR, IARURegions::ALL}, {136000, Modes::WSPR, IARURegions::ALL},
{136000, Modes::FST4, IARURegions::ALL}, {136000, Modes::FST4, IARURegions::ALL},
{136000, Modes::FST4W, IARURegions::ALL}, {136000, Modes::FST4W, IARURegions::ALL},
{136130, Modes::JT9, IARURegions::ALL}, {136000, Modes::JT9, IARURegions::ALL},
{474200, Modes::JT9, IARURegions::ALL}, {474200, Modes::JT9, IARURegions::ALL},
{474200, Modes::FST4, IARURegions::ALL}, {474200, Modes::FST4, IARURegions::ALL},

17
widgets/mainwindow.cpp
View File

@ -1893,8 +1893,12 @@ void MainWindow::on_monitorButton_clicked (bool checked)
setXIT (ui->TxFreqSpinBox->value ()); setXIT (ui->TxFreqSpinBox->value ());
} }
// ensure FreqCal triggers // ensure FreqCal triggers
if(m_mode=="FST4W") {
on_sbFST4W_RxFreq_valueChanged(ui->sbFST4W_RxFreq->value());
} else {
on_RxFreqSpinBox_valueChanged (ui->RxFreqSpinBox->value ()); on_RxFreqSpinBox_valueChanged (ui->RxFreqSpinBox->value ());
} }
}
//Get Configuration in/out of strict split and mode checking //Get Configuration in/out of strict split and mode checking
m_config.sync_transceiver (true, checked); m_config.sync_transceiver (true, checked);
} else { } else {
@ -3022,6 +3026,8 @@ void MainWindow::decode() //decode()
dec_data.params.nutc=dec_data.params.nutc/100; dec_data.params.nutc=dec_data.params.nutc/100;
} }
if(dec_data.params.nagain==0 && dec_data.params.newdat==1 && (!m_diskData)) { if(dec_data.params.nagain==0 && dec_data.params.newdat==1 && (!m_diskData)) {
qint64 nperiods=now.toMSecsSinceEpoch()/(1000.0*m_TRperiod);
m_dateTimeSeqStart=QDateTime::fromMSecsSinceEpoch(qint64(1000.0*nperiods*m_TRperiod)).toUTC();
qint64 ms = QDateTime::currentMSecsSinceEpoch() % 86400000; qint64 ms = QDateTime::currentMSecsSinceEpoch() % 86400000;
int imin=ms/60000; int imin=ms/60000;
int ihr=imin/60; int ihr=imin/60;
@ -7508,7 +7514,7 @@ void::MainWindow::VHF_features_enabled(bool b)
void MainWindow::on_sbTR_valueChanged(int value) void MainWindow::on_sbTR_valueChanged(int value)
{ {
// if(!m_bFastMode and n>m_nSubMode) m_MinW=m_nSubMode; // if(!m_bFastMode and n>m_nSubMode) m_MinW=m_nSubMode;
if(m_bFastMode or m_mode=="FreqCal" or m_mode=="FST4" or m_mode=="FST4W") { if(m_bFastMode or m_mode=="FreqCal" or m_mode=="FST4" or m_mode=="FST4W") {
m_TRperiod = value; m_TRperiod = value;
if (m_mode == "FST4" || m_mode == "FST4W") if (m_mode == "FST4" || m_mode == "FST4W")
@ -9101,13 +9107,8 @@ void MainWindow::write_all(QString txRx, QString message)
t = t.asprintf("%5d",ui->TxFreqSpinBox->value()); t = t.asprintf("%5d",ui->TxFreqSpinBox->value());
if (txRx=="Tx") msg=" 0 0.0" + t + " " + message; if (txRx=="Tx") msg=" 0 0.0" + t + " " + message;
auto time = QDateTime::currentDateTimeUtc (); auto time = QDateTime::currentDateTimeUtc ();
if( txRx=="Rx" ) { if( txRx=="Rx" ) time=m_dateTimeSeqStart;
double tdec = fmod(double(time.time().second()),m_TRperiod);
if( "MSK144" != m_mode && tdec < 0.5*m_TRperiod ) {
tdec+=m_TRperiod;
}
time = time.addSecs(-tdec);
}
t = t.asprintf("%10.3f ",m_freqNominal/1.e6); t = t.asprintf("%10.3f ",m_freqNominal/1.e6);
if (m_diskData) { if (m_diskData) {
if (m_fileDateTime.size()==11) { if (m_fileDateTime.size()==11) {

1
widgets/mainwindow.h
View File

@ -660,6 +660,7 @@ private:
QDateTime m_dateTimeSentTx3; QDateTime m_dateTimeSentTx3;
QDateTime m_dateTimeRcvdRR73; QDateTime m_dateTimeRcvdRR73;
QDateTime m_dateTimeBestSP; QDateTime m_dateTimeBestSP;
QDateTime m_dateTimeSeqStart; //Nominal start time of Rx sequence about to be decoded
QSharedMemory *mem_jt9; QSharedMemory *mem_jt9;
QString m_QSOText; QString m_QSOText;

3
widgets/plotter.cpp
View File

@ -547,7 +547,8 @@ void CPlotter::DrawOverlay() //DrawOverlay()
x1=XfromFreq(m_rxFreq-m_tol); x1=XfromFreq(m_rxFreq-m_tol);
x2=XfromFreq(m_rxFreq+m_tol); x2=XfromFreq(m_rxFreq+m_tol);
painter0.drawLine(x1,26,x2,26); // Mark the Tol range painter0.drawLine(x1,26,x2,26); // Mark the Tol range
} } }
}
} }
if(m_mode=="JT9" or m_mode=="JT65" or m_mode=="JT9+JT65" or if(m_mode=="JT9" or m_mode=="JT65" or m_mode=="JT9+JT65" or