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

Restore HB/HB+ACK settings when switching between Normal, Fast, and Turbo modes

Browse Source
This commit is contained in:
Jordan Sherer 2019-09-16 14:16:17 -04:00
parent a882e1d9a5
commit 18b59e1b52
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mainwindow.cpp
View File

@ -1150,7 +1150,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
} }
// prep // prep
prepareHeartbeatMode(ui->actionModeJS8HB->isChecked()); prepareHeartbeatMode(ui->actionModeJS8HB->isEnabled() && ui->actionModeJS8HB->isChecked());
prepareSpotting(); prepareSpotting();
auto enterFilter = new EnterKeyPressEater(); auto enterFilter = new EnterKeyPressEater();
@ -6876,7 +6876,8 @@ void MainWindow::displayWidgets(qint64 n)
void MainWindow::on_actionModeJS8HB_toggled(bool checked){ void MainWindow::on_actionModeJS8HB_toggled(bool checked){
// prep hb mode // prep hb mode
prepareHeartbeatMode(checked);
prepareHeartbeatMode(ui->actionModeJS8HB->isEnabled() && ui->actionModeJS8HB->isChecked());
displayActivity(true); displayActivity(true);
on_actionJS8_triggered(); on_actionJS8_triggered();
@ -6884,7 +6885,8 @@ void MainWindow::on_actionModeJS8HB_toggled(bool checked){
void MainWindow::on_actionHeartbeatAcknowledgements_toggled(bool checked){ void MainWindow::on_actionHeartbeatAcknowledgements_toggled(bool checked){
// prep hb ack mode // prep hb ack mode
prepareHeartbeatMode(ui->actionModeJS8HB->isChecked());
prepareHeartbeatMode(ui->actionModeJS8HB->isEnabled() && ui->actionModeJS8HB->isChecked());
displayActivity(true); displayActivity(true);
on_actionJS8_triggered(); on_actionJS8_triggered();
@ -6908,7 +6910,7 @@ void MainWindow::on_actionModeJS8Ultra_triggered(){
void MainWindow::on_actionModeAutoreply_toggled(bool checked){ void MainWindow::on_actionModeAutoreply_toggled(bool checked){
// update the HB ack option (needs autoreply on) // update the HB ack option (needs autoreply on)
prepareHeartbeatMode(ui->actionModeJS8HB->isChecked()); prepareHeartbeatMode(ui->actionModeJS8HB->isEnabled() && ui->actionModeJS8HB->isChecked());
// then update the js8 mode // then update the js8 mode
on_actionJS8_triggered(); on_actionJS8_triggered();
@ -6924,6 +6926,7 @@ void MainWindow::prepareHeartbeatMode(bool enabled){
ui->actionModeJS8HB->setEnabled(m_nSubMode == Varicode::JS8CallNormal); ui->actionModeJS8HB->setEnabled(m_nSubMode == Varicode::JS8CallNormal);
ui->actionHeartbeatAcknowledgements->setEnabled(ui->actionModeAutoreply->isChecked() && enabled); ui->actionHeartbeatAcknowledgements->setEnabled(ui->actionModeAutoreply->isChecked() && enabled);
#if 0
//ui->actionCQ->setEnabled(!enabled); //ui->actionCQ->setEnabled(!enabled);
//ui->actionFocus_Message_Reply_Area->setEnabled(!enabled); //ui->actionFocus_Message_Reply_Area->setEnabled(!enabled);
@ -6943,6 +6946,7 @@ void MainWindow::prepareHeartbeatMode(bool enabled){
// ui->actionShow_Band_Heartbeats_and_ACKs->setChecked(enabled); // ui->actionShow_Band_Heartbeats_and_ACKs->setChecked(enabled);
// ui->actionShow_Band_Heartbeats_and_ACKs->setVisible(true); // ui->actionShow_Band_Heartbeats_and_ACKs->setVisible(true);
// ui->actionShow_Band_Heartbeats_and_ACKs->setEnabled(false); // ui->actionShow_Band_Heartbeats_and_ACKs->setEnabled(false);
#endif
// update the HB button immediately // update the HB button immediately
updateRepeatButtonDisplay(); updateRepeatButtonDisplay();
@ -6968,15 +6972,17 @@ void MainWindow::on_actionJS8_triggered()
// Only enable heartbeat for normal mode // Only enable heartbeat for normal mode
ui->actionModeJS8HB->setEnabled(m_nSubMode == Varicode::JS8CallNormal); ui->actionModeJS8HB->setEnabled(m_nSubMode == Varicode::JS8CallNormal);
if(m_nSubMode != Varicode::JS8CallNormal){ prepareHeartbeatMode(ui->actionModeJS8HB->isEnabled() && ui->actionModeJS8HB->isChecked());
ui->actionModeJS8HB->setChecked(false);
} //if(m_nSubMode != Varicode::JS8CallNormal){
// ui->actionModeJS8HB->setChecked(false);
//}
auto modeText = currentMode(); auto modeText = currentMode();
if(ui->actionModeAutoreply->isChecked()){ if(ui->actionModeAutoreply->isChecked()){
modeText += QString("+AUTO"); modeText += QString("+AUTO");
} }
if(ui->actionModeJS8HB->isChecked()){ if(ui->actionModeJS8HB->isEnabled() && ui->actionModeJS8HB->isChecked()){
if(ui->actionHeartbeatAcknowledgements->isChecked()){ if(ui->actionHeartbeatAcknowledgements->isChecked()){
modeText += QString("+HB+ACK"); modeText += QString("+HB+ACK");
} else { } else {
@ -10729,7 +10735,7 @@ void MainWindow::processCommandActivity() {
// PROCESS ACTIVE HEARTBEAT // PROCESS ACTIVE HEARTBEAT
// if we have hb mode enabled and auto reply enabled <del>and auto ack enabled and no callsign is selected</del> update: if we're in HB mode, doesn't matter if a callsign is selected. // if we have hb mode enabled and auto reply enabled <del>and auto ack enabled and no callsign is selected</del> update: if we're in HB mode, doesn't matter if a callsign is selected.
else if (d.cmd == " HB" && ui->actionModeJS8HB->isChecked() && ui->actionModeAutoreply->isChecked() && ui->actionHeartbeatAcknowledgements->isChecked()){ else if (d.cmd == " HB" && ui->actionModeJS8HB->isEnabled() && ui->actionModeJS8HB->isChecked() && ui->actionModeAutoreply->isChecked() && ui->actionHeartbeatAcknowledgements->isChecked()){
// check to make sure we aren't pausing HB transmissions (ACKs) while a callsign is selected // check to make sure we aren't pausing HB transmissions (ACKs) while a callsign is selected
if(m_config.heartbeat_qso_pause() && !selectedCallsign.isEmpty()){ if(m_config.heartbeat_qso_pause() && !selectedCallsign.isEmpty()){
qDebug() << "hb paused during qso"; qDebug() << "hb paused during qso";