From 4298a000a001a441f230e1f202d1687e0f0e2111 Mon Sep 17 00:00:00 2001 From: Brian Moran Date: Fri, 6 Sep 2024 06:43:58 -0700 Subject: [PATCH] lower case for verified and invalid messages --- Network/FoxVerifier.cpp | 4 ++-- widgets/mainwindow.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Network/FoxVerifier.cpp b/Network/FoxVerifier.cpp index 51cdddf23..750e40df0 100644 --- a/Network/FoxVerifier.cpp +++ b/Network/FoxVerifier.cpp @@ -103,11 +103,11 @@ QString FoxVerifier::formatDecodeMessage(QDateTime ts, QString callsign, unsigne QTime rx_time = ts.time(); QString hz=QString("%1").arg(hz_, 4, 10 ); // insert Hz 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 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 return QString{}; diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index be433ad4e..a2a1aef57 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -4310,7 +4310,7 @@ void MainWindow::readFromStdout() //readFromStdout #ifdef FOX_OTP if ((SpecOp::HOUND == m_specOp) && ((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: // QString test_return = QString{"203630 -12 0.1 775 ~ K8R.920749"}; @@ -4322,7 +4322,7 @@ void MainWindow::readFromStdout() //readFromStdout lineparts = decodedtext0.string().split(' ', SkipEmptyParts); if (lineparts.length() <= 6) { QStringList otp_parts; - // split K8R.V920749 into K8R and 920749 + // split K8.V920749 into K8R and 920749 otp_parts = lineparts[5].split('.', SkipEmptyParts); callsign = otp_parts[0]; otp = otp_parts[1];