w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-07-30 20:52:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

lower case for verified and invalid messages

Browse Source
This commit is contained in:
Brian Moran 2024-09-06 06:43:58 -07:00
parent ec72810451
commit 4298a000a0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Network/FoxVerifier.cpp
View File

@ -103,11 +103,11 @@ QString FoxVerifier::formatDecodeMessage(QDateTime ts, QString callsign, unsigne
QTime rx_time = ts.time(); QTime rx_time = ts.time();
QString hz=QString("%1").arg(hz_, 4, 10 ); // insert Hz QString hz=QString("%1").arg(hz_, 4, 10 ); // insert Hz
if (verify_message.endsWith(" VERIFIED")) { if (verify_message.endsWith(" VERIFIED")) {
return QString("%1 0 0.0 %2 ~ %3 VERIFIED").arg(rx_time.toString("hhmmss")).arg(hz).arg(callsign); return QString("%1 0 0.0 %2 ~ %3 Verified").arg(rx_time.toString("hhmmss")).arg(hz).arg(callsign);
} else } else
if (verify_message.endsWith(" INVALID")) if (verify_message.endsWith(" INVALID"))
{ {
return QString("%1 0 0.0 %2 ~ %3 INVALID").arg(rx_time.toString("hhmmss")).arg(hz).arg(callsign); return QString("%1 0 0.0 %2 ~ %3 Invalid").arg(rx_time.toString("hhmmss")).arg(hz).arg(callsign);
} }
else else
return QString{}; return QString{};

4
widgets/mainwindow.cpp
View File

@ -4310,7 +4310,7 @@ void MainWindow::readFromStdout() //readFromStdout
#ifdef FOX_OTP #ifdef FOX_OTP
if ((SpecOp::HOUND == m_specOp) && if ((SpecOp::HOUND == m_specOp) &&
((m_config.superFox() && (decodedtext0.mid(24, 8) == "$VERIFY$")) || // $VERIFY$ K8R 920749 ((m_config.superFox() && (decodedtext0.mid(24, 8) == "$VERIFY$")) || // $VERIFY$ K8R 920749
(decodedtext0.mid(24,-1).contains(QRegularExpression{"^[A-Z0-9]{2,5}\\.[0-9]{6}"})))) // K8R.920749 (decodedtext0.mid(24,-1).contains(QRegularExpression{"^[A-Z0-9]{2,6}\\.[0-9]{6}"})))) // K8R.920749
{ {
// two cases: // two cases:
// QString test_return = QString{"203630 -12 0.1 775 ~ K8R.920749"}; // QString test_return = QString{"203630 -12 0.1 775 ~ K8R.920749"};
@ -4322,7 +4322,7 @@ void MainWindow::readFromStdout() //readFromStdout
lineparts = decodedtext0.string().split(' ', SkipEmptyParts); lineparts = decodedtext0.string().split(' ', SkipEmptyParts);
if (lineparts.length() <= 6) { if (lineparts.length() <= 6) {
QStringList otp_parts; QStringList otp_parts;
// split K8R.V920749 into K8R and 920749 // split K8.V920749 into K8R and 920749
otp_parts = lineparts[5].split('.', SkipEmptyParts); otp_parts = lineparts[5].split('.', SkipEmptyParts);
callsign = otp_parts[0]; callsign = otp_parts[0];
otp = otp_parts[1]; otp = otp_parts[1];