chris/js8call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed default idle timer

Browse Source
This commit is contained in:
Jordan Sherer 2018-10-10 15:29:48 -04:00
parent 3e38067561
commit 4ffa82f695
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Configuration.cpp
View File

@ -1650,7 +1650,7 @@ void Configuration::impl::read_settings ()
quick_call_ = settings_->value ("QuickCall", false).toBool (); quick_call_ = settings_->value ("QuickCall", false).toBool ();
disable_TX_on_73_ = settings_->value ("73TxDisable", false).toBool (); disable_TX_on_73_ = settings_->value ("73TxDisable", false).toBool ();
beacon_ = settings_->value ("TxBeacon", 30).toInt (); beacon_ = settings_->value ("TxBeacon", 30).toInt ();
watchdog_ = settings_->value ("TxWatchdog", 0).toInt (); watchdog_ = settings_->value ("TxIdleWatchdog", 60).toInt ();
if(watchdog_){ if(watchdog_){
watchdog_ = qMax(5, watchdog_); watchdog_ = qMax(5, watchdog_);
} }
@ -1783,7 +1783,7 @@ void Configuration::impl::write_settings ()
settings_->setValue ("QuickCall", quick_call_); settings_->setValue ("QuickCall", quick_call_);
settings_->setValue ("73TxDisable", disable_TX_on_73_); settings_->setValue ("73TxDisable", disable_TX_on_73_);
settings_->setValue ("TxBeacon", beacon_); settings_->setValue ("TxBeacon", beacon_);
settings_->setValue ("TxWatchdog", watchdog_); settings_->setValue ("TxIdleWatchdog", watchdog_);
settings_->setValue ("Tx2QSO", TX_messages_); settings_->setValue ("Tx2QSO", TX_messages_);
settings_->setValue ("CATForceDTR", rig_params_.force_dtr); settings_->setValue ("CATForceDTR", rig_params_.force_dtr);
settings_->setValue ("DTR", rig_params_.dtr_high); settings_->setValue ("DTR", rig_params_.dtr_high);

13
Configuration.ui
View File

@ -457,7 +457,7 @@
<string/> <string/>
</property> </property>
<property name="minimum"> <property name="minimum">
<number>10</number> <number>5</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>1440</number> <number>1440</number>
@ -466,7 +466,7 @@
<number>1</number> <number>1</number>
</property> </property>
<property name="value"> <property name="value">
<number>30</number> <number>15</number>
</property> </property>
</widget> </widget>
</item> </item>
@ -498,6 +498,9 @@
<property name="prefix"> <property name="prefix">
<string/> <string/>
</property> </property>
<property name="minimum">
<number>0</number>
</property>
<property name="maximum"> <property name="maximum">
<number>1440</number> <number>1440</number>
</property> </property>
@ -505,7 +508,7 @@
<number>1</number> <number>1</number>
</property> </property>
<property name="value"> <property name="value">
<number>0</number> <number>60</number>
</property> </property>
</widget> </widget>
</item> </item>
@ -3616,11 +3619,11 @@ soundcard changes</string>
</connections> </connections>
<buttongroups> <buttongroups>
<buttongroup name="CAT_handshake_button_group"/> <buttongroup name="CAT_handshake_button_group"/>
<buttongroup name="CAT_data_bits_button_group"/>
<buttongroup name="split_mode_button_group"/> <buttongroup name="split_mode_button_group"/>
<buttongroup name="TX_audio_source_button_group"/> <buttongroup name="TX_audio_source_button_group"/>
<buttongroup name="TX_mode_button_group"/> <buttongroup name="TX_mode_button_group"/>
<buttongroup name="PTT_method_button_group"/> <buttongroup name="CAT_data_bits_button_group"/>
<buttongroup name="CAT_stop_bits_button_group"/> <buttongroup name="CAT_stop_bits_button_group"/>
<buttongroup name="PTT_method_button_group"/>
</buttongroups> </buttongroups>
</ui> </ui>

4
mainwindow.cpp
View File

@ -10118,6 +10118,9 @@ void MainWindow::tx_watchdog (bool triggered)
void MainWindow::update_watchdog_label () void MainWindow::update_watchdog_label ()
{ {
watchdog_label.setVisible (false);
#if 0
if (m_config.watchdog () && !m_mode.startsWith ("WSPR")) if (m_config.watchdog () && !m_mode.startsWith ("WSPR"))
{ {
watchdog_label.setText (QString {"WD:%1m"}.arg (m_config.watchdog () - m_idleMinutes)); watchdog_label.setText (QString {"WD:%1m"}.arg (m_config.watchdog () - m_idleMinutes));
@ -10128,6 +10131,7 @@ void MainWindow::update_watchdog_label ()
watchdog_label.setText (QString {}); watchdog_label.setText (QString {});
watchdog_label.setVisible (false); watchdog_label.setVisible (false);
} }
#endif
} }
void MainWindow::on_cbMenus_toggled(bool b) void MainWindow::on_cbMenus_toggled(bool b)