w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feat-map65-integration' of bitbucket.org:k1jt/wsjtx into feat-map65-integration

This commit is contained in:
Joe Taylor 2021-04-21 17:06:00 -04:00
parent 9e9357b970 6ec55f0698
commit a90b58ad40
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/q65_decode.f90
View File

@ -342,8 +342,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

1
map65/devsetup.cpp
View File

@ -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);

7
models/FrequencyList.cpp
View File

@ -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_);
}

2
widgets/mainwindow.cpp
View File

@ -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) {