From 71bd5b79e3c931f063055b6dad7b0576f7abb3d2 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Fri, 2 Apr 2021 09:56:50 -0400 Subject: [PATCH 1/5] Don't attempt a Q65 average decode if it's not selected on Decode menu. --- lib/q65_decode.f90 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/q65_decode.f90 b/lib/q65_decode.f90 index 7869527d7..5acc15f52 100644 --- a/lib/q65_decode.f90 +++ b/lib/q65_decode.f90 @@ -341,8 +341,7 @@ contains endif endif enddo ! icand - if(iavg.eq.0 .and.navg(iseq).ge.2) go to 50 - + if(iavg.eq.0 .and.navg(iseq).ge.2 .and. iand(ndepth,16).ne.0) go to 50 900 return end subroutine decode From 901952859055ad2b4283bf16d48b96f0f19e4453 Mon Sep 17 00:00:00 2001 From: Steven Franke Date: Wed, 21 Apr 2021 10:16:05 -0500 Subject: [PATCH 2/5] Fix missing MSK144 timestamps in ALL.TXT. --- widgets/mainwindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index 942729137..5246279d0 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -9214,7 +9214,7 @@ 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" ) time=m_dateTimeSeqStart; + if( txRx=="Rx" && !m_bFastMode ) time=m_dateTimeSeqStart; t = t.asprintf("%10.3f ",m_freqNominal/1.e6); if (m_diskData) { From 828fb8f4a2a1e95e2b5ae1588e1b1c2454e5382c Mon Sep 17 00:00:00 2001 From: Steven Franke Date: Wed, 21 Apr 2021 10:16:05 -0500 Subject: [PATCH 3/5] Fix missing MSK144 timestamps in ALL.TXT. --- widgets/mainwindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index 5e4a7307a..54c31949e 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -9214,7 +9214,7 @@ 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" ) time=m_dateTimeSeqStart; + if( txRx=="Rx" && !m_bFastMode ) time=m_dateTimeSeqStart; t = t.asprintf("%10.3f ",m_freqNominal/1.e6); if (m_diskData) { From 7f47e67026dc204bcf8f31d95ec3b4f35b997303 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Wed, 21 Apr 2021 19:33:52 +0100 Subject: [PATCH 4/5] Repair a defect in band/mode matching in the frequency list This defect could cause the incorrect number of columns and incorrect column headings in the WSPR Band Hopping schedule settings. --- models/FrequencyList.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/models/FrequencyList.cpp b/models/FrequencyList.cpp index beae8fd6d..034af8951 100644 --- a/models/FrequencyList.cpp +++ b/models/FrequencyList.cpp @@ -965,8 +965,11 @@ auto FrequencyList_v2::all_bands (Region region, Mode mode) const -> BandSet BandSet result; for (auto const& item : m_->frequency_list_) { - if (region == IARURegions::ALL || item.region_ == region - || mode == Modes::ALL || item.mode_ == mode) + // Match frequencies that are for all regions, for the specified + // region (which can also be "all"), and where the mode matches + // the specified mode (which can also be "all"). + if ((region == IARURegions::ALL || item.region_ == IARURegions::ALL || item.region_ == region) + && (mode == Modes::ALL || item.mode_ == Modes::ALL || item.mode_ == mode)) { result << m_->bands_->find (item.frequency_); } From 6ec55f06986ccfc0fd930a4fb0ebfed68727fa27 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Wed, 21 Apr 2021 21:58:10 +0100 Subject: [PATCH 5/5] Repair a regression in saving colours to settings --- map65/devsetup.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/map65/devsetup.cpp b/map65/devsetup.cpp index 2e223a710..abd0734a9 100644 --- a/map65/devsetup.cpp +++ b/map65/devsetup.cpp @@ -274,6 +274,7 @@ void DevSetup::updateColorLabels() .arg (b3, 2, 16, QLatin1Char {'0'}) ); + m_colors.clear (); QTextStream ots {&m_colors, QIODevice::WriteOnly}; ots.setIntegerBase (16); ots.setFieldWidth (2);