diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index 5eda58779..cf3d424a0 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -349,7 +349,6 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple, m_widebandDecode {false}, m_dataAvailable {false}, m_decodedText2 {false}, - m_freeText {false}, m_sentFirst73 {false}, m_currentMessageType {-1}, m_lastMessageType {-1}, @@ -2675,8 +2674,8 @@ void MainWindow::statusChanged() } } else { ui->sbNslots->setVisible(true); - ui->pbFreeText->setVisible(false); - ui->cbSendMsg->setVisible(false); + ui->pbFreeText->setVisible(true); + ui->cbSendMsg->setVisible(true); ui->sbNslots->setValue(m_Nslots0); } if (SpecOp::HOUND==m_specOp) ui->cbRxAll->setVisible(!m_config.superFox()); @@ -9208,6 +9207,8 @@ void MainWindow::on_cbFast9_clicked(bool b) void MainWindow::on_cbSendMsg_toggled(bool b) { + if (!(m_config.superFox() && m_specOp==SpecOp::FOX)) + return; // don't do anything with slot values unless SuperFox mode if(b) { ui->sbNslots->setValue(2); } else { @@ -10636,7 +10637,7 @@ void MainWindow::foxTxSequencer() m_tFoxTxSinceOTP++; m_tFoxTx++; //Increment Fox Tx cycle counter - //Is it time for a stand-alone CQ? + // Is it time for a stand-alone CQ? if(m_tFoxTxSinceCQ >= m_foxCQtime and ui->cbMoreCQs->isChecked()) { fm=ui->comboBoxCQ->currentText() + " " + m_config.my_callsign(); if(!fm.contains("/")) { @@ -10650,6 +10651,13 @@ void MainWindow::foxTxSequencer() goto Transmit; } + // Maybe send out the freetext message? + if (ui->cbSendMsg->isChecked() && (islot < m_Nslots)) { + fm = m_freeTextMsg; + islot++; + foxGenWaveform(islot - 1, fm); + } + #ifdef FOX_OTP // Send OTP message maybe for regular fox mode if (!m_config.superFox() && m_config.OTPEnabled() && (islot < m_Nslots) && (m_tFoxTxSinceOTP >= m_config.OTPinterval())) diff --git a/widgets/mainwindow.h b/widgets/mainwindow.h index fd951e39a..6b7fd6597 100644 --- a/widgets/mainwindow.h +++ b/widgets/mainwindow.h @@ -544,7 +544,6 @@ private: bool m_bDecoded; bool m_noSuffix; bool m_decodedText2; - bool m_freeText; bool m_sentFirst73; int m_currentMessageType; QString m_currentMessage;