From b73c4418ad4ed9a489ddf64ac8bbfc2c07d5d2c0 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Mon, 21 Nov 2016 15:46:17 +0000 Subject: [PATCH] Display "OOO" at end of Tx message in status bar. Correct the logic for regenerating standard messages when "Enable VHF features" is changed. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7324 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- lib/gen65.f90 | 2 ++ mainwindow.cpp | 10 ++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/gen65.f90 b/lib/gen65.f90 index b899c5e00..af036c2a9 100644 --- a/lib/gen65.f90 +++ b/lib/gen65.f90 @@ -46,6 +46,8 @@ subroutine gen65(msg0,ichk,msgsent,itone,itype) if(nspecial.eq.0) then call packmsg(message,dgen,itype) !Pack message into 72 bits call unpackmsg(dgen,msgsent) !Unpack to get message sent + msgsent(20:22)=cok + call fmtmsg(msgsent,iz) if(ichk.ne.0) go to 999 !Return if checking only call rs_encode(dgen,sent) !Apply Reed-Solomon code diff --git a/mainwindow.cpp b/mainwindow.cpp index bdb3804ba..e3b47a33d 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1389,7 +1389,7 @@ void MainWindow::on_actionSettings_triggered() //Setup Dialog { // things that might change that we need know about auto callsign = m_config.my_callsign (); - + bool bvhf0=m_config.enable_VHF_features(); if (QDialog::Accepted == m_config.exec ()) { if (m_config.my_callsign () != callsign) { m_baseCall = Radio::base_callsign (m_config.my_callsign ()); @@ -1427,7 +1427,10 @@ void MainWindow::on_actionSettings_triggered() //Setup Dialog if(m_mode=="JT4") on_actionJT4_triggered(); if(m_mode=="JT9") on_actionJT9_triggered(); if(m_mode=="JT9+JT65") on_actionJT9_JT65_triggered(); - if(m_mode=="JT65") on_actionJT65_triggered(); + if(m_mode=="JT65") { + on_actionJT65_triggered(); + if(m_config.enable_VHF_features() != bvhf0) genStdMsgs(m_rpt); + } if(m_mode=="QRA64") on_actionQRA64_triggered(); if(m_mode=="ISCAT") on_actionISCAT_triggered(); if(m_mode=="MSK144") on_actionMSK144_triggered(); @@ -3539,8 +3542,7 @@ void MainWindow::genStdMsgs(QString rpt) QString t00=t0; t=t0 + m_config.my_grid ().mid(0,4); msgtype(t, ui->tx1); - if(ui->cbShMsgs->isVisible() and ui->cbShMsgs->isChecked() and - m_mode=="JT65") { + if(m_config.enable_VHF_features() and ui->cbShMsgs->isChecked() and m_mode=="JT65") { t=t+" OOO"; msgtype(t, ui->tx2); msgtype("RO", ui->tx3);