From 0c0ecd893bb9d3c9eccd21b6ae6c97a348736bcd Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 2 Feb 2023 12:18:00 -0500 Subject: [PATCH] Revert "Another tweak to make temporary manual rig control work as intended." This reverts commit 1b7830825a356eb3436998b51f6cf071da9763ab. --- widgets/mainwindow.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index 53262e8ac..535a475d4 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -7802,18 +7802,17 @@ void MainWindow::on_readFreq_clicked() // CTRL+click on the rig-mode button to allow temporary manual rig control. bool b=QApplication::keyboardModifiers().testFlag(Qt::ControlModifier); - if(b) { - if(m_config.is_transceiver_online()) { + if(b and m_config.is_transceiver_online()) { m_config.transceiver_offline(); update_dynamic_property (ui->readFreq, "state", "manual"); ui->readFreq->setText("M"); - } else { - m_config.transceiver_online(); - update_dynamic_property (ui->readFreq, "state", "ok"); - ui->readFreq->setText(m_rigState.split() ? "S" : ""); - } + return; } - if (m_config.is_transceiver_online()) m_config.sync_transceiver(true, true); + + if (m_config.transceiver_online ()) + { + m_config.sync_transceiver (true, true); + } } void MainWindow::setXIT(int n, Frequency base) @@ -7883,7 +7882,6 @@ void MainWindow::setFreq4(int rxFreq, int txFreq) void MainWindow::handle_transceiver_update (Transceiver::TransceiverState const& s) { - if(ui->readFreq->text()=="M") return; //Manual rig control is active, do nothing here Transceiver::TransceiverState old_state {m_rigState}; //transmitDisplay (s.ptt ()); if (s.ptt () // && !m_rigState.ptt ()