From 9fe2fc6de042456b70446e1bffc3f38938907940 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Mon, 21 Sep 2020 14:35:16 -0400 Subject: [PATCH 1/2] Fix two problems: sometime incorrect setting of RxFreq in WideGraph, and incorrect timestamp for FST4W-120 and FST4W-300 decodes in ALL.TXT. --- widgets/mainwindow.cpp | 19 ++++++++++--------- widgets/mainwindow.h | 1 + widgets/plotter.cpp | 3 ++- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index d8461bd67..6a45be645 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -1893,7 +1893,11 @@ void MainWindow::on_monitorButton_clicked (bool checked) setXIT (ui->TxFreqSpinBox->value ()); } // ensure FreqCal triggers - on_RxFreqSpinBox_valueChanged (ui->RxFreqSpinBox->value ()); + if(m_mode=="FST4W") { + on_sbFST4W_RxFreq_valueChanged(ui->sbFST4W_RxFreq->value()); + } else { + on_RxFreqSpinBox_valueChanged (ui->RxFreqSpinBox->value ()); + } } //Get Configuration in/out of strict split and mode checking m_config.sync_transceiver (true, checked); @@ -3022,6 +3026,8 @@ void MainWindow::decode() //decode() dec_data.params.nutc=dec_data.params.nutc/100; } 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; int imin=ms/60000; int ihr=imin/60; @@ -7508,7 +7514,7 @@ void::MainWindow::VHF_features_enabled(bool b) 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") { m_TRperiod = value; 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()); if (txRx=="Tx") msg=" 0 0.0" + t + " " + message; auto time = QDateTime::currentDateTimeUtc (); - if( txRx=="Rx" ) { - 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); - } + if( txRx=="Rx" ) time=m_dateTimeSeqStart; + t = t.asprintf("%10.3f ",m_freqNominal/1.e6); if (m_diskData) { if (m_fileDateTime.size()==11) { diff --git a/widgets/mainwindow.h b/widgets/mainwindow.h index 011e29945..071ffd90d 100644 --- a/widgets/mainwindow.h +++ b/widgets/mainwindow.h @@ -660,6 +660,7 @@ private: QDateTime m_dateTimeSentTx3; QDateTime m_dateTimeRcvdRR73; QDateTime m_dateTimeBestSP; + QDateTime m_dateTimeSeqStart; //Nominal start time of Rx sequence about to be decoded QSharedMemory *mem_jt9; QString m_QSOText; diff --git a/widgets/plotter.cpp b/widgets/plotter.cpp index ab979af64..d612b2eb6 100644 --- a/widgets/plotter.cpp +++ b/widgets/plotter.cpp @@ -547,7 +547,8 @@ void CPlotter::DrawOverlay() //DrawOverlay() x1=XfromFreq(m_rxFreq-m_tol); x2=XfromFreq(m_rxFreq+m_tol); painter0.drawLine(x1,26,x2,26); // Mark the Tol range - } } + } + } } if(m_mode=="JT9" or m_mode=="JT65" or m_mode=="JT9+JT65" or From 8c9acfc464a79bc27ec3a41f8326bf19e5f14c1f Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Mon, 21 Sep 2020 14:45:17 -0400 Subject: [PATCH 2/2] Set default freq for JT9 on 2200 m to 0.136000 MHz. --- models/FrequencyList.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/FrequencyList.cpp b/models/FrequencyList.cpp index ec3c185ff..7523b20a3 100644 --- a/models/FrequencyList.cpp +++ b/models/FrequencyList.cpp @@ -48,7 +48,7 @@ namespace {136000, Modes::WSPR, IARURegions::ALL}, {136000, Modes::FST4, IARURegions::ALL}, {136000, Modes::FST4W, IARURegions::ALL}, - {136130, Modes::JT9, IARURegions::ALL}, + {136000, Modes::JT9, IARURegions::ALL}, {474200, Modes::JT9, IARURegions::ALL}, {474200, Modes::FST4, IARURegions::ALL},