From b1000ee153e7de359b9fc76b8ea25055d809ea3b Mon Sep 17 00:00:00 2001 From: Uwe Risse Date: Fri, 29 Jul 2022 11:06:59 +0200 Subject: [PATCH] Remove the Tune watchdog. --- Configuration.cpp | 6 ------ Configuration.hpp | 1 - Configuration.ui | 20 +++++--------------- widgets/mainwindow.cpp | 2 -- 4 files changed, 5 insertions(+), 24 deletions(-) diff --git a/Configuration.cpp b/Configuration.cpp index d313d5bb2..e45bc99af 100644 --- a/Configuration.cpp +++ b/Configuration.cpp @@ -646,7 +646,6 @@ private: bool TX_messages_; bool enable_VHF_features_; bool decode_at_52s_; - bool Tune_watchdog_disabled_; bool single_decode_; bool twoPass_; bool bSpecialOp_; @@ -754,7 +753,6 @@ int Configuration::watchdog () const {return m_->watchdog_;} bool Configuration::TX_messages () const {return m_->TX_messages_;} bool Configuration::enable_VHF_features () const {return m_->enable_VHF_features_;} bool Configuration::decode_at_52s () const {return m_->decode_at_52s_;} -bool Configuration::Tune_watchdog_disabled () const {return m_->Tune_watchdog_disabled_;} bool Configuration::single_decode () const {return m_->single_decode_;} bool Configuration::twoPass() const {return m_->twoPass_;} bool Configuration::x2ToneSpacing() const {return m_->x2ToneSpacing_;} @@ -1355,7 +1353,6 @@ void Configuration::impl::initialize_models () ui_->TX_messages_check_box->setChecked (TX_messages_); ui_->enable_VHF_features_check_box->setChecked(enable_VHF_features_); ui_->decode_at_52s_check_box->setChecked(decode_at_52s_); - ui_->disable_Tune_watchdog_check_box->setChecked(Tune_watchdog_disabled_); ui_->single_decode_check_box->setChecked(single_decode_); ui_->cbTwoPass->setChecked(twoPass_); ui_->gbSpecialOpActivity->setChecked(bSpecialOp_); @@ -1571,7 +1568,6 @@ void Configuration::impl::read_settings () TX_messages_ = settings_->value ("Tx2QSO", true).toBool (); enable_VHF_features_ = settings_->value("VHFUHF",false).toBool (); decode_at_52s_ = settings_->value("Decode52",false).toBool (); - Tune_watchdog_disabled_ = settings_->value("TuneWatchdogDisabled",false).toBool (); single_decode_ = settings_->value("SingleDecode",false).toBool (); twoPass_ = settings_->value("TwoPass",true).toBool (); bSpecialOp_ = settings_->value("SpecialOpActivity",false).toBool (); @@ -1706,7 +1702,6 @@ void Configuration::impl::write_settings () settings_->setValue ("SplitMode", QVariant::fromValue (rig_params_.split_mode)); settings_->setValue ("VHFUHF", enable_VHF_features_); settings_->setValue ("Decode52", decode_at_52s_); - settings_->setValue ("TuneWatchdogDisabled", Tune_watchdog_disabled_); settings_->setValue ("SingleDecode", single_decode_); settings_->setValue ("TwoPass", twoPass_); settings_->setValue ("SelectedActivity", SelectedActivity_); @@ -2135,7 +2130,6 @@ void Configuration::impl::accept () azel_directory_.setPath (ui_->azel_path_display_label->text ()); enable_VHF_features_ = ui_->enable_VHF_features_check_box->isChecked (); decode_at_52s_ = ui_->decode_at_52s_check_box->isChecked (); - Tune_watchdog_disabled_ = ui_->disable_Tune_watchdog_check_box->isChecked (); single_decode_ = ui_->single_decode_check_box->isChecked (); twoPass_ = ui_->cbTwoPass->isChecked (); bSpecialOp_ = ui_->gbSpecialOpActivity->isChecked (); diff --git a/Configuration.hpp b/Configuration.hpp index 8d76040b8..50c17033b 100644 --- a/Configuration.hpp +++ b/Configuration.hpp @@ -134,7 +134,6 @@ public: bool split_mode () const; bool enable_VHF_features () const; bool decode_at_52s () const; - bool Tune_watchdog_disabled () const; bool single_decode () const; bool twoPass() const; bool bFox() const; diff --git a/Configuration.ui b/Configuration.ui index 3dbef882c..f86214cca 100644 --- a/Configuration.ui +++ b/Configuration.ui @@ -503,16 +503,6 @@ quiet period when decoding is done. - - - - <html><head/><body><p>Disable the Tune watchdog.</p></body></html> - - - Disable Tune watchdog - - - @@ -3277,13 +3267,13 @@ Right click for insert and delete options. - - - - - + + + + + diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index f717c68f7..5345a8f6c 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -2004,7 +2004,6 @@ void MainWindow::on_actionAbout_triggered() //Display "About" void MainWindow::on_autoButton_clicked (bool checked) { - QTimer::singleShot (3000, [=] {tuneATU_Timer.stop ();}); // Stop the Tune watchdog m_auto = checked; m_maxPoints=-1; if (checked @@ -7479,7 +7478,6 @@ void MainWindow::on_rptSpinBox_valueChanged(int n) void MainWindow::on_tuneButton_clicked (bool checked) { - if (!m_config.Tune_watchdog_disabled ()) tuneATU_Timer.start (90000); // tune watchdog (90s) static bool lastChecked = false; if (lastChecked == checked) return; lastChecked = checked;