Renamed Runaway Tx to Idle Watchdog

This commit is contained in:
Jordan Sherer 2018-09-23 16:41:06 -04:00
parent a0abda9313
commit 522f5cf743
3 changed files with 15 additions and 5 deletions

View File

@ -550,7 +550,7 @@
<item> <item>
<widget class="QLabel" name="label_10"> <widget class="QLabel" name="label_10">
<property name="text"> <property name="text">
<string>Tx watchdog:</string> <string>Idle watchdog timer:</string>
</property> </property>
<property name="buddy"> <property name="buddy">
<cstring>tx_watchdog_spin_box</cstring> <cstring>tx_watchdog_spin_box</cstring>
@ -560,7 +560,7 @@
<item> <item>
<widget class="QSpinBox" name="tx_watchdog_spin_box"> <widget class="QSpinBox" name="tx_watchdog_spin_box">
<property name="toolTip"> <property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Number of minutes before unattended transmissions are aborted&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Number of minutes before unattended transmissions are aborted (beacons, auto-replies, etc).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="specialValueText"> <property name="specialValueText">
<string>Disabled</string> <string>Disabled</string>
@ -571,8 +571,11 @@
<property name="prefix"> <property name="prefix">
<string/> <string/>
</property> </property>
<property name="maximum">
<number>1440</number>
</property>
<property name="singleStep"> <property name="singleStep">
<number>5</number> <number>1</number>
</property> </property>
<property name="value"> <property name="value">
<number>0</number> <number>0</number>

View File

@ -6552,6 +6552,9 @@ void MainWindow::checkBeacon(){
if(m_nextBeaconQueued){ if(m_nextBeaconQueued){
return; return;
} }
if(m_tx_watchdog){
return;
}
prepareBeacon(); prepareBeacon();
} }
@ -9784,6 +9787,10 @@ void MainWindow::processSpots() {
} }
void MainWindow::processTxQueue(){ void MainWindow::processTxQueue(){
if(m_tx_watchdog){
return;
}
if(m_txMessageQueue.isEmpty()){ if(m_txMessageQueue.isEmpty()){
return; return;
} }
@ -10915,7 +10922,7 @@ void MainWindow::tx_watchdog (bool triggered)
if (m_auto) auto_tx_mode (false); if (m_auto) auto_tx_mode (false);
stopTx(); stopTx();
tx_status_label.setStyleSheet ("QLabel{background-color: #ff0000}"); tx_status_label.setStyleSheet ("QLabel{background-color: #ff0000}");
tx_status_label.setText ("Runaway Tx watchdog"); tx_status_label.setText ("Idle watchdog");
QApplication::alert (this); QApplication::alert (this);
} }
else else

View File

@ -4942,7 +4942,7 @@ list. The list can be maintained in Settings (F2).</string>
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="text"> <property name="text">
<string>Runaway Tx watchdog</string> <string>Idle watchdog</string>
</property> </property>
</action> </action>
<action name="actionAllow_multiple_instances"> <action name="actionAllow_multiple_instances">