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

Refactored function for enabling HB. Set FAST as the default mode. Added FAST support to HB

Browse Source
This commit is contained in:
Jordan Sherer 2020-03-23 09:52:46 -04:00
parent f350443dff
commit e55689b25b
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
mainwindow.cpp
View File

@ -2383,8 +2383,8 @@ void MainWindow::readSettings()
// set the frequency offset // set the frequency offset
setFreqOffsetForRestore(m_settings->value("RxFreq",1500).toInt(), false); setFreqOffsetForRestore(m_settings->value("RxFreq",1500).toInt(), false);
setSubmode(m_settings->value("SubMode", Varicode::JS8CallNormal).toInt()); setSubmode(m_settings->value("SubMode", Varicode::JS8CallFast).toInt());
ui->actionModeJS8HB->setChecked((m_nSubMode == Varicode::JS8CallNormal || m_nSubMode == Varicode::JS8CallSlow) && m_settings->value("SubModeHB", false).toBool()); ui->actionModeJS8HB->setChecked(canEnableHeartbeat() && m_settings->value("SubModeHB", false).toBool());
ui->actionHeartbeatAcknowledgements->setChecked(m_settings->value("SubModeHBAck", false).toBool()); ui->actionHeartbeatAcknowledgements->setChecked(m_settings->value("SubModeHBAck", false).toBool());
ui->actionModeMultiDecoder->setChecked(m_settings->value("SubModeMultiDecode", true).toBool()); ui->actionModeMultiDecoder->setChecked(m_settings->value("SubModeMultiDecode", true).toBool());
@ -7498,15 +7498,31 @@ void MainWindow::on_actionModeAutoreply_toggled(bool checked){
on_actionJS8_triggered(); on_actionJS8_triggered();
} }
bool MainWindow::canEnableHeartbeat(){
if(m_nSubMode == Varicode::JS8CallFast){
return true;
}
if(m_nSubMode == Varicode::JS8CallNormal){
return true;
}
if(m_nSubMode == Varicode::JS8CallSlow){
return true;
}
return false;
}
void MainWindow::prepareHeartbeatMode(bool enabled){ void MainWindow::prepareHeartbeatMode(bool enabled){
// heartbeat is only available in HB mode // heartbeat is only available in a supported HB mode
ui->hbMacroButton->setVisible(enabled); ui->hbMacroButton->setVisible(enabled);
if(!enabled){ if(!enabled){
ui->hbMacroButton->setChecked(false); ui->hbMacroButton->setChecked(false);
} }
ui->actionHeartbeat->setEnabled(enabled); ui->actionHeartbeat->setEnabled(enabled);
ui->actionModeJS8HB->setEnabled(m_nSubMode == Varicode::JS8CallNormal || m_nSubMode == Varicode::JS8CallSlow); ui->actionModeJS8HB->setEnabled(enabled && canEnableHeartbeat());
ui->actionHeartbeatAcknowledgements->setEnabled(ui->actionModeAutoreply->isChecked() && enabled); ui->actionHeartbeatAcknowledgements->setEnabled(enabled && ui->actionModeAutoreply->isChecked());
#if 0 #if 0
//ui->actionCQ->setEnabled(!enabled); //ui->actionCQ->setEnabled(!enabled);
@ -7556,7 +7572,7 @@ void MainWindow::on_actionJS8_triggered()
} }
// Only enable heartbeat for normal mode // Only enable heartbeat for normal mode
ui->actionModeJS8HB->setEnabled(m_nSubMode == Varicode::JS8CallNormal || m_nSubMode == Varicode::JS8CallSlow); ui->actionModeJS8HB->setEnabled(canEnableHeartbeat());
prepareHeartbeatMode(ui->actionModeJS8HB->isEnabled() && ui->actionModeJS8HB->isChecked()); prepareHeartbeatMode(ui->actionModeJS8HB->isEnabled() && ui->actionModeJS8HB->isChecked());
//if(m_nSubMode != Varicode::JS8CallNormal){ //if(m_nSubMode != Varicode::JS8CallNormal){

1
mainwindow.h
View File

@ -282,6 +282,7 @@ private slots:
void on_actionHeartbeatAcknowledgements_toggled(bool checked); void on_actionHeartbeatAcknowledgements_toggled(bool checked);
void on_actionModeMultiDecoder_toggled(bool checked); void on_actionModeMultiDecoder_toggled(bool checked);
void on_actionModeAutoreply_toggled(bool checked); void on_actionModeAutoreply_toggled(bool checked);
bool canEnableHeartbeat();
void prepareHeartbeatMode(bool enabled); void prepareHeartbeatMode(bool enabled);
void on_actionJS8_triggered(); void on_actionJS8_triggered();
void on_TxFreqSpinBox_valueChanged(int arg1); void on_TxFreqSpinBox_valueChanged(int arg1);