mirror of
				https://github.com/saitohirga/WSJT-X.git
				synced 2025-10-30 20:40:28 -04:00 
			
		
		
		
	Revert "Add an option to disable the Tune watchdog."
This reverts commit 0b951a05e78947faa58ffa438d22b4feeb3a1672.
This commit is contained in:
		
							parent
							
								
									0b951a05e7
								
							
						
					
					
						commit
						36e54bf3a0
					
				| @ -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_; | ||||
| @ -756,7 +755,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_;} | ||||
| @ -1357,7 +1355,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_); | ||||
| @ -1575,7 +1572,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 (); | ||||
| @ -1712,7 +1708,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_); | ||||
| @ -2143,7 +2138,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 (); | ||||
|  | ||||
| @ -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; | ||||
|  | ||||
| @ -517,13 +517,6 @@ quiet period when decoding is done.</string> | ||||
|             </property> | ||||
|            </widget> | ||||
|           </item> | ||||
|           <item row="4" column="1"> | ||||
|            <widget class="QCheckBox" name="disable_Tune_watchdog_check_box"> | ||||
|             <property name="text"> | ||||
|              <string>Disable Tune watchdog</string> | ||||
|             </property> | ||||
|            </widget> | ||||
|           </item> | ||||
|          </layout> | ||||
|         </widget> | ||||
|        </item> | ||||
| @ -3275,13 +3268,13 @@ Right click for insert and delete options.</string> | ||||
|   </connection> | ||||
|  </connections> | ||||
|  <buttongroups> | ||||
|   <buttongroup name="TX_audio_source_button_group"/> | ||||
|   <buttongroup name="split_mode_button_group"/> | ||||
|   <buttongroup name="CAT_handshake_button_group"/> | ||||
|   <buttongroup name="CAT_data_bits_button_group"/> | ||||
|   <buttongroup name="TX_mode_button_group"/> | ||||
|   <buttongroup name="PTT_method_button_group"/> | ||||
|   <buttongroup name="special_op_activity_button_group"/> | ||||
|   <buttongroup name="TX_audio_source_button_group"/> | ||||
|   <buttongroup name="CAT_stop_bits_button_group"/> | ||||
|   <buttongroup name="TX_mode_button_group"/> | ||||
|   <buttongroup name="CAT_data_bits_button_group"/> | ||||
|   <buttongroup name="CAT_handshake_button_group"/> | ||||
|  </buttongroups> | ||||
| </ui> | ||||
|  | ||||
| @ -7057,7 +7057,7 @@ 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)
 | ||||
|   tuneATU_Timer.start (120000); // tune watchdog (120s)
 | ||||
|   static bool lastChecked = false; | ||||
|   if (lastChecked == checked) return; | ||||
|   lastChecked = checked; | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user