Merge branch 'develop' into map65

This commit is contained in:
Joe Taylor 2022-11-29 14:12:34 -05:00
commit ef79bed994
4 changed files with 18 additions and 7 deletions

7
NEWS
View File

@ -22,13 +22,15 @@ In program WSJT-X:
- Better calibration for FST4/W SNR estimates.
- Upload FST4W-900 spots to wsprnet with TR code 15 instead of 16.
- Improved FT8 decoding on crowded bands.
- The Working frequency table now offers the following options:
- Better handling of more than one frequency per band.
- Set your preferred frequencies, WSJT-X always comes back to these
QRGs when changing band or mode.
- You can label your frequencies with discriptions (e.g. DXp AB0YXZ).
- You can label your frequencies with descriptions (e.g. DXp AB0YXZ).
- Option to set Start and End Date/Time, so that the frequencies
automatically appear and disappear. Useful for contest or
DXpedition QRGs.
@ -88,7 +90,7 @@ In program WSJT-X:
has turned out to be not reliable enough.
- Correct a long-standing flaw which caused the "Transmit digital gain"
overlay toappear somewhere on the screen.
overlay to appear somewhere on the screen.
- "Highlight DX Call" now also works when the other station is <...>.
@ -102,6 +104,7 @@ tentative new features:
- an ability to read the file wsjtx.log (kept by WSJT-X) to recognize
EME contest dupes.
Release: WSJT-X 2.6.0-rc4
September 8, 2022
-------------------------

View File

@ -278,9 +278,10 @@ QString WSPRNet::encode_mode () const
if (m_mode == "FST4W")
{
auto tr = static_cast<int> ((TR_period_ / 60.)+.5);
if (2 == tr || 15 == tr)
// if (2 == tr || 15 == tr)
if (2 == tr)
{
tr += 1; // distinguish from WSPR-2 and WSPR-15
tr += 1; // distinguish from WSPR-2
}
return QString::number (tr);
}

View File

@ -22,13 +22,15 @@ In program WSJT-X:
- Better calibration for FST4/W SNR estimates.
- Upload FST4W-900 spots to wsprnet with TR code 15 instead of 16.
- Improved FT8 decoding on crowded bands.
- The Working frequency table now offers the following options:
- Better handling of more than one frequency per band.
- Set your preferred frequencies, WSJT-X always comes back to these
QRGs when changing band or mode.
- You can label your frequencies with discriptions (e.g. DXp AB0YXZ).
- You can label your frequencies with descriptions (e.g. DXp AB0YXZ).
- Option to set Start and End Date/Time, so that the frequencies
automatically appear and disappear. Useful for contest or
DXpedition QRGs.
@ -88,7 +90,7 @@ In program WSJT-X:
has turned out to be not reliable enough.
- Correct a long-standing flaw which caused the "Transmit digital gain"
overlay toappear somewhere on the screen.
overlay to appear somewhere on the screen.
- "Highlight DX Call" now also works when the other station is <...>.
@ -102,6 +104,7 @@ tentative new features:
- an ability to read the file wsjtx.log (kept by WSJT-X) to recognize
EME contest dupes.
Release: WSJT-X 2.6.0-rc4
September 8, 2022
-------------------------

View File

@ -3957,7 +3957,7 @@ void MainWindow::readFromStdout() //readFromStdout
}
if(SpecOp::FOX==m_specOp and decodedtext.string().contains(" DE ")) for_us=true; //Hound with compound callsign
if(SpecOp::FOX==m_specOp and for_us and (audioFreq<1000)) bDisplayRight=true;
if(SpecOp::FOX==m_specOp and for_us and decodedtext.string().contains(QRegularExpression{" R\\W\\d"})) bDisplayRight=true;
if(SpecOp::FOX!=m_specOp and (for_us or (abs(audioFreq - m_wideGraph->rxFreq()) <= 10))) bDisplayRight=true;
}
} else {
@ -9593,6 +9593,10 @@ list2Done:
on_logQSOButton_clicked ();
m_foxRateQueue.enqueue (now); //Add present time in seconds
//to Rate queue.
QTimer::singleShot (13000, [=] {
m_foxQSOinProgress.removeOne(hc1); //Remove from In Progress window
updateFoxQSOsInProgressDisplay(); //Update InProgress display after Tx is complete
});
}
m_loggedByFox[hc1] += (m_lastBand + " ");
}